summaryrefslogtreecommitdiff
path: root/xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h
diff options
context:
space:
mode:
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h')
-rw-r--r--xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h17
1 files changed, 13 insertions, 4 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h b/xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h
index 6e3f63388..7d1faaf89 100644
--- a/xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h
+++ b/xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h,v 1.25 2001/05/18 16:03:11 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/common/xf86Privstr.h,v 1.27 2001/08/15 16:25:21 paulo Exp $ */
/*
* Copyright (c) 1997,1998 by The XFree86 Project, Inc.
@@ -83,9 +83,6 @@ typedef struct {
* vga card */
int consType; /* Which console driver? */
#endif
-#if defined(AMOEBA)
- void * screenPtr;
-#endif
#ifdef XKB
/*
@@ -123,6 +120,18 @@ typedef struct {
Bool pmFlag;
int estimateSizesAggressively;
Bool kbdCustomKeycodes;
+ struct {
+ Bool disabled; /* enable/disable deactivating
+ * grabs or closing the
+ * connection to the grabbing
+ * client */
+ ClientPtr override; /* client that disabled
+ * grab deactivation.
+ */
+ Bool allowDeactivate;
+ Bool allowClosedown;
+ ServerGrabInfoRec server;
+ } grabInfo;
} xf86InfoRec, *xf86InfoPtr;
#ifdef DPMSExtension