hashirama/xserver
Watch
0
0
Fork
You've already forked xserver
 0
mirror of https://github.com/X11Libre/xserver.git synced 2026-10-19 00:51:16 +00:00
Code Issues Projects Releases Wiki Activity

dix: GetPairedKeyboard() always returns a valid keyboard (VCK if necessary).

Browse source 
We need it unconditionally in a few places, and the rest checked for NULL and
then set it to VCK anyway. So, fixing up all callers to appreciate the defined
return value.
This commit is contained in:
Peter Hutterer 2007-09-27 22:23:05 +09:30
commit be466d8df8
2 changed files with 6 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
dix/events.c
View file

@ -3233,8 +3233,6 @@ CheckPassiveGrabsOnWindow(
{
grab->device = device;
grab->modifierDevice = GetPairedKeyboard(device);
if (!grab->modifierDevice)
grab->modifierDevice = inputInfo.keyboard;
}
(*grabinfo->ActivateGrab)(device, grab, currentTime, TRUE);
@ -4052,8 +4050,7 @@ EnterLeaveEvent(
int mskidx;
OtherInputMasks *inputMasks;
if (!(keybd = GetPairedKeyboard(mouse)))
keybd = inputInfo.keyboard;
keybd = GetPairedKeyboard(mouse);
if ((pWin == mouse->valuator->motionHintWindow) &&
(detail != NotifyInferior))
@ -4572,11 +4569,7 @@ SetInputFocus(
if (IsKeyboardDevice(dev))
keybd = dev;
else
{
keybd = GetPairedKeyboard(dev);
if (!keybd)
keybd = inputInfo.keyboard;
}
if ((focusID == None) || (focusID == PointerRoot))
focusWin = (WindowPtr)(long)focusID;
@ -5592,8 +5585,6 @@ ProcGrabButton(ClientPtr client)
pointer = PickPointer(client);
modifierDevice = GetPairedKeyboard(pointer);
if (!modifierDevice)
modifierDevice = inputInfo.keyboard;
grab = CreateGrab(client->index, pointer, pWin,
(Mask)stuff->eventMask, (Bool)stuff->ownerEvents,