diff options
| author | marha <marha@users.sourceforge.net> | 2011-12-16 20:49:54 +0100 |
|---|---|---|
| committer | Marc Haesen <marc@hc-consult.be> | 2011-12-16 20:46:08 +0100 |
| commit | 1ae4005bfe3690b34ec40e33918b3e24468d47e1 (patch) | |
| tree | 451bee4796d3058f90af4e66f2cfbdfbe6c77bfe /xorg-server/xkb/xkbActions.c | |
| parent | 64718ba8bdcecd8d736a48239847b1f9aadd40ea (diff) | |
| parent | 47913e82955ec8e2b1ba4d4b145497dede9163b5 (diff) | |
| download | vcxsrv-1ae4005bfe3690b34ec40e33918b3e24468d47e1.tar.gz vcxsrv-1ae4005bfe3690b34ec40e33918b3e24468d47e1.tar.bz2 vcxsrv-1ae4005bfe3690b34ec40e33918b3e24468d47e1.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
xorg-server/dix/registry.c
xorg-server/include/resource.h
xorg-server/os/access.c
xorg-server/os/auth.c
Diffstat (limited to 'xorg-server/xkb/xkbActions.c')
| -rw-r--r-- | xorg-server/xkb/xkbActions.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/xorg-server/xkb/xkbActions.c b/xorg-server/xkb/xkbActions.c index fc8026c87..10575c509 100644 --- a/xorg-server/xkb/xkbActions.c +++ b/xorg-server/xkb/xkbActions.c @@ -951,13 +951,13 @@ _XkbFilterDeviceBtn( XkbSrvInfoPtr xkbi, unsigned keycode, XkbAction * pAction) { -DeviceIntPtr dev; -int button; - if (xkbi->device == inputInfo.keyboard) return 0; if (filter->keycode==0) { /* initial press */ + DeviceIntPtr dev; + int button; + _XkbLookupButtonDevice(&dev, pAction->devbtn.device, serverClient, DixUnknownAccess, &button); if (!dev || !dev->public.on) @@ -996,7 +996,8 @@ int button; } } else if (filter->keycode==keycode) { - int button; + DeviceIntPtr dev; + int button; filter->active= 0; _XkbLookupButtonDevice(&dev, filter->upAction.devbtn.device, |