fall back to fzf

Author: pvsr

qbpm/operations.py

@@ -10,7 +10,7 @@
 
 from . import profiles
 from .profiles import Profile
-from .utils import AUTO_MENUS, error, get_default_menu, user_data_dir
+from .utils import AUTO_MENUS, error, installed_menus, user_data_dir
 
 
 def from_session(
@@ -85,7 +85,7 @@ def list_(args: argparse.Namespace) -> bool:
 
 
 def choose(args: argparse.Namespace) -> bool:
-    menu = args.menu or get_default_menu()
+    menu = args.menu or next(installed_menus())
     if not menu:
         error(f"No menu program found, please install one of: {AUTO_MENUS}")
         return False
@@ -137,9 +137,9 @@ def menu_command(
             command = f"{menu} -dmenu -no-custom {prompt} -mesg {arg_string}"
         elif program == "wofi":
             command = f"{menu} --dmenu {prompt}"
-        elif program in ["dmenu", "dmenu-wl"]:
+        elif program.startswith("dmenu"):
             command = f"{menu} {prompt}"
-        elif program == "fzf":
+        elif program.startswith("fzf"):
             command = f"{menu} --prompt 'qutebrowser '"
         elif program == "fuzzel":
             command = f"{menu} -d"

qbpm/utils.py

@@ -1,4 +1,5 @@
 import platform
+from collections.abc import Generator
 from os import environ
 from pathlib import Path
 from shutil import which
@@ -36,23 +37,20 @@ def user_config_dir() -> Path:
     return Path(BaseDirectory.xdg_config_home) / "qutebrowser"
 
 
-def get_default_menu() -> Optional[str]:
+def installed_menus() -> Generator[str, None, None]:
     if platform.system() == "Darwin":
-        return "applescript"
+        yield "applescript"
     if environ.get("WAYLAND_DISPLAY"):
         for menu_cmd in WAYLAND_MENUS:
             if which(menu_cmd) is not None:
-                return menu_cmd
-    elif environ.get("DISPLAY"):
+                yield menu_cmd
+    if environ.get("DISPLAY"):
         for menu_cmd in X11_MENUS:
             if which(menu_cmd) is not None:
-                return menu_cmd
-    else:
-        # TODO can we detect whether we're in a term so we can run fzf?
-        error(
-            "Neither $DISPLAY nor $WAYLAND_DISPLAY are set,"
-            + " cannot launch a graphical menu."
-            + " Consider passing `--menu fzf`"
-        )
-        exit(1)
-    return None
+                yield menu_cmd
+    if environ.get("TMUX") and which("fzf-tmux") is not None:
+        yield "fzf-tmux"
+    # if there's no display and fzf is installed we're probably(?) in a term
+    if which("fzf") is not None:
+        print("no graphical launchers found, trying fzf", file=stderr)
+        yield "fzf"