suckless-desktop/slock
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: suckless-desktop:4f045545a25cc02c64bfc08d27ed2ccecb962292
Branches Tags
suckless-desktop:mymain
...
compare: suckless-desktop:85b967adf8d94960e8c0289314fcbb126ea06eeb
Branches Tags
suckless-desktop:mymain

10 Commits
4f045545a2 ... 85b967adf8

Author SHA1 Message Date
Andreev Gregory
85b967adf8 Now with gitignore 2025-03-27 11:56:20 +03:00
Andreev Gregory
e8967af67d Merge branch 'with-capscolor' into my-main 2025-03-27 11:55:04 +03:00
Andreev Gregory
df89fc5301 With capslock color 2025-03-27 11:44:28 +03:00
Andreev Gregory
31c801b304 Fixed 2025-03-06 15:06:46 +03:00
Hiltjo Posthuma
a34d8fb432 slock.1: use standard wording for options 
Remove the OPTIONS section and add an EXIT STATUS section.
 2023-10-06 11:57:31 +02:00
Hiltjo Posthuma
e8bca65d62 write version to stdout like the man page says 2023-10-06 11:50:11 +02:00
Hiltjo Posthuma
ca6f30f621 slock.1: improve man page 
* Fix all lint warnings.
* Remove "Op Ar arg..." in the description. It looks ugly.
* No need to set -offset left for .Bd literal.
 2023-10-06 11:48:40 +02:00
Hiltjo Posthuma
2fec14c567 config.mk: no need to set CC 2023-10-06 11:41:19 +02:00
Hiltjo Posthuma
5678764412 Makefile: be verbose and remove options 
Some things to improve at some point:

* Respect system/packaging CFLAGS/LDFLAGS (don't hardcode -Os -Wall -pedantic,
  -s, etc).
 2023-10-06 11:39:40 +02:00
Hiltjo Posthuma
aecfb3f680 update LICENSE 2023-10-06 11:39:31 +02:00
7 changed files with 57 additions and 58 deletions
Show Stats Expand all files Collapse all files

3
.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
config.h
slock
*.o

1
LICENSE
View File

@ -4,6 +4,7 @@ MIT/X Consortium License
© 2014 Dimitris Papastamos <sin@2f30.org> © 2014 Dimitris Papastamos <sin@2f30.org>
© 2006-2014 Anselm R Garbe <anselm@garbe.us> © 2006-2014 Anselm R Garbe <anselm@garbe.us>
© 2014-2016 Laslo Hunhold <dev@frign.de> © 2014-2016 Laslo Hunhold <dev@frign.de>
© 2016-2023 Hiltjo Posthuma <hiltjo@codemadness.org>
Permission is hereby granted, free of charge, to any person obtaining a Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"), copy of this software and associated documentation files (the "Software"),

58
Makefile
View File

