aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/include/windowstr.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-09-09 05:23:48 +0000
committermarha <marha@users.sourceforge.net>2009-09-09 05:23:48 +0000
commit81f91c615982e50bb62708201569c33a3cd3d973 (patch)
tree4f32ecc48a3b7b5e76642f3792338263c53879bd /xorg-server/include/windowstr.h
parentb571a562410f565af2bdde52d9f7f9a23ffae04f (diff)
parenta915739887477b28d924ecc8417ee107d125bd6c (diff)
downloadvcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.gz
vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.tar.bz2
vcxsrv-81f91c615982e50bb62708201569c33a3cd3d973.zip
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/include/windowstr.h')
-rw-r--r--xorg-server/include/windowstr.h31
1 files changed, 5 insertions, 26 deletions
diff --git a/xorg-server/include/windowstr.h b/xorg-server/include/windowstr.h
index e7f4691d9..94e04ead2 100644
--- a/xorg-server/include/windowstr.h
+++ b/xorg-server/include/windowstr.h
@@ -59,7 +59,6 @@ SOFTWARE.
#include "miscstruct.h"
#include <X11/Xprotostr.h>
#include "opaque.h"
-#include "inputstr.h"
#define GuaranteeNothing 0
#define GuaranteeVisBack 1
@@ -79,24 +78,6 @@ typedef struct _DevCursorNode {
struct _DevCursorNode* next;
} DevCursNodeRec, *DevCursNodePtr, *DevCursorList;
-/* Mask structure for GE extension as stored on the window.
- * Allows one mask per extension.
- * .eventMask - Summary mask for all clients, used for quick checking.
- * .geClients - list of clients with their specific mask.
- */
-typedef struct _GenericClientMasks {
- Mask eventMasks[MAXEXTENSIONS];
- GenericMaskPtr geClients;
-} GenericClientMasksRec, *GenericClientMasksPtr;
-
-typedef struct _WindowAccessRec {
- int defaultRule; /* WindowAccessDenyAll */
- DeviceIntPtr* perm;
- int nperm;
- DeviceIntPtr* deny;
- int ndeny;
-} WindowAccessRec, *WindowAccessPtr;
-
typedef struct _WindowOpt {
VisualID visual; /* default: same as parent */
CursorPtr cursor; /* default: window.cursorNone */
@@ -113,8 +94,6 @@ typedef struct _WindowOpt {
RegionPtr inputShape; /* default: NULL */
struct _OtherInputMasks *inputMasks; /* default: NULL */
DevCursorList deviceCursors; /* default: NULL */
- struct _GenericClientMasks *geMasks; /* default: NULL */
- WindowAccessRec access;
} WindowOptRec, *WindowOptPtr;
#define BackgroundPixel 2L
@@ -162,8 +141,8 @@ typedef struct _Window {
RegionRec borderSize;
DDXPointRec origin; /* position relative to parent */
unsigned short borderWidth;
- unsigned long deliverableEvents;
- Mask eventMask;
+ unsigned long deliverableEvents; /* all masks from all clients */
+ Mask eventMask; /* mask from the creating client */
PixUnion background;
PixUnion border;
pointer backStorage; /* null when BS disabled */
@@ -195,7 +174,7 @@ typedef struct _Window {
* fields (or filling the appropriate default value)
*/
-extern Mask DontPropagateMasks[];
+extern _X_EXPORT Mask DontPropagateMasks[];
#define wTrackParent(w,field) ((w)->optional ? \
(w)->optional->field \
@@ -242,7 +221,7 @@ typedef struct _ScreenSaverStuff {
#define HasSaverWindow(i) (savedScreenInfo[i].pWindow != NullWindow)
-extern int screenIsSaved;
-extern ScreenSaverStuffRec savedScreenInfo[MAXSCREENS];
+extern _X_EXPORT int screenIsSaved;
+extern _X_EXPORT ScreenSaverStuffRec savedScreenInfo[MAXSCREENS];
#endif /* WINDOWSTRUCT_H */