summaryrefslogtreecommitdiffstats
path: root/slock.c
diff options
context:
space:
mode:
authorDouglas Rumbaugh <doug@douglasrumbaugh.com>2021-12-19 23:07:56 -0500
committerDouglas Rumbaugh <doug@douglasrumbaugh.com>2021-12-19 23:07:56 -0500
commite1529e12787da7ab7fc9ddb6ba75bbff11c6cd2f (patch)
treedabd47b841b359d0e1b85e9bbc7c930b27c196d7 /slock.c
parent1cb89c4f15140122532b956e4e48f9674523f546 (diff)
downloadslock-e1529e12787da7ab7fc9ddb6ba75bbff11c6cd2f.tar.gz
Applied Capscolor patch
https://tools.suckless.org/slock/patches/capscolor/
Diffstat (limited to 'slock.c')
-rw-r--r--slock.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/slock.c b/slock.c
index 5e0515b..acd6655 100644
--- a/slock.c
+++ b/slock.c
@@ -25,6 +25,7 @@
#include <X11/Xutil.h>
#include <X11/Xft/Xft.h>
#include <X11/Xresource.h>
+#include <X11/XKBlib.h>
#include <Imlib2.h>
#include "arg.h"
@@ -36,6 +37,7 @@ enum {
INIT,
INPUT,
FAILED,
+ CAPS,
NUMCOLS
};
@@ -187,16 +189,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));
@@ -236,6 +242,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))) {
@@ -244,7 +253,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);