diff options
| author | marha <marha@users.sourceforge.net> | 2010-01-05 08:57:42 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-01-05 08:57:42 +0000 |
| commit | 4b1326f06330c00501dd84100ed3a1987e2fa631 (patch) | |
| tree | 6675ebcf771a6fdfeb9a2164f08811407731482e /xorg-server/hw/xfree86/parser/xf86tokens.h | |
| parent | 7397e255c2e82618ab55ef2c81636c8e688b1225 (diff) | |
| parent | 163827567b71b0763a4c1a7104159cd08b5c2d95 (diff) | |
| download | vcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.tar.gz vcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.tar.bz2 vcxsrv-4b1326f06330c00501dd84100ed3a1987e2fa631.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/hw/xfree86/parser/xf86tokens.h')
| -rw-r--r-- | xorg-server/hw/xfree86/parser/xf86tokens.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/xorg-server/hw/xfree86/parser/xf86tokens.h b/xorg-server/hw/xfree86/parser/xf86tokens.h index 4c1d38c03..e3a9d716b 100644 --- a/xorg-server/hw/xfree86/parser/xf86tokens.h +++ b/xorg-server/hw/xfree86/parser/xf86tokens.h @@ -273,7 +273,18 @@ typedef enum { /* DRI Tokens */ GROUP, - BUFFERS + BUFFERS, + + /* InputClass Tokens */ + MATCH_PRODUCT, + MATCH_VENDOR, + MATCH_DEVICE_PATH, + MATCH_IS_KEYBOARD, + MATCH_IS_POINTER, + MATCH_IS_JOYSTICK, + MATCH_IS_TABLET, + MATCH_IS_TOUCHPAD, + MATCH_IS_TOUCHSCREEN } ParserTokens; #endif /* _xf86_tokens_h */ |