diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2014-01-17 08:24:35 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2014-02-21 11:10:27 +1000 |
| commit | 1bd4ca3b5af6e5ee98c7d7f153fd4ee643c29e1a (patch) | |
| tree | b035dda9d5b0d3f1373f0f1608788213aca63be9 /src/synapticsstr.h | |
| parent | 90d93891be0dcc55d87c349ab438144ead818402 (diff) | |
Revert "Purge scrollbuttons (repeat)"
This reverts commit 0903d99ada1755f11a2a5cbf89a345de896e18ec.
Scroll buttons are still present in some modern devices, e.g. the Fujitsu
Lifebook E782 and others in the series.
Conflicts:
include/synaptics.h
man/synaptics.man
src/synaptics.c
(cherry picked from commit e0069c154440305ece6def92a9813a9f8004b2fb)
Diffstat (limited to 'src/synapticsstr.h')
| -rw-r--r-- | src/synapticsstr.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/synapticsstr.h b/src/synapticsstr.h index 3d6f756..3f66b14 100644 --- a/src/synapticsstr.h +++ b/src/synapticsstr.h @@ -55,6 +55,10 @@ #define SYNAPTICS_MAX_TOUCHES 10 #define SYN_MAX_BUTTONS 12 /* Max number of mouse buttons */ +/* Minimum and maximum values for scroll_button_repeat */ +#define SBR_MIN 10 +#define SBR_MAX 1000 + enum OffState { TOUCHPAD_ON = 0, TOUCHPAD_OFF = 1, @@ -168,6 +172,12 @@ typedef struct _SynapticsParameters { Bool scroll_twofinger_horiz; /* Enable/disable horizontal two-finger scrolling */ double min_speed, max_speed, accl; /* movement parameters */ + Bool updown_button_scrolling; /* Up/Down-Button scrolling or middle/double-click */ + Bool leftright_button_scrolling; /* Left/right-button scrolling, or two lots of middle button */ + Bool updown_button_repeat; /* If up/down button being used to scroll, auto-repeat? */ + Bool leftright_button_repeat; /* If left/right button being used to scroll, auto-repeat? */ + int scroll_button_repeat; /* time, in milliseconds, between scroll events being + * sent when holding down scroll buttons */ int touchpad_off; /* Switches the touchpad off * 0 : Not off * 1 : Off @@ -209,7 +219,7 @@ struct _SynapticsPrivateRec { const char *device; /* device node */ CARD32 timer_time; /* when timer last fired */ - OsTimerPtr timer; /* for tap processing, etc */ + OsTimerPtr timer; /* for up/down-button repeat, tap processing, etc */ struct CommData comm; @@ -254,6 +264,8 @@ struct _SynapticsPrivateRec { False: Generate horizontal events */ double frac_x, frac_y; /* absolute -> relative fraction */ enum MidButtonEmulation mid_emu_state; /* emulated 3rd button */ + int repeatButtons; /* buttons for repeat */ + int nextRepeat; /* Time when to trigger next auto repeat event */ int lastButtons; /* last state of the buttons */ int prev_z; /* previous z value, for palm detection */ int prevFingers; /* previous numFingers, for transition detection */ |