diff options
| author | marha <marha@users.sourceforge.net> | 2010-07-01 07:14:24 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-07-01 07:14:24 +0000 |
| commit | 1faa0f175bda9074b5f45e5e005d9a80721e3c24 (patch) | |
| tree | 3a1c33cb65654d1a65979618dedf732b9ea11819 /xorg-server/include | |
| parent | af64ef0fd32e87e56c5b293eaef39f3b9791bfbb (diff) | |
| parent | 87559ccfc67a98a75fa8068066871c35caa88e30 (diff) | |
| download | vcxsrv-1faa0f175bda9074b5f45e5e005d9a80721e3c24.tar.gz vcxsrv-1faa0f175bda9074b5f45e5e005d9a80721e3c24.tar.bz2 vcxsrv-1faa0f175bda9074b5f45e5e005d9a80721e3c24.zip | |
svn merge ^/branches/released .
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 0a25307b1..a77e56d7c 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 2648ff51a..ce29a8150 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"
|