From afad25de6e51b617388a8367005215b5f46d784c Mon Sep 17 00:00:00 2001
From: zachir <zachir@librem.one>
Date: Tue, 15 Jul 2025 17:51:51 -0500
Subject: Change all menus to dmenu

---
 mprisctl | 31 ++++++-------------------------
 1 file changed, 6 insertions(+), 25 deletions(-)

(limited to 'mprisctl')

diff --git a/mprisctl b/mprisctl
index ce03642..b784523 100755
--- a/mprisctl
+++ b/mprisctl
@@ -4,31 +4,12 @@ printhelp () {
   exit
 }
 
-while getopts "hwxd:" o; do case "${o}" in
-  w)
-    DMENU="tofi"
-    ;;
-  x)
-    DMENU="dmenu"
-    ;;
+while getopts "hd:" o; do case "${o}" in
   d) ARGS="$ARGS$OPTARG " ;;
   *) printhelp ;;
 esac done
 
-if [ -z "$DMENU" ]; then
-  if [ -n "$WAYLAND_DISPLAY" ]; then
-    DMENU="tofi"
-    DEFARGS="--prompt-text"
-  elif [ -n "$DISPLAY" ]; then
-    DMENU="dmenu"
-    DEFARGS="-p"
-  else
-    printf "Can't tell if Wayland or X; what gives?\n"
-    exit 1
-  fi
-fi
-
-DMENU_PROMPT=$(playerctl -l | $DMENU $ARGS $DEFARGS 'Players:')
+DMENU_PROMPT=$(playerctl -l | dmenu $ARGS -p 'Players:')
 [ -z "$DMENU_PROMPT" ] && exit 1
 
 PLAYERCONTROLS_PROMPT=$(echo "play-pause
@@ -40,7 +21,7 @@ previous
 position
 volume
 status
-shuffle" | $DMENU $ARGS $DEFARGS 'Action:')
+shuffle" | dmenu $ARGS -p 'Action:')
 [ -z "$PLAYERCONTROLS_PROMPT" ] && exit 1
 
 case "$PLAYERCONTROLS_PROMPT" in
@@ -48,12 +29,12 @@ case "$PLAYERCONTROLS_PROMPT" in
     playerctl -p "$DMENU_PROMPT" "$PLAYERCONTROLS_PROMPT"
     ;;
   "position")
-    VALUE=$(seq -100 5 +100 | grep -v '^0$' | sed 's/^[0-9]/\+&/' | $DMENU $ARGS $DEFARGS 'Position:')
+    VALUE=$(seq -100 5 +100 | grep -v '^0$' | sed 's/^[0-9]/\+&/' | dmenu $ARGS -p 'Position:')
     [ -z "$VALUE" ] && exit 1
     playerctl -p "$DMENU_PROMPT" "$PLAYERCONTROLS_PROMPT" "$VALUE"
     ;;
   "volume")
-    VALUE=$(set 0 5 100 |$DMENU $ARGS $DEFARGS 'Volume:')
+    VALUE=$(set 0 5 100 |dmenu $ARGS -p 'Volume:')
     [ -z "$VALUE" ] && exit 1
     playerctl -p "$DMENU_PROMPT" "$PLAYERCONTROLS_PROMPT" "$VALUE"
     ;;
@@ -65,7 +46,7 @@ case "$PLAYERCONTROLS_PROMPT" in
     VALUE=$(echo "On
 Off
 Toggle
-Status" | $DMENU $ARGS $DEFARGS "Shuffle:")
+Status" | dmenu $ARGS -p "Shuffle:")
     [ -z "$VALUE" ] && exit 1
     case "$VALUE" in
       "On"|"Off"|"Toggle")
-- 
cgit v1.2.3