mirror of
https://github.com/tiyn/slock.git
synced 2025-10-18 05:41:21 +02:00
Compare commits
11 Commits
e738d89c47
...
master
Author | SHA1 | Date | |
---|---|---|---|
fedcfc595b | |||
940aa6c46b | |||
8eae6d56b3 | |||
632909ee67 | |||
5a88ca3a66 | |||
|
eeb357c356 | ||
|
f6f743c04d | ||
|
535d3daa33 | ||
|
62f56acf86 | ||
b8f4624e30 | |||
744232078f |
@@ -10,6 +10,7 @@ The list below shows the currently applied patches to the master branch.
|
||||
- slock-capscolor-20220921-35633d4.diff (displays a separate color if caps is set)
|
||||
- slock-dwmlogo-20210324.diff (adds dwm logo on lock screen)
|
||||
- slock-git-20161012-control-clear.diff (doesnt turn logo red when pressing control keys)
|
||||
- slock-secret-password-1.4.diff (modified) (can give additional passwords that run commands)
|
||||
|
||||
## Installation
|
||||
|
||||
|
53
config.def.h
53
config.def.h
@@ -3,10 +3,10 @@ static const char *user = "user";
|
||||
static const char *group = "nobody";
|
||||
|
||||
static const char *colorname[NUMCOLS] = {
|
||||
[INIT] = "#000000", /* after initialization */
|
||||
[INPUT] = "#0000ff", /* during input */
|
||||
[FAILED] = "#ff0000", /* wrong password */
|
||||
[CAPS] = "#ffff00", /* CapsLock on */
|
||||
[INIT] = "#2d2d2d", /* after initialization */
|
||||
[INPUT] = "#005577", /* during input */
|
||||
[FAILED] = "#cc3333", /* wrong password */
|
||||
[CAPS] = "#ff0000", /* CapsLock on */
|
||||
};
|
||||
|
||||
/* treat a cleared input like a wrong password (color) */
|
||||
@@ -15,23 +15,40 @@ static const int failonclear = 1;
|
||||
/* Background image path, should be available to the user above */
|
||||
static const char* background_image = "/home/user/.local/share/lock";
|
||||
/* insert grid pattern with scale 1:1, the size can be changed with logosize */
|
||||
static const int logosize = 75;
|
||||
static const int logow = 12; /* grid width and height for right center alignment*/
|
||||
static const int logoh = 6;
|
||||
static const int logosize = 40;
|
||||
static const int logow = 10; /* grid width and height for right center alignment*/
|
||||
static const int logoh = 15;
|
||||
|
||||
static XRectangle rectangles[9] = {
|
||||
static XRectangle rectangles[12] = {
|
||||
/* x y w h */
|
||||
{ 0, 3, 1, 3 },
|
||||
{ 1, 3, 2, 1 },
|
||||
{ 0, 5, 8, 1 },
|
||||
{ 3, 0, 1, 5 },
|
||||
{ 5, 3, 1, 2 },
|
||||
{ 7, 3, 1, 2 },
|
||||
{ 8, 3, 4, 1 },
|
||||
{ 9, 4, 1, 2 },
|
||||
{ 11, 4, 1, 2 },
|
||||
|
||||
{ 0, 0, 1, 3 },
|
||||
{ 0, 7, 4, 2 },
|
||||
{ 1, 0, 1, 4 },
|
||||
{ 2, 2, 1, 3 },
|
||||
{ 3, 3, 1, 3 },
|
||||
{ 4, 0, 2, 2 },
|
||||
{ 4, 4, 2, 11 },
|
||||
{ 6, 3, 1, 3 },
|
||||
{ 6, 7, 4, 2 },
|
||||
{ 7, 2, 1, 3 },
|
||||
{ 8, 0, 1, 4 },
|
||||
{ 9, 0, 1, 3 },
|
||||
};
|
||||
|
||||
/* allow control key to trigger fail on clear */
|
||||
static const int controlkeyclear = 1;
|
||||
|
||||
/* struct for secret passwords and commands */
|
||||
struct secretpass {
|
||||
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;
|
||||
|
33
slock-secret-password-1.4.diff
Normal file
33
slock-secret-password-1.4.diff
Normal file
@@ -0,0 +1,33 @@
|
||||
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);
|
||||
+ }
|
||||
+ }
|
||||
+
|
6
slock.c
6
slock.c
@@ -202,6 +202,12 @@ 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);
|
||||
}
|
||||
}
|
||||
|
||||
if (!(inputhash = crypt(passwd, hash)))
|
||||
fprintf(stderr, "slock: crypt: %s\n", strerror(errno));
|
||||
else
|
||||
|
Reference in New Issue
Block a user