Apply message patchHEADmaster

4 files changed, 132 insertions, 5 deletions

diff --git a/config.h b/config.h
index 6991d6b..26e00b8 100644
--- a/config.h
+++ b/config.h
@@ -39,3 +39,12 @@ static const int blurRadius=5;
 //#define PIXELATION
 /*Set pixelation radius*/
 static const int pixelSize=0;
+
+/* 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.mk b/config.mk
index 1ff42e9..dd58a49 100644
--- a/config.mk
+++ b/config.mk
@@ -37,4 +37,4 @@ COMPATSRC = explicit_bzero.c
 #COMPATSRC =
 
 # compiler and linker
-CC = cc
+CC = cc -w
diff --git a/slock.1 b/slock.1
index 82cdcd6..946165f 100644
--- a/slock.1
+++ b/slock.1
@@ -6,6 +6,8 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl v
+.Op Fl f
+.Op Fl m Ar message
 .Op Ar cmd Op Ar arg ...
 .Sh DESCRIPTION
 .Nm
@@ -16,6 +18,11 @@ is executed after the screen has been locked.
 .Bl -tag -width Ds
 .It Fl v
 Print version information to stdout and exit.
+.It Fl f
+List all valid X fonts and exit.
+.It Fl m Ar message
+Overrides default slock lock message.
+.TP
 .El
 .Sh SECURITY CONSIDERATIONS
 To make sure a locked screen can not be bypassed by switching VTs
diff --git a/slock.c b/slock.c
index b8be41a..1edc02a 100644
--- a/slock.c
+++ b/slock.c
@@ -30,6 +30,9 @@
 
 char *argv0;
 
+/* global count to prevent repeated error messages */
+int count_error = 0;
+
 enum {
         INIT,
         INPUT,
@@ -98,6 +101,98 @@ dontkillme(void)
 }
 #endif
 
+static void
+writemessage(Display *dpy, Window win, int screen)
+{
+        int len, line_len, width, height, s_width, s_height, i, j, k, tab_replace, tab_size;
+        XGCValues gr_values;
+        XFontStruct *fontinfo;
+        XColor color, dummy;
+        XineramaScreenInfo *xsi;
+        GC gc;
+        fontinfo = XLoadQueryFont(dpy, font_name);
+
+        if (fontinfo == NULL) {
+                if (count_error == 0) {
+                        fprintf(stderr, "slock: Unable to load font \"%s\"\n", font_name);
+                        fprintf(stderr, "slock: Try listing fonts with 'slock -f'\n");
+                        count_error++;
+                }
+                return;
+        }
+
+        tab_size = 8 * XTextWidth(fontinfo, " ", 1);
+
+        XAllocNamedColor(dpy, DefaultColormap(dpy, screen),
+                 text_color, &color, &dummy);
+
+        gr_values.font = fontinfo->fid;
+        gr_values.foreground = color.pixel;
+        gc=XCreateGC(dpy,win,GCFont+GCForeground, &gr_values);
+
+        /*  To prevent "Uninitialized" warnings. */
+        xsi = NULL;
+
+        /*
+         * Start formatting and drawing text
+         */
+
+        len = strlen(message);
+
+        /* Max max line length (cut at '\n') */
+        line_len = 0;
+        k = 0;
+        for (i = j = 0; i < len; i++) {
+                if (message[i] == '\n') {
+                        if (i - j > line_len)
+                                line_len = i - j;
+                        k++;
+                        i++;
+                        j = i;
+                }
+        }
+        /* If there is only one line */
+        if (line_len == 0)
+                line_len = len;
+
+        if (XineramaIsActive(dpy)) {
+                xsi = XineramaQueryScreens(dpy, &i);
+                s_width = xsi[0].width;
+                s_height = xsi[0].height;
+        } else {
+                s_width = DisplayWidth(dpy, screen);
+                s_height = DisplayHeight(dpy, screen);
+        }
+
+        height = s_height*3/7 - (k*20)/3;
+        width  = (s_width - XTextWidth(fontinfo, message, line_len))/2;
+
+        /* Look for '\n' and print the text between them. */
+        for (i = j = k = 0; i <= len; i++) {
+                /* i == len is the special case for the last line */
+                if (i == len || message[i] == '\n') {
+                        tab_replace = 0;
+                        while (message[j] == '\t' && j < i) {
+                                tab_replace++;
+                                j++;
+                        }
+
+                        XDrawString(dpy, win, gc, width + tab_size*tab_replace, height + 20*k, message + j, i - j);
+                        while (i < len && message[i] == '\n') {
+                                i++;
+                                j = i;
+                                k++;
+                        }
+                }
+        }
+
+        /* xsi should not be NULL anyway if Xinerama is active, but to be safe */
+        if (XineramaIsActive(dpy) && xsi != NULL)
+                        XFree(xsi);
+}
+
+
+
 static const char *
 gethash(void)
 {
@@ -241,6 +336,7 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
                         if (running && oldc != color) {
                                 for (screen = 0; screen < nscreens; screen++) {
                                         drawlogo(dpy, locks[screen], color);
+                                        writemessage(dpy, locks[screen]->win, screen);
                                 }
                                 oldc = color;
                         }
@@ -385,7 +481,7 @@ lockscreen(Display *dpy, struct xrandr *rr, int screen)
 static void
 usage(void)
 {
-        die("usage: slock [-v] [cmd [arg ...]]\n");
+        die("usage: slock [-v] [-f] [-m message] [cmd [arg ...]]\n");
 }
 
 int
@@ -398,12 +494,25 @@ main(int argc, char **argv) {
         gid_t dgid;
         const char *hash;
         Display *dpy;
-        int s, nlocks, nscreens;
+        int i, s, nlocks, nscreens;
+        int count_fonts;
+        char **font_names;
 
         ARGBEGIN {
         case 'v':
                 fprintf(stderr, "slock-"VERSION"\n");
                 return 0;
+        case 'm':
+                message = EARGF(usage());
+                break;
+        case 'f':
+                if (!(dpy = XOpenDisplay(NULL)))
+                        die("slock: cannot open display\n");
+                font_names = XListFonts(dpy, "*", 10000 /* list 10000 fonts*/, &count_fonts);
+                for (i=0; i<count_fonts; i++) {
+                        fprintf(stderr, "%s\n", *(font_names+i));
+                }
+                return 0;
         default:
                 usage();
         } ARGEND
@@ -502,10 +611,12 @@ main(int argc, char **argv) {
         if (!(locks = calloc(nscreens, sizeof(struct lock *))))
                 die("slock: out of memory\n");
         for (nlocks = 0, s = 0; s < nscreens; s++) {
-                if ((locks[s] = lockscreen(dpy, &rr, s)) != NULL)
+                if ((locks[s] = lockscreen(dpy, &rr, s)) != NULL) {
+                        writemessage(dpy, locks[s]->win, s);
                         nlocks++;
-                else
+                } else {
                         break;
+                }
         }
         XSync(dpy, 0);