diff options
author | marha <marha@users.sourceforge.net> | 2010-02-11 09:51:46 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-02-11 09:51:46 +0000 |
commit | 5fb5118fe4afa528cc4a3fe147f4487e90e0c9f5 (patch) | |
tree | c2d3355fd5cda30a9ed8fd02b948952cdde3d49e /xorg-server/include | |
parent | b9f4c74751c445ad2d35b2591056cae0a716e6e1 (diff) | |
parent | 4268e59d0c18a7bfc584189d3418765407d05bbf (diff) | |
download | vcxsrv-5fb5118fe4afa528cc4a3fe147f4487e90e0c9f5.tar.gz vcxsrv-5fb5118fe4afa528cc4a3fe147f4487e90e0c9f5.tar.bz2 vcxsrv-5fb5118fe4afa528cc4a3fe147f4487e90e0c9f5.zip |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/include')
-rw-r--r-- | xorg-server/include/xserver-properties.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/xorg-server/include/xserver-properties.h b/xorg-server/include/xserver-properties.h index 626d0ad27..30e8efb68 100644 --- a/xorg-server/include/xserver-properties.h +++ b/xorg-server/include/xserver-properties.h @@ -89,6 +89,17 @@ #define AXIS_LABEL_PROP_ABS_TILT_Y "Abs Tilt Y" #define AXIS_LABEL_PROP_ABS_TOOL_WIDTH "Abs Tool Width" #define AXIS_LABEL_PROP_ABS_VOLUME "Abs Volume" +#define AXIS_LABEL_PROP_ABS_MT_TOUCH_MAJOR "Abs MT Touch Major" +#define AXIS_LABEL_PROP_ABS_MT_TOUCH_MINOR "Abs MT Touch Minor" +#define AXIS_LABEL_PROP_ABS_MT_WIDTH_MAJOR "Abs MT Width Major" +#define AXIS_LABEL_PROP_ABS_MT_WIDTH_MINOR "Abs MT Width Minor" +#define AXIS_LABEL_PROP_ABS_MT_ORIENTATION "Abs MT Orientation" +#define AXIS_LABEL_PROP_ABS_MT_POSITION_X "Abs MT Position X" +#define AXIS_LABEL_PROP_ABS_MT_POSITION_Y "Abs MT Position Y" +#define AXIS_LABEL_PROP_ABS_MT_TOOL_TYPE "Abs MT Tool Type" +#define AXIS_LABEL_PROP_ABS_MT_BLOB_ID "Abs MT Blob ID" +#define AXIS_LABEL_PROP_ABS_MT_TRACKING_ID "Abs MT Tracking ID" +#define AXIS_LABEL_PROP_ABS_MT_PRESSURE "Abs MT Pressure" #define AXIS_LABEL_PROP_ABS_MISC "Abs Misc" /* Button names */ |