zathura: don't specify a page if none is given

1 files changed, 7 insertions, 3 deletions

diff --git a/init.el b/init.el
index a925623..95a484b 100644
--- a/init.el
+++ b/init.el
@@ -474,14 +474,18 @@
 (defun jao-sway-send (txt) (jao-shell-string "wtype" txt))
 
 (defun jao-zathura--open-cmd (file page &optional suffix)
-  (format "zathura %s -P %s%s" file (or page 1) (or suffix "")))
+  (let ((page (if page (format "-P %s" page) "")))
+    (format "zathura %s %s %s" file page (or suffix ""))))
 
 (defun jao-sway-open-with-zathura (file page)
   (let* ((a (jao-zathura--open-cmd file page ""))
          (n (file-name-nondirectory file))
-         (c (format "swaymsg [title=\"%s\"] focus || %s" n a)))
+         (f (format "swaymsg -r [title=\"%s\"] focus" n))
+         (c (format "%s || %s" f a)))
     (jao-shell-exec c)
-    (when page (jao-sway-send (format "%dg" page)))))
+    (sit-for 0.2)
+    (jao-shell-exec f)
+    (when page (sit-for 0.2) (jao-sway-send (format "%dg" page)))))
 
 (defun jao-sway-set-wallpaper (f)
   (jao-swaymsg (format "output * bg %s fill" f))