twin/slock
1
0
Fork 0
mirror of git://git.suckless.org/slock synced 2025-08-11 10:12:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: twin:1.4
Branches Tags
twin:master
twin:1.6 twin:1.5 twin:1.4 twin:1.3 twin:1.2 twin:1.0 twin:0.9 twin:0.8 twin:0.7 twin:0.6 twin:0.5 twin:0.4 twin:0.3 twin:0.2 twin:0.1
...
compare: twin:1.5
Branches Tags
twin:master
twin:1.6 twin:1.5 twin:1.4 twin:1.3 twin:1.2 twin:1.0 twin:0.9 twin:0.8 twin:0.7 twin:0.6 twin:0.5 twin:0.4 twin:0.3 twin:0.2 twin:0.1

7 Commits
1.4 ... 1.5

Author SHA1 Message Date
Hiltjo Posthuma
4f045545a2 bump version to 1.5 2022-10-04 19:45:14 +02:00
Hiltjo Posthuma
265704d736 Makefile: explicit_bzero.c was copied twice (GNU make gives a warning) 2022-10-04 19:44:47 +02:00
Tobias Stoeckmann
35633d4567 Properly clear the last entered character 
When enter is pressed, passwd[len] will be set to '\0'. Pressing
backspace is supposed to remove the last entered character.

But currently, the clearing has an off-by-one, as in setting
passwd[len] to '\0' just like enter would do.

You can also verify it by imagining len=1 and that it's impossible to
clear passwd[0] by pressing backspace with the current code.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
 2017-03-25 21:51:29 +01:00
Markus Teich
2d2a21a90a rm trailing whitespace in README 2016-11-23 00:29:18 +01:00
Markus Teich
325581b935 syntax fix 2016-11-23 00:28:43 +01:00
Markus Teich
0ff0d9f7a7 there can only be one window in the event 2016-11-23 00:28:25 +01:00
Bob Uhl
7a604ec1fa Fix resize with multiple monitors and portrait mode 
When connecting/disconnecting a portrait monitor, the
XRRScreenChangeNotifyEvent height & width are reversed due to the XRandR
rotation; detect this and DTRT.
 2016-11-23 00:26:51 +01:00
4 changed files with 16 additions and 8 deletions
Expand all files Collapse all files

2
Makefile
View File

@@ -36,7 +36,7 @@ dist: clean
@echo creating dist tarball @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} explicit_bzero.c 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}

2
config.mk
View File

@@ -1,5 +1,5 @@
# slock version # slock version
VERSION = 1.4 VERSION = 1.5
# Customize below to fit your system # Customize below to fit your system

12
slock.c
View File

@@ -177,7 +177,7 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
break; break;
case XK_BackSpace: case XK_BackSpace:
if (len) if (len)
passwd[len--] = '\0'; passwd[--len] = '\0';
break; break;
default: default:
if (num && !iscntrl((int)buf[0]) && if (num && !iscntrl((int)buf[0]) &&
@@ -201,15 +201,23 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
rre = (XRRScreenChangeNotifyEvent*)&ev; rre = (XRRScreenChangeNotifyEvent*)&ev;
for (screen = 0; screen < nscreens; screen++) { for (screen = 0; screen < nscreens; screen++) {
if (locks[screen]->win == rre->window) { if (locks[screen]->win == rre->window) {
if (rre->rotation == RR_Rotate_90 ||
rre->rotation == RR_Rotate_270)
XResizeWindow(dpy, locks[screen]->win,
rre->height, rre->width);
else
XResizeWindow(dpy, locks[screen]->win, XResizeWindow(dpy, locks[screen]->win,
rre->width, rre->height); rre->width, rre->height);
XClearWindow(dpy, locks[screen]->win); XClearWindow(dpy, locks[screen]->win);
break;
} }
} }
} else for (screen = 0; screen < nscreens; screen++) } else {
for (screen = 0; screen < nscreens; screen++)
XRaiseWindow(dpy, locks[screen]->win); XRaiseWindow(dpy, locks[screen]->win);
} }
} }
}
static struct lock * static struct lock *
lockscreen(Display *dpy, struct xrandr *rr, int screen) lockscreen(Display *dpy, struct xrandr *rr, int screen)