diff options
| author | Keith Packard <keithp@keithp.com> | 2009-12-30 09:28:19 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-12-30 09:28:19 -0800 |
| commit | 9fad8f06fb89ac2ae05bea0fa24cab3df7677297 (patch) | |
| tree | 8d231f684ded8cc9a92c8133d37cf1ee421d6f6e /hw/xfree86/parser/xf86Parser.h | |
| parent | 871bbe1d87fa3c7ebd075e1d1eec33e45b08493d (diff) | |
| parent | 42e8c9224e6c54655c45f87999d37d0d67b3f7f5 (diff) | |
Merge remote branch 'dbn/inputclass'
Diffstat (limited to 'hw/xfree86/parser/xf86Parser.h')
| -rw-r--r-- | hw/xfree86/parser/xf86Parser.h | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/hw/xfree86/parser/xf86Parser.h b/hw/xfree86/parser/xf86Parser.h index 4675d02c7..5e8351fc4 100644 --- a/hw/xfree86/parser/xf86Parser.h +++ b/hw/xfree86/parser/xf86Parser.h @@ -64,6 +64,7 @@ #ifndef _xf86Parser_h_ #define _xf86Parser_h_ +#include <X11/Xdefs.h> #include "xf86Optrec.h" #define HAVE_PARSER_DECLS @@ -330,6 +331,32 @@ typedef struct } XF86ConfInputrefRec, *XF86ConfInputrefPtr; +typedef struct +{ + Bool set; + Bool val; +} +xf86TriState; + +typedef struct +{ + GenericListRec list; + char *identifier; + char *driver; + char *match_product; + char *match_vendor; + char *match_device; + xf86TriState is_keyboard; + xf86TriState is_pointer; + xf86TriState is_joystick; + xf86TriState is_tablet; + xf86TriState is_touchpad; + xf86TriState is_touchscreen; + XF86OptionPtr option_lst; + char *comment; +} +XF86ConfInputClassRec, *XF86ConfInputClassPtr; + /* Values for adj_where */ #define CONF_ADJ_OBSOLETE -1 #define CONF_ADJ_ABSOLUTE 0 @@ -438,6 +465,7 @@ typedef struct XF86ConfDevicePtr conf_device_lst; XF86ConfScreenPtr conf_screen_lst; XF86ConfInputPtr conf_input_lst; + XF86ConfInputClassPtr conf_inputclass_lst; XF86ConfLayoutPtr conf_layout_lst; XF86ConfVendorPtr conf_vendor_lst; XF86ConfDRIPtr conf_dri; @@ -484,5 +512,6 @@ extern _X_EXPORT int xf86itemNotSublist(GenericListPtr list_1, GenericListPtr li extern _X_EXPORT int xf86pathIsAbsolute(const char *path); extern _X_EXPORT int xf86pathIsSafe(const char *path); extern _X_EXPORT char *xf86addComment(char *cur, char *add); +extern _X_EXPORT Bool xf86getBoolValue(Bool *val, const char *str); #endif /* _xf86Parser_h_ */ |