diff options
| author | Thomas Jaeger <ThJaeger@gmail.com> | 2008-12-22 00:55:09 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2009-01-30 17:25:24 -0800 |
| commit | 191161a24a80dc553b11f829c12cfffb76ec7185 (patch) | |
| tree | 5bd63420ec4820e9956078f58ab57be0a59e6d96 | |
| parent | fe0abdceb483ec0bb2977016b00aef57033aa449 (diff) | |
Count the number of logically down buttons in buttonsDown
This fixes the following bug. Assuming your window manager grabs
Alt+Button1 to move windows, map Button3 to 0 via XSetPointerMapping,
then press the physical button 3 (this shouldn't have any effect), press
Alt and then button 1. The press event is delivered to the application
instead of firing the grab.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit f7f85f696570541e2dd43462675de9e6ee46f545)
| -rw-r--r-- | Xi/exevents.c | 8 | ||||
| -rw-r--r-- | include/inputstr.h | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/Xi/exevents.c b/Xi/exevents.c index 2aa316102..b4359a818 100644 --- a/Xi/exevents.c +++ b/Xi/exevents.c @@ -895,10 +895,10 @@ UpdateDeviceState(DeviceIntPtr device, xEvent* xE, int count) *kptr |= bit; if (device->valuator) device->valuator->motionHintWindow = NullWindow; - b->buttonsDown++; - b->motionMask = DeviceButtonMotionMask; if (!b->map[key]) return DONT_PROCESS; + b->buttonsDown++; + b->motionMask = DeviceButtonMotionMask; if (b->map[key] <= 5) b->state |= (Button1Mask >> 1) << b->map[key]; SetMaskForEvent(device->id, Motion_Filter(b), DeviceMotionNotify); @@ -927,10 +927,10 @@ UpdateDeviceState(DeviceIntPtr device, xEvent* xE, int count) *kptr &= ~bit; if (device->valuator) device->valuator->motionHintWindow = NullWindow; - if (b->buttonsDown >= 1 && !--b->buttonsDown) - b->motionMask = 0; if (!b->map[key]) return DONT_PROCESS; + if (b->buttonsDown >= 1 && !--b->buttonsDown) + b->motionMask = 0; if (b->map[key] <= 5) b->state &= ~((Button1Mask >> 1) << b->map[key]); SetMaskForEvent(device->id, Motion_Filter(b), DeviceMotionNotify); diff --git a/include/inputstr.h b/include/inputstr.h index 4719d37d7..a6f823cd5 100644 --- a/include/inputstr.h +++ b/include/inputstr.h @@ -185,7 +185,11 @@ typedef struct _ValuatorClassRec { typedef struct _ButtonClassRec { CARD8 numButtons; - CARD8 buttonsDown; /* number of buttons currently down */ + CARD8 buttonsDown; /* number of buttons currently down + This counts logical buttons, not + physical ones, i.e if some buttons + are mapped to 0, they're not counted + here */ unsigned short state; Mask motionMask; CARD8 down[DOWN_LENGTH]; |