diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-09 05:23:48 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-09 05:23:48 +0000 |
| commit | 81f91c615982e50bb62708201569c33a3cd3d973 (patch) | |
| tree | 4f32ecc48a3b7b5e76642f3792338263c53879bd /xorg-server/Xi/exglobals.h | |
| parent | b571a562410f565af2bdde52d9f7f9a23ffae04f (diff) | |
| parent | a915739887477b28d924ecc8417ee107d125bd6c (diff) | |
| download | vcxsrv-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/Xi/exglobals.h')
| -rw-r--r-- | xorg-server/Xi/exglobals.h | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/xorg-server/Xi/exglobals.h b/xorg-server/Xi/exglobals.h index 42a695356..2d2d25c0b 100644 --- a/xorg-server/Xi/exglobals.h +++ b/xorg-server/Xi/exglobals.h @@ -43,18 +43,19 @@ extern int BadMode; extern int DeviceBusy; extern int BadClass; -extern Mask DevicePointerMotionMask; -extern Mask DevicePointerMotionHintMask; -extern Mask DeviceFocusChangeMask; -extern Mask DeviceStateNotifyMask; -extern Mask DeviceMappingNotifyMask; -extern Mask DeviceOwnerGrabButtonMask; -extern Mask DeviceButtonGrabMask; -extern Mask DeviceButtonMotionMask; -extern Mask DevicePresenceNotifyMask; -extern Mask DevicePropertyNotifyMask; -extern Mask DeviceEnterWindowMask; -extern Mask DeviceLeaveWindowMask; +/* Note: only the ones needed in files other than extinit.c are declared */ +extern const Mask DevicePointerMotionMask; +extern const Mask DevicePointerMotionHintMask; +extern const Mask DeviceFocusChangeMask; +extern const Mask DeviceStateNotifyMask; +extern const Mask DeviceMappingNotifyMask; +extern const Mask DeviceOwnerGrabButtonMask; +extern const Mask DeviceButtonGrabMask; +extern const Mask DeviceButtonMotionMask; +extern const Mask DevicePresenceNotifyMask; +extern const Mask DevicePropertyNotifyMask; +extern const Mask XIAllMasks; + extern Mask PropagateMask[]; extern int DeviceValuator; @@ -74,8 +75,6 @@ extern int DeviceMappingNotify; extern int ChangeDeviceNotify; extern int DevicePresenceNotify; extern int DevicePropertyNotify; -extern int DeviceEnterNotify; -extern int DeviceLeaveNotify; extern int RT_INPUTCLIENT; |