From 011634a6f8df4fb6b6c24dc173680b96c7fb16f1 Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Mon, 1 Feb 2010 20:26:21 +0100 Subject: button: simplify button handling Make better use of the bit representation, reducing one layer of conversion. --- src/multitouch.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/multitouch.c') diff --git a/src/multitouch.c b/src/multitouch.c index f6e5305..fa966ce 100644 --- a/src/multitouch.c +++ b/src/multitouch.c @@ -231,12 +231,13 @@ static void handle_gestures(LocalDevicePtr local, int hstep = 1 + hscroll_fraction * (caps->abs_position_x.maximum - caps->abs_position_x.minimum); - int i; - for (i = 0; i < gs->nbt; i++) { - xf86PostButtonEvent(local->dev, FALSE, - gs->btix[i], gs->btval[i], - 0, 0); - TRACE2("button: %d %d\n", gs->btix[i], gs->btval[i]); + int i; + for (i = 0; i < DIM_BUTTON; i++) { + if (GETBIT(gs->btmask, i)) { + xf86PostButtonEvent(local->dev, FALSE, + i + 1, GETBIT(gs->btdata, i), 0, 0); + TRACE2("button bit: %d %d\n", i, GETBIT(gs->btdata, i)); + } } if (GETBIT(gs->type, GS_MOVE)) { xf86PostMotionEvent(local->dev, 0, 0, 2, -- cgit v1.2.3