1
0
mirror of https://github.com/tiyn/slock.git synced 2025-10-18 13:51:20 +02:00

4 Commits

Author SHA1 Message Date
TiynGER
614ca8a08a new option 2020-03-31 11:13:48 +02:00
TiynGER
45193c468d new option 2020-03-31 11:12:36 +02:00
TiynGER
a604d3ccc3 changing group 2020-03-29 21:20:41 +02:00
TiynGER
9ea097e951 adding README 2020-03-29 19:32:47 +02:00
7 changed files with 13 additions and 37 deletions

3
.gitignore vendored
View File

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

View File

@@ -36,7 +36,7 @@ dist: clean
@echo creating dist tarball
@mkdir -p slock-${VERSION}
@cp -R LICENSE Makefile README slock.1 config.mk \
${SRC} config.def.h arg.h util.h slock-${VERSION}
${SRC} explicit_bzero.c config.def.h arg.h util.h slock-${VERSION}
@tar -cf slock-${VERSION}.tar slock-${VERSION}
@gzip slock-${VERSION}.tar
@rm -rf slock-${VERSION}

7
README.md Normal file
View File

@@ -0,0 +1,7 @@
# slock
This is my patched version of st. The base version is directly from suckless.org.
This belongs to my larbs installation script.
## Patches
The list below shows the currently applied patches to the master branch.
- slock-dpms-1.4.diff (turns off the monitor after a given time)

View File

@@ -11,5 +11,5 @@ static const char *colorname[NUMCOLS] = {
/* treat a cleared input like a wrong password (color) */
static const int failonclear = 1;
/* allow control key to trigger fail on clear */
static const int controlkeyclear = 0;
/* time in seconds before the monitor shuts down */
static const int monitortime = 3;

View File

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

View File

@@ -1,27 +0,0 @@
diff --git a/config.def.h b/config.def.h
index 6fba2b6..933152b 100644
--- a/config.def.h
+++ b/config.def.h
@@ -10,3 +10,6 @@ static const char *colorname[NUMCOLS] = {
/* treat a cleared input like a wrong password */
static const int failonclear = 1;
+
+/* allow control key to trigger fail on clear */
+static const int controlkeyclear = 0;
diff --git a/slock.c b/slock.c
index 4d7f06f..15552ef 100644
--- a/slock.c
+++ b/slock.c
@@ -180,8 +180,9 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
passwd[len--] = '\0';
break;
default:
- if (num && !iscntrl((int)buf[0]) &&
- (len + num < sizeof(passwd))) {
+ if (controlkeyclear && iscntrl((int)buf[0]))
+ continue;
+ if (num && (len + num < sizeof(passwd))) {
memcpy(passwd + len, buf, num);
len += num;
}

View File

@@ -180,9 +180,8 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
passwd[--len] = '\0';
break;
default:
if (controlkeyclear && iscntrl((int)buf[0]))
continue;
if (num && (len + num < sizeof(passwd))) {
if (num && !iscntrl((int)buf[0]) &&
(len + num < sizeof(passwd))) {
memcpy(passwd + len, buf, num);
len += num;
}