From cebd8c3e6e23d15e05c37549231e04e15c99d8c1 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 14 Mar 2011 09:21:40 +0000 Subject: Synchronised again with released version --- xorg-server/xkb/xkbActions.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xorg-server/xkb/xkbActions.c') diff --git a/xorg-server/xkb/xkbActions.c b/xorg-server/xkb/xkbActions.c index c9649115e..a40e2ae79 100644 --- a/xorg-server/xkb/xkbActions.c +++ b/xorg-server/xkb/xkbActions.c @@ -958,15 +958,15 @@ _XkbFilterDeviceBtn( XkbSrvInfoPtr xkbi, DeviceIntPtr dev; int button; + if (xkbi->device == inputInfo.keyboard) + return 0; + if (filter->keycode==0) { /* initial press */ _XkbLookupButtonDevice(&dev, pAction->devbtn.device, serverClient, DixUnknownAccess, &button); if (!dev || !dev->public.on) return 1; - if (xkbi->device == inputInfo.keyboard) - return 0; - button= pAction->devbtn.button; if ((button<1)||(button>dev->button->numButtons)) return 1; -- cgit v1.2.3