[wiki] [sites] [slock] Update capscolor patch || Klemens Nanni

From: <git_AT_suckless.org>
Date: Sat, 07 Jan 2017 02:13:59 +0100

commit 95140e1bab520b01724e6fa0dff757f4fbb996df
Author: Klemens Nanni <kl3_AT_posteo.org>
Date: Sat Jan 7 01:49:17 2017 +0100

    [slock] Update capscolor patch

diff --git a/tools.suckless.org/slock/patches/capscolor.md b/tools.suckless.org/slock/patches/capscolor.md
index 1574d26..634d4b2 100644
--- a/tools.suckless.org/slock/patches/capscolor.md
+++ b/tools.suckless.org/slock/patches/capscolor.md
_AT_@ -8,16 +8,14 @@ Introduces an additional color to indicate the state of Caps Lock. Not
 compatible with the [failcolor](./failcolor) patch. Written against HEAD at
 a31b919, but should apply to 1.2.
 
-Version 20160902 is written against current HEAD at a55594f.
-
 Download
 --------
 
 * [slock-capscolor.diff](slock-capscolor.diff)
-* [slock-capscolor-20160902-a55594f.diff](slock-capscolor-20160902-a55594f.diff)
+* [slock-capscolor-20170106-2d2a21a.diff](slock-capscolor-20170106-2d2a21a.diff)
 
 Authors
 -------
 
 * Andrew Hills <[ahills_AT_ednos.net](mailto:ahills_AT_ednos.net)>
