diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-27 08:26:50 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-27 08:26:50 +0200 |
| commit | 183b7373f9919eeb5eb408f38578e01717b2cc10 (patch) | |
| tree | 216dcb7e4efb0d67d019a4abe0e58cc6e1fa58b8 /xorg-server/include/inputstr.h | |
| parent | 873965b49f283ad028dd4e0e5b7e93a758c84993 (diff) | |
| download | vcxsrv-183b7373f9919eeb5eb408f38578e01717b2cc10.tar.gz vcxsrv-183b7373f9919eeb5eb408f38578e01717b2cc10.tar.bz2 vcxsrv-183b7373f9919eeb5eb408f38578e01717b2cc10.zip | |
libX11 pixman mesa xserver git update 27 sep 2011
Diffstat (limited to 'xorg-server/include/inputstr.h')
| -rw-r--r-- | xorg-server/include/inputstr.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/xorg-server/include/inputstr.h b/xorg-server/include/inputstr.h index 00f72c260..480e95671 100644 --- a/xorg-server/include/inputstr.h +++ b/xorg-server/include/inputstr.h @@ -472,7 +472,10 @@ typedef struct _SpriteInfoRec { #define MASTER_POINTER 1 #define MASTER_KEYBOARD 2 #define SLAVE 3 -#define MASTER_ATTACHED 4 /* special type for GetMaster */ +/* special types for GetMaster */ +#define MASTER_ATTACHED 4 /* Master for this device */ +#define KEYBOARD_OR_FLOAT 5 /* Keyboard master for this device or this device if floating */ +#define POINTER_OR_FLOAT 6 /* Pointer master for this device or this device if floating */ typedef struct _DeviceIntRec { DeviceRec public; @@ -599,4 +602,11 @@ static inline WindowPtr DeepestSpriteWin(SpritePtr sprite) return sprite->spriteTrace[sprite->spriteTraceGood - 1]; } +struct _InputOption { + char *key; + char *value; + struct _InputOption *next; +}; + + #endif /* INPUTSTRUCT_H */ |