Apply terminalkeys patch

[slock.git] / slock.c

diff --git a/slock.c b/slock.c
index 700acfb4f5c969adc503fbabfb2b9ffd58932f0b..04665ffc8fd196828c07b5657c7cf6908599e94d 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -156,6 +156,22 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
                            IsPFKey(ksym) ||
                            IsPrivateKeypadKey(ksym))
                                continue;
+                       if (ev.xkey.state & ControlMask) {
+                               switch (ksym) {
+                               case XK_u:
+                                       ksym = XK_Escape;
+                                       break;
+                               case XK_m:
+                                       ksym = XK_Return;
+                                       break;
+                               case XK_j:
+                                       ksym = XK_Return;
+                                       break;
+                               case XK_h:
+                                       ksym = XK_BackSpace;
+                                       break;
+                               }
+                       }
                        switch (ksym) {
                        case XK_Return:
                                passwd[len] = '\0';
@@ -177,7 +193,7 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
                                break;
                        case XK_BackSpace:
                                if (len)
-                                       passwd[len--] = '\0';
+                                       passwd[--len] = '\0';
                                break;
                        default:
                                if (num && !iscntrl((int)buf[0]) &&
@@ -212,8 +228,10 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
                                        break;
                                }
                        }
-               } else for (screen = 0; screen < nscreens; screen++)
-                       XRaiseWindow(dpy, locks[screen]->win);
+               } else {
+                       for (screen = 0; screen < nscreens; screen++)
+                               XRaiseWindow(dpy, locks[screen]->win);
+               }
        }
 }