[wiki] [sites] slock: update failcolor patch to slock-1.2 || Kylie McClain

From: <git_AT_suckless.org>
Date: Mon, 19 Jan 2015 06:55:22 +0100

commit 50b1865403d0fbcc49020e9fafceeb85257d99c5
Author: Kylie McClain <somasissounds_AT_gmail.com>
Date: Mon Jan 19 00:55:01 2015 -0500

    slock: update failcolor patch to slock-1.2

diff --git a/tools.suckless.org/slock/patches/failcolor.md b/tools.suckless.org/slock/patches/failcolor.md
index 4419fa4..1ad5bef 100644
--- a/tools.suckless.org/slock/patches/failcolor.md
+++ b/tools.suckless.org/slock/patches/failcolor.md
_AT_@ -9,9 +9,11 @@ Introduces an additional color to indicate an failed login attempt.
 Download
 --------
 
+* [slock-1.2-failcolor.diff](slock-1.2-failcolor.diff)
 * [slock-1.1-failcolor.diff](slock-1.1-failcolor.diff)
 
 Author
 ------
 
 * Michael Stummvoll <[michael_AT_stummi.org](mailto:michael_AT_stummi.org)>
+* Updated to 1.2 by Kylie McClain <[somasissounds_AT_gmail.com](mailto:somasissounds_AT_gmail.com)>
diff --git a/tools.suckless.org/slock/patches/slock-1.2-failcolor.diff b/tools.suckless.org/slock/patches/slock-1.2-failcolor.diff
new file mode 100644
index 0000000..3b2a031
--- /dev/null
+++ b/tools.suckless.org/slock/patches/slock-1.2-failcolor.diff
_AT_@ -0,0 +1,62 @@
+diff --git a/config.def.h b/config.def.h
+index 89e5977..7f55466 100644
+--- a/config.def.h
++++ b/config.def.h
+_AT_@ -1,2 +1,3 @@
+ #define COLOR1 "black"
+ #define COLOR2 "#005577"
++#define COLOR3 "#550000"
+diff --git a/slock.c b/slock.c
+index face75e..8519ce2 100644
+--- a/slock.c
++++ b/slock.c
+_AT_@ -29,12 +29,13 @@ typedef struct {
+ int screen;
+ Window root, win;
+ Pixmap pmap;
+- unsigned long colors[2];
++ unsigned long colors[3];
+ } Lock;
+
+ static Lock **locks;
+ static int nscreens;
+ static Bool running = True;
++static Bool tried = False;
+
+ static void
+ die(const char *errstr, ...) {
+_AT_@ -135,6 +136,7 @@ readpw(Display *dpy, const char *pws)
+ #ifdef HAVE_BSD_AUTH
+ running = !auth_userokay(getlogin(), NULL, "auth-xlock", passwd);
+ #else
++ tried=True;
+ running = !!strcmp(crypt(passwd, pws), pws);
+ #endif
+ if(running)
+_AT_@ -162,7 +164,7 @@ readpw(Display *dpy, const char *pws)
+ }
+ } else if(llen != 0 && len == 0) {
+ for(screen = 0; screen < nscreens; screen++) {
+- XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[0]);
++ XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[tried ? 2 : 0]);
+ XClearWindow(dpy, locks[screen]->win);
+ }
+ }
+_AT_@ -179,7 +181,7 @@ unlockscreen(Display *dpy, Lock *lock) {
+ return;
+
+ XUngrabPointer(dpy, CurrentTime);
+- XFreeColors(dpy, DefaultColormap(dpy, lock->screen), lock->colors, 2, 0);
++ XFreeColors(dpy, DefaultColormap(dpy, lock->screen), lock->colors, 3, 0);
+ XFreePixmap(dpy, lock->pmap);
+ XDestroyWindow(dpy, lock->win);
+
+_AT_@ -212,6 +214,8 @@ lockscreen(Display *dpy, int screen) {
+ lock->win = XCreateWindow(dpy, lock->root, 0, 0, DisplayWidth(dpy, lock->screen), DisplayHeight(dpy, lock->screen),
+ 0, DefaultDepth(dpy, lock->screen), CopyFromParent,
+ DefaultVisual(dpy, lock->screen), CWOverrideRedirect | CWBackPixel, &wa);
++ XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), COLOR3, &color, &dummy);
++ lock->colors[2] = color.pixel;
+ XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), COLOR2, &color, &dummy);
+ lock->colors[1] = color.pixel;
+ XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), COLOR1, &color, &dummy);
Received on Mon Jan 19 2015 - 06:55:22 CET