1453N/A--- a/greeter/Login.h-orig Thu Sep 17 19:24:37 2009

1453N/A+++ b/greeter/Login.h Mon Feb 24 00:45:55 2014

1453N/A@@ -100,6 +100,7 @@

1453N/A # define XtNgreetFace "greetFace"

1453N/A # define XtNfailFace "failFace"

1453N/A # define XtNfailTimeout "failTimeout"

1453N/A+# define XtNgrabDelay "grabDelay"

1453N/A # define XtNsessionArgument "sessionArgument"

1453N/A # define XtNsecureSession "secureSession"

1453N/A # define XtNallowAccess "allowAccess"

1453N/A@@ -140,6 +141,7 @@

1453N/A # define XtCPasswdPrompt "PasswdPrompt"

1453N/A # define XtCFail "Fail"

1453N/A # define XtCFailTimeout "FailTimeout"

1453N/A+# define XtCGrabDelay "GrabDelay"

1453N/A # define XtCSessionArgument "SessionArgument"

1453N/A # define XtCSecureSession "SecureSession"

1453N/A # define XtCAllowAccess "AllowAccess"

1453N/A--- a/greeter/LoginP.h-orig Thu Sep 17 19:24:37 2009

1453N/A+++ b/greeter/LoginP.h Mon Feb 24 00:46:53 2014

1453N/A@@ -130,6 +130,7 @@

1453N/A char *sessionArg; /* argument passed to session */

1453N/A LoginFunc notify_done; /* proc to call when done */

1453N/A int failTimeout; /* seconds til drop fail msg */

1453N/A+ int grabDelay; /* time to retry to set the input focus to the login widget */

1453N/A XtIntervalId interval_id; /* drop fail message note */

1453N/A Boolean secure_session; /* session is secured */

1453N/A Boolean allow_access; /* disable access control on login */

1453N/A--- a/greeter/Login.c-orig Wed Feb 26 01:36:09 2014

1453N/A+++ b/greeter/Login.c Wed Feb 26 01:21:35 2014

1453N/A@@ -217,6 +217,8 @@

1453N/A (XtPointer) "Password Change Required" },

1453N/A {XtNfailTimeout, XtCFailTimeout, XtRInt, sizeof (int),

1453N/A offset(failTimeout), XtRImmediate, (XtPointer) 10},

1453N/A+ {XtNgrabDelay, XtCGrabDelay, XtRInt, sizeof (int),

1453N/A+ offset(grabDelay), XtRImmediate, (XtPointer) 10},

1453N/A {XtNnotifyDone, XtCCallback, XtRFunction, sizeof (XtPointer),

1453N/A offset(notify_done), XtRFunction, (XtPointer) 0},

1453N/A {XtNsessionArgument, XtCSessionArgument, XtRString, sizeof (char *),

1453N/A@@ -665,6 +667,37 @@

1453N/A ErrorMessage(ctx, w->login.passwdChangeMsg, False);

1453N/A }

1453N/A

1453N/A+const char *

1453N/A+xerrMessage(int e)

1453N/A+{

1453N/A+ const char *s;

1453N/A+

1453N/A+ switch (e) {

1453N/A+

1453N/A+ case BadMatch:

1453N/A+ s = "window is not visible";

1453N/A+ break;

1453N/A+

1453N/A+ case BadWindow:

1453N/A+ s = "window is no longer valid";

1453N/A+ break;

1453N/A+

1453N/A+ default:

1453N/A+ s = "generic failure";

1453N/A+ break;

1453N/A+ }

1453N/A+ return s;

1453N/A+}

1453N/A+

1453N/A+static volatile int xerr;

1453N/A+

1453N/A+static int

1453N/A+xErrorHandler(Display *d, XErrorEvent *xeep)

1453N/A+{

1453N/A+ xerr = xeep->error_code;

1453N/A+ return xerr;

1453N/A+}

1453N/A+

1453N/A static void

1453N/A draw_it (LoginWidget w)

1453N/A {

1453N/A@@ -770,8 +803,40 @@

1453N/A }

1453N/A RedrawFail (w);

1453N/A XorCursor (w);

1453N/A- XSetInputFocus (XtDisplay (w), XtWindow (w),

1453N/A- RevertToPointerRoot, CurrentTime);

1453N/A+

1453N/A+ if (XGrabKeyboard (XtDisplay (w), XtWindow (w), False, GrabModeAsync,

1453N/A+ GrabModeAsync, CurrentTime) != GrabSuccess)

1453N/A+ {

1453N/A+ typedef int (*x_e_h)(Display *, XErrorEvent *);

1453N/A+ x_e_h originalHandler = XSetErrorHandler(xErrorHandler);

1453N/A+ int waitsecs = w->login.grabDelay;

1453N/A+ for (;;) {

1453N/A+ xerr = Success;

1453N/A+ XSetInputFocus (XtDisplay (w), XtWindow (w),

1453N/A+ RevertToPointerRoot, CurrentTime);

1453N/A+ XSync(XtDisplay (w), False);

1453N/A+

1453N/A+ if (xerr != BadMatch) {

1453N/A+ break;

1453N/A+ }

1453N/A+

1453N/A+ if (waitsecs == 0) { /* timed out */

1453N/A+ break;

1453N/A+ }

1453N/A+

1453N/A+ if (waitsecs > 0) {

1453N/A+ sleep(1);

1453N/A+ --waitsecs;

1453N/A+ }

1453N/A+ }

1453N/A+ (void) XSetErrorHandler(originalHandler);

1453N/A+

1453N/A+ if (xerr != Success) {

1453N/A+ fprintf(stderr, "%s: failed to set focus; %s\n",

1453N/A+ "greeter", xerrMessage(xerr));

1453N/A+ }

1453N/A+ }

1453N/A+

1453N/A }

1453N/A

1453N/A /* Returns 0 on success, -1 on failure */

1453N/A--- a/config/Xresources.cpp-orig Thu Sep 17 19:24:37 2009

1453N/A+++ b/config/Xresources.cpp Mon Feb 24 01:06:12 2014

1453N/A@@ -5,6 +5,7 @@

1453N/A !

1453N/A

1453N/A Xcursor.theme: whiteglass

1453N/A+xlogin*grabDelay: 5

1453N/A

1453N/A #define BS \ /* cpp can be trickier than m4 */

1453N/A #define NLBS \n\ /* don't remove these comments */