afio: option to use frames (for terminals) and cleanups galore

1 files changed, 6 insertions, 13 deletions

diff --git a/init.el b/init.el
index 9952379..213ad94 100644
--- a/init.el
+++ b/init.el
@@ -1284,7 +1284,7 @@
 (menu-bar-mode -1)
 
 ;; (setting it to nil avoids mouse wrapping after other-frame)
-(setq focus-follows-mouse t)
+(setq focus-follows-mouse (and window-system t))
 
 (use-package scroll-bar)
 (set-scroll-bar-mode nil)
@@ -1312,22 +1312,15 @@
   (delete-window))
 
 ;;;; afio
-(use-package jao-afio)
-
-(defun jao-xmonad-goto-1 ()
-  (shell-command "sendCommand 1"))
-
-(defun jao-afio--goto-scratch-1 ()
-  (interactive)
-  (jao-afio-goto-scratch t))
-
-(jao-afio-setup 'jao-afio--goto-scratch-1 t)
+(use-package jao-afio
+  :demand t
+  :config (jao-afio-setup (not window-system)))
 
 (defun jao-current--frame-id ()
   (propertize (if (and (jao-exwm-enabled-p)
                        (not (bound-and-true-p jao-exwm--use-afio)))
                   (format "F%s" exwm-workspace-current-index)
-                (format "%s" (jao-afio-current-no)))
+                (format "%s" (jao-afio-frame-no)))
               'face 'font-lock-warning-face))
 
 (add-hook 'jao-afio-switch-hook #'tracking-remove-visible-buffers)
@@ -1335,7 +1328,7 @@
 
 (defun jao-afio--set-mode-line ()
   (when (and window-system (fboundp 'jao-mode-line-hide-inactive))
-    (if (string= "Docs" (jao-afio-current-frame))
+    (if (string= "Docs" (jao-afio-frame-name))
         (jao-mode-line-show-inactive nil)
       (jao-mode-line-hide-inactive nil))))