components/x11/xdm/patches/10.18286609.patch

   1
   2 --- a/greeter/Login.h   2020-09-22 08:15:48.445614405 -0700
   3 +++ b/greeter/Login.h   2020-09-22 08:16:04.418229439 -0700
   4 @@ -95,6 +95,7 @@
   5  # define XtNgreetFace          "greetFace"
   6  # define XtNfailFace           "failFace"
   7  # define XtNfailTimeout                "failTimeout"
   8 +# define XtNgrabDelay           "grabDelay"
   9  # define XtNsessionArgument    "sessionArgument"
  10  # define XtNsecureSession      "secureSession"
  11  # define XtNallowAccess                "allowAccess"
  12 --- a/greeter/LoginP.h  2020-09-22 08:16:19.588151594 -0700
  13 +++ b/greeter/LoginP.h  2020-09-22 08:16:33.452749073 -0700
  14 @@ -127,6 +127,7 @@
  15         char            *sessionArg;    /* argument passed to session */
  16         LoginFunc       notify_done;    /* proc to call when done */
  17         int             failTimeout;    /* seconds til drop fail msg */
  18 +       int             grabDelay;      /* time to retry to set the input focus to the login widget */
  19         XtIntervalId    interval_id;    /* drop fail message note */
  20         Boolean         secure_session; /* session is secured */
  21         Boolean         allow_access;   /* disable access control on login */
  22 --- a/greeter/Login.c   2020-09-22 08:16:45.129246397 -0700
  23 +++ b/greeter/Login.c   2020-09-22 08:19:03.626851807 -0700
  24 @@ -210,6 +210,8 @@
  25         (XtPointer) "Password Change Required" },
  26      {XtNfailTimeout, XtCFailTimeout, XtRInt, sizeof (int),
  27         offset(failTimeout), XtRImmediate, (XtPointer) 10},
  28 +    {XtNgrabDelay, XtCGrabDelay, XtRInt, sizeof (int),
  29 +       offset(grabDelay), XtRImmediate, (XtPointer) 10},
  30      {XtNnotifyDone, XtCCallback, XtRFunction, sizeof (XtPointer),
  31         offset(notify_done), XtRFunction, (XtPointer) 0},
  32      {XtNsessionArgument, XtCSessionArgument, XtRString,        sizeof (char *),
  33 @@ -695,6 +697,37 @@
  34      ErrorMessage(ctx, w->login.passwdChangeMsg, False);
  35  }
  36
  37 +const char *
  38 +xerrMessage(int e)
  39 +{
  40 +       const char *s;
  41 +
  42 +       switch (e) {
  43 +
  44 +               case BadMatch:
  45 +                       s = "window is not visible";
  46 +                       break;
  47 +
  48 +               case BadWindow:
  49 +                       s = "window is no longer valid";
  50 +                       break;
  51 +
  52 +               default:
  53 +                       s = "generic failure";
  54 +                       break;
  55 +       }
  56 +       return s;
  57 +}
  58 +
  59 +static volatile int xerr;
  60 +
  61 +static int
  62 +xErrorHandler(Display *d, XErrorEvent *xeep)
  63 +{
  64 +       xerr = xeep->error_code;
  65 +       return xerr;
  66 +}
  67 +
  68  static void
  69  draw_it (LoginWidget w)
  70  {
  71 @@ -802,8 +835,40 @@
  72      }
  73      RedrawFail (w);
  74      XorCursor (w);
  75 -    XSetInputFocus (XtDisplay (w), XtWindow (w),
  76 -                   RevertToPointerRoot, CurrentTime);
  77 +
  78 +   if (XGrabKeyboard (XtDisplay (w), XtWindow (w), False, GrabModeAsync,
  79 +                       GrabModeAsync, CurrentTime) != GrabSuccess)
  80 +   {
  81 +                       typedef int (*x_e_h)(Display *, XErrorEvent *);
  82 +               x_e_h originalHandler = XSetErrorHandler(xErrorHandler);
  83 +               int waitsecs = w->login.grabDelay;
  84 +               for (;;) {
  85 +                       xerr = Success;
  86 +                       XSetInputFocus (XtDisplay (w), XtWindow (w),
  87 +                       RevertToPointerRoot, CurrentTime);
  88 +                       XSync(XtDisplay (w), False);
  89 +
  90 +                       if (xerr != BadMatch) {
  91 +                               break;
  92 +                       }
  93 +
  94 +                       if (waitsecs == 0) {    /* timed out */
  95 +                               break;
  96 +                       }
  97 +
  98 +                       if (waitsecs > 0) {
  99 +                               sleep(1);
 100 +                               --waitsecs;
 101 +                       }
 102 +               }
 103 +               (void) XSetErrorHandler(originalHandler);
 104 +
 105 +               if (xerr != Success) {
 106 +                       fprintf(stderr, "%s: failed to set focus; %s\n",
 107 +                                       "greeter", xerrMessage(xerr));
 108 +               }
 109 +  }
 110 +
 111  }
 112
 113  /* Returns 0 on success, -1 on failure */
 114 --- a/config/Xresources.in      2020-09-22 08:19:33.923767351 -0700
 115 +++ b/config/Xresources.in      2020-09-22 08:20:02.447969714 -0700
 116 @@ -1,4 +1,5 @@
 117  Xcursor.theme: whiteglass
 118 +xlogin*grabDelay: 5
 119
 120  xlogin*login.translations: #override BS
 121         Ctrl<Key>R: abort-display()NLBS
 122 --- a/greeter/Login.h   2020-09-22 10:42:07.782375282 -0700
 123 +++ b/greeter/Login.h   2020-09-22 10:43:04.572299383 -0700
 124 @@ -139,6 +139,7 @@
 125  # define XtCPasswdPrompt       "PasswdPrompt"
 126  # define XtCFail               "Fail"
 127  # define XtCFailTimeout                "FailTimeout"
 128 +# define XtCGrabDelay           "GrabDelay"
 129  # define XtCSessionArgument    "SessionArgument"
 130  # define XtCSecureSession      "SecureSession"
 131  # define XtCAllowAccess                "AllowAccess"