frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deliver FocusIn/FocusOut events for all devices. 

Don't use VCK in SetInputFocus and DeliverFocusedEvent.
This commit is contained in:
Peter Hutterer 2007-04-13 17:15:22 +09:30
parent 2bb3c81fc1
commit ea27b09d3a
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dix/events.c
View File

@ -2787,9 +2787,9 @@ CheckDeviceGrabs(DeviceIntPtr device, xEvent *xE,
void void
DeliverFocusedEvent(DeviceIntPtr keybd, xEvent *xE, WindowPtr window, int count) DeliverFocusedEvent(DeviceIntPtr keybd, xEvent *xE, WindowPtr window, int count)
{ {
DeviceIntPtr pointer;
WindowPtr focus = keybd->focus->win; WindowPtr focus = keybd->focus->win;
int mskidx = 0; int mskidx = 0;
if (focus == FollowKeyboardWin) if (focus == FollowKeyboardWin)
focus = inputInfo.keyboard->focus->win; focus = inputInfo.keyboard->focus->win;
if (!focus) if (!focus)
@ -2804,8 +2804,11 @@ DeliverFocusedEvent(DeviceIntPtr keybd, xEvent *xE, WindowPtr window, int count)
if (DeliverDeviceEvents(window, xE, NullGrab, focus, keybd, count)) if (DeliverDeviceEvents(window, xE, NullGrab, focus, keybd, count))
return; return;
} }
pointer = GetPairedPointer(keybd);
if (!pointer)
pointer = inputInfo.pointer;
/* just deliver it to the focus window */ /* just deliver it to the focus window */
FixUpEventFromWindow(inputInfo.pointer, xE, focus, None, FALSE); FixUpEventFromWindow(pointer, xE, focus, None, FALSE);
if (xE->u.u.type & EXTENSION_EVENT_BASE) if (xE->u.u.type & EXTENSION_EVENT_BASE)
mskidx = keybd->id; mskidx = keybd->id;
(void)DeliverEventsToWindow(keybd, focus, xE, count, filters[xE->u.u.type], (void)DeliverEventsToWindow(keybd, focus, xE, count, filters[xE->u.u.type],
@ -3632,13 +3635,8 @@ FocusEvent(DeviceIntPtr dev, int type, int mode, int detail, WindowPtr pWin)
{ {
xEvent event; xEvent event;
#ifdef XINPUT
if (dev != inputInfo.keyboard) if (dev != inputInfo.keyboard)
{
DeviceFocusEvent(dev, type, mode, detail, pWin); DeviceFocusEvent(dev, type, mode, detail, pWin);
return;
}
#endif
event.u.focus.mode = mode; event.u.focus.mode = mode;
event.u.u.type = type; event.u.u.type = type;
event.u.u.detail = detail; event.u.u.detail = detail;
@ -3846,6 +3844,8 @@ SetInputFocus(
WindowPtr focusWin; WindowPtr focusWin;
int mode, rc; int mode, rc;
TimeStamp time; TimeStamp time;
DeviceIntPtr keybd; /* used for FollowKeyboard or FollowKeyboardWin */
UpdateCurrentTime(); UpdateCurrentTime();
if ((revertTo != RevertToParent) && if ((revertTo != RevertToParent) &&
@ -3857,10 +3857,22 @@ SetInputFocus(
return BadValue; return BadValue;
} }
time = ClientTimeToServerTime(ctime); time = ClientTimeToServerTime(ctime);
if (IsKeyboardDevice(dev))
keybd = dev;
else
{
keybd = GetPairedKeyboard(dev);
if (!keybd)
keybd = inputInfo.keyboard;
}
if ((focusID == None) || (focusID == PointerRoot)) if ((focusID == None) || (focusID == PointerRoot))
focusWin = (WindowPtr)(long)focusID; focusWin = (WindowPtr)(long)focusID;
else if ((focusID == FollowKeyboard) && followOK) else if ((focusID == FollowKeyboard) && followOK)
focusWin = inputInfo.keyboard->focus->win; {
focusWin = keybd->focus->win;
}
else { else {
rc = dixLookupWindow(&focusWin, focusID, client, DixReadAccess); rc = dixLookupWindow(&focusWin, focusID, client, DixReadAccess);
if (rc != Success) if (rc != Success)
@ -3876,7 +3888,7 @@ SetInputFocus(
return Success; return Success;
mode = (dev->coreGrab.grab) ? NotifyWhileGrabbed : NotifyNormal; mode = (dev->coreGrab.grab) ? NotifyWhileGrabbed : NotifyNormal;
if (focus->win == FollowKeyboardWin) if (focus->win == FollowKeyboardWin)
DoFocusEvents(dev, inputInfo.keyboard->focus->win, focusWin, mode); DoFocusEvents(dev, keybd->focus->win, focusWin, mode);
else else
DoFocusEvents(dev, focus->win, focusWin, mode); DoFocusEvents(dev, focus->win, focusWin, mode);
focus->time = time; focus->time = time;