diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2011-06-09 20:03:11 +0100 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-10-24 16:01:30 +1000 |
| commit | 4f46057a33b20df62d919e49a394ab6cb7aa6aa1 (patch) | |
| tree | 4cf77764e89da1948439a56d0c3f556be0003c9c /src/synapticsstr.h | |
| parent | 15bef1f7092d37aeaa916ed7642ae3b6e684660c (diff) | |
Scroll: Initial smooth scrolling support
Post smooth-scrolling events through the new X server API when
available, rather than legacy jerky button events.
[Amended to use the final smooth scrolling API]
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Amendments-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'src/synapticsstr.h')
| -rw-r--r-- | src/synapticsstr.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/synapticsstr.h b/src/synapticsstr.h index 1f6dc08..1ec8246 100644 --- a/src/synapticsstr.h +++ b/src/synapticsstr.h @@ -23,6 +23,7 @@ #define _SYNAPTICSSTR_H_ #include "synproto.h" +#include <xserver-properties.h> #ifdef DBG # undef DBG @@ -39,6 +40,10 @@ #define xf86IDrvMsg(pInfo, type, ...) xf86Msg(type, __VA_ARGS__) #endif +#ifdef AXIS_LABEL_PROP_REL_VSCROLL +#define HAVE_SMOOTH_SCROLL +#endif + /****************************************************************************** * Definitions * structs, typedefs, #defines, enums @@ -254,6 +259,12 @@ typedef struct _SynapticsPrivateRec enum TouchpadModel model; /* The detected model */ unsigned short id_vendor; /* vendor id */ unsigned short id_product; /* product id */ + +#ifdef HAVE_SMOOTH_SCROLL + int scroll_axis_horiz; /* Horizontal smooth-scrolling axis */ + int scroll_axis_vert; /* Vertical smooth-scrolling axis */ + ValuatorMask *scroll_events_mask; /* ValuatorMask for smooth-scrolling */ +#endif } SynapticsPrivate; #endif /* _SYNAPTICSSTR_H_ */ |