Revert "xkb: merge lockedPtrButtons state from all attached SDs."
Preparing to merge Peter's branch.
This reverts commit 6052710670
.
This commit is contained in:
parent
9fb0785449
commit
b90faa7156
|
@ -924,9 +924,6 @@ extern int XkbGetEffectiveGroup(
|
||||||
XkbStatePtr /* xkbstate */,
|
XkbStatePtr /* xkbstate */,
|
||||||
CARD8 /* keycode */);
|
CARD8 /* keycode */);
|
||||||
|
|
||||||
extern void XkbMergeLockedPtrBtns(
|
|
||||||
DeviceIntPtr /* master */);
|
|
||||||
|
|
||||||
#include "xkbfile.h"
|
#include "xkbfile.h"
|
||||||
#include "xkbrules.h"
|
#include "xkbrules.h"
|
||||||
|
|
||||||
|
|
|
@ -707,24 +707,8 @@ DeviceEvent *event = &ev->device_event;
|
||||||
changed |= XkbPointerButtonMask;
|
changed |= XkbPointerButtonMask;
|
||||||
}
|
}
|
||||||
else if (event->type == ET_ButtonRelease) {
|
else if (event->type == ET_ButtonRelease) {
|
||||||
if (xkbi) {
|
if (xkbi)
|
||||||
xkbi->lockedPtrButtons&= ~(1 << (event->detail.key & 0x7));
|
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;
|
changed |= XkbPointerButtonMask;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -633,16 +633,6 @@ _XkbFilterPointerBtn( XkbSrvInfoPtr xkbi,
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
xkbi->lockedPtrButtons&= ~(1<<button);
|
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:
|
case XkbSA_PtrBtn:
|
||||||
XkbFakeDeviceButton(xkbi->device, 0, button);
|
XkbFakeDeviceButton(xkbi->device, 0, button);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -2094,29 +2094,3 @@ XkbGetEffectiveGroup(XkbSrvInfoPtr xkbi, XkbStatePtr xkbState, CARD8 keycode)
|
||||||
|
|
||||||
return effectiveGroup;
|
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user