Move `acdw/modeline' functions into `acdw/pkg' forms

This change means I don't have to `require' libraries that haven't been
registered with `straight' yet.

1 files changed, 52 insertions, 11 deletions

@@ -307,17 +307,58 @@
 
 ;; Simple mode line
 (acdw/pkg simple-modeline
-  :now ((acdw/set '((simple-modeline-segments
-                     ((;; left
-                       acdw/modeline-modified
-                       simple-modeline-segment-buffer-name
-                       simple-modeline-segment-position)
-                      (;; right
-                       simple-modeline-segment-vc
-                       simple-modeline-segment-misc-info
-                       simple-modeline-segment-process
-                       acdw/modeline-minions
-                       simple-modeline-segment-major-mode)))))
+  :set '((simple-modeline-segments
+          ((;; left
+            acdw/modeline-modified
+            simple-modeline-segment-buffer-name
+            simple-modeline-segment-position)
+           (;; right
+            simple-modeline-segment-vc
+            simple-modeline-segment-misc-info
+            simple-modeline-segment-process
+            acdw/modeline-minions
+            simple-modeline-segment-major-mode))))
+  :now ((defun acdw/modeline-modified ()
+          "Displays a color-coded buffer modification/read-only
+indicator in the mode-line."
+          (if (not (string-match-p "\\*.*\\*" (buffer-name)))
+              (let* ((read-only (and buffer-read-only (buffer-file-name)))
+                     (modified (buffer-modified-p)))
+                (propertize
+                 (if read-only " ×" (if modified " ●" " ○"))
+                 'face `(:inherit
+                         ,(if modified 'simple-modeline-status-modified
+                            (if read-only 'simple-modeline-status-error
+                              'simple-modeline-unimportant)))
+                 'help-echo (format
+                             (concat "Buffer is %s and %smodified\n"
+                                     "mouse-1: Toggle read-only status.")
+                             (if read-only "read-only" "writable")
+                             (if modified "" "not "))
+                 'local-map (purecopy (simple-modeline-make-mouse-map
+                                       'mouse-1
+                                       (lambda (event)
+                                         (interactive "e")
+                                         (with-selected-window
+                                             (posn-window (event-start event))
+                                           (read-only-mode 'toggle)))))
+                 'mouse-face 'mode-line-highlight))))
+        (defun acdw/modeline-minions ()
+          "Display a button for `minions-minor-modes-menu'."
+          (concat
+           " "
+           (propertize
+            "ⱷ"
+            'help-echo (format
+                        "Minor modes menu\nmouse-1: show menu.")
+            'local-map (purecopy (simple-modeline-make-mouse-map
+                                  'mouse-1
+                                  (lambda (event)
+                                    (interactive "e")
+                                    (with-selected-window (posn-window
+                                                           (event-start event))
+                                      (minions-minor-modes-menu)))))
+            'mouse-face 'mode-line-highlight)))
         (simple-modeline-mode +1)))
 
 ;;; Magit