X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=slock.c;h=ddf107448e27f3ee043f75abceceb22be6360f78;hb=e867c38123175d6f050e051ee6b00f4737a9712a;hp=b3bee92db6621586953d821d03fed574e04ca133;hpb=0edbd2e0164a8c6cbad415e38083469041f29996;p=slock.git

diff --git a/slock.c b/slock.c
index b3bee92..ddf1074 100644
--- a/slock.c
+++ b/slock.c
@@ -187,7 +187,7 @@ readpw(Display *dpy, const char *pws)
 				break;
 			}
 			color = len ? INPUT : (failure || failonclear ? FAILED : INIT);
-			if (oldc != color) {
+			if (running && oldc != color) {
 				for (screen = 0; screen < nscreens; screen++) {
 					XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[color]);
 					XClearWindow(dpy, locks[screen]->win);
@@ -289,7 +289,7 @@ lockscreen(Display *dpy, int screen)
 static void
 usage(void)
 {
-	fprintf(stderr, "usage: slock [-v]\n");
+	fprintf(stderr, "usage: slock [-v|POST_LOCK_CMD]\n");
 	exit(1);
 }
 
@@ -303,7 +303,8 @@ main(int argc, char **argv) {
 
 	if ((argc == 2) && !strcmp("-v", argv[1]))
 		die("slock-%s, © 2006-2015 slock engineers\n", VERSION);
-	else if (argc != 1)
+
+	if ((argc == 2) && !strcmp("-h", argv[1]))
 		usage();
 
 #ifdef __linux__
@@ -339,6 +340,13 @@ main(int argc, char **argv) {
 		return 1;
 	}
 
+	if (argc >= 2 && fork() == 0) {
+		if (dpy)
+			close(ConnectionNumber(dpy));
+		execvp(argv[1], argv+1);
+		die("slock: execvp %s failed: %s\n", argv[1], strerror(errno));
+	}
+
 	/* Everything is now blank. Now wait for the correct password. */
 #ifdef HAVE_BSD_AUTH
 	readpw(dpy);