Fix up detritus from removing GetPairedPointer/Keyboard.
This commit is contained in:
parent
840bde3d32
commit
e9f149fb56
|
@ -144,12 +144,12 @@ ProcessOtherEvent(xEventPtr xE, DeviceIntPtr device, int count)
|
|||
*/
|
||||
if (IsPointerDevice(device))
|
||||
{
|
||||
kbd = GetPairedKeyboard(device);
|
||||
kbd = GetPairedDevice(device);
|
||||
mouse = device;
|
||||
}
|
||||
else
|
||||
{
|
||||
mouse = GetPairedPointer(device);
|
||||
mouse = GetPairedDevice(device);
|
||||
kbd = device;
|
||||
}
|
||||
xE->u.keyButtonPointer.state = (kbd) ? (kbd->key->state) : 0;
|
||||
|
|
|
@ -73,27 +73,20 @@ ProcXGetPairedPointer(ClientPtr client)
|
|||
REQUEST_SIZE_MATCH(xGetPairedPointerReq);
|
||||
|
||||
kbd = LookupDeviceIntRec(stuff->deviceid);
|
||||
if (!kbd || !kbd->key) {
|
||||
if (!kbd || !kbd->key || !kbd->isMaster) {
|
||||
SendErrorToClient(client, IReqCode, X_GetPairedPointer,
|
||||
stuff->deviceid, BadDevice);
|
||||
return Success;
|
||||
}
|
||||
|
||||
ptr = GetPairedPointer(kbd);
|
||||
ptr = GetPairedDevice(kbd);
|
||||
|
||||
rep.repType = X_Reply;
|
||||
rep.RepType = X_GetPairedPointer;
|
||||
rep.length = 0;
|
||||
rep.sequenceNumber = client->sequence;
|
||||
if (ptr == inputInfo.pointer)
|
||||
{
|
||||
rep.paired = FALSE;
|
||||
rep.deviceid = 0;
|
||||
} else
|
||||
{
|
||||
rep.paired = TRUE;
|
||||
rep.deviceid = ptr->id;
|
||||
}
|
||||
rep.paired = TRUE;
|
||||
rep.deviceid = ptr->id;
|
||||
WriteReplyToClient(client, sizeof(xGetPairedPointerReply), &rep);
|
||||
return Success;
|
||||
}
|
||||
|
|
18
dix/events.c
18
dix/events.c
|
@ -3243,7 +3243,7 @@ CheckPassiveGrabsOnWindow(
|
|||
|
||||
gdev= grab->modifierDevice;
|
||||
if (grab->coreGrab)
|
||||
gdev = GetPairedKeyboard(device);
|
||||
gdev = GetPairedDevice(device);
|
||||
xkbi= gdev->key->xkbInfo;
|
||||
#endif
|
||||
tempGrab.modifierDevice = grab->modifierDevice;
|
||||
|
@ -3294,7 +3294,7 @@ CheckPassiveGrabsOnWindow(
|
|||
if (xE->u.u.type < LASTEvent)
|
||||
{
|
||||
grab->device = device;
|
||||
grab->modifierDevice = GetPairedKeyboard(device);
|
||||
grab->modifierDevice = GetPairedDevice(device);
|
||||
}
|
||||
|
||||
/* In some cases a passive core grab may exist, but the client
|
||||
|
@ -3453,9 +3453,7 @@ DeliverFocusedEvent(DeviceIntPtr keybd, xEvent *xE, WindowPtr window, int count)
|
|||
if (DeliverDeviceEvents(window, xE, NullGrab, focus, keybd, count))
|
||||
return;
|
||||
}
|
||||
pointer = GetPairedPointer(keybd);
|
||||
if (!pointer)
|
||||
pointer = inputInfo.pointer;
|
||||
pointer = GetPairedDevice(keybd);
|
||||
/* just deliver it to the focus window */
|
||||
FixUpEventFromWindow(pointer, xE, focus, None, FALSE);
|
||||
if (xE->u.u.type & EXTENSION_EVENT_BASE)
|
||||
|
@ -3684,7 +3682,7 @@ drawable.id:0;
|
|||
#endif
|
||||
/* ProcessOtherEvent already updated the keyboard's state, so we need to
|
||||
* access prev_state here! */
|
||||
XE_KBPTR.state = (keyc->prev_state | GetPairedPointer(keybd)->button->state);
|
||||
XE_KBPTR.state = (keyc->prev_state | GetPairedDevice(keybd)->button->state);
|
||||
XE_KBPTR.rootX = keybd->spriteInfo->sprite->hot.x;
|
||||
XE_KBPTR.rootY = keybd->spriteInfo->sprite->hot.y;
|
||||
key = xE->u.u.detail;
|
||||
|
@ -3796,7 +3794,7 @@ ProcessPointerEvent (xEvent *xE, DeviceIntPtr mouse, int count)
|
|||
SpritePtr pSprite = mouse->spriteInfo->sprite;
|
||||
|
||||
#ifdef XKB
|
||||
XkbSrvInfoPtr xkbi= GetPairedKeyboard(mouse)->key->xkbInfo;
|
||||
XkbSrvInfoPtr xkbi= GetPairedDevice(mouse)->key->xkbInfo;
|
||||
#endif
|
||||
#ifdef XEVIE
|
||||
if(xevieFlag && clients[xevieClientIndex] && !xeviegrabState &&
|
||||
|
@ -4141,7 +4139,7 @@ EnterLeaveEvent(
|
|||
int mskidx;
|
||||
OtherInputMasks *inputMasks;
|
||||
|
||||
keybd = GetPairedKeyboard(mouse);
|
||||
keybd = GetPairedDevice(mouse);
|
||||
|
||||
if ((pWin == mouse->valuator->motionHintWindow) &&
|
||||
(detail != NotifyInferior))
|
||||
|
@ -4682,7 +4680,7 @@ SetInputFocus(
|
|||
if (IsKeyboardDevice(dev))
|
||||
keybd = dev;
|
||||
else
|
||||
keybd = GetPairedKeyboard(dev);
|
||||
keybd = GetPairedDevice(dev);
|
||||
|
||||
if ((focusID == None) || (focusID == PointerRoot))
|
||||
focusWin = (WindowPtr)(long)focusID;
|
||||
|
@ -5697,7 +5695,7 @@ ProcGrabButton(ClientPtr client)
|
|||
}
|
||||
|
||||
pointer = PickPointer(client);
|
||||
modifierDevice = GetPairedKeyboard(pointer);
|
||||
modifierDevice = GetPairedDevice(pointer);
|
||||
|
||||
grab = CreateGrab(client->index, pointer, pWin,
|
||||
(Mask)stuff->eventMask, (Bool)stuff->ownerEvents,
|
||||
|
|
|
@ -1038,7 +1038,7 @@ DGAProcessKeyboardEvent (ScreenPtr pScreen, dgaEvent *de, DeviceIntPtr keybd)
|
|||
xEvent core;
|
||||
KeyClassPtr keyc = keybd->key;
|
||||
DGAScreenPtr pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
|
||||
DeviceIntPtr pointer = GetPairedPointer(keybd);
|
||||
DeviceIntPtr pointer = GetPairedDevice(keybd);
|
||||
|
||||
coreEquiv = de->u.u.type - *XDGAEventBase;
|
||||
|
||||
|
@ -1145,7 +1145,7 @@ DGAProcessPointerEvent (ScreenPtr pScreen, dgaEvent *de, DeviceIntPtr mouse)
|
|||
* Fill in remaining event state
|
||||
*/
|
||||
de->u.event.screen = pScreen->myNum;
|
||||
de->u.event.state = butc->state | GetPairedKeyboard(mouse)->key->state;
|
||||
de->u.event.state = butc->state | GetPairedDevice(mouse)->key->state;
|
||||
/*
|
||||
* Keep the core state in sync by duplicating what
|
||||
* CoreProcessPointerEvent does
|
||||
|
|
|
@ -723,7 +723,7 @@ xf86PostKeyboardEvent(DeviceIntPtr device,
|
|||
int index;
|
||||
|
||||
#if XFreeXDGA
|
||||
DeviceIntPtr pointer = GetPairedPointer(device);
|
||||
DeviceIntPtr pointer = GetPairedDevice(device);
|
||||
|
||||
if (miPointerGetScreen(pointer)) {
|
||||
index = miPointerGetScreen(pointer)->myNum;
|
||||
|
|
|
@ -1273,7 +1273,7 @@ xkbDeviceInfoPtr xkbPrivPtr = XKBDEVICEINFO(dev);
|
|||
keyc->modifierMap[key] = 0;
|
||||
tmpdev = dev;
|
||||
} else
|
||||
tmpdev = GetPairedPointer(dev);
|
||||
tmpdev = GetPairedDevice(dev);
|
||||
|
||||
|
||||
UNWRAP_PROCESS_INPUT_PROC(tmpdev,xkbPrivPtr, backupproc);
|
||||
|
|
Loading…
Reference in New Issue
Block a user