diff options
| author | marha <marha@users.sourceforge.net> | 2010-07-01 06:37:06 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-07-01 06:37:06 +0000 |
| commit | 87559ccfc67a98a75fa8068066871c35caa88e30 (patch) | |
| tree | 2bf313d2ae1adb6840cff8e62ccce5f984af142a /xorg-server/include | |
| parent | 644d0b3793014483679c9ae0d45a972484c10cb9 (diff) | |
| download | vcxsrv-87559ccfc67a98a75fa8068066871c35caa88e30.tar.gz vcxsrv-87559ccfc67a98a75fa8068066871c35caa88e30.tar.bz2 vcxsrv-87559ccfc67a98a75fa8068066871c35caa88e30.zip | |
git update 1/7/2010
Diffstat (limited to 'xorg-server/include')
| -rw-r--r-- | xorg-server/include/dixstruct.h | 1 | ||||
| -rw-r--r-- | xorg-server/include/xkbsrv.h | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/xorg-server/include/dixstruct.h b/xorg-server/include/dixstruct.h index 8f365f6ed..c0a834f23 100644 --- a/xorg-server/include/dixstruct.h +++ b/xorg-server/include/dixstruct.h @@ -98,6 +98,7 @@ typedef struct _Client { int clientGone;
int noClientException; /* this client died or needs to be
* killed */
+ int ignoreCount; /* count for Attend/IgnoreClient */
SaveSetElt *saveSet;
int numSaved;
int (**requestVector) (
diff --git a/xorg-server/include/xkbsrv.h b/xorg-server/include/xkbsrv.h index 30b4f9f8e..bd342a351 100644 --- a/xorg-server/include/xkbsrv.h +++ b/xorg-server/include/xkbsrv.h @@ -924,6 +924,9 @@ extern int XkbGetEffectiveGroup( XkbStatePtr /* xkbstate */,
CARD8 /* keycode */);
+extern void XkbMergeLockedPtrBtns(
+ DeviceIntPtr /* master */);
+
#include "xkbfile.h"
#include "xkbrules.h"
|