From b8e289d20a3a27c4216f533e083d9c04d199b6b6 Mon Sep 17 00:00:00 2001 From: Sravan Balaji Date: Fri, 11 Dec 2020 10:42:20 -0500 Subject: [PATCH] capscolor patch - Apply capscolor patch - Change README to markdown - Add capscolor patch link to README --- README | 24 ----- README.md | 33 +++++++ config.def.h | 1 + patches/slock-capscolor-20170106-2d2a21a.diff | 87 +++++++++++++++++++ slock.c | 15 +++- 5 files changed, 133 insertions(+), 27 deletions(-) delete mode 100644 README create mode 100644 README.md create mode 100644 patches/slock-capscolor-20170106-2d2a21a.diff diff --git a/README b/README deleted file mode 100644 index dcacd01..0000000 --- a/README +++ /dev/null @@ -1,24 +0,0 @@ -slock - simple screen locker -============================ -simple screen locker utility for X. - - -Requirements ------------- -In order to build slock you need the Xlib header files. - - -Installation ------------- -Edit config.mk to match your local setup (slock is installed into -the /usr/local namespace by default). - -Afterwards enter the following command to build and install slock -(if necessary as root): - - make clean install - - -Running slock -------------- -Simply invoke the 'slock' command. To get out of it, enter your password. diff --git a/README.md b/README.md new file mode 100644 index 0000000..7965cfc --- /dev/null +++ b/README.md @@ -0,0 +1,33 @@ +# slock - simple screen locker + +Sravan's custom build of slock. Original slock build by suckless team found here: [https://tools.suckless.org/slock/](https://tools.suckless.org/slock/) + +## Requirements + +In order to build slock you need the Xlib header files. + +## Installation + +Edit [config.mk](config.mk) to match your local setup (slock is installed into +the /usr/local namespace by default). + +Afterwards enter the following command to build and install slock +(if necessary as root): + +``` +make clean install +``` + +## Running slock + +Simply invoke the `slock` command. To get out of it, enter your password. + +## Configuration + +The configuration of slock is done by creating a custom config.h and (re)compiling the source code. + +## Patches + +Most patches can be found on the suckless website: [https://tools.suckless.org/slock/patches/](https://tools.suckless.org/slock/patches/) + +* [capscolor](https://tools.suckless.org/slock/patches/capscolor/) - Introduces an additional color to indicate the state of Caps Lock. diff --git a/config.def.h b/config.def.h index 27cc2d0..83e4887 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 */ }; /* treat a cleared input like a wrong password (color) */ diff --git a/patches/slock-capscolor-20170106-2d2a21a.diff b/patches/slock-capscolor-20170106-2d2a21a.diff new file mode 100644 index 0000000..a3aca2d --- /dev/null +++ b/patches/slock-capscolor-20170106-2d2a21a.diff @@ -0,0 +1,87 @@ +From 95463f58beb669d9221881deac3b6df7d9c4f162 Mon Sep 17 00:00:00 2001 +From: Klemens Nanni +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 +@@ -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 +@@ -18,6 +18,7 @@ + #include + #include + #include ++#include + + #include "arg.h" + #include "util.h" +@@ -28,6 +29,7 @@ enum { + INIT, + INPUT, + FAILED, ++ CAPS, + NUMCOLS + }; + +@@ -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)); +@@ -179,6 +185,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))) { +@@ -187,7 +196,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++) { + XSetWindowBackground(dpy, +-- +2.11.0 + diff --git a/slock.c b/slock.c index 5ae738c..5f4fb7a 100644 --- a/slock.c +++ b/slock.c @@ -18,6 +18,7 @@ #include #include #include +#include #include "arg.h" #include "util.h" @@ -28,6 +29,7 @@ enum { INIT, INPUT, FAILED, + CAPS, NUMCOLS }; @@ -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)); @@ -179,6 +185,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))) { @@ -187,7 +196,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++) { XSetWindowBackground(dpy,