.gitignore

@@ -1,3 +0,0 @@
-config.h
-slock
-*.o

LICENSE

@@ -4,7 +4,6 @@ MIT/X Consortium License
 © 2014 Dimitris Papastamos <sin@2f30.org>
 © 2006-2014 Anselm R Garbe <anselm@garbe.us>
 © 2014-2016 Laslo Hunhold <dev@frign.de>
-© 2016-2023 Hiltjo Posthuma <hiltjo@codemadness.org>
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

Makefile

@@ -6,38 +6,56 @@ include config.mk
 SRC = slock.c ${COMPATSRC}
 OBJ = ${SRC:.c=.o}
 
-all: slock
+all: options slock
+
+options:
+	@echo slock build options:
+	@echo "CFLAGS   = ${CFLAGS}"
+	@echo "LDFLAGS  = ${LDFLAGS}"
+	@echo "CC       = ${CC}"
 
 .c.o:
-	${CC} -c ${CFLAGS} $<
+	@echo CC $<
+	@${CC} -c ${CFLAGS} $<
 
-${OBJ}: config.def.h config.mk arg.h util.h
+${OBJ}: config.h config.mk arg.h util.h
+
+config.h:
+	@echo creating $@ from config.def.h
+	@cp config.def.h $@
 
 slock: ${OBJ}
-	${CC} -o $@ ${OBJ} ${LDFLAGS}
+	@echo CC -o $@
+	@${CC} -o $@ ${OBJ} ${LDFLAGS}
 
 clean:
-	rm -f slock ${OBJ} slock-${VERSION}.tar.gz
+	@echo cleaning
+	@rm -f slock ${OBJ} slock-${VERSION}.tar.gz
 
 dist: clean
-	mkdir -p slock-${VERSION}
-	cp -R LICENSE Makefile README slock.1 config.mk \
+	@echo creating dist tarball
+	@mkdir -p slock-${VERSION}
+	@cp -R LICENSE Makefile README slock.1 config.mk \
 		${SRC} config.def.h arg.h util.h slock-${VERSION}
-	tar -cf slock-${VERSION}.tar slock-${VERSION}
-	gzip slock-${VERSION}.tar
-	rm -rf slock-${VERSION}
+	@tar -cf slock-${VERSION}.tar slock-${VERSION}
+	@gzip slock-${VERSION}.tar
+	@rm -rf slock-${VERSION}
 
 install: all
-	mkdir -p ${DESTDIR}${PREFIX}/bin
-	cp -f slock ${DESTDIR}${PREFIX}/bin
-	chmod 755 ${DESTDIR}${PREFIX}/bin/slock
-	chmod u+s ${DESTDIR}${PREFIX}/bin/slock
-	mkdir -p ${DESTDIR}${MANPREFIX}/man1
-	sed "s/VERSION/${VERSION}/g" <slock.1 >${DESTDIR}${MANPREFIX}/man1/slock.1
-	chmod 644 ${DESTDIR}${MANPREFIX}/man1/slock.1
+	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
+	@mkdir -p ${DESTDIR}${PREFIX}/bin
+	@cp -f slock ${DESTDIR}${PREFIX}/bin
+	@chmod 755 ${DESTDIR}${PREFIX}/bin/slock
+	@chmod u+s ${DESTDIR}${PREFIX}/bin/slock
+	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
+	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
+	@sed "s/VERSION/${VERSION}/g" <slock.1 >${DESTDIR}${MANPREFIX}/man1/slock.1
+	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/slock.1
 
 uninstall:
-	rm -f ${DESTDIR}${PREFIX}/bin/slock
-	rm -f ${DESTDIR}${MANPREFIX}/man1/slock.1
+	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
+	@rm -f ${DESTDIR}${PREFIX}/bin/slock
+	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
+	@rm -f ${DESTDIR}${MANPREFIX}/man1/slock.1
 
-.PHONY: all clean dist install uninstall
+.PHONY: all options clean dist install uninstall

config.def.h

@@ -1,13 +1,12 @@
 /* user and group to drop privileges to */
 static const char *user  = "nobody";
-static const char *group = "nobody";
+static const char *group = "nogroup";
 
 static const char *colorname[NUMCOLS] = {
 	[INIT] =   "black",     /* after initialization */
 	[INPUT] =  "#005577",   /* during input */
 	[FAILED] = "#CC3333",   /* wrong password */
-	[CAPS] = "red",         /* CapsLock on */
 };
 
 /* treat a cleared input like a wrong password (color) */
