applied Ali Gholami Rudi's patch regarding DPMS timeout customization and persistence

[slock.git] / slock.c

diff --git a/slock.c b/slock.c
index 40f1fbe..8490dae 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -22,8 +22,8 @@
 #include <bsd_auth.h>
 #endif
 
 #include <bsd_auth.h>
 #endif
 

-void
-eprint(const char *errstr, ...) {
+static void
+die(const char *errstr, ...) {

        va_list ap;
 
        va_start(ap, errstr);
        va_list ap;
 
        va_start(ap, errstr);


@@ -33,13 +33,13 @@ eprint(const char *errstr, ...) {
 }
 
 #ifndef HAVE_BSD_AUTH
 }
 
 #ifndef HAVE_BSD_AUTH

-const char *
+static const char *

 get_password() { /* only run as root */
        const char *rval;
        struct passwd *pw;
 
        if(geteuid() != 0)
 get_password() { /* only run as root */
        const char *rval;
        struct passwd *pw;
 
        if(geteuid() != 0)

-               eprint("slock: cannot retrieve password entry (make sure to suid slock)\n");
+               die("slock: cannot retrieve password entry (make sure to suid slock)\n");

        pw = getpwuid(getuid());
        endpwent();
        rval =  pw->pw_passwd;
        pw = getpwuid(getuid());
        endpwent();
        rval =  pw->pw_passwd;


@@ -55,7 +55,7 @@ get_password() { /* only run as root */
 
        /* drop privileges */
        if(setgid(pw->pw_gid) < 0 || setuid(pw->pw_uid) < 0)
 
        /* drop privileges */
        if(setgid(pw->pw_gid) < 0 || setuid(pw->pw_uid) < 0)

-               eprint("slock: cannot drop privileges\n");
+               die("slock: cannot drop privileges\n");

        return rval;
 }
 #endif
        return rval;
 }
 #endif


@@ -79,18 +79,19 @@ main(int argc, char **argv) {
        XColor black, dummy;
        XEvent ev;
        XSetWindowAttributes wa;
        XColor black, dummy;
        XEvent ev;
        XSetWindowAttributes wa;

+       CARD16 standby, suspend, off;

 
        if((argc == 2) && !strcmp("-v", argv[1]))
 
        if((argc == 2) && !strcmp("-v", argv[1]))

-               eprint("slock-"VERSION", © 2006-2008 Anselm R Garbe\n");
+               die("slock-"VERSION", © 2006-2008 Anselm R Garbe\n");

        else if(argc != 1)
        else if(argc != 1)

-               eprint("usage: slock [-v]\n");
+               die("usage: slock [-v]\n");

 
 #ifndef HAVE_BSD_AUTH
        pws = get_password();
 #endif
 
        if(!(dpy = XOpenDisplay(0)))
 
 #ifndef HAVE_BSD_AUTH
        pws = get_password();
 #endif
 
        if(!(dpy = XOpenDisplay(0)))

-               eprint("slock: cannot open display\n");
+               die("slock: cannot open display\n");

        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
 
        screen = DefaultScreen(dpy);
        root = RootWindow(dpy, screen);
 


@@ -123,20 +124,22 @@ main(int argc, char **argv) {
        len = 0;
        XSync(dpy, False);
 
        len = 0;
        XSync(dpy, False);
 

+       if(DPMSCapable(dpy)) { /* save and customize DPMS settings */
+               DPMSGetTimeouts(dpy, &standby, &suspend, &off);
+               DPMSSetTimeouts(dpy, 10, 30, 90);
+       }
+

        /* main event loop */
        while(running && !XNextEvent(dpy, &ev)) {
        /* main event loop */
        while(running && !XNextEvent(dpy, &ev)) {

-               if(len == 0 && DPMSCapable(dpy)) {
-                       DPMSEnable(dpy);
-                       DPMSForceLevel(dpy, DPMSModeOff);
-               }

                if(ev.type == KeyPress) {
                        buf[0] = 0;
                        num = XLookupString(&ev.xkey, buf, sizeof buf, &ksym, 0);
                if(ev.type == KeyPress) {
                        buf[0] = 0;
                        num = XLookupString(&ev.xkey, buf, sizeof buf, &ksym, 0);

-                       if(IsKeypadKey(ksym)) 
+                       if(IsKeypadKey(ksym)) {

                                if(ksym == XK_KP_Enter)
                                        ksym = XK_Return;
                                else if(ksym >= XK_KP_0 && ksym <= XK_KP_9)
                                        ksym = (ksym - XK_KP_0) + XK_0;
                                if(ksym == XK_KP_Enter)
                                        ksym = XK_Return;
                                else if(ksym >= XK_KP_0 && ksym <= XK_KP_9)
                                        ksym = (ksym - XK_KP_0) + XK_0;

+                       }

                        if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
                                        || IsMiscFunctionKey(ksym) || IsPFKey(ksym)
                                        || IsPrivateKeypadKey(ksym))
                        if(IsFunctionKey(ksym) || IsKeypadKey(ksym)
                                        || IsMiscFunctionKey(ksym) || IsPFKey(ksym)
                                        || IsPrivateKeypadKey(ksym))


@@ -144,13 +147,11 @@ main(int argc, char **argv) {
                        switch(ksym) {
                        case XK_Return:
                                passwd[len] = 0;
                        switch(ksym) {
                        case XK_Return:
                                passwd[len] = 0;

-

 #ifdef HAVE_BSD_AUTH
                                running = !auth_userokay(getlogin(), NULL, "auth-xlock", passwd);
 #else
                                running = strcmp(crypt(passwd, pws), pws);
 #endif
 #ifdef HAVE_BSD_AUTH
                                running = !auth_userokay(getlogin(), NULL, "auth-xlock", passwd);
 #else
                                running = strcmp(crypt(passwd, pws), pws);
 #endif

-

                                if (running != 0)
                                        XBell(dpy, 100);
                                len = 0;
                                if (running != 0)
                                        XBell(dpy, 100);
                                len = 0;


@@ -171,6 +172,9 @@ main(int argc, char **argv) {
                        }
                }
        }
                        }
                }
        }

+       if(DPMSCapable(dpy)) { /* restore DPMS settings */
+               DPMSSetTimeouts(dpy, standby, suspend, off);
+       }

        XUngrabPointer(dpy, CurrentTime);
        XFreePixmap(dpy, pmap);
        XDestroyWindow(dpy, w);
        XUngrabPointer(dpy, CurrentTime);
        XFreePixmap(dpy, pmap);
        XDestroyWindow(dpy, w);