@ -6,56 +6,38 @@ include config.mk
SRC = slock.c ${COMPATSRC} SRC = slock.c ${COMPATSRC}
OBJ = ${SRC:.c=.o} OBJ = ${SRC:.c=.o}
all: options slock all: slock
options:
@echo slock build options:
@echo "CFLAGS = ${CFLAGS}"
@echo "LDFLAGS = ${LDFLAGS}"
@echo "CC = ${CC}"
.c.o: .c.o:
@echo CC $< ${CC} -c ${CFLAGS} $<
@${CC} -c ${CFLAGS} $<
${OBJ}: config.h config.mk arg.h util.h ${OBJ}: config.def.h config.mk arg.h util.h
config.h:
@echo creating $@ from config.def.h
@cp config.def.h $@
slock: ${OBJ} slock: ${OBJ}
@echo CC -o $@ ${CC} -o $@ ${OBJ} ${LDFLAGS}
@${CC} -o $@ ${OBJ} ${LDFLAGS}
clean: clean:
@echo cleaning rm -f slock ${OBJ} slock-${VERSION}.tar.gz
@rm -f slock ${OBJ} slock-${VERSION}.tar.gz
dist: clean dist: clean
@echo creating dist tarball mkdir -p slock-${VERSION}
@mkdir -p slock-${VERSION} cp -R LICENSE Makefile README slock.1 config.mk \
@cp -R LICENSE Makefile README slock.1 config.mk \
${SRC} config.def.h arg.h util.h slock-${VERSION} ${SRC} config.def.h arg.h util.h slock-${VERSION}
@tar -cf slock-${VERSION}.tar slock-${VERSION} tar -cf slock-${VERSION}.tar slock-${VERSION}
@gzip slock-${VERSION}.tar gzip slock-${VERSION}.tar
@rm -rf slock-${VERSION} rm -rf slock-${VERSION}
install: all install: all
@echo installing executable file to ${DESTDIR}${PREFIX}/bin mkdir -p ${DESTDIR}${PREFIX}/bin
@mkdir -p ${DESTDIR}${PREFIX}/bin cp -f slock ${DESTDIR}${PREFIX}/bin
@cp -f slock ${DESTDIR}${PREFIX}/bin chmod 755 ${DESTDIR}${PREFIX}/bin/slock
@chmod 755 ${DESTDIR}${PREFIX}/bin/slock chmod u+s ${DESTDIR}${PREFIX}/bin/slock
@chmod u+s ${DESTDIR}${PREFIX}/bin/slock mkdir -p ${DESTDIR}${MANPREFIX}/man1
@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1 sed "s/VERSION/${VERSION}/g" <slock.1 >${DESTDIR}${MANPREFIX}/man1/slock.1
@mkdir -p ${DESTDIR}${MANPREFIX}/man1 chmod 644 ${DESTDIR}${MANPREFIX}/man1/slock.1
@sed "s/VERSION/${VERSION}/g" <slock.1 >${DESTDIR}${MANPREFIX}/man1/slock.1
@chmod 644 ${DESTDIR}${MANPREFIX}/man1/slock.1
uninstall: uninstall:
@echo removing executable file from ${DESTDIR}${PREFIX}/bin rm -f ${DESTDIR}${PREFIX}/bin/slock
@rm -f ${DESTDIR}${PREFIX}/bin/slock rm -f ${DESTDIR}${MANPREFIX}/man1/slock.1
@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
@rm -f ${DESTDIR}${MANPREFIX}/man1/slock.1
.PHONY: all options clean dist install uninstall .PHONY: all clean dist install uninstall

5
config.def.h
View File

@ -1,12 +1,13 @@
/* user and group to drop privileges to */ /* user and group to drop privileges to */
static const char *user = "nobody"; static const char *user = "nobody";
static const char *group = "nogroup"; static const char *group = "nobody";
static const char *colorname[NUMCOLS] = { static const char *colorname[NUMCOLS] = {
[INIT] = "black", /* after initialization */ [INIT] = "black", /* after initialization */
[INPUT] = "#005577", /* during input */ [INPUT] = "#005577", /* during input */
[FAILED] = "#CC3333", /* wrong password */ [FAILED] = "#CC3333", /* wrong password */
[CAPS] = "red", /* CapsLock on */
}; };
/* treat a cleared input like a wrong password (color) */ /* treat a cleared input like a wrong password (color) */
static const int failonclear = 1; static const int failonclear = 0;

3
config.mk
View File

@ -27,6 +27,3 @@ COMPATSRC = explicit_bzero.c
#CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE -D_NETBSD_SOURCE #CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE -D_NETBSD_SOURCE
# On OpenBSD set COMPATSRC to empty # On OpenBSD set COMPATSRC to empty
#COMPATSRC = #COMPATSRC =
# compiler and linker
CC = cc

26
slock.1
View File

