feat(dirvish): add Hyprland Super+F popup with focus-loss dismiss

A single-instance Dirvish popup frame (named "dirvish") for a Hyprland Super+F launcher, mirroring the org-capture popup. q closes the frame; in the popup, RET opens files through the OS handler so they launch independently, and the frame dismisses itself on focus loss. A second launch reuses the open popup instead of spawning another frame.

2 files changed, 346 insertions, 1 deletions

diff --git a/modules/dirvish-config.el b/modules/dirvish-config.el
index c86f3d1bf..04f9ce20e 100644
--- a/modules/dirvish-config.el
+++ b/modules/dirvish-config.el
@@ -411,6 +411,101 @@ Uses feh on X11, swww on Wayland."
         (message "Wallpaper set: %s (%s)"
                  (file-name-nondirectory file) (car cmd))))))
 
+;;; ------------------------- Dirvish Hyprland Popup ----------------------------
+
+;; The Hyprland Super+F popup opens an emacsclient frame named "dirvish" (window
+;; rules float/size/center it by that name) and runs `cj/dirvish-popup', rooted
+;; at home.  `q' in that frame runs `cj/dirvish-popup-quit', which quits Dirvish
+;; and deletes the popup frame so a stray launch never orphans it; `q' in any
+;; other frame quits Dirvish normally.  The launcher script calls this command
+;; instead of plain `dirvish'.  This mirrors the Super+Shift+N quick-capture
+;; popup (see `cj/quick-capture' in org-capture-config.el).
+
+(defun cj/--dirvish-popup-frame ()
+  "Return a live frame named \"dirvish\" (the Hyprland popup), or nil."
+  (seq-find (lambda (f)
+              (and (frame-live-p f)
+                   (equal (frame-parameter f 'name) "dirvish")))
+            (frame-list)))
+
+(defun cj/dirvish-popup ()
+  "Open Dirvish in the Hyprland popup frame (frame \"dirvish\"), rooted at home.
+The launcher script calls this through =emacsclient -c -e=.  `q'
+(`cj/dirvish-popup-quit') closes the frame.
+
+Selects the \"dirvish\" frame by name before opening rather than trusting the
+ambient selected frame: the launching =emacsclient -c -e= runs before Hyprland
+settles focus on the new float, so =(selected-frame)= is still the daemon's main
+frame and Dirvish would otherwise open there."
+  (interactive)
+  (let ((frame (cj/--dirvish-popup-frame)))
+    (when frame (select-frame-set-input-focus frame))
+    (dirvish (expand-file-name "~/"))))
+
+(defun cj/dirvish-popup-focus-existing ()
+  "Raise and focus the live dirvish popup frame, returning t; nil if none.
+The launcher script calls this before creating a frame, so a second Super+F
+re-uses the open popup instead of spawning a second one (the popup is a
+single-instance, transient launcher -- use =C-x d= for several independent
+Dirvish sessions)."
+  (let ((popup (cj/--dirvish-popup-frame)))
+    (when popup
+      (select-frame-set-input-focus popup)
+      t)))
+
+(defun cj/dirvish-popup-quit ()
+  "Quit Dirvish.  In the Hyprland popup frame (\"dirvish\"), delete the frame too.
+Bound to `q' in `dirvish-mode-map'.  A normal Dirvish session (any other frame)
+quits as usual; only the popup frame is torn down, so the Super+F launch never
+leaves an empty frame behind."
+  (interactive)
+  (let ((popup (cj/--dirvish-popup-frame)))
+    (if (and popup (eq popup (selected-frame)))
+        (progn
+          (ignore-errors (dirvish-quit))
+          (when (frame-live-p popup) (delete-frame popup)))
+      (dirvish-quit))))
+
+(defun cj/--dirvish-popup-selected-p ()
+  "Return non-nil when the selected frame is the dirvish popup frame."
+  (let ((popup (cj/--dirvish-popup-frame)))
+    (and popup (eq popup (selected-frame)))))
+
+(defun cj/dirvish-popup-find-file ()
+  "Open the file at point.
+In the Hyprland popup frame the popup is a context-free launcher: files open
+through the OS handler (`cj/xdg-open' -> xdg-open), so nothing lands inside the
+throwaway frame and the launch is independent of the running Emacs session (a
+text/code file opens its own new emacsclient frame, not your working session --
+use =C-x d= when you want a file in the session you're in).  Directories are
+entered normally so you can keep browsing.  The popup then dismisses itself on
+focus loss.  Outside the popup this is exactly `dired-find-file'."
+  (interactive)
+  (if (cj/--dirvish-popup-selected-p)
+      (let ((file (dired-get-file-for-visit)))
+        (if (file-directory-p file)
+            (dired-find-file)
+          (cj/xdg-open file)))
+    (dired-find-file)))
+
+(defun cj/--dirvish-popup-focus-watch (&rest _)
+  "Dismiss the dirvish popup frame once it loses focus.
+Armed only after the popup has actually held focus (a per-frame flag), so the
+frame is never torn down during its own creation, before Hyprland settles focus
+on the new float.  Installed on `after-focus-change-function'; a no-op whenever
+no popup frame is live."
+  (let ((popup (cj/--dirvish-popup-frame)))
+    (when popup
+      (if (frame-focus-state popup)
+          (set-frame-parameter popup 'cj-dirvish-popup-had-focus t)
+        (when (frame-parameter popup 'cj-dirvish-popup-had-focus)
+          (delete-frame popup))))))
+
+;; Install idempotently: remove any prior copy before adding, so re-loading the
+;; module updates the watch rather than stacking duplicate copies.
+(remove-function after-focus-change-function #'cj/--dirvish-popup-focus-watch)
+(add-function :after after-focus-change-function #'cj/--dirvish-popup-focus-watch)
+
 ;;; ---------------------------------- Dirvish ----------------------------------
 
 (use-package dirvish
@@ -515,7 +610,8 @@ Uses feh on X11, swww on Wayland."
    ("bg"      . cj/set-wallpaper)
    ("/"       . dirvish-narrow)
    ("<left>"  . dired-up-directory)
-   ("<right>" . dired-find-file)
+   ("RET"     . cj/dirvish-popup-find-file)   ; popup: launch file externally; else normal
+   ("<right>" . cj/dirvish-popup-find-file)
    ("C-,"     . dirvish-history-go-backward)
    ("C-."     . dirvish-history-go-forward)
    ("F"       . dirvish-file-info-menu)
@@ -537,6 +633,7 @@ Uses feh on X11, swww on Wayland."
    ("O"       . cj/open-file-with-command)  ; Prompts for command to run
    ("p"       . (lambda () (interactive) (cj/dired-copy-path-as-kill nil t)))
    ("P"       . cj/dirvish-print-file)
+   ("q"       . cj/dirvish-popup-quit)   ; quit; in the Hyprland popup frame, close it
    ("r"       . dirvish-rsync)
    ("S"       . cj/dirvish-drill-file)  ; Study: org-drill the .org file at point
    ("s"       . dirvish-quicksort)
diff --git a/tests/test-dirvish-config-popup.el b/tests/test-dirvish-config-popup.el
new file mode 100644
index 000000000..2bd3a192c
--- /dev/null
+++ b/tests/test-dirvish-config-popup.el
@@ -0,0 +1,248 @@
+;;; test-dirvish-config-popup.el --- Dirvish Hyprland popup tests -*- lexical-binding: t; -*-
+
+;;; Commentary:
+;; Tests for the Hyprland Super+F dirvish popup.  The launcher opens an
+;; emacsclient frame named "dirvish" (window rules float/size/center it by that
+;; name) and runs `cj/dirvish-popup', which opens Dirvish rooted at home.  `q'
+;; runs `cj/dirvish-popup-quit': in the popup frame it quits Dirvish and deletes
+;; the frame; in any other frame it quits Dirvish normally.  Covered here: frame
+;; discovery by name, the emacsclient focus race on open, and the quit dispatch
+;; on every frame condition.
+
+;;; Code:
+
+(require 'ert)
+(require 'cl-lib)
+(add-to-list 'load-path (expand-file-name "modules" user-emacs-directory))
+(require 'dirvish-config)
+
+;;; cj/--dirvish-popup-frame  (find the popup frame by name)
+
+(ert-deftest test-dirvish-config-popup-frame-found ()
+  "Normal: returns the live frame whose name is \"dirvish\"."
+  (cl-letf (((symbol-function 'frame-list) (lambda () '(fa fb fc)))
+            ((symbol-function 'frame-live-p) (lambda (_f) t))
+            ((symbol-function 'frame-parameter)
+             (lambda (f _p) (if (eq f 'fb) "dirvish" "other"))))
+    (should (eq (cj/--dirvish-popup-frame) 'fb))))
+
+(ert-deftest test-dirvish-config-popup-frame-none ()
+  "Boundary: no popup frame present yields nil."
+  (cl-letf (((symbol-function 'frame-list) (lambda () '(fa fc)))
+            ((symbol-function 'frame-live-p) (lambda (_f) t))
+            ((symbol-function 'frame-parameter) (lambda (_f _p) "other")))
+    (should-not (cj/--dirvish-popup-frame))))
+
+(ert-deftest test-dirvish-config-popup-frame-skips-dead ()
+  "Boundary: a dead frame named \"dirvish\" is skipped."
+  (cl-letf (((symbol-function 'frame-list) (lambda () '(fa fb)))
+            ((symbol-function 'frame-live-p) (lambda (f) (not (eq f 'fb))))
+            ((symbol-function 'frame-parameter) (lambda (_f _p) "dirvish")))
+    (should (eq (cj/--dirvish-popup-frame) 'fa))))
+
+;;; cj/dirvish-popup  (open dirvish in the named frame)
+
+(ert-deftest test-dirvish-config-popup-selects-named-frame ()
+  "Integration: cj/dirvish-popup focuses the \"dirvish\" frame found by name,
+not whatever frame happens to be selected (the emacsclient -c focus race).
+
+Components integrated:
+- cj/dirvish-popup (real)
+- cj/--dirvish-popup-frame (MOCKED — returns a sentinel frame)
+- select-frame-set-input-focus (MOCKED — records the focused frame)
+- dirvish (MOCKED — records the path opened)"
+  (let ((focused nil) (opened nil))
+    (cl-letf (((symbol-function 'cj/--dirvish-popup-frame) (lambda () 'popup-frame))
+              ((symbol-function 'select-frame-set-input-focus)
+               (lambda (f &rest _) (setq focused f)))
+              ((symbol-function 'dirvish) (lambda (&optional p) (setq opened (or p t)))))
+      (cj/dirvish-popup))
+    (should (eq focused 'popup-frame))
+    (should opened)))
+
+(ert-deftest test-dirvish-config-popup-no-frame-still-opens ()
+  "Integration: with no popup frame found, cj/dirvish-popup skips the focus call
+and still opens Dirvish (no error)."
+  (let ((focused 'unset) (opened nil))
+    (cl-letf (((symbol-function 'cj/--dirvish-popup-frame) (lambda () nil))
+              ((symbol-function 'select-frame-set-input-focus)
+               (lambda (f &rest _) (setq focused f)))
+              ((symbol-function 'dirvish) (lambda (&optional _p) (setq opened t))))
+      (cj/dirvish-popup))
+    (should (eq focused 'unset))
+    (should opened)))
+
+;;; cj/dirvish-popup-quit  (quit; delete the popup frame only when in it)
+
+(ert-deftest test-dirvish-config-popup-quit-in-popup-deletes-frame ()
+  "Normal: in the popup frame, q quits Dirvish and deletes the popup frame."
+  (let ((quit 0) (deleted nil))
+    (cl-letf (((symbol-function 'cj/--dirvish-popup-frame) (lambda () 'popup))
+              ((symbol-function 'selected-frame) (lambda () 'popup))
+              ((symbol-function 'frame-live-p) (lambda (_f) t))
+              ((symbol-function 'dirvish-quit) (lambda () (cl-incf quit)))
+              ((symbol-function 'delete-frame) (lambda (f &rest _) (setq deleted f))))
+      (cj/dirvish-popup-quit))
+    (should (= quit 1))
+    (should (eq deleted 'popup))))
+
+(ert-deftest test-dirvish-config-popup-quit-normal-frame-keeps-frame ()
+  "Boundary: with no popup frame, q quits Dirvish and deletes nothing."
+  (let ((quit 0) (deleted 'unset))
+    (cl-letf (((symbol-function 'cj/--dirvish-popup-frame) (lambda () nil))
+              ((symbol-function 'selected-frame) (lambda () 'main))
+              ((symbol-function 'dirvish-quit) (lambda () (cl-incf quit)))
+              ((symbol-function 'delete-frame) (lambda (f &rest _) (setq deleted f))))
+      (cj/dirvish-popup-quit))
+    (should (= quit 1))
+    (should (eq deleted 'unset))))
+
+(ert-deftest test-dirvish-config-popup-quit-popup-not-selected-keeps-frame ()
+  "Boundary: the popup exists but a different frame is selected — q quits Dirvish
+in that frame and does not delete the popup."
+  (let ((quit 0) (deleted 'unset))
+    (cl-letf (((symbol-function 'cj/--dirvish-popup-frame) (lambda () 'popup))
+              ((symbol-function 'selected-frame) (lambda () 'main))
+              ((symbol-function 'dirvish-quit) (lambda () (cl-incf quit)))
+              ((symbol-function 'delete-frame) (lambda (f &rest _) (setq deleted f))))
+      (cj/dirvish-popup-quit))
+    (should (= quit 1))
+    (should (eq deleted 'unset))))
+
+(ert-deftest test-dirvish-config-popup-quit-survives-dirvish-quit-error ()
+  "Error: a signal from dirvish-quit in the popup still deletes the frame."
+  (let ((deleted nil))
+    (cl-letf (((symbol-function 'cj/--dirvish-popup-frame) (lambda () 'popup))
+              ((symbol-function 'selected-frame) (lambda () 'popup))
+              ((symbol-function 'frame-live-p) (lambda (_f) t))
+              ((symbol-function 'dirvish-quit) (lambda () (error "boom")))
+              ((symbol-function 'delete-frame) (lambda (f &rest _) (setq deleted f))))
+      (cj/dirvish-popup-quit))
+    (should (eq deleted 'popup))))
+
+;;; cj/dirvish-popup-focus-existing  (second-launch re-use guard)
+
+(ert-deftest test-dirvish-config-popup-focus-existing-found ()
+  "Normal: an existing popup is focused and t is returned."
+  (let ((focused nil))
+    (cl-letf (((symbol-function 'cj/--dirvish-popup-frame) (lambda () 'popup))
+              ((symbol-function 'select-frame-set-input-focus)
+               (lambda (f &rest _) (setq focused f))))
+      (should (eq (cj/dirvish-popup-focus-existing) t))
+      (should (eq focused 'popup)))))
+
+(ert-deftest test-dirvish-config-popup-focus-existing-none ()
+  "Boundary: no popup present — returns nil and focuses nothing."
+  (let ((focused 'unset))
+    (cl-letf (((symbol-function 'cj/--dirvish-popup-frame) (lambda () nil))
+              ((symbol-function 'select-frame-set-input-focus)
+               (lambda (f &rest _) (setq focused f))))
+      (should-not (cj/dirvish-popup-focus-existing))
+      (should (eq focused 'unset)))))
+
+;;; cj/--dirvish-popup-selected-p
+
+(ert-deftest test-dirvish-config-popup-selected-p-true ()
+  "Normal: true when the selected frame is the popup frame."
+  (cl-letf (((symbol-function 'cj/--dirvish-popup-frame) (lambda () 'popup))
+            ((symbol-function 'selected-frame) (lambda () 'popup)))
+    (should (cj/--dirvish-popup-selected-p))))
+
+(ert-deftest test-dirvish-config-popup-selected-p-false-other-frame ()
+  "Boundary: false when a different frame is selected."
+  (cl-letf (((symbol-function 'cj/--dirvish-popup-frame) (lambda () 'popup))
+            ((symbol-function 'selected-frame) (lambda () 'main)))
+    (should-not (cj/--dirvish-popup-selected-p))))
+
+(ert-deftest test-dirvish-config-popup-selected-p-false-no-popup ()
+  "Boundary: false when no popup frame exists."
+  (cl-letf (((symbol-function 'cj/--dirvish-popup-frame) (lambda () nil))
+            ((symbol-function 'selected-frame) (lambda () 'main)))
+    (should-not (cj/--dirvish-popup-selected-p))))
+
+;;; cj/dirvish-popup-find-file  (popup = launcher; outside = plain find-file)
+
+(ert-deftest test-dirvish-config-popup-find-file-in-popup-file-launches-external ()
+  "Normal: in the popup, a file at point opens via cj/xdg-open, not in-frame."
+  (let ((opened nil) (visited nil))
+    (cl-letf (((symbol-function 'cj/--dirvish-popup-selected-p) (lambda () t))
+              ((symbol-function 'dired-get-file-for-visit) (lambda () "/tmp/a.mp4"))
+              ((symbol-function 'file-directory-p) (lambda (_f) nil))
+              ((symbol-function 'cj/xdg-open) (lambda (f) (setq opened f)))
+              ((symbol-function 'dired-find-file) (lambda () (setq visited t))))
+      (cj/dirvish-popup-find-file))
+    (should (equal opened "/tmp/a.mp4"))
+    (should-not visited)))
+
+(ert-deftest test-dirvish-config-popup-find-file-in-popup-dir-navigates ()
+  "Boundary: in the popup, a directory at point is entered normally."
+  (let ((opened nil) (visited nil))
+    (cl-letf (((symbol-function 'cj/--dirvish-popup-selected-p) (lambda () t))
+              ((symbol-function 'dired-get-file-for-visit) (lambda () "/tmp/dir/"))
+              ((symbol-function 'file-directory-p) (lambda (_f) t))
+              ((symbol-function 'cj/xdg-open) (lambda (f) (setq opened f)))
+              ((symbol-function 'dired-find-file) (lambda () (setq visited t))))
+      (cj/dirvish-popup-find-file))
+    (should visited)
+    (should-not opened)))
+
+(ert-deftest test-dirvish-config-popup-find-file-outside-popup-is-plain-find-file ()
+  "Boundary: outside the popup, behaves exactly like dired-find-file."
+  (let ((opened nil) (visited nil))
+    (cl-letf (((symbol-function 'cj/--dirvish-popup-selected-p) (lambda () nil))
+              ((symbol-function 'cj/xdg-open) (lambda (f) (setq opened f)))
+              ((symbol-function 'dired-find-file) (lambda () (setq visited t))))
+      (cj/dirvish-popup-find-file))
+    (should visited)
+    (should-not opened)))
+
+;;; cj/--dirvish-popup-focus-watch  (dismiss on focus loss, armed after focus)
+
+(ert-deftest test-dirvish-config-popup-focus-watch-focused-arms-flag ()
+  "Normal: while the popup is focused, the watch sets the had-focus flag and
+deletes nothing."
+  (let ((params '()) (deleted nil))
+    (cl-letf (((symbol-function 'cj/--dirvish-popup-frame) (lambda () 'popup))
+              ((symbol-function 'frame-focus-state) (lambda (_f) t))
+              ((symbol-function 'frame-parameter) (lambda (_f p) (plist-get params p)))
+              ((symbol-function 'set-frame-parameter)
+               (lambda (_f p v) (setq params (plist-put params p v))))
+              ((symbol-function 'delete-frame) (lambda (f &rest _) (setq deleted f))))
+      (cj/--dirvish-popup-focus-watch))
+    (should (plist-get params 'cj-dirvish-popup-had-focus))
+    (should-not deleted)))
+
+(ert-deftest test-dirvish-config-popup-focus-watch-unfocused-after-arming-deletes ()
+  "Normal: lost focus after having held it — the popup is deleted."
+  (let ((params (list 'cj-dirvish-popup-had-focus t)) (deleted nil))
+    (cl-letf (((symbol-function 'cj/--dirvish-popup-frame) (lambda () 'popup))
+              ((symbol-function 'frame-focus-state) (lambda (_f) nil))
+              ((symbol-function 'frame-parameter) (lambda (_f p) (plist-get params p)))
+              ((symbol-function 'set-frame-parameter)
+               (lambda (_f p v) (setq params (plist-put params p v))))
+              ((symbol-function 'delete-frame) (lambda (f &rest _) (setq deleted f))))
+      (cj/--dirvish-popup-focus-watch))
+    (should (eq deleted 'popup))))
+
+(ert-deftest test-dirvish-config-popup-focus-watch-unfocused-before-arming-keeps ()
+  "Boundary: not focused and never armed (the creation race) — NOT deleted."
+  (let ((params '()) (deleted nil))
+    (cl-letf (((symbol-function 'cj/--dirvish-popup-frame) (lambda () 'popup))
+              ((symbol-function 'frame-focus-state) (lambda (_f) nil))
+              ((symbol-function 'frame-parameter) (lambda (_f p) (plist-get params p)))
+              ((symbol-function 'set-frame-parameter)
+               (lambda (_f p v) (setq params (plist-put params p v))))
+              ((symbol-function 'delete-frame) (lambda (f &rest _) (setq deleted f))))
+      (cj/--dirvish-popup-focus-watch))
+    (should-not deleted)))
+
+(ert-deftest test-dirvish-config-popup-focus-watch-no-popup-is-noop ()
+  "Error: with no popup frame, the watch does nothing and doesn't raise."
+  (let ((deleted nil))
+    (cl-letf (((symbol-function 'cj/--dirvish-popup-frame) (lambda () nil))
+              ((symbol-function 'delete-frame) (lambda (f &rest _) (setq deleted f))))
+      (cj/--dirvish-popup-focus-watch))
+    (should-not deleted)))
+
+(provide 'test-dirvish-config-popup)
+;;; test-dirvish-config-popup.el ends here