procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/tab-bar.el: Support displaying global-mode-string in the tab bar.

Browse source 
* lisp/tab-bar.el (tab-bar--define-keys): Update global-mode-string
in mode-line-misc-info with condition to disable global-mode-string
in the mode line.
(tab-bar-format): New variable.
(tab-bar-format-history, tab-bar-format-add-tab)
(tab-bar-format-tabs): New functions with body from
'tab-bar-make-keymap-1'.
(tab-bar-format-align-right, tab-bar-format-global): New functions for
'tab-bar-format' list.
(tab-bar-format-list): New utility function.
(tab-bar-make-keymap-1): Just call 'tab-bar-format-list'.
https://lists.gnu.org/archive/html/emacs-devel/2020-11/msg01210.html
This commit is contained in:
Juri Linkov 2021-02-27 22:09:33 +02:00
parent 53f6218cdc
commit 3b3b16ea17
2 changed files with 124 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
etc/NEWS
View file

@ -493,6 +493,13 @@ value of 'tab-bar-show'.
It can be used to enable/disable the tab bar individually on each frame
independently from the value of 'tab-bar-mode' and 'tab-bar-show'.
---
*** New variable 'tab-bar-format' defines a list of tab bar items.
When it contains 'tab-bar-format-global' (possibly appended after
'tab-bar-format-align-right'), then after enabling 'display-time-mode'
(or any other mode that uses 'global-mode-string') it displays time
aligned to the right on the tab bar instead of the mode line.
---
*** 'Mod-9' bound to 'tab-last' now switches to the last tab.
It also supports a negative argument.

165
lisp/tab-bar.el
View file