-static const int failonclear = 0;
+static const int failonclear = 1;

config.mk

@@ -27,3 +27,6 @@ COMPATSRC = explicit_bzero.c
 #CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE -D_NETBSD_SOURCE
 # On OpenBSD set COMPATSRC to empty
 #COMPATSRC =
+
+# compiler and linker
+CC = cc

slock.1

@@ -1,6 +1,5 @@
-.Dd October 6, 2023
+.Dd 2016-08-23
 .Dt SLOCK 1
-.Os
 .Sh NAME
 .Nm slock
 .Nd simple X screen locker
@@ -10,36 +9,31 @@
 .Op Ar cmd Op Ar arg ...
 .Sh DESCRIPTION
 .Nm
-is a simple X screen locker.
-If provided,
-.Ar cmd
+is a simple X screen locker. If provided,
+.Ar cmd Op Ar arg ...
 is executed after the screen has been locked.
-.Pp
-The options are as follows:
+.Sh OPTIONS
 .Bl -tag -width Ds
 .It Fl v
 Print version information to stdout and exit.
 .El
-.Sh EXIT STATUS
-.Ex -std
-.Sh EXAMPLES
-$
-.Nm
-/usr/sbin/s2ram
 .Sh SECURITY CONSIDERATIONS
 To make sure a locked screen can not be bypassed by switching VTs
 or killing the X server with Ctrl+Alt+Backspace, it is recommended
 to disable both in
 .Xr xorg.conf 5
 for maximum security:
-.Bd -literal
+.Bd -literal -offset left
 Section "ServerFlags"
 	Option "DontVTSwitch" "True"
 	Option "DontZap"      "True"
 EndSection
 .Ed
+.Sh EXAMPLES
+$
+.Nm
+/usr/sbin/s2ram
 .Sh CUSTOMIZATION
 .Nm
 can be customized by creating a custom config.h from config.def.h and
-(re)compiling the source code.
-This keeps it fast, secure and simple.
+(re)compiling the source code. This keeps it fast, secure and simple.

slock.c

@@ -18,7 +18,6 @@
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include <X11/XKBlib.h>
 
 #include "arg.h"
 #include "util.h"
@@ -29,7 +28,6 @@ enum {
 	INIT,
 	INPUT,
 	FAILED,
-	CAPS,
 	NUMCOLS
 };
 
@@ -46,7 +44,7 @@ struct xrandr {
 	int errbase;
 };
 
-#include "config.def.h"
+#include "config.h"
 
 static void
 die(const char *errstr, ...)
@@ -132,20 +130,16 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
 {
 	XRRScreenChangeNotifyEvent *rre;
 	char buf[32], passwd[256], *inputhash;
-	int caps, num, screen, running, failure, oldc;
-	unsigned int len, color, indicators;
+	int num, screen, running, failure, oldc;
+	unsigned int len, color;
 	KeySym ksym;
 	XEvent ev;
 
 	len = 0;
-	caps = 0;
 	running = 1;
 	failure = 0;
 	oldc = INIT;
 
-	if (!XkbGetIndicatorState(dpy, XkbUseCoreKbd, &indicators))
-		caps = indicators & 1;
-
 	while (running && !XNextEvent(dpy, &ev)) {
 		if (ev.type == KeyPress) {
 			explicit_bzero(&buf, sizeof(buf));
@@ -185,9 +179,6 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
 				if (len)
 					passwd[--len] = '\0';
 				break;
-			case XK_Caps_Lock:
-				caps = !caps;
-				break;
 			default:
 				if (num && !iscntrl((int)buf[0]) &&
 				    (len + num < sizeof(passwd))) {
@@ -196,7 +187,7 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
 				}
 				break;
 			}
-			color = len ? (caps ? CAPS : INPUT) : (failure || failonclear ? FAILED : INIT);
+			color = len ? INPUT : ((failure || failonclear) ? FAILED : INIT);
 			if (running && oldc != color) {
 				for (screen = 0; screen < nscreens; screen++) {
 					XSetWindowBackground(dpy,
@@ -326,7 +317,7 @@ main(int argc, char **argv) {
 
 	ARGBEGIN {
 	case 'v':
-		puts("slock-"VERSION);
+		fprintf(stderr, "slock-"VERSION"\n");
 		return 0;
 	default:
 		usage();