From c8c683681c622881397b9662f7cf1c97b039dd0a Mon Sep 17 00:00:00 2001 From: Sam Chudnick Date: Sat, 25 Feb 2023 22:33:40 -0500 Subject: Add capscolor (and Xresources) patch --- config.h | 1 + slock.c | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/config.h b/config.h index ceceeb0..6991d6b 100644 --- a/config.h +++ b/config.h @@ -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 efbe833..b8be41a 100644 --- a/slock.c +++ b/slock.c @@ -24,7 +24,7 @@ #include #include #include - +#include #include "arg.h" #include "util.h" @@ -34,6 +34,7 @@ enum { INIT, INPUT, FAILED, + CAPS, NUMCOLS }; @@ -172,16 +173,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)); @@ -221,6 +226,9 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens, if (len) passwd[--len] = '\0'; break; + case XK_Caps_Lock: + caps = !caps; + break; default: if (num && !iscntrl((int)buf[0]) && (len + num < sizeof(passwd))) { @@ -229,7 +237,7 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens, } 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++) { drawlogo(dpy, locks[screen], color); -- cgit v1.2.3