summaryrefslogtreecommitdiffstats
path: root/desktop/slock/patches/0004-Option-to-not-show-failure-color-on-clear.patch
diff options
context:
space:
mode:
author Robby Workman2016-01-10 06:13:52 +0100
committer Robby Workman2016-01-11 04:36:31 +0100
commit65271fcf4d1c2cc28f4b5a440b553d5647dcd2e5 (patch)
tree92021468d6d9d2a3dd3f057982b0998ac532ac7c /desktop/slock/patches/0004-Option-to-not-show-failure-color-on-clear.patch
parentdb8440e2ba43a9c83c3c29543ccc5dad026c611c (diff)
downloadslackbuilds-65271fcf4d1c2cc28f4b5a440b553d5647dcd2e5.tar.gz
desktop/slock: Added some patches from upstream git
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'desktop/slock/patches/0004-Option-to-not-show-failure-color-on-clear.patch')
-rw-r--r--desktop/slock/patches/0004-Option-to-not-show-failure-color-on-clear.patch64
1 files changed, 64 insertions, 0 deletions
diff --git a/desktop/slock/patches/0004-Option-to-not-show-failure-color-on-clear.patch b/desktop/slock/patches/0004-Option-to-not-show-failure-color-on-clear.patch
new file mode 100644
index 0000000000..07866a66c6
--- /dev/null
+++ b/desktop/slock/patches/0004-Option-to-not-show-failure-color-on-clear.patch
@@ -0,0 +1,64 @@
+From b1289f30b79c9c5ea43a9e9c624406d7d0661692 Mon Sep 17 00:00:00 2001
+From: Nick Currier <nick.currier@gmail.com>
+Date: Wed, 6 May 2015 10:18:50 -0600
+Subject: [PATCH 4/9] Option to not show failure color on clear
+
+---
+ config.def.h | 1 +
+ slock.c | 9 ++++++---
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/config.def.h b/config.def.h
+index 4bccb5d..fca0ae0 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -3,3 +3,4 @@ static const char *colorname[NUMCOLS] = {
+ "#005577", /* during input */
+ "#CC3333", /* failed/cleared the input */
+ };
++static const Bool failonclear = True;
+diff --git a/slock.c b/slock.c
+index 6502c86..1551a9e 100644
+--- a/slock.c
++++ b/slock.c
+@@ -26,7 +26,7 @@
+ enum {
+ INIT,
+ INPUT,
+- EMPTY,
++ FAILED,
+ NUMCOLS
+ };
+
+@@ -42,6 +42,7 @@ typedef struct {
+ static Lock **locks;
+ static int nscreens;
+ static Bool running = True;
++static Bool failure = False;
+ static Bool rr;
+ static int rrevbase;
+ static int rrerrbase;
+@@ -153,8 +154,10 @@ readpw(Display *dpy, const char *pws)
+ #else
+ running = !!strcmp(crypt(passwd, pws), pws);
+ #endif
+- if (running)
++ if (running) {
+ XBell(dpy, 100);
++ failure = True;
++ }
+ len = 0;
+ break;
+ case XK_Escape:
+@@ -178,7 +181,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[EMPTY]);
++ XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[failure || failonclear ? FAILED : INIT]);
+ XClearWindow(dpy, locks[screen]->win);
+ }
+ }
+--
+2.6.4
+