X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=slock.c;h=47231021ced0cb9416d45979ce145786cee0b54f;hb=a430a647e48a894499143b03da86e5707b4127df;hp=65722eacbcdca856f9992ebbd87a09fef34ead32;hpb=ae8cce24d3eb590c3cc810eb8487296ee1db0718;p=slock.git

diff --git a/slock.c b/slock.c
index 65722ea..4723102 100644
--- a/slock.c
+++ b/slock.c
@@ -1,6 +1,5 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+ * See LICENSE file for license details. */
 #define _XOPEN_SOURCE 500
 #if HAVE_SHADOW_H
 #include <shadow.h>
@@ -8,6 +7,7 @@
 
 #include <ctype.h>
 #include <pwd.h>
+#include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -17,15 +17,23 @@
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
+void
+eprint(const char *errstr, ...) {
+	va_list ap;
+
+	va_start(ap, errstr);
+	vfprintf(stderr, errstr, ap);
+	va_end(ap);
+	exit(EXIT_FAILURE);
+}
+
 const char *
 get_password() { /* only run as root */
 	const char *rval;
 	struct passwd *pw;
 
-	if(geteuid() != 0) {
-		fputs("slock: cannot retrieve password entry (make sure to suid slock)\n", stderr);
-		exit(EXIT_FAILURE);
-	}
+	if(geteuid() != 0)
+		eprint("slock: cannot retrieve password entry (make sure to suid slock)\n");
 	pw = getpwuid(getuid());
 	endpwent();
 	rval =  pw->pw_passwd;
@@ -39,10 +47,8 @@ get_password() { /* only run as root */
 	}
 #endif
 	/* drop privileges */
-	if(setgid(pw->pw_gid) < 0 || setuid(pw->pw_uid) < 0) {
-		fputs("slock: cannot drop privileges\n",stdout);
-		exit(EXIT_FAILURE);
-	}
+	if(setgid(pw->pw_gid) < 0 || setuid(pw->pw_uid) < 0)
+		eprint("slock: cannot drop privileges\n");
 	return rval;
 }
 
@@ -58,45 +64,48 @@ main(int argc, char **argv) {
 	Display *dpy;
 	KeySym ksym;
 	Pixmap pmap;
-	Window w;
+	Window root, w;
 	XColor black, dummy;
 	XEvent ev;
 	XSetWindowAttributes wa;
 
-	if((argc > 1) && !strncmp(argv[1], "-v", 3)) {
-		fputs("slock-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
-		exit(EXIT_SUCCESS);
-	}
+	if((argc == 2) && !strcmp("-v", argv[1]))
+		eprint("slock-"VERSION", © 2006-2007 Anselm R. Garbe\n");
+	else if(argc != 1)
+		eprint("usage: slock [-v]\n");
 	pws = get_password();
-	if(!(dpy = XOpenDisplay(0))) {
-		fputs("slock: cannot open display\n", stderr);
-		exit(EXIT_FAILURE);
-	}
+	if(!(dpy = XOpenDisplay(0)))
+		eprint("slock: cannot open display\n");
 	screen = DefaultScreen(dpy);
+	root = RootWindow(dpy, screen);
 
 	/* init */
 	wa.override_redirect = 1;
 	wa.background_pixel = BlackPixel(dpy, screen);
-	w = XCreateWindow(dpy, RootWindow(dpy, screen), 0, 0,
-			DisplayWidth(dpy, screen), DisplayHeight(dpy, screen),
+	w = XCreateWindow(dpy, root, 0, 0, DisplayWidth(dpy, screen), DisplayHeight(dpy, screen),
 			0, DefaultDepth(dpy, screen), CopyFromParent,
 			DefaultVisual(dpy, screen), CWOverrideRedirect | CWBackPixel, &wa);
-
 	XAllocNamedColor(dpy, DefaultColormap(dpy, screen), "black", &black, &dummy);
 	pmap = XCreateBitmapFromData(dpy, w, curs, 8, 8);
 	invisible = XCreatePixmapCursor(dpy, pmap, pmap, &black, &black, 0, 0);
 	XDefineCursor(dpy, w, invisible);
-	for(len = 1000; len && (XGrabPointer(dpy, RootWindow(dpy, screen), False,
-			ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
-			GrabModeAsync, GrabModeSync, None, invisible, CurrentTime) != GrabSuccess); len--)
-		usleep(1000);
-	running = running && (len > 0);
-	for(len = 1000; len && (XGrabKeyboard(dpy, RootWindow(dpy, screen), True, GrabModeAsync,
-		GrabModeAsync, CurrentTime) != GrabSuccess); len--)
+	XMapRaised(dpy, w);
+	for(len = 1000; len; len--) {
+		if(XGrabPointer(dpy, root, False, ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
+			GrabModeAsync, GrabModeAsync, None, invisible, CurrentTime) == GrabSuccess)
+			break;
 		usleep(1000);
-	running = running && (len > 0);
+	}
+	if((running = running && (len > 0))) {
+		for(len = 1000; len; len--) {
+			if(XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime)
+				== GrabSuccess)
+				break;
+			usleep(1000);
+		}
+		running = (len > 0);
+	}
 	len = 0;
-	XMapRaised(dpy, w);
 	XSync(dpy, False);
 
 	/* main event loop */