@ -1,5 +1,6 @@
.Dd 2016-08-23 .Dd October 6, 2023
.Dt SLOCK 1 .Dt SLOCK 1
.Os
.Sh NAME .Sh NAME
.Nm slock .Nm slock
.Nd simple X screen locker .Nd simple X screen locker
@ -9,31 +10,36 @@
.Op Ar cmd Op Ar arg ... .Op Ar cmd Op Ar arg ...
.Sh DESCRIPTION .Sh DESCRIPTION
.Nm .Nm
is a simple X screen locker. If provided, is a simple X screen locker.
.Ar cmd Op Ar arg ... If provided,
.Ar cmd
is executed after the screen has been locked. is executed after the screen has been locked.
.Sh OPTIONS .Pp
The options are as follows:
.Bl -tag -width Ds .Bl -tag -width Ds
.It Fl v .It Fl v
Print version information to stdout and exit. Print version information to stdout and exit.
.El .El
.Sh EXIT STATUS
.Ex -std
.Sh EXAMPLES
$
.Nm
/usr/sbin/s2ram
.Sh SECURITY CONSIDERATIONS .Sh SECURITY CONSIDERATIONS
To make sure a locked screen can not be bypassed by switching VTs To make sure a locked screen can not be bypassed by switching VTs
or killing the X server with Ctrl+Alt+Backspace, it is recommended or killing the X server with Ctrl+Alt+Backspace, it is recommended
to disable both in to disable both in
.Xr xorg.conf 5 .Xr xorg.conf 5
for maximum security: for maximum security:
.Bd -literal -offset left .Bd -literal
Section "ServerFlags" Section "ServerFlags"
Option "DontVTSwitch" "True" Option "DontVTSwitch" "True"
Option "DontZap" "True" Option "DontZap" "True"
EndSection EndSection
.Ed .Ed
.Sh EXAMPLES
$
.Nm
/usr/sbin/s2ram
.Sh CUSTOMIZATION .Sh CUSTOMIZATION
.Nm .Nm
can be customized by creating a custom config.h from config.def.h and can be customized by creating a custom config.h from config.def.h and
(re)compiling the source code. This keeps it fast, secure and simple. (re)compiling the source code.
This keeps it fast, secure and simple.

19
slock.c
View File

@ -18,6 +18,7 @@
#include <X11/keysym.h> #include <X11/keysym.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/XKBlib.h>
#include "arg.h" #include "arg.h"
#include "util.h" #include "util.h"
@ -28,6 +29,7 @@ enum {
INIT, INIT,
INPUT, INPUT,
FAILED, FAILED,
CAPS,
NUMCOLS NUMCOLS
}; };
@ -44,7 +46,7 @@ struct xrandr {
int errbase; int errbase;
}; };
#include "config.h" #include "config.def.h"
static void static void
die(const char *errstr, ...) die(const char *errstr, ...)
@ -130,16 +132,20 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
{ {
XRRScreenChangeNotifyEvent *rre; XRRScreenChangeNotifyEvent *rre;
char buf[32], passwd[256], *inputhash; char buf[32], passwd[256], *inputhash;
int num, screen, running, failure, oldc; int caps, num, screen, running, failure, oldc;
unsigned int len, color; unsigned int len, color, indicators;
KeySym ksym; KeySym ksym;
XEvent ev; XEvent ev;
len = 0; len = 0;
caps = 0;
running = 1; running = 1;
failure = 0; failure = 0;
oldc = INIT; oldc = INIT;
if (!XkbGetIndicatorState(dpy, XkbUseCoreKbd, &indicators))
caps = indicators & 1;
while (running && !XNextEvent(dpy, &ev)) { while (running && !XNextEvent(dpy, &ev)) {
if (ev.type == KeyPress) { if (ev.type == KeyPress) {
explicit_bzero(&buf, sizeof(buf)); explicit_bzero(&buf, sizeof(buf));
@ -179,6 +185,9 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
if (len) if (len)
passwd[--len] = '\0'; passwd[--len] = '\0';
break; break;
case XK_Caps_Lock:
caps = !caps;
break;
default: default:
if (num && !iscntrl((int)buf[0]) && if (num && !iscntrl((int)buf[0]) &&
(len + num < sizeof(passwd))) { (len + num < sizeof(passwd))) {
@ -187,7 +196,7 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
} }
break; break;
} }
color = len ? INPUT : ((failure || failonclear) ? FAILED : INIT); color = len ? (caps ? CAPS : INPUT) : (failure || failonclear ? FAILED : INIT);
if (running && oldc != color) { if (running && oldc != color) {
for (screen = 0; screen < nscreens; screen++) { for (screen = 0; screen < nscreens; screen++) {
XSetWindowBackground(dpy, XSetWindowBackground(dpy,
@ -317,7 +326,7 @@ main(int argc, char **argv) {
ARGBEGIN { ARGBEGIN {
case 'v': case 'v':
fprintf(stderr, "slock-"VERSION"\n"); puts("slock-"VERSION);
return 0; return 0;
default: default:
usage(); usage();