From 3712989253e0ab87171f76ec6a03f5b530d8e119 Mon Sep 17 00:00:00 2001
From: speedie <speedie@duck.com>
Date: Sat, 25 Mar 2023 20:40:10 +0100
Subject: [PATCH] oops fix an oversight

---
 src/speedwm-utils | 78 +++++++++++++++++++++++++++++++++++------------
 1 file changed, 59 insertions(+), 19 deletions(-)

diff --git a/src/speedwm-utils b/src/speedwm-utils
index 6e1ba37..3a36773 100755
--- a/src/speedwm-utils
+++ b/src/speedwm-utils
@@ -4,9 +4,11 @@
 # Licensed under GNU GPLv3.
 
 case "$RUNLAUNCHER" in
-"") RUNLAUNCHER=spmenu # Run launcher to use (spmenu, rofi, etc.) ;;
+    "") RUNLAUNCHER=spmenu # Run launcher to use (spmenu, rofi, etc.) ;;
 esac
 
+IMAGE_SUPPORT=true
+
 GENERAL() {
 		case "$(printf "mfact +\nmfact -\nToggle Sticky\nToggle Bar\nToggle Fullscreen\nReset Layout/mfact\nReorganize Tags" | $RUNLAUNCHER -l 20 -p 'What do you want to do?')" in
 		"mfact +") libspeedwm --perform tiling_mfact_inc ;;
@@ -55,6 +57,8 @@ L13_SYMBOL=" "
 L14_SYMBOL=" "
 L15_SYMBOL=" "
 
+[ ! -e "/usr/share/speedwm/lprev/layout-1.png" ] && IMAGE_SUPPORT=false
+
 L1="$(printf "%s\t%s: Tiling\n" "IMG:/usr/share/speedwm/lprev/layout-1.png" "$L1_SYMBOL")"
 L2="$(printf "%s\t%s: Floating\n" "IMG:/usr/share/speedwm/lprev/layout-2.png" "$L2_SYMBOL")"
 L3="$(printf "%s\t%s: Monocle\n" "IMG:/usr/share/speedwm/lprev/layout-3.png" "$L3_SYMBOL")"
@@ -71,15 +75,50 @@ L13="$(printf "%s\t%s: Dynamic Grid\n" "IMG:/usr/share/speedwm/lprev/layout-13.p
 L14="$(printf "%s\t%s: Custom\n" "IMG:/usr/share/speedwm/lprev/layout-14.png" "$L14_SYMBOL")"
 L15="$(printf "%s\t%s: Empty\n" "IMG:/usr/share/speedwm/lprev/layout-15.png" "$L15_SYMBOL")"
 
+O_L1="$(printf "%s: Tiling\n" "$L1_SYMBOL")"
+O_L2="$(printf "%s: Floating\n" "$L2_SYMBOL")"
+O_L3="$(printf "%s: Monocle\n" "$L3_SYMBOL")"
+O_L4="$(printf "%s: Grid\n" "$L4_SYMBOL")"
+O_L5="$(printf "%s: Deck\n" "$L5_SYMBOL")"
+O_L6="$(printf "%s: Centered Master\n" "$L6_SYMBOL")"
+O_L7="$(printf "%s: Tatami\n" "$L7_SYMBOL")"
+O_L8="$(printf "%s: Dwindle\n" "$L8_SYMBOL")"
+O_L9="$(printf "%s: Spiral\n" "$L9_SYMBOL")"
+O_L10="$(printf "%s: Bottom Stack (Vertical)\n" "$L10_SYMBOL")"
+O_L11="$(printf "%s: Bottom Stack (Horizontal)\n" "$L11_SYMBOL")"
+O_L12="$(printf "%s: Grid (Horizontal)\n" "$L12_SYMBOL")"
+O_L13="$(printf "%s: Dynamic Grid\n" "$L13_SYMBOL")"
+O_L14="$(printf "%s: Custom\n" "$L14_SYMBOL")"
+O_L15="$(printf "%s: Empty\n" "$L15_SYMBOL")"
+
+# disable image support if necessary
+if [ "$IMAGE_SUPPORT" != "true" ]; then
+    L1="$O_L1"
+    L2="$O_L2"
+    L3="$O_L3"
+    L4="$O_L4"
+    L5="$O_L5"
+    L6="$O_L6"
+    L7="$O_L7"
+    L8="$O_L8"
+    L9="$O_L9"
+    L10="$O_L10"
+    L11="$O_L11"
+    L12="$O_L12"
+    L13="$O_L13"
+    L14="$O_L14"
+    L15="$O_L15"
+fi
+
 EXIT="Exit"
-SEPARATOR="------"
+SEPARATOR="‎"
 LNEXT="Next Layout"
 LPREV="Previous Layout"
 SEXP="Enter S expression"
 
 case "$1" in
