diff options
| -rw-r--r-- | config.def.h | 1 | ||||
| -rw-r--r-- | slock.c | 15 |
2 files changed, 13 insertions, 3 deletions
diff --git a/config.def.h b/config.def.h index 6ab12bf..f9b2c1d 100644 --- a/config.def.h +++ b/config.def.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 */ }; @@ -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); |