andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dix: SetFocusOut and LeaveWindow don't need parameters other than dev.

Browse Source 
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2009-07-30 16:36:30 +10:00
parent d040940efe
commit 97ed946cfc
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dix/enterleave.c
View File

@ -167,7 +167,7 @@ EnterWindow(DeviceIntPtr dev, WindowPtr win, int mode)
* Unset the presence flag for dev to mark that it is not in 'win' anymore. * Unset the presence flag for dev to mark that it is not in 'win' anymore.
*/ */
static void static void
LeaveWindow(DeviceIntPtr dev, WindowPtr win, int mode) LeaveWindow(DeviceIntPtr dev)
{ {
PointerWindows[dev->id] = NULL; PointerWindows[dev->id] = NULL;
} }
@ -185,7 +185,7 @@ SetFocusIn(DeviceIntPtr dev, WindowPtr win)
* Unset the presence flag for dev to mark that it is not in 'win' anymore. * Unset the presence flag for dev to mark that it is not in 'win' anymore.
*/ */
void void
SetFocusOut(DeviceIntPtr dev, WindowPtr win) SetFocusOut(DeviceIntPtr dev)
{ {
FocusWindows[dev->id] = NULL; FocusWindows[dev->id] = NULL;
} }
@ -550,7 +550,7 @@ CoreEnterLeaveEvents(DeviceIntPtr dev,
if (!IsMaster(dev)) if (!IsMaster(dev))
return; return;
LeaveWindow(dev, from, mode); LeaveWindow(dev);
if (IsParent(from, to)) if (IsParent(from, to))
CoreEnterLeaveToDescendant(dev, from, to, mode); CoreEnterLeaveToDescendant(dev, from, to, mode);
@ -1223,7 +1223,7 @@ CoreFocusEvents(DeviceIntPtr dev,
if (!IsMaster(dev)) if (!IsMaster(dev))
return; return;
SetFocusOut(dev, from); SetFocusOut(dev);
if (((to == NullWindow) || (to == PointerRootWin)) && if (((to == NullWindow) || (to == PointerRootWin)) &&
((from == NullWindow) || (from == PointerRootWin))) ((from == NullWindow) || (from == PointerRootWin)))

3
dix/enterleave.h
View File

@ -92,6 +92,5 @@ extern void DeviceFocusEvent(DeviceIntPtr kbd,
extern void SetFocusIn(DeviceIntPtr kbd, extern void SetFocusIn(DeviceIntPtr kbd,
WindowPtr win); WindowPtr win);
extern void SetFocusOut(DeviceIntPtr dev, extern void SetFocusOut(DeviceIntPtr dev);
WindowPtr win);
#endif /* _ENTERLEAVE_H_ */ #endif /* _ENTERLEAVE_H_ */