slock

commit be284bc272cd965da9b2a10b486af7d1f32a9c98
parent 1d358e4b70bdf584bf5ba7486c2d2b7e0f1f9b2e
Author: Hayden Hamilton <haydenh@sdf.org>
Date:   Tue, 18 Aug 2020 18:48:06 +0100

font

Diffstat:
D
config.def.h
 | 
21
---------------------
D
config.def.h.rej
 | 
9
---------
M
config.h
 | 
2
+-
D
slock.c.rej
 | 
18
------------------

4 files changed, 1 insertion(+), 49 deletions(-)
diff --git a/config.def.h b/config.def.h
@@ -1,21 +0,0 @@
-/* user and group to drop privileges to */
-static const char *user  = "nobody";
-static const char *group = "nogroup";
-
-static const char *colorname[NUMCOLS] = {
-	[INIT] =   "black",     /* after initialization */
-	[INPUT] =  "#005577",   /* during input */
-	[FAILED] = "#CC3333",   /* wrong password */
-};
-
-/* treat a cleared input like a wrong password (color) */
-static const int failonclear = 1;
-
-/* default message */
-static const char * message = "Suckless: Software that sucks less.";
-
-/* text color */
-static const char * text_color = "#ffffff";
-
-/* text size (must be a valid size) */
-static const char * font_name = "6x10";
diff --git a/config.def.h.rej b/config.def.h.rej
@@ -1,9 +0,0 @@
---- config.def.h
-+++ config.def.h
-@@ -10,3 +10,6 @@ static const char *colorname[NUMCOLS] = {
- 
- /* treat a cleared input like a wrong password (color) */
- static const int failonclear = 1;
-+
-+/* time in seconds before the monitor shuts down */
-+static const int monitortime = 5;
diff --git a/config.h b/config.h
@@ -18,7 +18,7 @@ static const char * message = "Locked";
 static const char * text_color = "#1e5eb1";
 
 /* text size (must be a valid size) */
-static const char * font_name = "6x10";
+static const char * font_name = "-b&h-luxi mono-bold-o-normal--0-0-0-0-m-0-adobe-standard";
 
 /* seconds before monitor shuts off */
 static const int monitortime = 50;
diff --git a/slock.c.rej b/slock.c.rej
@@ -1,18 +0,0 @@
---- slock.c
-+++ slock.c
-@@ -15,6 +15,7 @@
- #include <unistd.h>
- #include <sys/types.h>
- #include <X11/extensions/Xrandr.h>
-+#include <X11/extensions/dpms.h>
- #include <X11/keysym.h>
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
-@@ -306,6 +307,7 @@ main(int argc, char **argv) {
- 	const char *hash;
- 	Display *dpy;
- 	int s, nlocks, nscreens;
-+	CARD16 standby, suspend, off;
- 
- 	ARGBEGIN {
- 	case 'v':