summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2019-12-22 17:51:52 -0700
committerSean Whitton <spwhitton@spwhitton.name>2019-12-22 17:51:52 -0700
commitff0a2f36e4e8097d4273ad005b1f3aec1cc2096c (patch)
treeeb3c5906d95e5b5d4df0341c0c6701e4cf2343ac
parent665479b76e32ba1257ad96ef32d207d31fef10fe (diff)
downloaddotfiles-ff0a2f36e4e8097d4273ad005b1f3aec1cc2096c.tar.gz
switch back to i3lock
xtrlock and xfce4-terminal interact badly, it seems. xfce4-terminal sometimes refuses to redraw.
-rw-r--r--.config/i3/config3
-rwxr-xr-xbin/i3-startup-always4
-rwxr-xr-xbin/i3-startup-i3lock10
-rwxr-xr-xbin/i3-startup-once2
4 files changed, 13 insertions, 6 deletions
diff --git a/.config/i3/config b/.config/i3/config
index 0cfa31ca..6d640b16 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -45,9 +45,6 @@ bindsym $mod+b exec firefox -new-window
# lock screen -- relies on xss-lock
# note that this won't lock other VTs (lock-session*s* requires root password)
-
-# lock & blank screen -- relies on xss-lock, too
-bindsym $mod+Shift+b exec touch ~/local/xtrlock-please-blank, exec loginctl lock-session
bindsym $mod+l exec loginctl lock-session && sleep 0.5 && xset dpms force standby
# go to sleep -- xss-lock will lock screen
diff --git a/bin/i3-startup-always b/bin/i3-startup-always
index 8a17c230..d3301545 100755
--- a/bin/i3-startup-always
+++ b/bin/i3-startup-always
@@ -82,9 +82,9 @@ fi
#
# I used to have have (e.g.) `xset s 150 180; xset dpms 1200 1200 0`
# with a --notifier option passed to xss-lock which used i3-nagbar to
-# warn of an impending lock. This warning is necessary because
+# warn of an impending lock. This warning was necessary because
# xtrlock's visual feedback is low. However, when i3-nagbar (or,
-# indeed, notify-send) are launched by xss-lock, they break the
+# indeed, notify-send) is launched by xss-lock, they break the
# display of various windows until the mouse is moved around. This
# problem does not occur if I launch i3-nagbar from a terminal window.
# In that case, everything gets redrawn as it should be.
diff --git a/bin/i3-startup-i3lock b/bin/i3-startup-i3lock
new file mode 100755
index 00000000..9d2ca5de
--- /dev/null
+++ b/bin/i3-startup-i3lock
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+pkill -u "$USER" xss-lock
+if i3-have-wallpaper; then
+ i3lock_arg="--image=$HOME/local/wallpaper.png"
+else
+ i3lock_arg="--color=E5E5E5"
+fi
+(xss-lock --transfer-sleep-lock -- \
+ i3lock --nofork --ignore-empty-password "$i3lock_arg") &
diff --git a/bin/i3-startup-once b/bin/i3-startup-once
index 157616a1..b1217b74 100755
--- a/bin/i3-startup-once
+++ b/bin/i3-startup-once
@@ -7,7 +7,7 @@
# don't lock in develacc, because that's just annoying, and the
# session is protected by main screen locker
-in-develacc || i3-startup-xtrlock
+in-develacc || i3-startup-i3lock
# ---- xrandr on specific hosts