summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-07-30 16:36:30 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-08-03 10:11:48 +1000
commit97ed946cfccec5979c47b5fabf1ad56cc7d33ef4 (patch)
treea3c6bc32c6dff1d394fe0a327638c01c7bce73d2 /dix
parentd040940efe041b57e6323921c380ceb2bb43f41e (diff)
dix: SetFocusOut and LeaveWindow don't need parameters other than dev.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'dix')
-rw-r--r--dix/enterleave.c8
-rw-r--r--dix/enterleave.h3
2 files changed, 5 insertions, 6 deletions
diff --git a/dix/enterleave.c b/dix/enterleave.c
index 09b9f5527..29b93499c 100644
--- a/dix/enterleave.c
+++ b/dix/enterleave.c
@@ -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.
*/
static void
-LeaveWindow(DeviceIntPtr dev, WindowPtr win, int mode)
+LeaveWindow(DeviceIntPtr dev)
{
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.
*/
void
-SetFocusOut(DeviceIntPtr dev, WindowPtr win)
+SetFocusOut(DeviceIntPtr dev)
{
FocusWindows[dev->id] = NULL;
}
@@ -550,7 +550,7 @@ CoreEnterLeaveEvents(DeviceIntPtr dev,
if (!IsMaster(dev))
return;
- LeaveWindow(dev, from, mode);
+ LeaveWindow(dev);
if (IsParent(from, to))
CoreEnterLeaveToDescendant(dev, from, to, mode);
@@ -1223,7 +1223,7 @@ CoreFocusEvents(DeviceIntPtr dev,
if (!IsMaster(dev))
return;
- SetFocusOut(dev, from);
+ SetFocusOut(dev);
if (((to == NullWindow) || (to == PointerRootWin)) &&
((from == NullWindow) || (from == PointerRootWin)))
diff --git a/dix/enterleave.h b/dix/enterleave.h
index 746c5d4b0..4da4e02fb 100644
--- a/dix/enterleave.h
+++ b/dix/enterleave.h
@@ -92,6 +92,5 @@ extern void DeviceFocusEvent(DeviceIntPtr kbd,
extern void SetFocusIn(DeviceIntPtr kbd,
WindowPtr win);
-extern void SetFocusOut(DeviceIntPtr dev,
- WindowPtr win);
+extern void SetFocusOut(DeviceIntPtr dev);
#endif /* _ENTERLEAVE_H_ */