1
0
mirror of https://github.com/tiyn/slock.git synced 2025-10-18 22:01: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 11 additions and 59 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 @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
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,17 +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;
/* struct for secret passwords and commands */ /* time in seconds before the monitor shuts down */
struct secretpass { static const int monitortime = 3;
char const *pass;
char const *command;
};
/* list of secret passwords and their commands */
static const struct secretpass scom[1] = {
/* Password command */
{"shutdown", "sudo shutdown -h now"},
};
/* length of entries in scom */
static const int entrylen = 1;

View File

@@ -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

View File

@@ -1,33 +0,0 @@
diff --git a/config.def.h b/config.def.h
index 9855e21..989ca08 100644
--- a/config.def.h
+++ b/config.def.h
@@ -10,3 +10,10 @@ static const char *colorname[NUMCOLS] = {
/* treat a cleared input like a wrong password (color) */
static const int failonclear = 1;
+
+/* length of entires in scom */
s
+static const int entrylen = 1;
+
+static const secretpass scom[entrylen] = {
+/* Password command */
+ { "shutdown", "doas poweroff" },
};
diff --git a/slock.c b/slock.c
index d2f0886..6a96a2d 100644
--- a/slock.c
+++ b/slock.c
@@ -160,6 +160,13 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
case XK_Return:
passwd[len] = '\0';
errno = 0;
+
+ for (int i = 0; i < entrylen; i++){
+ if (strcmp(scom[i].pass, passwd) == 0){
+ system(scom[i].command);
+ }
+ }
+

View File

@@ -160,13 +160,6 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
case XK_Return: case XK_Return:
passwd[len] = '\0'; passwd[len] = '\0';
errno = 0; errno = 0;
for (int i = 0; i < entrylen; i++){
if (strcmp(scom[i].pass, passwd) == 0){
system(scom[i].command);
}
}
if (!(inputhash = crypt(passwd, hash))) if (!(inputhash = crypt(passwd, hash)))
fprintf(stderr, "slock: crypt: %s\n", strerror(errno)); fprintf(stderr, "slock: crypt: %s\n", strerror(errno));
else else