diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/IO/IO.c | 7 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/cssparser.cc | 2 | ||||
| -rw-r--r-- | src/domainrc | 8 | ||||
| -rw-r--r-- | src/findbar.cc | 16 | ||||
| -rw-r--r-- | src/findbar.hh | 5 | ||||
| -rw-r--r-- | src/html.cc | 4 | ||||
| -rw-r--r-- | src/tipwin.cc | 224 | ||||
| -rw-r--r-- | src/tipwin.hh | 74 | ||||
| -rw-r--r-- | src/ui.cc | 78 | ||||
| -rw-r--r-- | src/ui.hh | 36 | ||||
| -rw-r--r-- | src/uicmd.cc | 10 |
12 files changed, 370 insertions, 96 deletions
diff --git a/src/IO/IO.c b/src/IO/IO.c index 4b0285f2..1243c70a 100644 --- a/src/IO/IO.c +++ b/src/IO/IO.c @@ -369,8 +369,11 @@ void a_IO_ccc(int Op, int Branch, int Dir, ChainLink *Info, case OpAbort: io = Info->LocalKey; if (io->Buf->len > 0) { - MSG_WARN("IO_write, closing with pending data not sent\n"); - MSG_WARN(" \"%s\"\n", dStr_printable(io->Buf, 2048)); + char *newline = memchr(io->Buf->str, '\n', io->Buf->len); + int msglen = newline ? newline - io->Buf->str : 2048; + + MSG_WARN("IO_write, closing with pending data not sent: " + "\"%s\"\n", dStr_printable(io->Buf, msglen)); } /* close FD, remove from ValidIOs and remove its watch */ IO_close_fd(io, Op == OpEnd ? IO_StopWr : IO_StopRdWr); diff --git a/src/Makefile.am b/src/Makefile.am index ceba3e01..c4c7949a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,6 +25,8 @@ dillo_SOURCES = \ dillo.cc \ paths.cc \ paths.hh \ + tipwin.cc \ + tipwin.hh \ ui.cc \ ui.hh \ uicmd.cc \ diff --git a/src/cssparser.cc b/src/cssparser.cc index 28b3badb..5096fb96 100644 --- a/src/cssparser.cc +++ b/src/cssparser.cc @@ -1261,7 +1261,7 @@ bool CssParser::parseSimpleSelector(CssSimpleSelector *selector) if (selectType != CssSimpleSelector::SELECT_NONE) { nextToken(); if (spaceSeparated) - return true; + return false; if (ttype == CSS_TK_SYMBOL) { selector->setSelect (selectType, tval); diff --git a/src/domainrc b/src/domainrc index 44380fd0..eaed9e8e 100644 --- a/src/domainrc +++ b/src/domainrc @@ -22,10 +22,18 @@ default accept # Let's block some of the most notorious ad sites and trackers. +* .2o7.net * .admt.com * .adnxs.com +* .atdmt.com +* .collective-media.net * .crwdcntrl.com * .doubleclick.net +* .effectivemeasure.net +* .googleadservices.com +* .imrworldwide.com * .quantserve.com +* .revsci.net * .scorecardresearch.com +* .webtrendslive.com * .yieldmanager.com diff --git a/src/findbar.cc b/src/findbar.cc index 28790563..f376895f 100644 --- a/src/findbar.cc +++ b/src/findbar.cc @@ -118,14 +118,14 @@ Findbar::Findbar(int width, int height) : box(FL_THIN_UP_BOX); - hide_btn = new Fl_Button(x, border, 16, height, 0); + hide_btn = new CustButton(x, border, 16, height, 0); hideImg = new Fl_Pixmap(new_s_xpm); hide_btn->image(hideImg); x += 16 + gap; hide_btn->callback(hide_cb, this); hide_btn->clear_visible_focus(); hide_btn->box(FL_THIN_UP_BOX); - hide_btn->tooltip("Hide"); + hide_btn->set_tooltip("Hide"); add(hide_btn); i = new MyInput(x, border, input_width, height); @@ -135,24 +135,24 @@ Findbar::Findbar(int width, int height) : i->when(FL_WHEN_NEVER); add(i); - next_btn = new Fl_Button(x, border, button_width, height, "Next"); + next_btn = new CustButton(x, border, button_width, height, "Next"); x += button_width + gap; next_btn->shortcut(FL_Enter); next_btn->callback(search_cb, this); next_btn->clear_visible_focus(); next_btn->box(FL_THIN_UP_BOX); - next_btn->tooltip("Find next occurrence of the search phrase\n" - "shortcut: Enter"); + next_btn->set_tooltip("Find next occurrence of the search phrase\n" + "shortcut: Enter"); add(next_btn); - prev_btn= new Fl_Button(x, border, button_width, height, "Previous"); + prev_btn= new CustButton(x, border, button_width, height, "Previous"); x += button_width + gap; prev_btn->shortcut(FL_SHIFT+FL_Enter); prev_btn->callback(searchBackwards_cb, this); prev_btn->clear_visible_focus(); prev_btn->box(FL_THIN_UP_BOX); - prev_btn->tooltip("Find previous occurrence of the search phrase\n" - "shortcut: Shift+Enter"); + prev_btn->set_tooltip("Find previous occurrence of the search phrase\n" + "shortcut: Shift+Enter"); add(prev_btn); check_btn = new Fl_Check_Button(x, border, 2*button_width, height, diff --git a/src/findbar.hh b/src/findbar.hh index 72d24c44..d91c42df 100644 --- a/src/findbar.hh +++ b/src/findbar.hh @@ -8,12 +8,13 @@ #include <FL/Fl_Group.H> #include <FL/Fl_Check_Button.H> +#include "tipwin.hh" + /* * Searchbar to find text in page. */ class Findbar : public Fl_Group { - Fl_Button *clrb; - Fl_Button *hide_btn, *next_btn, *prev_btn; + CustButton *hide_btn, *next_btn, *prev_btn; Fl_Check_Button *check_btn; Fl_Pixmap *hideImg; Fl_Input *i; diff --git a/src/html.cc b/src/html.cc index 1803e68c..ea675c1a 100644 --- a/src/html.cc +++ b/src/html.cc @@ -2969,10 +2969,10 @@ void a_Html_load_stylesheet(DilloHtml *html, DilloUrl *url) ++html->bw->NumPendingStyleSheets; a_Bw_add_client(html->bw, ClientKey, 0); a_Bw_add_url(html->bw, url); - MSG("NumPendingStyleSheets=%d", html->bw->NumPendingStyleSheets); + MSG("NumPendingStyleSheets=%d\n", html->bw->NumPendingStyleSheets); } } - MSG("\n"); + _MSG("\n"); } /* diff --git a/src/tipwin.cc b/src/tipwin.cc new file mode 100644 index 00000000..1b6d91a2 --- /dev/null +++ b/src/tipwin.cc @@ -0,0 +1,224 @@ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <FL/fl_draw.H> +#include <FL/Fl.H> +#include <FL/Fl_Group.H> +#include <FL/Fl_Menu_Window.H> +#include <FL/Fl_Tooltip.H> +#include <FL/Fl_Button.H> + +#include "tipwin.hh" + +/* + * Forward declarations + */ +static void show_timeout(void*); +static void recent_timeout(void*); + +/* + * Custom tooltip window + */ +TipWin::TipWin() : Fl_Menu_Window(1, 1) // will autosize +{ + bgcolor = fl_color_cube(FL_NUM_RED - 1, FL_NUM_GREEN - 1, FL_NUM_BLUE - 2); + recent = 0; + strcpy(tip, ""); + cur_widget = NULL; + set_override(); // no border + end(); +} + +void TipWin::draw() +{ + draw_box(FL_BORDER_BOX, 0, 0, w(), h(), bgcolor); + fl_color(FL_BLACK); + fl_font(labelfont(), labelsize()); + fl_draw(tip, 3, 3, w() - 6, h() - 6, + //Fl_Align(FL_ALIGN_LEFT | FL_ALIGN_WRAP)); + Fl_Align(FL_ALIGN_LEFT)); +} + +void TipWin::value(const char *s) { + // Recalc size of window + snprintf(tip, sizeof(tip) - 1, "%s", s); + fl_font(labelfont(), labelsize()); + int W = w(), H = h(); + W = 0; + fl_measure(tip, W, H, 0); + W += 8; H += 8; + size(W, H); + redraw(); +} + +void TipWin::do_show(void *wid) { + cur_widget = wid; // Keep track of requesting widget + Fl::add_timeout(recent ? 0.2f : 0.8f, show_timeout); +} + +void TipWin::do_hide() { + Fl::remove_timeout(show_timeout); + if (shown()) { + hide(); + recent = 1; + Fl::add_timeout(0.8f, recent_timeout); + } +} + +void TipWin::recent_tooltip(int val) { + recent = val; +} + +//-------------------------------------------------------------------------- + +TipWin *my_tipwin(void) +{ + static TipWin *tw = NULL; + + if (!tw) { + Fl_Group *save = Fl_Group::current(); // save current widget.. + tw = new TipWin(); // ..because this trashes it + tw->hide(); // start hidden + Fl_Group::current(save); // ..then back to previous. + } + return tw; +} + +static void show_timeout(void*) { + // if offscreen, move tip ABOVE mouse instead + int scr_x, scr_y, scr_w, scr_h; + Fl::screen_xywh(scr_x, scr_y, scr_w, scr_h); + int ty = Fl::event_y_root() + 20; + if (ty + my_tipwin()->h() > scr_h) + ty = Fl::event_y_root() - 20 - my_tipwin()->h(); + if (ty < 0) ty = 0; + + my_tipwin()->position(Fl::event_x_root(), ty); + my_tipwin()->show(); + my_tipwin()->recent_tooltip(0); +} + +static void recent_timeout(void*) { + my_tipwin()->recent_tooltip(0); +} + + +//--------------------------------------------------------------------------- + +/* + * A Button sharing a custom tooltip window + */ +TipWinButton::TipWinButton(int x, int y, int w, int h, const char *l) : + Fl_Button(x, y, w, h, l) +{ + tipwin = my_tipwin(); + mytooltip = strdup("empty"); +} + +TipWinButton::~TipWinButton(void) +{ + tipwin->cancel(this); // cancel tooltip if shown + free(mytooltip); +} + +int TipWinButton::handle(int e) +{ + switch (e) { + case FL_ENTER: + tipwin->value(mytooltip); + tipwin->do_show(this); + break; + case FL_PUSH: // push mouse + case FL_RELEASE: // release mouse + case FL_HIDE: // widget goes away + case FL_LEAVE: // leave focus + tipwin->do_hide(); + break; + } + return (Fl_Button::handle(e)); +} + +void TipWinButton::set_tooltip(const char *s) +{ + free(mytooltip); + mytooltip = strdup(s); +} + + +//--------------------------------------------------------------------------- + +/* + * A Light Button sharing a custom tooltip window + */ +CustButton::CustButton(int x, int y, int w, int h, const char *l) : + TipWinButton(x,y,w,h,l) +{ + norm_color = color(); + light_color = 17; // {17,26,51} +} + +int CustButton::handle(int e) +{ + if (active()) { + if (e == FL_ENTER) { + color(light_color); + redraw(); + } else if (e == FL_LEAVE || e == FL_RELEASE || e == FL_HIDE) { + color(norm_color); + redraw(); + } + } else if (e == FL_DEACTIVATE && color() != norm_color) { + color(norm_color); + redraw(); + } + return TipWinButton::handle(e); +} + +void CustButton::hl_color(Fl_Color col) +{ + light_color = col; +} + + +//--------------------------------------------------------------------------- + +/* + * An Input with custom tooltip window + */ +TipWinInput::TipWinInput (int x, int y, int w, int h, const char *l) : + Fl_Input(x,y,w,h,l) +{ + tipwin = my_tipwin(); + mytooltip = strdup("empty"); +} + +TipWinInput::~TipWinInput(void) +{ + tipwin->cancel(this); // cancel tooltip if shown + free(mytooltip); +} + +int TipWinInput::handle(int e) +{ + switch (e) { + case FL_ENTER: + tipwin->value(mytooltip); + tipwin->do_show(this); + break; + case FL_PUSH: // push mouse + case FL_RELEASE: // release mouse + case FL_HIDE: // widget goes away + case FL_LEAVE: // leave focus + case FL_KEYBOARD: // key press + tipwin->do_hide(); + break; + } + return (Fl_Input::handle(e)); +} + +void TipWinInput::set_tooltip(const char *s) +{ + free(mytooltip); + mytooltip = strdup(s); +} + diff --git a/src/tipwin.hh b/src/tipwin.hh new file mode 100644 index 00000000..d3aeeac5 --- /dev/null +++ b/src/tipwin.hh @@ -0,0 +1,74 @@ +#ifndef __TIPWIN_HH__ +#define __TIPWIN_HH__ + +#include <FL/Fl_Menu_Window.H> +#include <FL/Fl_Button.H> +#include <FL/Fl_Input.H> + + +/* + * Custom tooltip window + */ +class TipWin : public Fl_Menu_Window { + char tip[256]; + int bgcolor, recent; + void *cur_widget; +public: + TipWin(); + void draw(); + void value(const char *s); + void do_show(void *wid); + void do_hide(); + void recent_tooltip(int val); + + void cancel(void *wid) { + if (wid == cur_widget) { cur_widget = NULL; do_hide(); } + } +}; + +extern TipWin *my_tipwin(void); + + +/* + * A Button sharing a custom tooltip window + */ +class TipWinButton : public Fl_Button { + char *mytooltip; + TipWin *tipwin; + public: + TipWinButton(int x, int y, int w, int h, const char *l = 0); + ~TipWinButton(); + virtual int handle(int e); + + void set_tooltip(const char *s); +}; + +/* + * A button that highlights on mouse over + */ +class CustButton : public TipWinButton { + Fl_Color norm_color, light_color; +public: + CustButton(int x, int y, int w, int h, const char *l=0); + virtual int handle(int e); + void hl_color(Fl_Color col); +}; + + +/* + * An Input with custom tooltip window + */ +class TipWinInput : public Fl_Input { + char *mytooltip; + TipWin *tipwin; +public: + TipWinInput (int x, int y, int w, int h, const char* l=0); + ~TipWinInput(void); + virtual int handle(int e); + + void set_tooltip(const char *s); +}; + + +#endif // __TIPWIN_HH__ + @@ -19,6 +19,7 @@ #include "msg.h" #include "timeout.hh" #include "utf8.hh" +#include "tipwin.hh" #include <FL/Fl.H> #include <FL/Fl_Pixmap.H> @@ -88,11 +89,11 @@ static struct iconset *icons = &standard_icons; /* * (Used to avoid certain shortcuts in the location bar) */ -class CustInput : public Fl_Input { +class CustInput : public TipWinInput { public: CustInput (int x, int y, int w, int h, const char* l=0) : - Fl_Input(x,y,w,h,l) {}; - int handle(int e); + TipWinInput(x,y,w,h,l) {}; + virtual int handle(int e); }; /* @@ -150,7 +151,7 @@ int CustInput::handle(int e) } } - return Fl_Input::handle(e); + return TipWinInput::handle(e); } //---------------------------------------------------------------------------- @@ -158,10 +159,10 @@ int CustInput::handle(int e) /* * Used to handle "paste" within the toolbar's Clear button. */ -class CustPasteButton : public CustLightButton { +class CustPasteButton : public CustButton { public: CustPasteButton(int x, int y, int w, int h, const char *l=0) : - CustLightButton(x,y,w,h,l) {}; + CustButton(x,y,w,h,l) {}; int handle(int e); }; @@ -175,7 +176,7 @@ int CustPasteButton::handle(int e) return 1; } } - return CustLightButton::handle(e); + return CustButton::handle(e); } //---------------------------------------------------------------------------- @@ -379,13 +380,13 @@ static void bugmeter_cb(Fl_Widget *wid, void *data) /* * Make a generic navigation button */ -Fl_Button *UI::make_button(const char *label, Fl_Image *img, Fl_Image *deimg, - int b_n, int start) +CustButton *UI::make_button(const char *label, Fl_Image *img, Fl_Image *deimg, + int b_n, int start) { if (start) p_xpos = 0; - Fl_Button *b = new CustLightButton(p_xpos, 0, bw, bh, (lbl) ? label : NULL); + CustButton *b = new CustButton(p_xpos, 0, bw, bh, (lbl) ? label : NULL); if (img) b->image(img); if (deimg) @@ -413,14 +414,14 @@ void UI::make_toolbar(int tw, int th) Bookmarks = make_button("Book", icons->ImgBook, NULL, UI_BOOK); Tools = make_button("Tools", icons->ImgTools, NULL, UI_TOOLS); - Back->tooltip("Previous page"); - Forw->tooltip("Next page"); - Home->tooltip("Go to the Home page"); - Reload->tooltip("Reload"); - Save->tooltip("Save this page"); - Stop->tooltip("Stop loading"); - Bookmarks->tooltip("View bookmarks"); - Tools->tooltip("Settings"); + Back->set_tooltip("Previous page"); + Forw->set_tooltip("Next page"); + Home->set_tooltip("Go to the Home page"); + Reload->set_tooltip("Reload"); + Save->set_tooltip("Save this page"); + Stop->set_tooltip("Stop loading"); + Bookmarks->set_tooltip("View bookmarks"); + Tools->set_tooltip("Settings"); } /* @@ -428,37 +429,38 @@ void UI::make_toolbar(int tw, int th) */ void UI::make_location(int ww) { - Fl_Button *b; + CustButton *b; - Clear = b = new CustPasteButton(p_xpos,0,16,lh,0); + b = Clear = (CustButton*) new CustPasteButton(p_xpos,0,16,lh,0); b->image(icons->ImgClear); b->callback(clear_cb, this); b->clear_visible_focus(); b->box(FL_THIN_UP_BOX); - b->tooltip("Clear the URL box.\nMiddle-click to paste a URL."); + b->set_tooltip("Clear the URL box.\nMiddle-click to paste a URL."); p_xpos += b->w(); - Fl_Input *i = Location = new CustInput(p_xpos,0,ww-p_xpos-32,lh,0); + CustInput *i = new CustInput(p_xpos,0,ww-p_xpos-32,lh,0); + Location = i; i->color(CuteColor); i->when(FL_WHEN_ENTER_KEY); i->callback(location_cb, this); - i->tooltip("Location"); + i->set_tooltip("Location"); p_xpos += i->w(); - Search = b = new CustLightButton(p_xpos,0,16,lh,0); + Search = b = new CustButton(p_xpos,0,16,lh,0); b->image(icons->ImgSearch); b->callback(search_cb, this); b->clear_visible_focus(); b->box(FL_THIN_UP_BOX); - b->tooltip("Search the Web"); + b->set_tooltip("Search the Web"); p_xpos += b->w(); - Help = b = new CustLightButton(p_xpos,0,16,lh,0); + Help = b = new CustButton(p_xpos,0,16,lh,0); b->image(icons->ImgHelp); b->callback(help_cb, this); b->clear_visible_focus(); b->box(FL_THIN_UP_BOX); - b->tooltip("Help"); + b->set_tooltip("Help"); p_xpos += b->w(); } @@ -489,10 +491,10 @@ void UI::make_progress_bars(int wide, int thin_up) */ Fl_Widget *UI::make_filemenu_button() { - Fl_Button *btn; + CustButton *btn; int w = 0, h = 0, padding; - FileButton = btn = new Fl_Button(p_xpos,0,bw,bh,"W"); + FileButton = btn = new CustButton(p_xpos,0,bw,bh,"W"); btn->labeltype(FL_FREE_LABELTYPE); btn->measure_label(w, h); padding = w; @@ -504,7 +506,7 @@ Fl_Widget *UI::make_filemenu_button() _MSG("UI::make_filemenu_button w=%d h=%d padding=%d\n", w, h, padding); btn->box(FL_THIN_UP_BOX); btn->callback(filemenu_cb, this); - btn->tooltip("File menu"); + btn->set_tooltip("File menu"); btn->clear_visible_focus(); if (!prefs.show_filemenu) btn->hide(); @@ -610,11 +612,11 @@ void UI::make_status_bar(int ww, int wh) StatusOutput->color(FL_GRAY_RAMP + 18); // Bug Meter - BugMeter = new CustLightButton(ww-bm_w,wh-sh,bm_w,sh); + BugMeter = new CustButton(ww-bm_w,wh-sh,bm_w,sh); BugMeter->image(icons->ImgMeterOK); BugMeter->box(FL_THIN_DOWN_BOX); BugMeter->align(FL_ALIGN_INSIDE | FL_ALIGN_TEXT_NEXT_TO_IMAGE); - BugMeter->tooltip("Show HTML bugs\n(right-click for menu)"); + BugMeter->set_tooltip("Show HTML bugs\n(right-click for menu)"); BugMeter->callback(bugmeter_cb, this); BugMeter->clear_visible_focus(); @@ -632,7 +634,6 @@ UI::UI(int x, int y, int ui_w, int ui_h, const char* label, const UI *cur_ui) : LocBar = NavBar = StatusBar = NULL; Tabs = NULL; - TabTooltip = NULL; TopGroup = this; TopGroup->box(FL_NO_BOX); clear_flag(SHORTCUT_LABEL); @@ -691,7 +692,6 @@ UI::UI(int x, int y, int ui_w, int ui_h, const char* label, const UI *cur_ui) : UI::~UI() { _MSG("UI::~UI()\n"); - dFree(TabTooltip); } /* @@ -703,16 +703,6 @@ int UI::handle(int event) int ret = 0; if (event == FL_KEYBOARD) { - /* WORKAROUND: remove the Panel's fltk-tooltip. - * Although the expose event is delivered, it has an offset. This - * extra call avoids the lingering tooltip. */ - if (!Fl::event_inside(Main) && - (Fl::event_inside((Fl_Widget*)tabs()) || - Fl::event_inside(NavBar) || - (LocBar && Fl::event_inside(LocBar)) || - (StatusBar && Fl::event_inside(StatusBar)))) - window()->damage(FL_DAMAGE_EXPOSE,0,0,1,1); - return 0; // Receive as shortcut } else if (event == FL_SHORTCUT) { KeysCommand_t cmd = Keys::getKeyCmd(); @@ -11,6 +11,7 @@ #include <FL/Fl_Image.H> #include <FL/Fl_Tabs.H> +#include "tipwin.hh" #include "findbar.hh" typedef enum { @@ -115,43 +116,16 @@ 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 || e == FL_HIDE) { - color(norm_color); - redraw(); - } - } else if (e == FL_DEACTIVATE && color() != norm_color) { - color(norm_color); - redraw(); - } - return Fl_Button::handle(e); - } - void hl_color(Fl_Color col) { light_color = col; }; -}; // // UI class definition ------------------------------------------------------- // class UI : public CustGroupVertical { CustTabs *Tabs; - char *TabTooltip; CustGroupVertical *TopGroup; - Fl_Button *Back, *Forw, *Home, *Reload, *Save, *Stop, *Bookmarks, *Tools, - *Clear, *Search, *Help, *BugMeter, *FileButton; + CustButton *Back, *Forw, *Home, *Reload, *Save, *Stop, *Bookmarks, + *Tools, *Clear, *Search, *Help, *BugMeter, *FileButton; CustGroupHorizontal *LocBar, *NavBar, *StatusBar; Fl_Input *Location; CustProgressBox *PProg, *IProg; @@ -166,8 +140,8 @@ class UI : public CustGroupVertical { bool PanelTemporary; UIPanelmode Panelmode; - Fl_Button *make_button(const char *label, Fl_Image *img, - Fl_Image*deimg, int b_n, int start = 0); + CustButton *make_button(const char *label, Fl_Image *img, Fl_Image*deimg, + int b_n, int start = 0); void make_toolbar(int tw, int th); void make_location(int ww); void make_progress_bars(int wide, int thin_up); diff --git a/src/uicmd.cc b/src/uicmd.cc index bf4bbe2f..27ad7d49 100644 --- a/src/uicmd.cc +++ b/src/uicmd.cc @@ -84,7 +84,7 @@ class CustTabButton : public Fl_Button { // active one (the highest numbered gets focus). public: CustTabButton (int x,int y,int w,int h, const char* label = 0) : - Fl_Button (x,y,w,h,label) { ui_ = NULL; }; + Fl_Button (x,y,w,h,label) { ui_ = NULL; focus_num_ = 0; }; void ui(UI *pui) { ui_ = pui; } UI *ui(void) { return ui_; } void focus_num(uint_t fn) { focus_num_ = fn; } @@ -107,7 +107,7 @@ class CustTabs : public Fl_Group { Fl_Scroll *Scroll; Fl_Pack *Pack; Fl_Group *Control; - CustLightButton *CloseBtn; + CustButton *CloseBtn; int tabcolor_inactive, tabcolor_active; void update_pack_offset(void); @@ -151,12 +151,12 @@ public: /* control buttons go inside a group */ Control = new Fl_Group(ww-ctl_w,0,ctl_w,ctab_h); - CloseBtn = new CustLightButton(ww-ctl_w+2,0,btn_w,ctab_h, "X"); + CloseBtn = new CustButton(ww-ctl_w+2,0,btn_w,ctab_h, "X"); CloseBtn->box(FL_THIN_UP_BOX); CloseBtn->labelcolor(0x00641000); CloseBtn->hl_color(FL_WHITE); CloseBtn->clear_visible_focus(); - CloseBtn->tooltip(prefs.right_click_closes_tab ? + CloseBtn->set_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); @@ -290,8 +290,6 @@ UI *CustTabs::add_new_tab(UI *old_ui, int focus) if (focus) { switch_tab(btn); } else if (num_tabs() == 2) { - increase_focus_counter(); - btn->focus_num(focus_counter); // no focus and tabbar added: redraw current page Wizard->redraw(); } |