18286609.patch revision 1453
536N/A--- a/greeter/Login.h-orig Thu Sep 17 19:24:37 2009
536N/A+++ b/greeter/Login.h Mon Feb 24 00:45:55 2014
536N/A@@ -100,6 +100,7 @@
536N/A # define XtNgreetFace "greetFace"
851N/A # define XtNfailFace "failFace"
851N/A # define XtNfailTimeout "failTimeout"
536N/A+# define XtNgrabDelay "grabDelay"
536N/A # define XtNsessionArgument "sessionArgument"
536N/A # define XtNsecureSession "secureSession"
536N/A # define XtNallowAccess "allowAccess"
536N/A@@ -140,6 +141,7 @@
536N/A # define XtCPasswdPrompt "PasswdPrompt"
536N/A # define XtCFail "Fail"
536N/A # define XtCFailTimeout "FailTimeout"
536N/A+# define XtCGrabDelay "GrabDelay"
536N/A # define XtCSessionArgument "SessionArgument"
536N/A # define XtCSecureSession "SecureSession"
536N/A # define XtCAllowAccess "AllowAccess"
536N/A--- a/greeter/LoginP.h-orig Thu Sep 17 19:24:37 2009
536N/A+++ b/greeter/LoginP.h Mon Feb 24 00:46:53 2014
536N/A@@ -130,6 +130,7 @@
536N/A char *sessionArg; /* argument passed to session */
536N/A LoginFunc notify_done; /* proc to call when done */
536N/A int failTimeout; /* seconds til drop fail msg */
536N/A+ int grabDelay; /* time to retry to set the input focus to the login widget */
536N/A XtIntervalId interval_id; /* drop fail message note */
536N/A Boolean secure_session; /* session is secured */
536N/A Boolean allow_access; /* disable access control on login */
536N/A--- a/greeter/Login.c-orig Wed Feb 26 01:36:09 2014
536N/A+++ b/greeter/Login.c Wed Feb 26 01:21:35 2014
536N/A@@ -217,6 +217,8 @@
536N/A (XtPointer) "Password Change Required" },
536N/A {XtNfailTimeout, XtCFailTimeout, XtRInt, sizeof (int),
536N/A offset(failTimeout), XtRImmediate, (XtPointer) 10},
536N/A+ {XtNgrabDelay, XtCGrabDelay, XtRInt, sizeof (int),
536N/A+ offset(grabDelay), XtRImmediate, (XtPointer) 10},
536N/A {XtNnotifyDone, XtCCallback, XtRFunction, sizeof (XtPointer),
536N/A offset(notify_done), XtRFunction, (XtPointer) 0},
536N/A {XtNsessionArgument, XtCSessionArgument, XtRString, sizeof (char *),
536N/A@@ -665,6 +667,37 @@
536N/A ErrorMessage(ctx, w->login.passwdChangeMsg, False);
536N/A }
536N/A
536N/A+const char *
536N/A+xerrMessage(int e)
536N/A+{
536N/A+ const char *s;
536N/A+
536N/A+ switch (e) {
536N/A+
536N/A+ case BadMatch:
536N/A+ s = "window is not visible";
536N/A+ break;
536N/A+
536N/A+ case BadWindow:
536N/A+ s = "window is no longer valid";
536N/A+ break;
536N/A+
536N/A+ default:
536N/A+ s = "generic failure";
536N/A+ break;
851N/A+ }
536N/A+ return s;
851N/A+}
536N/A+
536N/A+static volatile int xerr;
+
+static int
+xErrorHandler(Display *d, XErrorEvent *xeep)
+{
+ xerr = xeep->error_code;
+ return xerr;
+}
+
static void
draw_it (LoginWidget w)
{
@@ -770,8 +803,40 @@
}
RedrawFail (w);
XorCursor (w);
- XSetInputFocus (XtDisplay (w), XtWindow (w),
- RevertToPointerRoot, CurrentTime);
+
+ if (XGrabKeyboard (XtDisplay (w), XtWindow (w), False, GrabModeAsync,
+ GrabModeAsync, CurrentTime) != GrabSuccess)
+ {
+ typedef int (*x_e_h)(Display *, XErrorEvent *);
+ x_e_h originalHandler = XSetErrorHandler(xErrorHandler);
+ int waitsecs = w->login.grabDelay;
+ for (;;) {
+ xerr = Success;
+ XSetInputFocus (XtDisplay (w), XtWindow (w),
+ RevertToPointerRoot, CurrentTime);
+ XSync(XtDisplay (w), False);
+
+ if (xerr != BadMatch) {
+ break;
+ }
+
+ if (waitsecs == 0) { /* timed out */
+ break;
+ }
+
+ if (waitsecs > 0) {
+ sleep(1);
+ --waitsecs;
+ }
+ }
+ (void) XSetErrorHandler(originalHandler);
+
+ if (xerr != Success) {
+ fprintf(stderr, "%s: failed to set focus; %s\n",
+ "greeter", xerrMessage(xerr));
+ }
+ }
+
}
/* Returns 0 on success, -1 on failure */
--- a/config/Xresources.cpp-orig Thu Sep 17 19:24:37 2009
+++ b/config/Xresources.cpp Mon Feb 24 01:06:12 2014
@@ -5,6 +5,7 @@
!
Xcursor.theme: whiteglass
+xlogin*grabDelay: 5
#define BS \ /* cpp can be trickier than m4 */
#define NLBS \n\ /* don't remove these comments */