1
0
mirror of https://github.com/alrayyes/slock synced 2023-11-13 18:16:41 +00:00

added dpms patch

This commit is contained in:
Ryan Kes 2019-03-13 20:39:22 +01:00
parent 11051d3acb
commit 2f8a36efc6
3 changed files with 119 additions and 1 deletions

View File

@ -10,12 +10,31 @@ license=('MIT')
depends=('libxext' 'libxrandr') depends=('libxext' 'libxrandr')
source=("http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz") source=("http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz")
#source=("slock-$pkgver.tar.bz2::http://hg.suckless.org/slock/archive/$_pkgver.tar.gz") #source=("slock-$pkgver.tar.bz2::http://hg.suckless.org/slock/archive/$_pkgver.tar.gz")
md5sums=('f91dd5ba50ce7bd1842caeca067086a3') md5sums=('f91dd5ba50ce7bd1842caeca067086a3'
'76c1d90cfb0a1da62a00caec951f48f7'
'2afeace988ef4eaf0a8a078aded7c4a0')
sha256sums=('b53849dbc60109a987d7a49b8da197305c29307fd74c12dc18af0d3044392e6a'
'209c5e9954f38f6dae8cc32f7c79bc0351eee5210f943912d1ff0c7a305a355c'
'0d5508c24ab2e870f1d807044c08c7c4f835e696267ecca7521b08f59bc803d1')
_patches=("slock-dpms-20170923-fa11589.diff")
source=("http://dl.suckless.org/st/$pkgname-$pkgver.tar.gz"
"config.h"
"${_patches[@]}")
prepare() { prepare() {
cd "$srcdir/slock-$pkgver" cd "$srcdir/slock-$pkgver"
sed -i 's|static const char \*group = "nogroup";|static const char *group = "nobody";|' config.def.h sed -i 's|static const char \*group = "nogroup";|static const char *group = "nobody";|' config.def.h
sed -ri 's/((CPP|C|LD)FLAGS) =/\1 +=/g' config.mk sed -ri 's/((CPP|C|LD)FLAGS) =/\1 +=/g' config.mk
for patch in "${_patches[@]}"; do
echo "Applying patch $(basename $patch)..."
patch -Np1 -i "$srcdir/$(basename $patch)"
done
cp $srcdir/config.h config.h
} }
build() { build() {

15
config.h Normal file
View File

@ -0,0 +1,15 @@
/* user and group to drop privileges to */
static const char *user = "nobody";
static const char *group = "nobody";
static const char *colorname[NUMCOLS] = {
[INIT] = "black", /* after initialization */
[INPUT] = "#005577", /* during input */
[FAILED] = "#CC3333", /* wrong password */
};
/* treat a cleared input like a wrong password (color) */
static const int failonclear = 1;
/* time in seconds before the monitor shuts down */
static const int monitortime = 5;

View File

@ -0,0 +1,84 @@
diff --git a/config.def.h b/config.def.h
index 9855e21..d01bd38 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 (color) */
static const int failonclear = 1;
+
+/* time in seconds before the monitor shuts down */
+static const int monitortime = 5;
diff --git a/slock.c b/slock.c
index d2f0886..7ab0521 100644
--- a/slock.c
+++ b/slock.c
@@ -15,6 +15,7 @@
#include <unistd.h>
#include <sys/types.h>
#include <X11/extensions/Xrandr.h>
+#include <X11/extensions/dpms.h>
#include <X11/keysym.h>
#include <X11/Xlib.h>
#include <X11/Xutil.h>
@@ -289,6 +290,14 @@ lockscreen(Display *dpy, struct xrandr *rr, int screen)
return NULL;
}
+static void
+monitorreset(Display* dpy, CARD16 standby, CARD16 suspend, CARD16 off)
+{
+ DPMSSetTimeouts(dpy, standby, suspend, off);
+ DPMSForceLevel(dpy, DPMSModeOn);
+ XFlush(dpy);
+}
+
static void
usage(void)
{
@@ -306,6 +315,7 @@ main(int argc, char **argv) {
const char *hash;
Display *dpy;
int s, nlocks, nscreens;
+ CARD16 standby, suspend, off;
ARGBEGIN {
case 'v':
@@ -366,12 +376,28 @@ main(int argc, char **argv) {
if (nlocks != nscreens)
return 1;
+ /* DPMS-magic to disable the monitor */
+ if (!DPMSCapable(dpy))
+ die("slock: DPMSCapable failed\n");
+ if (!DPMSEnable(dpy))
+ die("slock: DPMSEnable failed\n");
+ if (!DPMSGetTimeouts(dpy, &standby, &suspend, &off))
+ die("slock: DPMSGetTimeouts failed\n");
+ if (!standby || !suspend || !off)
+ /* set values if there arent some */
+ standby = suspend = off = 300;
+
+ DPMSSetTimeouts(dpy, monitortime, monitortime, monitortime);
+ XFlush(dpy);
+
/* run post-lock command */
if (argc > 0) {
switch (fork()) {
case -1:
die("slock: fork failed: %s\n", strerror(errno));
case 0:
+ monitorreset(dpy, standby, suspend, off);
+
if (close(ConnectionNumber(dpy)) < 0)
die("slock: close: %s\n", strerror(errno));
execvp(argv[0], argv);
@@ -383,5 +409,8 @@ main(int argc, char **argv) {
/* everything is now blank. Wait for the correct password */
readpw(dpy, &rr, locks, nscreens, hash);
+ /* reset DPMS values to inital ones */
+ monitorreset(dpy, standby, suspend, off);
+
return 0;
}