X-Git-Url: https://git.danieliu.xyz/?p=slock.git;a=blobdiff_plain;f=slock.c;h=d576c0b2baff0dc2d33a87d6d901c82b7df94914;hp=2dc96483426b360fe8c051e7776c13cf0530f35f;hb=1460b14f450d65c68bf519538de5b5df1a7bc01c;hpb=98e2fef63d2e6dbda63929867db70bee1f8b55f5

diff --git a/slock.c b/slock.c
index 2dc9648..d576c0b 100644
--- a/slock.c
+++ b/slock.c
@@ -1,5 +1,4 @@
-/* © 2006-2008 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>
@@ -24,7 +23,7 @@
 #endif
 
 void
-eprint(const char *errstr, ...) {
+die(const char *errstr, ...) {
 	va_list ap;
 
 	va_start(ap, errstr);
@@ -40,7 +39,7 @@ get_password() { /* only run as root */
 	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;
@@ -56,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
@@ -82,16 +81,16 @@ main(int argc, char **argv) {
 	XSetWindowAttributes wa;
 
 	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);
 
@@ -126,11 +125,18 @@ main(int argc, char **argv) {
 
 	/* main event loop */
 	while(running && !XNextEvent(dpy, &ev)) {
-		if(len == 0) 
+		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(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))
@@ -138,13 +144,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;