-* Klemens Nanni <[kl3_AT_posteo.org](mailto:kl3_AT_posteo.org)> (20160902 version)
+* Klemens Nanni <[kl3_AT_posteo.org](mailto:kl3_AT_posteo.org)> (20170106 version)
diff --git a/tools.suckless.org/slock/patches/slock-capscolor-20160902-a55594f.diff b/tools.suckless.org/slock/patches/slock-capscolor-20160902-a55594f.diff
deleted file mode 100644
index fda477d..0000000
--- a/tools.suckless.org/slock/patches/slock-capscolor-20160902-a55594f.diff
+++ /dev/null
_AT_@ -1,87 +0,0 @@
-From 950c07f342f91810f4af7ed2b6c59bd98acc932d Mon Sep 17 00:00:00 2001
-From: Klemens Nanni <kl3_AT_posteo.org>
-Date: Fri, 2 Sep 2016 14:53:30 +0200
-Subject: [PATCH] Indicate the state of CapsLock through a different color
-
----
- config.def.h |  1 +
- slock.c      | 15 ++++++++++++---
- 2 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/config.def.h b/config.def.h
-index eae2d9a..818ba47 100644
---- a/config.def.h
-+++ b/config.def.h
-_AT_@ -2,6 +2,7 @@ static const char *colorname[NUMCOLS] = {
- 	"black",     /* after initialization */
- 	"#005577",   /* during input */
- 	"#CC3333",   /* wrong password */
-+	"red",       /* CapsLock on */
- };
- 
- /* treat a cleared input like a wrong password */
-diff --git a/slock.c b/slock.c
-index 08ada6f..ed8f3b1 100644
---- a/slock.c
-+++ b/slock.c
-_AT_@ -17,6 +17,7 @@
- #include <X11/keysym.h>
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
-+#include <X11/XKBlib.h>
- 
- #if HAVE_BSD_AUTH
- #include <login_cap.h>
-_AT_@ -32,6 +33,7 @@ enum {
- 	INIT,
- 	INPUT,
- 	FAILED,
-+	CAPS,
- 	NUMCOLS
- };
- 
-_AT_@ -130,16 +132,20 @@ readpw(Display *dpy, const char *pws)
- #endif
- {
- 	char buf[32], passwd[256], *encrypted;
--	int num, screen, running, failure;
--	unsigned int len, color;
-+	int caps, num, screen, running, failure;
-+	unsigned int len, color, indicators;
- 	KeySym ksym;
- 	XEvent ev;
- 	static int oldc = INIT;
- 
- 	len = 0;
-+	caps = 0;
- 	running = 1;
- 	failure = 0;
- 
-+	if (!XkbGetIndicatorState(dpy, XkbUseCoreKbd, &indicators))
-+		caps = indicators & 1;
-+
- 	/* As "slock" stands for "Simple X display locker", the DPMS settings
- 	 * had been removed and you can set it with "xset" or some other
- 	 * utility. This way the user can easily set a customized DPMS
-_AT_@ -187,6 +193,9 @@ readpw(Display *dpy, const char *pws)
- 				if (len)
- 					passwd[len--] = 0;
- 				break;
-+			case XK_Caps_Lock:
-+				caps = !caps;
-+				break;
- 			default:
- 				if (num && !iscntrl((int)buf[0]) && (len + num < sizeof(passwd))) {
- 					memcpy(passwd + len, buf, num);
-_AT_@ -194,7 +203,7 @@ readpw(Display *dpy, const char *pws)
- 				}
- 				break;
- 			}
--			color = len ? INPUT : (failure || failonclear ? FAILED : INIT);
-+			color = len ? (caps ? CAPS : INPUT) : (failure || failonclear ? FAILED : INIT);
- 			if (running && oldc != color) {
- 				for (screen = 0; screen < nscreens; screen++) {
- 					XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[color]);
--- 
-2.8.3
-
diff --git a/tools.suckless.org/slock/patches/slock-capscolor-20170106-2d2a21a.diff b/tools.suckless.org/slock/patches/slock-capscolor-20170106-2d2a21a.diff
new file mode 100644
index 0000000..a3aca2d
--- /dev/null
+++ b/tools.suckless.org/slock/patches/slock-capscolor-20170106-2d2a21a.diff
_AT_@ -0,0 +1,87 @@
+From 95463f58beb669d9221881deac3b6df7d9c4f162 Mon Sep 17 00:00:00 2001
+From: Klemens Nanni <kl3_AT_posteo.org>
+Date: Fri, 2 Sep 2016 14:53:30 +0200
+Subject: [PATCH] Indicate the state of CapsLock through a different color
+
+---
+ config.def.h |  1 +
+ slock.c      | 15 ++++++++++++---
+ 2 files changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/config.def.h b/config.def.h
+index 9855e21..6288856 100644
+--- a/config.def.h
++++ b/config.def.h
+_AT_@ -6,6 +6,7 @@ static const char *colorname[NUMCOLS] = {
+ 	[INIT] =   "black",     /* after initialization */
+ 	[INPUT] =  "#005577",   /* during input */
+ 	[FAILED] = "#CC3333",   /* wrong password */
++	[CAPS] = "red",         /* CapsLock on */
+ };
+ 
+ /* treat a cleared input like a wrong password (color) */
+diff --git a/slock.c b/slock.c
+index d55eb3d..d7804f1 100644
+--- a/slock.c
++++ b/slock.c
+_AT_@ -18,6 +18,7 @@
+ #include <X11/keysym.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
++#include <X11/XKBlib.h>
+ 
+ #include "arg.h"
+ #include "util.h"
+_AT_@ -28,6 +29,7 @@ enum {
+ 	INIT,
+ 	INPUT,
+ 	FAILED,
++	CAPS,
+ 	NUMCOLS
+ };
+ 
+_AT_@ -130,16 +132,20 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
+ {
+ 	XRRScreenChangeNotifyEvent *rre;
+ 	char buf[32], passwd[256], *inputhash;
+-	int num, screen, running, failure, oldc;
+-	unsigned int len, color;
++	int caps, num, screen, running, failure, oldc;
++	unsigned int len, color, indicators;
+ 	KeySym ksym;
+ 	XEvent ev;
+ 
+ 	len = 0;
++	caps = 0;
+ 	running = 1;
+ 	failure = 0;
+ 	oldc = INIT;
+ 
++	if (!XkbGetIndicatorState(dpy, XkbUseCoreKbd, &indicators))
++		caps = indicators & 1;
++
+ 	while (running && !XNextEvent(dpy, &ev)) {
+ 		if (ev.type == KeyPress) {
+ 			explicit_bzero(&buf, sizeof(buf));
+_AT_@ -179,6 +185,9 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
+ 				if (len)
+ 					passwd[len--] = '
Received on Sat Jan 07 2017 - 02:13:59 CET

This archive was generated by hypermail 2.3.0 : Sat Jan 07 2017 - 02:24:18 CET