Improve timer.sh

- Change window focus to previous after timer is set
- Orignal variable "DISPLAY" was a mistake, it is necessary for xdotool
  (value is :0 in most of the cased)

2 files changed, 19 insertions, 11 deletions

diff --git a/X11/openbox/rc.xml b/X11/openbox/rc.xml
index e7736f8..d7c0345 100644
--- a/X11/openbox/rc.xml
+++ b/X11/openbox/rc.xml
@@ -499,15 +499,17 @@
       <action name="Execute">
         <command>
           sh -c '
+            origin=`xdotool getactivewindow`; \
             xdotool search --name "TIMER" windowactivate || \
-            alacritty --title TIMER --hold              \
-            -o "window.dimensions.columns=8"    \
-            -o "window.dimensions.lines=1"              \
-            -o "window.position.x=-0"               \
-            -o "window.position.y=0"                \
-            -o "window.opacity=0.6"                     \
-            -o "font.size=40"                   \
-            -e ~/helper/bin/unix/timer.sh SIGINT
+            alacritty --title TIMER --hold                  \
+            -o "window.dimensions.columns=8"        \
+            -o "window.dimensions.lines=1"                  \
+            -o "window.position.x=-0"                   \
+            -o "window.position.y=0"                    \
+            -o "window.opacity=0.6"                         \
+            -o "font.size=40"                       \
+            -e ~/helper/bin/unix/timer.sh SIGINT    \
+               "xdotool windowactivate $origin"
           '
         </command>
       </action>
diff --git a/bin/unix/timer.sh b/bin/unix/timer.sh
index ca807e8..3abe701 100755
--- a/bin/unix/timer.sh
+++ b/bin/unix/timer.sh
@@ -2,9 +2,11 @@
 # Ref: https://superuser.com/questions/611538/611582#611582
 
 SIGNAL=${1:-SIGTERM}
+COMMAND="$2"
 
 # If SIGNAL is received, switch to next display
 trap 'next_display' "$SIGNAL"
+# Use SIGTSTP (Ctrl-Z in most of the cases) to stop/restart timer
 trap 'toggle_timer' SIGTSTP
 
 # Do not print "^C" when SIGINT caught
@@ -14,10 +16,10 @@ stty -ctlecho
 tput civis
 
 display_list=(STOPWATCH COUNTDOWN PERIOD)
-export DISPLAY=0
+display=0
 
 next_display() {
-  export DISPLAY=$(( ("$DISPLAY" + 1) %${#display_list[@]} ))
+  display=$(( ("$display" + 1) %${#display_list[@]} ))
 }
 
 export stop=0
@@ -29,6 +31,10 @@ toggle_timer() {
 read -p '? ' -r input
 # Disable input on terminal
 stty -echo 
+# If COMMAND is given, run it after timer is set
+result="$([ -n "$COMMAND" ] && eval "$COMMAND" 2>&1)"
+notify-send "$result" &>/tmp/openbox
+
 
 # Modify input to fit the format that `date` can read
 hour=$(grep -o '[0-9.]\+h' <<<"$input" | tr -d h)
@@ -53,7 +59,7 @@ timer() {
     [ $stop = 1 ] && sleep 0.3 && break
 
     count=$(( count_from + $(date +%s) - start ))
-    case ${display_list[$DISPLAY]} in
+    case ${display_list[$display]} in
       STOPWATCH)
         printf '%s\r' "$(date -u -d @$count +%H:%M:%S)"
         ;;