X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=slock.c;h=8490dae275c05262ddb0398de662b1eed89dd4f2;hb=0cb05bdb75ac13f010d51e267007ca1c869763ec;hp=0116c70404738ee0973614965af5af5ff0fddb29;hpb=049ccf9a906dd9d4b261d3e9bb4166eaadb62731;p=slock.git

diff --git a/slock.c b/slock.c
index 0116c70..8490dae 100644
--- a/slock.c
+++ b/slock.c
@@ -22,8 +22,8 @@
 #include <bsd_auth.h>
 #endif
 
-void
-eprint(const char *errstr, ...) {
+static void
+die(const char *errstr, ...) {
 	va_list ap;
 
 	va_start(ap, errstr);
@@ -33,13 +33,13 @@ eprint(const char *errstr, ...) {
 }
 
 #ifndef HAVE_BSD_AUTH
-const char *
+static const char *
 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;
@@ -55,7 +55,7 @@ get_password() { /* only run as root */
 
 	/* 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
@@ -79,18 +79,19 @@ main(int argc, char **argv) {
 	XColor black, dummy;
 	XEvent ev;
 	XSetWindowAttributes wa;
+	CARD16 standby, suspend, off;
 
 	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)
-		eprint("usage: slock [-v]\n");
+		die("usage: slock [-v]\n");
 
 #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);
 
@@ -123,18 +124,22 @@ main(int argc, char **argv) {
 	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)) {
-		if(len == 0 && DPMSCapable(dpy)) 
-			DPMSForceLevel(dpy, DPMSModeOff);
 		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(IsFunctionKey(ksym) || IsKeypadKey(ksym)
 					|| IsMiscFunctionKey(ksym) || IsPFKey(ksym)
 					|| IsPrivateKeypadKey(ksym))
@@ -142,13 +147,11 @@ main(int argc, char **argv) {
 			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
-
 				if (running != 0)
 					XBell(dpy, 100);
 				len = 0;
@@ -169,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);