3 files changed, 58 insertions, 33 deletions

diff --git a/src/ui.cc b/src/ui.cc
index fc8624c6..4d8ee7c4 100644
--- a/src/ui.cc
+++ b/src/ui.cc
@@ -154,33 +154,6 @@ int CustInput::handle(int e)
 //----------------------------------------------------------------------------
 
 /*
- * A button that highlights on mouse over
- */
-class CustLightButton : public Fl_Button {
-   Fl_Color norm_color;
-public:
-   CustLightButton(int x, int y, int w, int h, const char *l=0) :
-      Fl_Button(x,y,w,h,l) { norm_color = color(); };
-   virtual int handle(int e);
-};
-
-int CustLightButton::handle(int e)
-{
-   if (active()) {
-      if (e == FL_ENTER) {
-         color(51); // {17,26,51}
-         redraw();
-      } else if (e == FL_LEAVE || e == FL_RELEASE) {
-         color(norm_color);
-         redraw();
-      }
-   }
-   return Fl_Button::handle(e);
-}
-
-//----------------------------------------------------------------------------
-
-/*
  * Used to handle "paste" within the toolbar's Clear button.
  */
 class CustPasteButton : public CustLightButton {
diff --git a/src/ui.hh b/src/ui.hh
index 6fd09b10..ca09723f 100644
--- a/src/ui.hh
+++ b/src/ui.hh
@@ -36,7 +36,7 @@ class CustProgressBox;
 class CustTabs;
 
 
-// Class definition ----------------------------------------------------------
+// Class definitions ---------------------------------------------------------
 /*
  * Used to reposition group's widgets when some of them are hidden.
  * All children get the height of the group but retain their original width.
@@ -98,6 +98,29 @@ public:
   }
 };
 
+/*
+ * A button that highlights on mouse over
+ */
+class CustLightButton : public Fl_Button {
+   Fl_Color norm_color, light_color;
+public:
+   CustLightButton(int x, int y, int w, int h, const char *l=0) :
+      Fl_Button(x,y,w,h,l) { norm_color = color(); light_color = 51; };
+   virtual int handle(int e)
+   {
+      if (active()) {
+         if (e == FL_ENTER) {
+            color(light_color); // {17,26,51}
+            redraw();
+         } else if (e == FL_LEAVE || e == FL_RELEASE) {
+            color(norm_color);
+            redraw();
+         }
+      }
+      return Fl_Button::handle(e);
+   }
+   void hl_color(Fl_Color col) { light_color = col; };
+};
 
 //
 // UI class definition -------------------------------------------------------
diff --git a/src/uicmd.cc b/src/uicmd.cc
index 66439bed..864113d6 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -63,6 +63,7 @@ static char *save_dir = NULL;
  * Forward declarations
  */
 static BrowserWindow *UIcmd_tab_new(CustTabs *tabs, UI *old_ui, int focus);
+static void close_tab_btn_cb (Fl_Widget *w, void *cb_data);
 
 //----------------------------------------------------------------------------
 
@@ -86,16 +87,29 @@ public:
  * Allows fine control of the tabbed interface
  */
 class CustTabs : public CustGroupHorizontal {
-   int tab_w, tab_h, ctab_h;
+   int tab_w, tab_h, ctab_h, btn_w;
    Fl_Wizard *Wizard;
+   Fl_Box *Invisible;
+   CustLightButton *CloseBtn;
    int tabcolor_inactive, tabcolor_active, curtab_idx;
 public:
    CustTabs (int ww, int wh, int th, const char *lbl=0) :
       CustGroupHorizontal(0,0,ww,th,lbl) {
-      tab_w = 80, tab_h = th, ctab_h = 1, curtab_idx = -1;
+      tab_w = 80, tab_h = th, ctab_h = 1, curtab_idx = -1, btn_w = 20;
       tabcolor_active = FL_DARK_CYAN; tabcolor_inactive = 206;
       resize(0,0,ww,ctab_h);
-      resizable(NULL);
+      Invisible = new Fl_Box(0,0,ww-btn_w,ctab_h);
+      CloseBtn = new CustLightButton(ww-btn_w,0,btn_w,ctab_h, "X");
+      CloseBtn->box(FL_PLASTIC_ROUND_UP_BOX);
+      CloseBtn->labelcolor(0x00641000);
+      CloseBtn->hl_color(FL_WHITE);
+      CloseBtn->clear_visible_focus();
+      CloseBtn->tooltip(prefs.right_click_closes_tab ?
+         "Close current tab.\nor Right-click tab label to close." :
+         "Close current tab.\nor Middle-click tab label to close.");
+      CloseBtn->callback(close_tab_btn_cb, this);
+      CloseBtn->hide();
+      resizable(Invisible);
       box(FL_FLAT_BOX);
       end();
 
@@ -108,7 +122,7 @@ public:
    void remove_tab(UI *ui);
    Fl_Wizard *wizard(void) { return Wizard; }
    int get_btn_idx(UI *ui);
-   int num_tabs() { return children(); }
+   int num_tabs() { return children()-2; }
    void switch_tab(CustTabButton *cbtn);
    void prev_tab(void);
    void next_tab(void);
@@ -134,6 +148,19 @@ static void tab_btn_cb (Fl_Widget *w, void *cb_data)
    }
 }
 
+/*
+ * Callback for the close-tab button
+ */
+static void close_tab_btn_cb (Fl_Widget *, void *cb_data)
+{
+   CustTabs *tabs = (CustTabs*) cb_data;
+   int b = Fl::event_button();
+
+   if (b == FL_LEFT_MOUSE) {
+      a_UIcmd_close_bw(a_UIcmd_get_bw_by_widget(tabs->wizard()->value()));
+   }
+}
+
 int CustTabs::handle(int e)
 {
    int ret = 0;
@@ -182,6 +209,7 @@ UI *CustTabs::add_new_tab(UI *old_ui, int focus)
       ctab_h = tab_h;
       Wizard->resize(0,ctab_h,Wizard->w(),window()->h()-ctab_h);
       resize(0,0,window()->w(),ctab_h);    // tabbar
+      CloseBtn->show();
       child(0)->show(); // first tab button
       window()->init_sizes();
    }
@@ -199,7 +227,7 @@ UI *CustTabs::add_new_tab(UI *old_ui, int focus)
    btn->box(FL_PLASTIC_ROUND_UP_BOX);
    btn->color(focus ? tabcolor_active : tabcolor_inactive);
    btn->ui(new_ui);
-   add(btn);
+   insert(*btn, Invisible); // before the Invisible
    btn->callback(tab_btn_cb, this);
 
    if (focus) {
@@ -247,6 +275,7 @@ void CustTabs::remove_tab(UI *ui)
    } else if (num_tabs() == 1) {
       // hide tabbar
       ctab_h = 1;
+      CloseBtn->hide();
       child(0)->hide(); // first tab button
       resize(0,0,window()->w(),ctab_h);    // tabbar
       Wizard->resize(0,ctab_h,Wizard->w(),window()->h()-ctab_h);