1 files changed, 25 insertions, 7 deletions
diff --git a/dmenu b/dmenu
index 0acd186..1a54458 100755
--- a/dmenu
+++ b/dmenu
@@ -1,16 +1,34 @@
-#!/bin/sh
+#!/bin/bash
 
 TOFI_CONF="$XDG_CONFIG_HOME/tofi/themes/dmenu"
-if echo "$@" | grep -qE -- '-l [0-9]+'; then
-  TOFI_CONF="$XDG_CONFIG_HOME/tofi/themes/dmenu_vertical"
-  ARGS="$(echo "$@" | grep -qE -- '-l [0-9]+' | sed 's/-l [0-9]+//' )"
-else
-  ARGS="$@"
+if [ -n "$WAYLAND_DISPLAY" ]; then
+  if echo "$@" | grep -qE -- '-l [0-9]+'; then
+    declare -a ARGS
+    SKIP="0"
+    for arg in "$@"; do
+      echo "$arg" | grep -qE '^\s*-l\s*' && SKIP=2
+      if [ "$SKIP" -gt 0 ]; then
+        DMENULINES="y"
+        TOFI_CONF="$XDG_CONFIG_HOME/tofi/themes/dmenu_vertical"
+        SKIP="$((SKIP - 1))"
+        continue
+      fi
+      if echo "$arg" | grep -qE '.* .*'; then
+        ARGS+=("$arg")
+      else
+        ARGS+=("$arg")
+      fi
+    done
+  fi
 fi
 
 if [ -n "$WAYLAND_DISPLAY" ]; then
   # Wayland
-  tofi -c "$TOFI_CONF" -d $ARGS 2>/dev/null
+  if [ -n "$DMENULINES" ]; then
+    tofi -c "$TOFI_CONF" -d "${ARGS[@]}"
+  else
+    tofi -c "$TOFI_CONF" -d "$@" 2>/dev/null
+  fi
   unset ARGS
 elif [ -n "$DISPLAY" ]; then
   # X11