dix: don't use inputInfo.keyboard to get the focus window in ActivateKbdGrab
I'm not sure if that's the right solution, but the other one is wronger.
This commit is contained in:
parent
de415743f4
commit
f01ee198ff
|
@ -1517,7 +1517,7 @@ ActivateKeyboardGrab(DeviceIntPtr keybd, GrabPtr grab, TimeStamp time, Bool pass
|
||||||
else
|
else
|
||||||
oldWin = keybd->spriteInfo->sprite->win;
|
oldWin = keybd->spriteInfo->sprite->win;
|
||||||
if (oldWin == FollowKeyboardWin)
|
if (oldWin == FollowKeyboardWin)
|
||||||
oldWin = inputInfo.keyboard->focus->win;
|
oldWin = keybd->focus->win;
|
||||||
if (keybd->valuator)
|
if (keybd->valuator)
|
||||||
keybd->valuator->motionHintWindow = NullWindow;
|
keybd->valuator->motionHintWindow = NullWindow;
|
||||||
DoFocusEvents(keybd, oldWin, grab->window, NotifyGrab);
|
DoFocusEvents(keybd, oldWin, grab->window, NotifyGrab);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user