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 af5d206..8490dae 100644 (file)
--- a/slock.c
+++ b/slock.c
@@ -1,5 +1,4 @@
-/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details. */
+/* See LICENSE file for license details. */

 #define _XOPEN_SOURCE 500
 #if HAVE_SHADOW_H
 #include <shadow.h>
 #define _XOPEN_SOURCE 500
 #if HAVE_SHADOW_H
 #include <shadow.h>


@@ -16,9 +15,15 @@
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>

+#include <X11/extensions/dpms.h>

 
 

-void
-eprint(const char *errstr, ...) {
+#if HAVE_BSD_AUTH
+#include <login_cap.h>
+#include <bsd_auth.h>
+#endif
+
+static void
+die(const char *errstr, ...) {

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


@@ -27,13 +32,14 @@ eprint(const char *errstr, ...) {
        exit(EXIT_FAILURE);
 }
 
        exit(EXIT_FAILURE);
 }
 

-const char *
+#ifndef HAVE_BSD_AUTH
+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;


@@ -46,18 +52,23 @@ get_password() { /* only run as root */
                rval = sp->sp_pwdp;
        }
 #endif
                rval = sp->sp_pwdp;
        }
 #endif

+

        /* 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;
 }
        return rval;
 }

+#endif

 
 int
 main(int argc, char **argv) {
        char curs[] = {0, 0, 0, 0, 0, 0, 0, 0};
        char buf[32], passwd[256];
        int num, screen;
 
 int
 main(int argc, char **argv) {
        char curs[] = {0, 0, 0, 0, 0, 0, 0, 0};
        char buf[32], passwd[256];
        int num, screen;

+
+#ifndef HAVE_BSD_AUTH

        const char *pws;
        const char *pws;

+#endif

        unsigned int len;
        Bool running = True;
        Cursor invisible;
        unsigned int len;
        Bool running = True;
        Cursor invisible;


@@ -68,14 +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-2007 Anselm R. Garbe, Sander van Dijk\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();
        pws = get_password();

+#endif
+

        if(!(dpy = XOpenDisplay(0)))
        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);
 


@@ -108,11 +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 */
        /* main event loop */

-       while(running && !XNextEvent(dpy, &ev))
+       while(running && !XNextEvent(dpy, &ev)) {

                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(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))


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

-                               if((running = strcmp(crypt(passwd, pws), pws)) != 0)
+#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;
                                break;
                                        XBell(dpy, 100);
                                len = 0;
                                break;


@@ -139,6 +171,10 @@ main(int argc, char **argv) {
                                break;
                        }
                }
                                break;
                        }
                }

+       }
+       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);