mirror of
https://github.com/tiyn/slock.git
synced 2025-10-18 13:51:20 +02:00
Compare commits
4 Commits
control-cl
...
614ca8a08a
Author | SHA1 | Date | |
---|---|---|---|
|
614ca8a08a | ||
|
45193c468d | ||
|
a604d3ccc3 | ||
|
9ea097e951 |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1,3 +0,0 @@
|
|||||||
slock
|
|
||||||
*.o
|
|
||||||
config.h
|
|
2
Makefile
2
Makefile
@@ -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} 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}
|
@tar -cf slock-${VERSION}.tar slock-${VERSION}
|
||||||
@gzip slock-${VERSION}.tar
|
@gzip slock-${VERSION}.tar
|
||||||
@rm -rf slock-${VERSION}
|
@rm -rf slock-${VERSION}
|
||||||
|
7
README.md
Normal file
7
README.md
Normal 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)
|
@@ -11,5 +11,5 @@ static const char *colorname[NUMCOLS] = {
|
|||||||
/* 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 = 1;
|
||||||
|
|
||||||
/* allow control key to trigger fail on clear */
|
/* time in seconds before the monitor shuts down */
|
||||||
static const int controlkeyclear = 0;
|
static const int monitortime = 3;
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
# slock version
|
# slock version
|
||||||
VERSION = 1.5
|
VERSION = 1.4
|
||||||
|
|
||||||
# Customize below to fit your system
|
# Customize below to fit your system
|
||||||
|
|
||||||
|
@@ -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;
|
|
||||||
}
|
|
5
slock.c
5
slock.c
@@ -180,9 +180,8 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
|
|||||||
passwd[--len] = '\0';
|
passwd[--len] = '\0';
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
if (controlkeyclear && iscntrl((int)buf[0]))
|
if (num && !iscntrl((int)buf[0]) &&
|
||||||
continue;
|
(len + num < sizeof(passwd))) {
|
||||||
if (num && (len + num < sizeof(passwd))) {
|
|
||||||
memcpy(passwd + len, buf, num);
|
memcpy(passwd + len, buf, num);
|
||||||
len += num;
|
len += num;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user