cleanup

README.md

@@ -1,20 +0,0 @@
-# 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,43 +1,16 @@
 /* user and group to drop privileges to */
-static const char *user  = "user";
+static const char *user  = "nobody";
 static const char *group = "nobody";
 
 static const char *colorname[NUMCOLS] = {
-	[INIT] =   "#2d2d2d",     /* after initialization */
+	[INIT] =   "black",     /* after initialization */
 	[INPUT] =  "#005577",   /* during input */
-	[FAILED] = "#cc3333",   /* wrong password */
-	[CAPS] = "#ff0000",         /* CapsLock on */
+	[FAILED] = "#CC3333",   /* wrong password */
 };
 
 /* 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 = 1;
-
 /* struct for secret passwords and commands */
 struct secretpass {
   char const *pass;

slock-secret-password-1.4.diff

@@ -0,0 +1,33 @@
+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,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);
+				    }
+                                }
+
 				if (!(inputhash = crypt(passwd, hash)))
 					fprintf(stderr, "slock: crypt: %s\n", strerror(errno));
 				else