Better handle modelinee mouse clikc

jcs-emacs · Feb 26, 2024 · e6c1223 · e6c1223
1 parent 6fe2da8
commit e6c1223
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 20 deletions.
diff --git a/Eask b/Eask
@@ -9,14 +9,15 @@
 
 (script "test" "echo \"Error: no test specified\" && exit 1")
 
-(source "gnu")
-(source "jcs-elpa")
-(source "melpa")
+(source 'gnu)
+(source 'jcs-elpa)
+(source 'melpa)
 
 (depends-on "emacs" "27.1")
 (depends-on "elenv")
 (depends-on "moody")
 (depends-on "minions")
 (depends-on "nerd-icons")
+(depends-on "reveal-in-folder")
 
 (setq network-security-level 'low)  ; see https://github.com/jcs090218/setup-emacs-windows/issues/156#issuecomment-932956432
diff --git a/jcs-modeline.el b/jcs-modeline.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Shen, Jen-Chieh <[email protected]>
 ;; URL: https://github.com/jcs-emacs/jcs-modeline
 ;; Version: 0.1.1
-;; Package-Requires: ((emacs "28.1") (moody "0.7.1") (minions "0.3.7") (elenv "0.1.0") (nerd-icons "0.0.1"))
+;; Package-Requires: ((emacs "28.1") (moody "0.7.1") (minions "0.3.7") (elenv "0.1.0") (nerd-icons "0.0.1") (reveal-in-folder "0.1.2"))
 ;; Keywords: faces mode-line
 
 ;; This file is not part of GNU Emacs.
@@ -283,21 +283,39 @@
   :type 'boolean
   :group 'jcs-modeline)
 
+(defcustom jcs-modeline-show-mode-name t
+  "Non-nil to display mode name."
+  :type 'boolean
+  :group 'jcs-modeline)
+
 (defun jcs-modeline--render-modes ()
   "Render line modes."
-  (let ((line-modes (jcs-modeline-format (if minions-mode
-                                             minions-mode-line-modes
-                                           mode-line-modes)))
-        (icon (and jcs-modeline-show-mode-icons
-                   (let* ((icon (nerd-icons-icon-for-buffer))
-                          (icon (if (or (null icon) (symbolp icon))
-                                    (nerd-icons-faicon "nf-fa-file_o")
-                                  icon)))
-                     (if (and icon
-                              (jcs-modeline--char-displayable-p icon))
-                         (concat icon " ")
-                       "")))))
-    (moody-tab (concat icon line-modes))))
+  (let* ((icon (and jcs-modeline-show-mode-icons
+                    (when-let* ((icon (nerd-icons-icon-for-buffer))
+                                (icon (if (or (null icon) (symbolp icon))
+                                          (nerd-icons-faicon "nf-fa-file_o")
+                                        icon))
+                                ((jcs-modeline--char-displayable-p icon)))
+                      icon)))
+         (line-modes (and (or jcs-modeline-show-mode-name
+                              (null icon))
+                          (jcs-modeline-format (if minions-mode
+                                                   minions-mode-line-modes
+                                                 mode-line-modes))))
+         (lst (cl-remove-if #'null (list icon line-modes)))
+         (ind (mapconcat #'identity lst " ")))
+    (moody-tab
+     (propertize ind
+                 'mouse-face 'mode-line-highlight
+                 'help-echo "mouse-1: Toggle display of major mode name"
+                 'local-map (let ((map (make-sparse-keymap)))
+                              (define-key map (vector 'mode-line 'mouse-1)
+                                          (lambda (&rest _)
+                                            (interactive)
+                                            (setq jcs-modeline-show-mode-name
+                                                  (not jcs-modeline-show-mode-name))
+                                            (force-mode-line-update t)))
+                              map)))))
 
 ;;
 ;;; Line and Columns
@@ -333,9 +351,21 @@
 
 (defun jcs-modeline--render-vc-project ()
   "Return the project name."
-  (when (or (buffer-file-name) jcs-modeline-show-project-name-virutal-buffer)
-    (when-let ((project (jcs-modeline--project-root)))
-      (concat " " (file-name-nondirectory (directory-file-name project))))))
+  (when-let* (((or (buffer-file-name) jcs-modeline-show-project-name-virutal-buffer))
+              (project (jcs-modeline--project-root))
+              (ind (file-name-nondirectory (directory-file-name project))))
+    (concat
+     " "
+     (propertize ind
+                 'mouse-face 'mode-line-highlight
+                 'help-echo (format "%s\n\nmouse-1: Reveal project in folder" project)
+                 'local-map
+                 (let ((map (make-sparse-keymap)))
+                   (define-key map (vector 'mode-line 'mouse-2)
+                               (lambda (&rest _)
+                                 (interactive)
+                                 (reveal-in-folder-open project)))
+                   map)))))
 
 ;;
 ;;; Text Scale