[PATCH:xdm] Remove workaround for X11R3 server bug

Alan Coopersmith alan.coopersmith at sun.com
Tue Jan 12 10:27:23 PST 2010


The comment promised 'compatibility until at least R4', so we're 20 years
past due for removing this.

Signed-off-by: Alan Coopersmith <alan.coopersmith at sun.com>
---
 greeter/Login.c |   16 ++--------------
 1 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/greeter/Login.c b/greeter/Login.c
index fefa29d..5afe363 100644
--- a/greeter/Login.c
+++ b/greeter/Login.c
@@ -766,20 +766,8 @@ draw_it (LoginWidget w)
     }
     RedrawFail (w);
     XorCursor (w);
-    /*
-     * The GrabKeyboard here is needed only because of
-     * a bug in the R3 server -- the keyboard is grabbed on
-     * the root window, and the server won't dispatch events
-     * to the focus window unless the focus window is a ancestor
-     * of the grab window.  Bug in server already found and fixed,
-     * compatibility until at least R4.
-     */
-    if (XGrabKeyboard (XtDisplay (w), XtWindow (w), False, GrabModeAsync,
-		       GrabModeAsync, CurrentTime) != GrabSuccess)
-    {
-	XSetInputFocus (XtDisplay (w), XtWindow (w),
-			RevertToPointerRoot, CurrentTime);
-    }
+    XSetInputFocus (XtDisplay (w), XtWindow (w),
+		    RevertToPointerRoot, CurrentTime);
 }
 
 /* Returns 0 on success, -1 on failure */
-- 
1.5.6.5



More information about the xorg-devel mailing list