aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@alnilam.(none)>2010-02-01 14:44:57 +0100
committerHenrik Rydberg <rydberg@alnilam.(none)>2010-02-01 14:44:57 +0100
commit8dcaab4219c3827c0661917542a28b1276703d8b (patch)
treeb4e4c8bf9fe3bd86f4e668a21ae3ea4e7c6ece92
parent2d291a123fe6a83f50cf7b93bceea872ab342d18 (diff)
downloadxorg-input-kobomultitouch-8dcaab4219c3827c0661917542a28b1276703d8b.tar.gz
xorg-input-kobomultitouch-8dcaab4219c3827c0661917542a28b1276703d8b.tar.bz2
xorg-input-kobomultitouch-8dcaab4219c3827c0661917542a28b1276703d8b.zip
Revert "sweep feels better without memory"
Really too specialized behavior, so better off without it. This reverts commit e880479ff29e57d8b47f08f620b4bccdd2683aa5.
-rw-r--r--src/multitouch.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/multitouch.c b/src/multitouch.c
index 6a54c45..f6e5305 100644
--- a/src/multitouch.c
+++ b/src/multitouch.c
@@ -257,14 +257,13 @@ static void handle_gestures(LocalDevicePtr local,
}
if (GETBIT(gs->type, GS_HSCROLL)) {
hscroll += gs->dx;
- // sweep is more natural as a one-time thing
- if (hscroll > hstep) {
+ while (hscroll > hstep) {
tickle_button(local, 6);
- hscroll = 0;
- }
- if (hscroll < -hstep) {
+ hscroll -= hstep;
+ }
+ while (hscroll < -hstep) {
tickle_button(local, 7);
- hscroll = 0;
+ hscroll += hstep;
}
TRACE1("hscroll: %d\n", gs->dx);
}