[PATCH 07/27] Input: Add vertical and horizontal scroll axes

Daniel Stone daniel at fooishbar.org
Fri Jun 3 07:59:43 PDT 2011


To be used for smooth scrolling with future driver APIs.

Signed-off-by: Daniel Stone <daniel at fooishbar.org>
---
 Xi/xiproperty.c              |    5 +++++
 include/xserver-properties.h |    2 ++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c
index 83ce930..4e20588 100644
--- a/Xi/xiproperty.c
+++ b/Xi/xiproperty.c
@@ -52,11 +52,14 @@ static struct dev_properties
 } dev_properties[] = {
     {0, XI_PROP_ENABLED},
     {0, XI_PROP_XTEST_DEVICE},
+
     {0, XATOM_FLOAT},
+
     {0, ACCEL_PROP_PROFILE_NUMBER},
     {0, ACCEL_PROP_CONSTANT_DECELERATION},
     {0, ACCEL_PROP_ADAPTIVE_DECELERATION},
     {0, ACCEL_PROP_VELOCITY_SCALING},
+
     {0, AXIS_LABEL_PROP},
     {0, AXIS_LABEL_PROP_REL_X},
     {0, AXIS_LABEL_PROP_REL_Y},
@@ -68,6 +71,8 @@ static struct dev_properties
     {0, AXIS_LABEL_PROP_REL_DIAL},
     {0, AXIS_LABEL_PROP_REL_WHEEL},
     {0, AXIS_LABEL_PROP_REL_MISC},
+    {0, AXIS_LABEL_PROP_REL_VSCROLL},
+    {0, AXIS_LABEL_PROP_REL_HSCROLL},
     {0, AXIS_LABEL_PROP_ABS_X},
     {0, AXIS_LABEL_PROP_ABS_Y},
     {0, AXIS_LABEL_PROP_ABS_Z},
diff --git a/include/xserver-properties.h b/include/xserver-properties.h
index 2b1feab..b3764c5 100644
--- a/include/xserver-properties.h
+++ b/include/xserver-properties.h
@@ -74,6 +74,8 @@
 #define AXIS_LABEL_PROP_REL_DIAL        "Rel Dial"
 #define AXIS_LABEL_PROP_REL_WHEEL       "Rel Vert Wheel"
 #define AXIS_LABEL_PROP_REL_MISC        "Rel Misc"
+#define AXIS_LABEL_PROP_REL_VSCROLL     "Rel Vert Scroll"
+#define AXIS_LABEL_PROP_REL_HSCROLL     "Rel Horiz Scroll"
 
 /*
  * Absolute axes
-- 
1.7.5.3



More information about the xorg-devel mailing list