commit 2a5c7290347296d410650c1b5580e6af49b7904b
parent a412d065fe2b00a72d5f89dcb954e99bf2cc0812
Author: Klemens Nanni <kl3@posteo.org>
Date: Fri, 2 Sep 2016 15:01:05 +0200
[slock] Update capscolor patch
Diffstat:
3 files changed, 90 insertions(+), 75 deletions(-)
diff --git a/tools.suckless.org/slock/patches/capscolor.md b/tools.suckless.org/slock/patches/capscolor.md
@@ -8,16 +8,16 @@ 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 20160130 is written against current HEAD at 9dfe0ce.
+Version 20160902 is written against current HEAD at a55594f.
Download
--------
* [slock-capscolor.diff](slock-capscolor.diff)
-* [slock-20160130-capscolor.diff](slock-20160130-capscolor.diff)
+* [slock-capscolor-20160902-a55594f.diff](slock-capscolor-20160902-a55594f.diff)
Authors
-------
* Andrew Hills <[ahills@ednos.net](mailto:ahills@ednos.net)>
-* Klemens Nanni <[kl3@posteo.org](mailto:kl3@posteo.org)> (20160130 version)
+* Klemens Nanni <[kl3@posteo.org](mailto:kl3@posteo.org)> (20160902 version)
diff --git a/tools.suckless.org/slock/patches/slock-20160130-capscolor.diff b/tools.suckless.org/slock/patches/slock-20160130-capscolor.diff
@@ -1,72 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index fca0ae0..6673e54 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -2,5 +2,6 @@ static const char *colorname[NUMCOLS] = {
- "black", /* after initialization */
- "#005577", /* during input */
- "#CC3333", /* failed/cleared the input */
-+ "red", /* CapsLock on */
- };
- static const Bool failonclear = True;
-diff --git a/slock.c b/slock.c
-index df2d3c6..8c1a791 100644
---- a/slock.c
-+++ b/slock.c
-@@ -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>
-@@ -27,6 +28,7 @@ enum {
- INIT,
- INPUT,
- FAILED,
-+ CAPS,
- NUMCOLS
- };
-
-@@ -127,15 +129,19 @@ readpw(Display *dpy, const char *pws)
- #endif
- {
- char buf[32], passwd[256];
-- int num, screen;
-- unsigned int len, color;
-+ int num, screen, caps;
-+ unsigned int len, color, indicators;
- KeySym ksym;
- XEvent ev;
- static int oldc = INIT;
-
- len = 0;
-+ caps = 0;
- running = True;
-
-+ 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
-@@ -177,6 +183,9 @@ readpw(Display *dpy, const char *pws)
- if (len)
- --len;
- break;
-+ case XK_Caps_Lock:
-+ caps = !caps;
-+ break;
- default:
- if (num && !iscntrl((int)buf[0]) && (len + num < sizeof(passwd))) {
- memcpy(passwd + len, buf, num);
-@@ -184,7 +193,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]);
diff --git a/tools.suckless.org/slock/patches/slock-capscolor-20160902-a55594f.diff b/tools.suckless.org/slock/patches/slock-capscolor-20160902-a55594f.diff
@@ -0,0 +1,87 @@
+From 950c07f342f91810f4af7ed2b6c59bd98acc932d Mon Sep 17 00:00:00 2001
+From: Klemens Nanni <kl3@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
+@@ -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
+@@ -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>
+@@ -32,6 +33,7 @@ enum {
+ INIT,
+ INPUT,
+ FAILED,
++ CAPS,
+ NUMCOLS
+ };
+
+@@ -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
+@@ -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);
+@@ -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
+
