Various changes.

i3/i3/scripts/i3exit.bash

@@ -12,6 +12,7 @@ touch "$LOGFILE"
 
 log()
 {
+    echo "$1"
     echo "[$(date +%FT%T)] $1" >> "$LOGFILE"
 }
 
@@ -19,24 +20,30 @@ lock()
 {
     resolution=$(xrandr | grep '*' | awk '{ print $1 }' | head -n1)
     log "[I] Resolution found: \"$resolution\""
-    lockscreen="$HOME/.i3/data/lockscreen_$resolution.png"
+    lockscreen="$HOME/.i3/data/lockscreen/$resolution.png"
     log "[I] Looking for lockscreen at \"$lockscreen\""
     if [[ -f "$lockscreen" ]] ; then
         log "[I] Lockscreen found, will be used as background image."
         background_options="--image $lockscreen -t"
     else
-        log "[W] Lockscreen not  found, using color #$FALLBACK_COLOR as background."
+        log "[W] Lockscreen not found, using color #$FALLBACK_COLOR as background."
         background_options="--color $FALLBACK_COLOR"
     fi
     i3lock $background_options #-p win --image "$HOME/pictures/windows-lockscreen.jpg"
     retval=$?
-    [[ -z "$1" ]] && sleep 1 && xset dpms force off
+    [[ -z "$1" ]] && sleep 3 && xset dpms force off
     return $retval
 }
 
-log "[I] Received signal \"$1\"."
+if [[ "$1" == '-' ]]; then
+    read signal
+else
+    signal="$1"
+fi
 
-case "$1" in
+log "[I] Received signal \"$signal\"."
+
+case "$signal" in
     lock)
         log "[I] Locking session."
         lock
@@ -64,7 +71,7 @@ case "$1" in
         ;;
     *)
         echo "Usage: $0 {lock|logout|suspend|hibernate|reboot|shutdown}"
-        log "[E] Signal \"$1\" unknown. Aborting."
+        log "[E] Signal \"$signal\" unknown. Aborting."
         exit 2
 esac
 

i3/i3/scripts/shutdown-menu.bash

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+options=(
+"lock"
+"logout"
+"suspend"
+"hibernate"
+"reboot"
+"shutdown")
+
+i=1
+output=$(
+for option in "${options[@]}"; do
+    echo "($i) $option"
+    (( i++ ))
+done | dmenu -fn 'DejaVu Sans Mono:size=11' -b -i -l 10 -p '>' -nb '#222222' -nf '#ffffff' -sb '#e16b40' -sf '#000000' -w 200 -name 'shutdown-menu')
+
+[[ "$output" ]] && "$(dirname "$0")"/i3exit.bash "${output#(*) }"