diff --git a/gentoo_portage/patches/x11-misc/slock/slock-dpms-1.4.diff b/gentoo_portage/patches/x11-misc/slock/slock-dpms-1.4.diff new file mode 100644 index 0000000..f9882e0 --- /dev/null +++ b/gentoo_portage/patches/x11-misc/slock/slock-dpms-1.4.diff @@ -0,0 +1,62 @@ +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 = 1; +diff --git a/slock.c b/slock.c +index d2f0886..f65a43b 100644 +--- a/slock.c ++++ b/slock.c +@@ -15,6 +15,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -306,6 +307,7 @@ main(int argc, char **argv) { + const char *hash; + Display *dpy; + int s, nlocks, nscreens; ++ CARD16 standby, suspend, off; + + ARGBEGIN { + case 'v': +@@ -366,6 +368,20 @@ 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) ++ die("slock: at least one DPMS variable is zero\n"); ++ if (!DPMSSetTimeouts(dpy, monitortime, monitortime, monitortime)) ++ die("slock: DPMSSetTimeouts failed\n"); ++ ++ XSync(dpy, 0); ++ + /* run post-lock command */ + if (argc > 0) { + switch (fork()) { +@@ -383,5 +399,9 @@ 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 */ ++ DPMSSetTimeouts(dpy, standby, suspend, off); ++ XSync(dpy, 0); ++ + return 0; + } diff --git a/script/sync-st-patch.sh b/script/sync-portage-patch.sh similarity index 63% rename from script/sync-st-patch.sh rename to script/sync-portage-patch.sh index 0f253c6..95245d8 100644 --- a/script/sync-st-patch.sh +++ b/script/sync-portage-patch.sh @@ -8,7 +8,8 @@ fi SCRIPT_DIR=$(dirname $0) -SOURCE_DIR="${SCRIPT_DIR}/../gentoo_portage/patches/x11-terms/st/" -DEST_DIR="/etc/portage/patches/x11-terms/st" +# 此处目录后面的 / 不能少 +SOURCE_DIR="${SCRIPT_DIR}/../gentoo_portage/patches/" +DEST_DIR="/etc/portage/patches/" rsync -r --delete --mkpath $SOURCE_DIR $DEST_DIR