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/Xi | |
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/Xi')
-rw-r--r-- | xorg-server/Xi/xiproperty.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/xorg-server/Xi/xiproperty.c b/xorg-server/Xi/xiproperty.c index ea66c54c6..be0783107 100644 --- a/xorg-server/Xi/xiproperty.c +++ b/xorg-server/Xi/xiproperty.c @@ -93,6 +93,17 @@ static struct dev_properties {0, AXIS_LABEL_PROP_ABS_TILT_Y}, {0, AXIS_LABEL_PROP_ABS_TOOL_WIDTH}, {0, AXIS_LABEL_PROP_ABS_VOLUME}, + {0, AXIS_LABEL_PROP_ABS_MT_TOUCH_MAJOR}, + {0, AXIS_LABEL_PROP_ABS_MT_TOUCH_MINOR}, + {0, AXIS_LABEL_PROP_ABS_MT_WIDTH_MAJOR}, + {0, AXIS_LABEL_PROP_ABS_MT_WIDTH_MINOR}, + {0, AXIS_LABEL_PROP_ABS_MT_ORIENTATION}, + {0, AXIS_LABEL_PROP_ABS_MT_POSITION_X}, + {0, AXIS_LABEL_PROP_ABS_MT_POSITION_Y}, + {0, AXIS_LABEL_PROP_ABS_MT_TOOL_TYPE}, + {0, AXIS_LABEL_PROP_ABS_MT_BLOB_ID}, + {0, AXIS_LABEL_PROP_ABS_MT_TRACKING_ID}, + {0, AXIS_LABEL_PROP_ABS_MT_PRESSURE}, {0, AXIS_LABEL_PROP_ABS_MISC}, {0, BTN_LABEL_PROP}, |