From 97ed946cfccec5979c47b5fabf1ad56cc7d33ef4 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 30 Jul 2009 16:36:30 +1000
Subject: [PATCH] dix: SetFocusOut and LeaveWindow don't need parameters other
 than dev.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
 dix/enterleave.c | 8 ++++----
 dix/enterleave.h | 3 +--
 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_ */