mirror of
https://github.com/tiyn/slock.git
synced 2025-10-15 20:31:21 +02:00
Compare commits
7 Commits
control-cl
...
7c32775522
Author | SHA1 | Date | |
---|---|---|---|
7c32775522 | |||
848f53aed5 | |||
1a7de3947f | |||
da2d4604a3 | |||
a977eadaa0 | |||
f06f25cffc | |||
135ba46cd0 |
19
README.md
Normal file
19
README.md
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
# slock
|
||||||
|
|
||||||
|
This is my patched version of slock. The base version is directly from suckless.org.
|
||||||
|
|
||||||
|
## Patches
|
||||||
|
|
||||||
|
The list below shows the currently applied patches to the master branch.
|
||||||
|
|
||||||
|
- slock-background-image-20220318-1c5a538.diff (shows a background image in locked state)
|
||||||
|
- 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)
|
||||||
|
|
||||||
|
## Installation
|
||||||
|
|
||||||
|
The most basic way is to clone the repository and then invoke make.
|
||||||
|
|
||||||
|
- `git clone https://github.com/tiyn/slock`
|
||||||
|
- `make clean install`
|
32
config.def.h
32
config.def.h
@@ -1,15 +1,37 @@
|
|||||||
/* user and group to drop privileges to */
|
/* user and group to drop privileges to */
|
||||||
static const char *user = "nobody";
|
static const char *user = "user";
|
||||||
static const char *group = "nobody";
|
static const char *group = "nobody";
|
||||||
|
|
||||||
static const char *colorname[NUMCOLS] = {
|
static const char *colorname[NUMCOLS] = {
|
||||||
[INIT] = "black", /* after initialization */
|
[INIT] = "#000000", /* after initialization */
|
||||||
[INPUT] = "#005577", /* during input */
|
[INPUT] = "#0000ff", /* during input */
|
||||||
[FAILED] = "#CC3333", /* wrong password */
|
[FAILED] = "#ff0000", /* wrong password */
|
||||||
|
[CAPS] = "#ffff00", /* CapsLock on */
|
||||||
};
|
};
|
||||||
|
|
||||||
/* 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;
|
||||||
|
|
||||||
|
/* 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 XRectangle rectangles[9] = {
|
||||||
|
/* 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 },
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
/* allow control key to trigger fail on clear */
|
/* allow control key to trigger fail on clear */
|
||||||
static const int controlkeyclear = 0;
|
static const int controlkeyclear = 1;
|
||||||
|
@@ -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