1 files changed, 52 insertions, 11 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 255b6c62d5a..5baa29a8466 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3220,9 +3220,11 @@ x_draw_image_relief (struct glyph_string *s)
   if (s->hl == DRAW_IMAGE_SUNKEN
       || s->hl == DRAW_IMAGE_RAISED)
     {
-      thick = (tool_bar_button_relief < 0
-               ? DEFAULT_TOOL_BAR_BUTTON_RELIEF
-               : min (tool_bar_button_relief, 1000000));
+      thick = (tab_bar_button_relief < 0
+               ? DEFAULT_TAB_BAR_BUTTON_RELIEF
+               : (tool_bar_button_relief < 0
+                  ? DEFAULT_TOOL_BAR_BUTTON_RELIEF
+                  : min (tool_bar_button_relief, 1000000)));
       raised_p = s->hl == DRAW_IMAGE_RAISED;
     }
   else
@@ -3235,6 +3237,19 @@ x_draw_image_relief (struct glyph_string *s)
   y1 = y + s->slice.height - 1;
 
   extra_x = extra_y = 0;
+  if (s->face->id == TAB_BAR_FACE_ID)
+    {
+      if (CONSP (Vtab_bar_button_margin)
+          && FIXNUMP (XCAR (Vtab_bar_button_margin))
+          && FIXNUMP (XCDR (Vtab_bar_button_margin)))
+        {
+          extra_x = XFIXNUM (XCAR (Vtab_bar_button_margin));
+          extra_y = XFIXNUM (XCDR (Vtab_bar_button_margin));
+        }
+      else if (FIXNUMP (Vtab_bar_button_margin))
+        extra_x = extra_y = XFIXNUM (Vtab_bar_button_margin);
+    }
+
   if (s->face->id == TOOL_BAR_FACE_ID)
     {
       if (CONSP (Vtool_bar_button_margin)
@@ -8396,10 +8411,11 @@ handle_one_xevent (struct x_display_info *dpyinfo,
       /* If mouse-highlight is an integer, input clears out
          mouse highlighting.  */
       if (!hlinfo->mouse_face_hidden && FIXNUMP (Vmouse_highlight)
-#if ! defined (USE_GTK)
           && (f == 0
-              || !EQ (f->tool_bar_window, hlinfo->mouse_face_window))
+#if ! defined (USE_GTK)
+              || !EQ (f->tool_bar_window, hlinfo->mouse_face_window)
 #endif
+              || !EQ (f->tab_bar_window, hlinfo->mouse_face_window))
           )
         {
           clear_mouse_face (hlinfo);
@@ -8823,7 +8839,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
               {
                 static Lisp_Object last_mouse_window;
                 Lisp_Object window = window_from_coordinates
-                  (f, event->xmotion.x, event->xmotion.y, 0, false);
+                  (f, event->xmotion.x, event->xmotion.y, 0, false, false);
 
                 /* A window will be autoselected only when it is not
                    selected now and the last mouse movement event was
@@ -9034,6 +9050,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
       {
         /* If we decide we want to generate an event to be seen
            by the rest of Emacs, we put it here.  */
+        bool tab_bar_p = false;
         bool tool_bar_p = false;
 
         memset (&compose_status, 0, sizeof (compose_status));
@@ -9070,6 +9087,23 @@ handle_one_xevent (struct x_display_info *dpyinfo,
 #endif
         if (f)
           {
+            /* Is this in the tab-bar?  */
+            if (WINDOWP (f->tab_bar_window)
+                && WINDOW_TOTAL_LINES (XWINDOW (f->tab_bar_window)))
+              {
+                Lisp_Object window;
+                int x = event->xbutton.x;
+                int y = event->xbutton.y;
+
+                window = window_from_coordinates (f, x, y, 0, true, true);
+                tab_bar_p = EQ (window, f->tab_bar_window);
+
+                if (tab_bar_p && event->xbutton.button < 4)
+                  handle_tab_bar_click
+                    (f, x, y, event->xbutton.type == ButtonPress,
+                     x_x_to_emacs_modifiers (dpyinfo, event->xbutton.state));
+              }
+
 #if ! defined (USE_GTK)
             /* Is this in the tool-bar?  */
             if (WINDOWP (f->tool_bar_window)
@@ -9079,7 +9113,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
                 int x = event->xbutton.x;
                 int y = event->xbutton.y;
 
-                window = window_from_coordinates (f, x, y, 0, true);
+                window = window_from_coordinates (f, x, y, 0, true, true);
                 tool_bar_p = EQ (window, f->tool_bar_window);
 
                 if (tool_bar_p && event->xbutton.button < 4)
@@ -9089,7 +9123,7 @@ handle_one_xevent (struct x_display_info *dpyinfo,
               }
 #endif /* !USE_GTK */
 
-            if (!tool_bar_p)
+            if (!tab_bar_p && !tool_bar_p)
 #if defined (USE_X_TOOLKIT) || defined (USE_GTK)
               if (! popup_activated ())
 #endif
@@ -9136,6 +9170,8 @@ handle_one_xevent (struct x_display_info *dpyinfo,
           {
             dpyinfo->grabbed |= (1 << event->xbutton.button);
             dpyinfo->last_mouse_frame = f;
+            if (f && !tab_bar_p)
+              f->last_tab_bar_item = -1;
 #if ! defined (USE_GTK)
             if (f && !tool_bar_p)
               f->last_tool_bar_item = -1;
@@ -10142,6 +10178,7 @@ x_new_font (struct frame *f, Lisp_Object font_object, int fontset)
   int unit, font_ascent, font_descent;
 #ifndef USE_X_TOOLKIT
   int old_menu_bar_height = FRAME_MENU_BAR_HEIGHT (f);
+  int old_tab_bar_height = FRAME_TAB_BAR_HEIGHT (f);
   Lisp_Object fullscreen;
 #endif
 
@@ -10161,6 +10198,7 @@ x_new_font (struct frame *f, Lisp_Object font_object, int fontset)
 
 #ifndef USE_X_TOOLKIT
   FRAME_MENU_BAR_HEIGHT (f) = FRAME_MENU_BAR_LINES (f) * FRAME_LINE_HEIGHT (f);
+  FRAME_TAB_BAR_HEIGHT (f) = FRAME_TAB_BAR_LINES (f) * FRAME_LINE_HEIGHT (f);
 #endif
 
   /* Compute character columns occupied by scrollbar.
@@ -10185,18 +10223,20 @@ x_new_font (struct frame *f, Lisp_Object font_object, int fontset)
                              FRAME_LINES (f) * FRAME_LINE_HEIGHT (f), 3,
                              false, Qfont);
 #ifndef USE_X_TOOLKIT
-          if (FRAME_MENU_BAR_HEIGHT (f) != old_menu_bar_height
+          if ((FRAME_MENU_BAR_HEIGHT (f) != old_menu_bar_height
+               || FRAME_TAB_BAR_HEIGHT (f) != old_tab_bar_height)
               && !f->after_make_frame
               && (EQ (frame_inhibit_implied_resize, Qt)
                   || (CONSP (frame_inhibit_implied_resize)
                       && NILP (Fmemq (Qfont, frame_inhibit_implied_resize))))
               && (NILP (fullscreen = get_frame_param (f, Qfullscreen))
                   || EQ (fullscreen, Qfullwidth)))
-            /* If the menu bar height changes, try to keep text height
+            /* If the menu/tab bar height changes, try to keep text height
                constant.  */
             adjust_frame_size
               (f, -1, FRAME_TEXT_HEIGHT (f) + FRAME_MENU_BAR_HEIGHT (f)
-               - old_menu_bar_height, 1, false, Qfont);
+               + FRAME_TAB_BAR_HEIGHT (f)
+               - old_menu_bar_height - old_tab_bar_height, 1, false, Qfont);
 #endif /* USE_X_TOOLKIT  */
         }
     }
@@ -13466,6 +13506,7 @@ x_create_terminal (struct x_display_info *dpyinfo)
 #if defined (USE_X_TOOLKIT) || defined (USE_GTK)
   terminal->popup_dialog_hook = xw_popup_dialog;
 #endif
+  terminal->change_tab_bar_height_hook = x_change_tab_bar_height;
 #ifndef HAVE_EXT_TOOL_BAR
   terminal->change_tool_bar_height_hook = x_change_tool_bar_height;
 #endif