added secret-password patch for readme

README.md

@@ -0,0 +1,20 @@
+# slock
+
+This is my patched version of slock. The base version is directly from suckless.org.
+
+## Patches
+
+The list below shows the currently applied patches to the master branch.
+
+- slock-background-image-20220318-1c5a538.diff (shows a background image in locked state)
+- slock-capscolor-20220921-35633d4.diff (displays a separate color if caps is set)
+- slock-dwmlogo-20210324.diff (adds dwm logo on lock screen)
+- slock-git-20161012-control-clear.diff (doesnt turn logo red when pressing control keys)
+- slock-secret-password-1.4.diff (modified) (can give additional passwords that run commands)
+
+## Installation
+
+The most basic way is to clone the repository and then invoke make.
+
+- `git clone https://github.com/tiyn/slock`
+- `make clean install`

config.def.h

@@ -1,15 +1,54 @@
 /* user and group to drop privileges to */
-static const char *user  = "nobody";
+static const char *user  = "user";
 static const char *group = "nobody";
 
 static const char *colorname[NUMCOLS] = {
-	[INIT] =   "black",     /* after initialization */
+	[INIT] =   "#2d2d2d",     /* after initialization */
 	[INPUT] =  "#005577",   /* during input */
-	[FAILED] = "#CC3333",   /* wrong password */
+	[FAILED] = "#cc3333",   /* wrong password */
+	[CAPS] = "#ff0000",         /* CapsLock on */
 };
 
 /* treat a cleared input like a wrong password (color) */
 static const int failonclear = 1;
 
+/* Background image path, should be available to the user above */
+static const char* background_image = "/home/user/.local/share/lock";
+/* insert grid pattern with scale 1:1, the size can be changed with logosize */
+static const int logosize = 40;
+static const int logow = 10;	/* grid width and height for right center alignment*/
+static const int logoh = 15;
+
+static XRectangle rectangles[12] = {
+	/* x	y	w	h */
+	{ 0,	0,	1,	3 },
+	{ 0,	7,	4,	2 },
+	{ 1,	0,	1,	4 },
+	{ 2,	2,	1,	3 },
+	{ 3,	3,	1,	3 },
+	{ 4,	0,	2,	2 },
+	{ 4,	4,	2,	11 },
+	{ 6,	3,	1,	3 },
+	{ 6,	7,	4,	2 },
+	{ 7,	2,	1,	3 },
+	{ 8,	0,	1,	4 },
+	{ 9,	0,	1,	3 },
+};
+
 /* allow control key to trigger fail on clear */
-static const int controlkeyclear = 0;
+static const int controlkeyclear = 1;
+
+/* struct for secret passwords and commands */
+struct secretpass {
+  char const *pass;
+  char const *command;
+};
+
+/* list of secret passwords and their commands */
+static const struct secretpass scom[1] = {
+/*	 Password				command */
+  {"shutdown",           "sudo shutdown -h now"},
+};
+
+/* length of entries in scom */
+static const int entrylen = 1;

slock-git-20161012-control-clear.diff

@@ -1,27 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 6fba2b6..933152b 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -10,3 +10,6 @@ static const char *colorname[NUMCOLS] = {
- 
- /* treat a cleared input like a wrong password */
- static const int failonclear = 1;
-+
-+/* allow control key to trigger fail on clear */
-+static const int controlkeyclear = 0;
-diff --git a/slock.c b/slock.c
-index 4d7f06f..15552ef 100644
---- a/slock.c
-+++ b/slock.c
-@@ -180,8 +180,9 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
- 					passwd[len--] = '\0';
- 				break;
- 			default:
--				if (num && !iscntrl((int)buf[0]) &&
--				    (len + num < sizeof(passwd))) {
-+				if (controlkeyclear && iscntrl((int)buf[0]))
-+					continue;
-+				if (num && (len + num < sizeof(passwd))) {
- 					memcpy(passwd + len, buf, num);
- 					len += num;
- 				}

slock.c

@@ -180,9 +180,8 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
 					passwd[--len] = '\0';
 				break;
 			default:
-				if (controlkeyclear && iscntrl((int)buf[0]))
+				if (num && !iscntrl((int)buf[0]) &&
-					continue;
+				    (len + num < sizeof(passwd))) {
-				if (num && (len + num < sizeof(passwd))) {
 					memcpy(passwd + len, buf, num);
 					len += num;
 				}