andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "xkb: merge lockedPtrButtons state from all attached SDs."

Browse Source 
Preparing to merge Peter's branch.

This reverts commit 6052710670.
This commit is contained in:
Keith Packard 2010-07-01 23:46:27 -04:00
parent 9fb0785449
commit b90faa7156
4 changed files with 1 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/xkbsrv.h
View File

@ -924,9 +924,6 @@ extern int XkbGetEffectiveGroup(
XkbStatePtr /* xkbstate */,
CARD8 /* keycode */);
extern void XkbMergeLockedPtrBtns(
DeviceIntPtr /* master */);
#include "xkbfile.h"
#include "xkbrules.h"

18
xkb/xkbAccessX.c
View File

@ -707,24 +707,8 @@ DeviceEvent *event = &ev->device_event;
changed |= XkbPointerButtonMask;
}
else if (event->type == ET_ButtonRelease) {
if (xkbi) {
if (xkbi)
xkbi->lockedPtrButtons&= ~(1 << (event->detail.key & 0x7));
/* Merge this MD's lockedPtrButtons with the one of all
* attached slave devices.
* The DIX uses a merged button state for MDs, not
* releasing buttons until the last SD has released
* thenm. If we unconditionally clear the
* lockedPtrButtons bit on the MD, a PointerKeys button
* release on the SD keyboard won't generate the required fake button
* event on the XTEST pointer, thus never processing the
* button event in the DIX and the XTEST pointer's
* buttons stay down - result is a stuck button.
*/
if (IsMaster(dev))
XkbMergeLockedPtrBtns(dev);
}
changed |= XkbPointerButtonMask;
}

10
xkb/xkbActions.c
View File

@ -633,16 +633,6 @@ _XkbFilterPointerBtn( XkbSrvInfoPtr xkbi,
break;
}
xkbi->lockedPtrButtons&= ~(1<<button);
if (IsMaster(xkbi->device))
{
XkbMergeLockedPtrBtns(xkbi->device);
/* One SD still has lock set, don't post event */
if ((xkbi->lockedPtrButtons & (1 << button)) != 0)
break;
}
/* fallthrough */
case XkbSA_PtrBtn:
XkbFakeDeviceButton(xkbi->device, 0, button);
break;

26
xkb/xkbUtils.c
View File

@ -2094,29 +2094,3 @@ XkbGetEffectiveGroup(XkbSrvInfoPtr xkbi, XkbStatePtr xkbState, CARD8 keycode)
return effectiveGroup;
}
/* Merge the lockedPtrButtons from all attached SDs for the given master
* device into the MD's state.
*/
void
XkbMergeLockedPtrBtns(DeviceIntPtr master)
{
DeviceIntPtr d = inputInfo.devices;
XkbSrvInfoPtr xkbi = NULL;
if (!IsMaster(master))
return;
if (!master->key)
return;
xkbi = master->key->xkbInfo;
xkbi->lockedPtrButtons = 0;
for (; d; d = d->next) {
if (IsMaster(d) || GetMaster(d, MASTER_KEYBOARD) != master || !d->key)
continue;
xkbi->lockedPtrButtons |= d->key->xkbInfo->lockedPtrButtons;
}
}