tweaks for better darwin behaviour

3 files changed, 13 insertions, 9 deletions

diff --git a/init.el b/init.el
index afb52c2..3511a2d 100644
--- a/init.el
+++ b/init.el
@@ -59,7 +59,7 @@
 
 (defun jao-data-file (file) (expand-file-name file jao-data-dir))
 
-(defvar jao-doc-dir (expand-file-name (jao-d-l "~/Documents/doc" "~/doc")))
+(defvar jao-doc-dir (expand-file-name (jao-d-l "~/Documents" "~/doc")))
 
 (setq jao-org-dir (expand-file-name "org" jao-doc-dir))
 
@@ -553,6 +553,7 @@
 (defvar jao-mode-line-in-minibuffer (jao-is-linux))
 
 (use-package jao-mode-line
+  :if (jao-is-linux)
   :commands (jao-mode-line-add-to-minibuffer-left
              jao-mode-line-add-to-minibuffer-right
              jao-mode-line-remove-from-minibuffer)
@@ -1114,7 +1115,9 @@
  `((horizontal-scroll-bars . nil)
    (vertical-scroll-bars . nil)
    (scroll-bar-width . 0)
-   (menu-bar . nil)))
+   (menu-bar . nil)
+   (width . 163)
+   (height . 67)))
 
 ;;;; frame layout, title, etc
 (setq frame-title-format '("%b - emacs"))
@@ -1143,7 +1146,7 @@
 (use-package jao-afio
   :demand t
   :config
-  (jao-afio-setup (not window-system))
+  (jao-afio-setup (or (not window-system) (jao-is-darwin)))
   (add-hook 'jao-afio-switch-hook 'jao-minibuffer-refresh t)
 
   (defun jao-current--frame-id ()
@@ -1152,7 +1155,7 @@
                             (not (bound-and-true-p jao-exwm--use-afio))
                             (boundp 'exwm-workspace-current-index))
                        (format "F%s" exwm-workspace-current-index))
-                      (t jao-afio-use-frames (or (jao-afio-frame-name) ""))
+                      (jao-afio-use-frames "")
                       (t (format "%s" (or (jao-afio-frame-no) ""))))
                 'face 'font-lock-warning-face))
   (jao-minibuffer-add-variable '(jao-current--frame-id) 100)
@@ -1870,7 +1873,8 @@
   (global-set-key "\C-cq" #'auto-fill-mode)
   (global-set-key "\C-xr\M-w" #'kill-rectangle-save)
   (global-set-key "\C-c\C-z" #'comment-or-uncomment-region)
-  (global-set-key "\C-z" #'comment-or-uncomment-region))
+  (global-set-key "\C-z" #'comment-or-uncomment-region)
+  (jao-when-darwin (global-set-key (kbd "M-`") 'other-frame)))
 
 (jao-global-keybindings)
 
diff --git a/lib/eos/jao-afio.el b/lib/eos/jao-afio.el
index 0a6d8e6..162a1b7 100644
--- a/lib/eos/jao-afio.el
+++ b/lib/eos/jao-afio.el
@@ -41,7 +41,7 @@
   (interactive)
   (jao-afio--current-config ?c)
   (if jao-afio-use-frames
-      (set-frame-name "W1")
+      (set-frame-name (jao-afio-frame-name ?c))
     (window-configuration-to-register ?c)))
 
 (defun jao-afio--check-frame ()
@@ -195,7 +195,7 @@
               (select-frame-set-input-focus (or f (make-frame)))
               (when (setq reset (or reset (not f)))
                 (set-frame-name
-                 (format "W%s" (or (jao-afio-frame-no next) next)))))
+                 (format "%s" (or (jao-afio-frame-name next) next)))))
           (window-configuration-to-register (jao-afio--current-config))
           (when (and (not reset) (get-register next))
             (ignore-errors (jump-to-register next)))
diff --git a/lib/eos/jao-mode-line.el b/lib/eos/jao-mode-line.el
index e1fe51f..f48040b 100644
--- a/lib/eos/jao-mode-line.el
+++ b/lib/eos/jao-mode-line.el
@@ -135,10 +135,10 @@
                  jao-minibuffer-inactive-buffer-line-color)))
     (jao-mode-line--extract-face nil)
     (jao-mode-line--extract-face t)
-    (set-face-attribute 'mode-line nil :box nil :height 10
+    (set-face-attribute 'mode-line nil :box nil :height 1
                         :background bg :foreground bg
                         :overline ol :underline ul :extend t)
-    (set-face-attribute 'mode-line-inactive nil :box nil :height 10
+    (set-face-attribute 'mode-line-inactive nil :box nil :height 1
                         :background bg :foreground bg
                         ;; :overline bg
                         :underline ul :extend t)))