Apply dpms patch

[slock.git] / slock.c

diff --git a/slock.c b/slock.c
index d55eb3d7346160613791b0436b92f1672271a8b4..2b06ca2a9c3b79c6ef7b9fe6fa2686edab91be7f 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -13,8 +13,10 @@
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
+#include <time.h>
 #include <sys/types.h>
 #include <X11/extensions/Xrandr.h>
+#include <X11/extensions/dpms.h>
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -24,6 +26,8 @@
 
 char *argv0;
 
+static time_t locktime;
+
 enum {
        INIT,
        INPUT,
@@ -141,6 +145,7 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
        oldc = INIT;
 
        while (running && !XNextEvent(dpy, &ev)) {
+               running = !((time(NULL) - locktime < timetocancel) && (ev.type == MotionNotify));
                if (ev.type == KeyPress) {
                        explicit_bzero(&buf, sizeof(buf));
                        num = XLookupString(&ev.xkey, buf, sizeof(buf), &ksym, 0);
@@ -156,6 +161,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 +198,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]) &&
@@ -276,6 +297,7 @@ lockscreen(Display *dpy, struct xrandr *rr, int screen)
                                XRRSelectInput(dpy, lock->win, RRScreenChangeNotifyMask);
 
                        XSelectInput(dpy, lock->root, SubstructureNotifyMask);
+                       locktime = time(NULL);
                        return lock;
                }
 
@@ -314,6 +336,7 @@ main(int argc, char **argv) {
        const char *hash;
        Display *dpy;
        int s, nlocks, nscreens;
+       CARD16 standby, suspend, off;
 
        ARGBEGIN {
        case 'v':
@@ -374,6 +397,20 @@ main(int argc, char **argv) {
        if (nlocks != nscreens)
                return 1;
 
+       /* DPMS magic to disable the monitor */
+       if (!DPMSCapable(dpy))
+               die("slock: DPMSCapable failed\n");
+       if (!DPMSEnable(dpy))
+               die("slock: DPMSEnable failed\n");
+       if (!DPMSGetTimeouts(dpy, &standby, &suspend, &off))
+               die("slock: DPMSGetTimeouts failed\n");
+       if (!standby || !suspend || !off)
+               die("slock: at least one DPMS variable is zero\n");
+       if (!DPMSSetTimeouts(dpy, monitortime, monitortime, monitortime))
+               die("slock: DPMSSetTimeouts failed\n");
+
+       XSync(dpy, 0);
+
        /* run post-lock command */
        if (argc > 0) {
                switch (fork()) {
@@ -391,5 +428,9 @@ main(int argc, char **argv) {
        /* everything is now blank. Wait for the correct password */
        readpw(dpy, &rr, locks, nscreens, hash);
 
+       /* reset DPMS values to inital ones */
+       DPMSSetTimeouts(dpy, standby, suspend, off);
+       XSync(dpy, 0);
+
        return 0;
 }