@ -113,7 +113,21 @@ Possible modifier keys are `control', `meta', `shift', `hyper', `super' and
(unless (global-key-binding [(control shift tab)])
(global-set-key [(control shift tab)] 'tab-previous))
(unless (global-key-binding [(control shift iso-lefttab)])
(global-set-key [(control shift iso-lefttab)] 'tab-previous)))
(global-set-key [(control shift iso-lefttab)] 'tab-previous))
;; Replace default value with a condition that supports displaying
;; global-mode-string in the tab bar instead of the mode line.
(when (member '(global-mode-string ("" global-mode-string " "))
mode-line-misc-info)
(setq mode-line-misc-info
(append '(global-mode-string
("" (:eval (if (and tab-bar-mode
(memq 'tab-bar-format-global
tab-bar-format))
"" global-mode-string))
" "))
(remove '(global-mode-string ("" global-mode-string " "))
mode-line-misc-info)))))
(defun tab-bar--undefine-keys ()
"Uninstall key bindings previously bound by `tab-bar--define-keys'."
@ -503,56 +517,111 @@ the formatted tab name to display in the tab bar."
""))
'face (if current-p 'tab-bar-tab 'tab-bar-tab-inactive))))
(defun tab-bar-make-keymap-1 ()
"Generate an actual keymap from `tab-bar-map', without caching."
(defvar tab-bar-format '(tab-bar-format-history
tab-bar-format-tabs
tab-bar-separator
tab-bar-format-add-tab)
"Template for displaying tab bar items.
Every item in the list is a function that returns
a string, or a list of menu-item elements, or nil.
When you add more items `tab-bar-format-align-right' and
`tab-bar-format-global' to the end, then after enabling
`display-time-mode' (or any other mode that uses `global-mode-string')
it will display time aligned to the right on the tab bar instead of
the mode line.")
(defun tab-bar-format-history ()
(when (and tab-bar-history-mode tab-bar-history-buttons-show)
`((sep-history-back menu-item ,(tab-bar-separator) ignore)
(history-back
menu-item ,tab-bar-back-button tab-bar-history-back
:help "Click to go back in tab history")
(sep-history-forward menu-item ,(tab-bar-separator) ignore)
(history-forward
menu-item ,tab-bar-forward-button tab-bar-history-forward
:help "Click to go forward in tab history"))))
(defun tab-bar-format-tabs ()
(let ((separator (tab-bar-separator))
(tabs (funcall tab-bar-tabs-function))
(i 0))
(append
'(keymap (mouse-1 . tab-bar-handle-mouse))
(when (and tab-bar-history-mode tab-bar-history-buttons-show)
`((sep-history-back menu-item ,separator ignore)
(history-back
menu-item ,tab-bar-back-button tab-bar-history-back
:help "Click to go back in tab history")
(sep-history-forward menu-item ,separator ignore)
(history-forward
menu-item ,tab-bar-forward-button tab-bar-history-forward
:help "Click to go forward in tab history")))
(mapcan
(lambda (tab)
(setq i (1+ i))
(append
`((,(intern (format "sep-%i" i)) menu-item ,separator ignore))
(cond
((eq (car tab) 'current-tab)
`((current-tab
menu-item
,(funcall tab-bar-tab-name-format-function tab i)
ignore
:help "Current tab")))
(t
`((,(intern (format "tab-%i" i))
menu-item
,(funcall tab-bar-tab-name-format-function tab i)
,(or
(alist-get 'binding tab)
`(lambda ()
(interactive)
(tab-bar-select-tab ,i)))
:help "Click to visit tab"))))
`((,(if (eq (car tab) 'current-tab) 'C-current-tab (intern (format "C-tab-%i" i)))
menu-item ""
,(or
(alist-get 'close-binding tab)
`(lambda ()
(interactive)
(tab-bar-close-tab ,i)))))))
tabs)
`((sep-add-tab menu-item ,separator ignore))
(when (and tab-bar-new-button-show tab-bar-new-button)
`((add-tab menu-item ,tab-bar-new-button tab-bar-new-tab
:help "New tab"))))))
(mapcan
(lambda (tab)
(setq i (1+ i))
(append
`((,(intern (format "sep-%i" i)) menu-item ,separator ignore))
(cond
((eq (car tab) 'current-tab)
`((current-tab
menu-item
,(funcall tab-bar-tab-name-format-function tab i)
ignore
:help "Current tab")))
(t
`((,(intern (format "tab-%i" i))
menu-item
,(funcall tab-bar-tab-name-format-function tab i)
,(or
(alist-get 'binding tab)
`(lambda ()
(interactive)
(tab-bar-select-tab ,i)))
:help "Click to visit tab"))))
`((,(if (eq (car tab) 'current-tab) 'C-current-tab (intern (format "C-tab-%i" i)))
menu-item ""
,(or
(alist-get 'close-binding tab)
`(lambda ()
(interactive)
(tab-bar-close-tab ,i)))))))
tabs)))
(defun tab-bar-format-add-tab ()
(when (and tab-bar-new-button-show tab-bar-new-button)
`((add-tab menu-item ,tab-bar-new-button tab-bar-new-tab
:help "New tab"))))
(defun tab-bar-format-align-right ()
"Align the rest of tab bar items to the right."
(let* ((rest (cdr (memq 'tab-bar-format-align-right tab-bar-format)))
(rest (tab-bar-format-list rest))
(rest (mapconcat (lambda (item) (nth 2 item)) rest ""))
(hpos (length rest))
(str (propertize " " 'display `(space :align-to (- right ,hpos)))))
`((tab-bar-format-align-right menu-item ,str ignore))))
(defun tab-bar-format-global ()
"Format `global-mode-string' to display it in the tab bar.
When `tab-bar-format-global' is added to `tab-bar-format'
(possibly appended after `tab-bar-format-align-right'),
then modes that display information on the mode line
using `global-mode-string' will display the same text
on the tab bar instead."
`((tab-bar-format-global
menu-item
,(format-mode-line global-mode-string)
ignore)))
(defun tab-bar-format-list (format-list)
(let ((i 0))
(apply #'append
(mapcar
(lambda (format)
(setq i (1+ i))
(cond
((functionp format)
(let ((ret (funcall format)))
(when (stringp ret)
(setq ret `((,(intern (format "str-%i" i))
menu-item ,ret ignore))))
ret))))
format-list))))
(defun tab-bar-make-keymap-1 ()
"Generate an actual keymap from `tab-bar-map', without caching."
(append
'(keymap (mouse-1 . tab-bar-handle-mouse))
(tab-bar-format-list tab-bar-format)))
;; Some window-configuration parameters don't need to be persistent.