-    "layout") SEL_LAYOUT=$(printf "Layouts\n------\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n------\n%s\n%s\n%s\n%s\n%s" \
-        "${L1}" "${L2}" "${L3}" "${L4}" "${L5}" "${L6}" "${L7}" "${L8}" "${L9}" "${L10}" "${L11}" "${L12}" "${L13}" "${L14}" "${L15}" "${LNEXT}" "${LPREV}" "${SEXP}" "${SEPARATOR}" "${EXIT}" | $RUNLAUNCHER -l 50 -p "Pick a layout: " -g 1 -is 400) ;;
+    "layout") SEL_LAYOUT=$(printf "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s" \
+        "${L1}" "${L2}" "${L3}" "${L4}" "${L5}" "${L6}" "${L7}" "${L8}" "${L9}" "${L10}" "${L11}" "${L12}" "${L13}" "${L14}" "${L15}" "${SEPARATOR}" "${LNEXT}" "${LPREV}" "${SEXP}" "${SEPARATOR}" "${EXIT}" | $RUNLAUNCHER -l 50 -p "Pick a layout: " -g 1 -is 400) ;;
     "reloadcolors") libspeedwm --perform core_wm_reload ;;
     "list") head -n -1 /usr/share/speedwm/example.signal ;;
     "help") HELP ;;
@@ -98,22 +137,23 @@ case "$SEL_LAYOUT" in
     "${EXIT}") exit 0 ;;
     "${LPREV}") libspeedwm --perform layout_cycle_down; exit ;;
     "${LNEXT}") libspeedwm --perform layout_cycle_up; exit ;;
-    "${L1}") libspeedwm --perform layout_setlayout_tile; CURLT="${L1}" ;;
-    "${L2}") libspeedwm --perform layout_setlayout_float; CURLT="${L2}" ;;
-    "${L3}") libspeedwm --perform layout_setlayout_monocle; CURLT="${L3}" ;;
-    "${L4}") libspeedwm --perform layout_setlayout_grid; CURLT="${L4}" ;;
-    "${L5}") libspeedwm --perform layout_setlayout_deck; CURLT="${L5}" ;;
-    "${L6}") libspeedwm --perform layout_setlayout_cm; CURLT="${L6}" ;;
-    "${L7}") libspeedwm --perform layout_setlayout_tatami; CURLT="${L7}" ;;
-    "${L8}") libspeedwm --perform layout_setlayout_dwindle; CURLT="${L8}" ;;
-    "${L9}") libspeedwm --perform layout_setlayout_spiral; CURLT="${L9}" ;;
-    "${L10}") libspeedwm --perform layout_setlayout_bs; CURLT="${L10}" ;;
-    "${L11}") libspeedwm --perform layout_setlayout_hbs; CURLT="${L11}" ;;
-    "${L12}") libspeedwm --perform layout_setlayout_hgrid; CURLT="${L12}" ;;
-    "${L13}") libspeedwm --perform layout_setlayout_dgrid; CURLT="${L13}" ;;
-    "${L14}") libspeedwm --perform layout_setlayout_custom; CURLT="${L14}" ;;
-    "${L15}") libspeedwm --perform layout_setlayout_empty; CURLT="${L15}" ;;
+    "${O_L1}") libspeedwm --perform layout_setlayout_tile; CURLT="${O_L1}" ;;
+    "${O_L2}") libspeedwm --perform layout_setlayout_float; CURLT="${O_L2}" ;;
+    "${O_L3}") libspeedwm --perform layout_setlayout_monocle; CURLT="${O_L3}" ;;
+    "${O_L4}") libspeedwm --perform layout_setlayout_grid; CURLT="${O_L4}" ;;
+    "${O_L5}") libspeedwm --perform layout_setlayout_deck; CURLT="${O_L5}" ;;
+    "${O_L6}") libspeedwm --perform layout_setlayout_cm; CURLT="${O_L6}" ;;
+    "${O_L7}") libspeedwm --perform layout_setlayout_tatami; CURLT="${O_L7}" ;;
+    "${O_L8}") libspeedwm --perform layout_setlayout_dwindle; CURLT="${O_L8}" ;;
+    "${O_L9}") libspeedwm --perform layout_setlayout_spiral; CURLT="${O_L9}" ;;
+    "${O_L10}") libspeedwm --perform layout_setlayout_bs; CURLT="${O_L10}" ;;
+    "${O_L11}") libspeedwm --perform layout_setlayout_hbs; CURLT="${O_L11}" ;;
+    "${O_L12}") libspeedwm --perform layout_setlayout_hgrid; CURLT="${O_L12}" ;;
+    "${O_L13}") libspeedwm --perform layout_setlayout_dgrid; CURLT="${O_L13}" ;;
+    "${O_L14}") libspeedwm --perform layout_setlayout_custom; CURLT="${O_L14}" ;;
+    "${O_L15}") libspeedwm --perform layout_setlayout_empty; CURLT="${O_L15}" ;;
     "Enter S expression") libspeedwm --perform layout_custom_express; exit ;;
+    *) printf "Undefined option\n"; exit ;;
 esac
 
 [ -n "${CURLT}" ] && command -v notify-send > /dev/null && notify-send "Layout" "${CURLT}"