Text-mode display of the tab-bar and emulation of clicking on a tty.

* lisp/tab-bar.el (tab-bar-mouse): New command bound to mouse-1 on [tab-bar].

* lisp/xt-mouse.el (xterm-mouse-event): Use `tab-bar' when clicking
on the tab-bar that is on the second row below menu-bar.

* src/frame.c (set_tab_bar_lines): New function.
(frame_windows_min_size): Add FRAME_TAB_BAR_LINES.
(make_initial_frame): Call set_tab_bar_lines.
(store_frame_param): Call set_tab_bar_lines for Qtab_bar_lines prop.
(Fframe_parameters): Call store_in_alist for Qtab_bar_lines.

* src/xdisp.c (display_tab_bar): New function.
(redisplay_window): Call display_tab_bar when `FRAME_WINDOW_P (f)'
is NULL on a tty.

2 files changed, 31 insertions, 4 deletions

diff --git a/lisp/tab-bar.el b/lisp/tab-bar.el
index 1819d44ac20..f596bdb0a4f 100644
--- a/lisp/tab-bar.el
+++ b/lisp/tab-bar.el
@@ -49,7 +49,8 @@
 (defface tab-bar
   '((default
      :box (:line-width 1 :style released-button)
-     :foreground "black")
+     :foreground "black"
+     :background "white")
     (((type x w32 ns) (class color))
      :background "grey75")
     (((type x) (class mono))
@@ -97,7 +98,27 @@
     (global-set-key [(control shift iso-lefttab)] 'tab-bar-switch-to-prev-tab)
     (global-set-key [(control tab)]               'tab-bar-switch-to-next-tab)))
 
-;;;###autoload
+(defun tab-bar-mouse (event)
+  "Text-mode emulation of switching tabs on the tab-bar.
+This command is used when you click the mouse in the tab-bar
+on a console which has no window system but does have a mouse."
+  (interactive "e")
+  (let* ((x-position (car (posn-x-y (event-start event))))
+         (keymap (lookup-key (cons 'keymap (nreverse (current-active-maps))) [tab-bar]))
+         (column 0))
+    (when x-position
+      (unless (catch 'done
+                (map-keymap
+                 (lambda (_key binding)
+                   (when (eq (car-safe binding) 'menu-item)
+                     (when (> (+ column (length (nth 1 binding))) x-position)
+                       (call-interactively (nth 2 binding))
+                       (throw 'done t))
+                     (setq column (+ column (length (nth 1 binding)) 1))))
+                 keymap))
+        ;; Clicking anywhere outside existing tabs will add a new tab
+        (tab-bar-add-tab)))))
+
 ;; Used in the Show/Hide menu, to have the toggle reflect the current frame.
 (defun toggle-tab-bar-mode-from-frame (&optional arg)
   "Toggle tab bar on or off, based on the status of the current frame.
@@ -152,7 +173,7 @@ Return its existing value or a new value."
   "Generate an actual keymap from `tab-bar-map', without caching."
   (let ((i 0))
     (append
-     '(keymap)
+     '(keymap (mouse-1 . tab-bar-mouse))
      (mapcan
       (lambda (tab)
         (setq i (1+ i))
diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el
index b53174b7bd5..5464da25009 100644
--- a/lisp/xt-mouse.el
+++ b/lisp/xt-mouse.el
@@ -253,7 +253,13 @@ which is the \"1006\" extension implemented in Xterm >= 277."
              (top (nth 1 ltrb))
              (posn (if w
                        (posn-at-x-y (- x left) (- y top) w t)
-                     (append (list nil 'menu-bar)
+                     (append (list nil (if (and tab-bar-mode
+                                                (or (not menu-bar-mode)
+                                                    ;; The tab-bar is on the
+                                                    ;; second row below menu-bar
+                                                    (eq (cdr (nth 6 (posn-at-x-y x y))) 1)))
+                                           'tab-bar
+                                         'menu-bar))
                              (nthcdr 2 (posn-at-x-y x y)))))
              (event (list type posn)))
         (setcar (nthcdr 3 posn) timestamp)