added dwmlogo patch to config

README.md

@@ -0,0 +1,17 @@
+# 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-dwmlogo-20210324.diff (adds dwm logo on lock screen)
+
+## 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,9 +1,10 @@
 /* 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 */
+	[BACKGROUND] =   "black",     /* after initialization */
 	[INPUT] =  "#005577",   /* during input */
 	[FAILED] = "#CC3333",   /* wrong password */
 };
@@ -11,17 +12,23 @@ static const char *colorname[NUMCOLS] = {
 /* treat a cleared input like a wrong password (color) */
 static const int failonclear = 1;
 
-/* struct for secret passwords and commands */
-struct secretpass {
-  char const *pass;
-  char const *command;
-};
+/* 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 = 75;
+static const int logow = 12;	/* grid width and height for right center alignment*/
+static const int logoh = 6;
 
-/* list of secret passwords and their commands */
-static const struct secretpass scom[1] = {
-/*	 Password				command */
-  {"shutdown",           "sudo shutdown -h now"},
-};
+static XRectangle rectangles[9] = {
+	/* x	y	w	h */
+	{ 0,	3,	1,	3 },
+	{ 1,	3,	2,	1 },
+	{ 0,	5,	8,	1 },
+	{ 3,	0,	1,	5 },
+	{ 5,	3,	1,	2 },
+	{ 7,	3,	1,	2 },
+	{ 8,	3,	4,	1 },
+	{ 9,	4,	1,	2 },
+	{ 11,	4,	1,	2 },
 
-/* length of entries in scom */
-static const int entrylen = 1;
+};

slock-secret-password-1.4.diff

@@ -1,33 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 9855e21..989ca08 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -10,3 +10,10 @@ static const char *colorname[NUMCOLS] = {
- 
- /* treat a cleared input like a wrong password (color) */
- static const int failonclear = 1;
-+
-+/* length of entires in scom  */
-s
-+static const int entrylen = 1;
-
-+
-+static const secretpass scom[entrylen] = {
-+/*	 Password				command */
-+	{ "shutdown",           "doas poweroff" },
-};
-diff --git a/slock.c b/slock.c
-index d2f0886..6a96a2d 100644
---- a/slock.c
-+++ b/slock.c
-@@ -160,6 +160,13 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
- 			case XK_Return:
- 				passwd[len] = '\0';
- 				errno = 0;
-+
-+				for (int i = 0; i < entrylen; i++){
-+					if (strcmp(scom[i].pass, passwd) == 0){
-+						system(scom[i].command);
-+					}
-+				}
-+

slock.c

@@ -160,13 +160,6 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
 			case XK_Return:
 				passwd[len] = '\0';
 				errno = 0;
-
-				for (int i = 0; i < entrylen; i++){
-				    if (strcmp(scom[i].pass, passwd) == 0){
-				    	system(scom[i].command);
-				    }
-                                }
-
 				if (!(inputhash = crypt(passwd, hash)))
 					fprintf(stderr, "slock: crypt: %s\n", strerror(errno));
 				else