- Reverted an accidental testing code commit.

8 files changed, 125 insertions, 186 deletions

diff --git a/src/findbar.cc b/src/findbar.cc
index 78f55df1..0807a4fa 100644
--- a/src/findbar.cc
+++ b/src/findbar.cc
@@ -10,13 +10,13 @@
  */
 
 #include <fltk/events.h>
-#include <fltk/Window.h>
 #include "findbar.hh"
 
 #include "msg.h"
 #include "pixmaps.h"
 #include "uicmd.hh"
 #include "bw.h"
+#include "ui.hh"
 
 /*
  * Local sub class
@@ -31,12 +31,12 @@ public:
 
 int MyInput::handle(int e)
 {
-   _MSG("findbar MyInput::handle()\n");
+   _MSG("findbar NewInput::handle()\n");
    int ret = 1, k = event_key();
    unsigned modifier = event_state() & (SHIFT | CTRL | ALT | META);
    if (modifier == 0) {
       if (e == KEY && k == EscapeKey) {
-         _MSG("findbar CustInput: caught EscapeKey\n");
+         _MSG("findbar NewInput: caught EscapeKey\n");
          ret = 0;
       }
    }
@@ -55,7 +55,7 @@ void Findbar::search_cb(Widget *, void *vfb)
    bool case_sens = fb->cb->value();
 
    if (key[0] != '\0')
-      a_UIcmd_findtext_search((BrowserWindow *) fb->window()->user_data(),
+      a_UIcmd_findtext_search((BrowserWindow *) fb->ui->user_data(),
                               key, case_sens);
 }
 
@@ -83,7 +83,7 @@ void Findbar::hide_cb(Widget *, void *vfb)
 /*
  * Construct text search bar
  */
-Findbar::Findbar(int width, int height) :
+Findbar::Findbar(int width, int height, UI *ui) :
    Group(0, 0, width, height)
 {
    int button_width = 70;
@@ -93,7 +93,8 @@ Findbar::Findbar(int width, int height) :
    int x = border;
    height -= 2 * border;
 
-   Group::hide();
+   this->ui = ui;
+   this->hide();
 
    begin();
     hidebutton = new HighlightButton(x, border, 16, height, 0);
@@ -112,7 +113,7 @@ Findbar::Findbar(int width, int height) :
     i->callback(search_cb2, this);
 
     // todo: search previous would be nice
-    findb = new HighlightButton(x, border, button_width, height, "Next");
+    findb = new HighlightButton(x, border, button_width, height, "&Next");
     x += button_width + gap;
     findb->tooltip("Find next occurrence of the search phrase");
     findb->add_shortcut(ReturnKey);
@@ -139,7 +140,7 @@ int Findbar::handle(int event)
    int k = event_key();
    unsigned modifier = event_state() & (SHIFT | CTRL | ALT | META);
 
-   if (event == KEY && modifier == 0 && k == EscapeKey) {
+   if (modifier == 0 && k == EscapeKey) {
       hide();
       ret = 1;
    }
@@ -169,7 +170,6 @@ void Findbar::hide()
    BrowserWindow *bw;
 
    Group::hide();
-   if ((bw = (BrowserWindow *) this->window()->user_data()))
+   if ((bw = (BrowserWindow *) ui->user_data()))
       a_UIcmd_findtext_reset(bw);
-   a_UIcmd_focus_main_area(bw);
 }
diff --git a/src/findbar.hh b/src/findbar.hh
index b5591889..db803140 100644
--- a/src/findbar.hh
+++ b/src/findbar.hh
@@ -9,6 +9,9 @@
 #include <fltk/Group.h>
 #include <fltk/CheckButton.h>
 
+// simple declaration to avoid circular include
+class UI;
+
 using namespace fltk;
 
 /*
@@ -19,6 +22,7 @@ class Findbar : public Group {
    Button *clrb;
    HighlightButton *hidebutton;
    xpmImage *hideImg;
+   UI *ui;
    Input *i;
    CheckButton *cb;
    
@@ -27,7 +31,7 @@ class Findbar : public Group {
    static void hide_cb (Widget *, void *);
 
 public:
-   Findbar(int width, int height);
+   Findbar(int width, int height, UI *ui);
    ~Findbar();
    int handle(int event);
    void show();
diff --git a/src/menu.cc b/src/menu.cc
index c6a4bb90..111e6182 100644
--- a/src/menu.cc
+++ b/src/menu.cc
@@ -49,10 +49,10 @@ static int *history_list = NULL;
  * Used to add the hint for history popup menus, and to remember
  * the mouse button pressed over a menu item.
  */
-class CustItem : public Item {
+class NewItem : public Item {
    int EventButton;
 public:
-   CustItem (const char* label) : Item(label) { EventButton = 0; };
+   NewItem (const char* label) : Item(label) { EventButton = 0; };
    int button () { return EventButton; };
    void draw();
    int handle(int e) {
@@ -65,7 +65,7 @@ public:
  * This adds a call to a_UIcmd_set_msg() to show the URL in the status bar
  * TODO: erase the URL on popup close.
  */
-void CustItem::draw() {
+void NewItem::draw() {
    DilloUrl *url;
 
    if (flags() & SELECTED) {
@@ -217,7 +217,7 @@ static void Menu_bugmeter_about_cb(Widget* )
  */
 static void Menu_history_cb(Widget *wid, void *data)
 {
-   int mb = ((CustItem*)wid)->button();
+   int mb = ((NewItem*)wid)->button();
    int offset = history_direction * VOIDP2INT(data);
 
    if (mb == 2) {
@@ -438,7 +438,7 @@ void a_Menu_history_popup(BrowserWindow *bw, int direction)
    pm->begin();
     for (i = 0; history_list[i] != -1; i += 1) {
        // TODO: restrict title size
-       it = new CustItem(a_History_get_title(history_list[i], 1));
+       it = new NewItem(a_History_get_title(history_list[i], 1));
        it->callback(Menu_history_cb, (void*)(i+1));
     }
    pm->type(PopupMenu::POPUP123);
diff --git a/src/pixmaps.h b/src/pixmaps.h
index 3043ead4..43d2268b 100644
--- a/src/pixmaps.h
+++ b/src/pixmaps.h
@@ -1497,8 +1497,8 @@ static const char *const mini_ok_xpm[] = {
 /* XPM */
 static const char *const imgload_on_xpm[] = {
 "15 15 2 1",
-"       c None",
-".      c #00000000CF3C",
+" 	c #FFFFFFFFFFFF",
+".	c #00000000CF3C",
 "               ",
 " . .   .  ...  ",
 " . .. .. .   . ",
@@ -1518,8 +1518,8 @@ static const char *const imgload_on_xpm[] = {
 /* XPM */
 static const char *const imgload_off_xpm[] = {
 "15 15 2 1",
-"       c None",
-".      c #CF3C00000000",
+" 	c #FFFFFFFFFFFF",
+".	c #CF3C00000000",
 "               ",
 " . .   .  ...  ",
 " . .. .. .   . ",
diff --git a/src/ui.cc b/src/ui.cc
index b355400e..5ea592b8 100644
--- a/src/ui.cc
+++ b/src/ui.cc
@@ -39,9 +39,9 @@ using namespace fltk;
  * (Used to avoid certain shortcuts in the location bar)
  */
 
-class CustInput : public Input {
+class NewInput : public Input {
 public:
-   CustInput (int x, int y, int w, int h, const char* l=0) :
+   NewInput (int x, int y, int w, int h, const char* l=0) :
       Input(x,y,w,h,l) {};
    int handle(int e);
 };
@@ -50,15 +50,15 @@ public:
  * Disable: UpKey, DownKey, PageUpKey, PageDownKey and 
  * CTRL+{o,r,HomeKey,EndKey}
  */
-int CustInput::handle(int e)
+int NewInput::handle(int e)
 {
    int k = event_key();
 
-   _MSG("CustInput::handle event=%d\n", e);
+   _MSG("NewInput::handle event=%d\n", e);
 
    // Don't focus with arrow keys
    if (e == FOCUS &&
-       (k == UpKey || k == DownKey || k == LeftKey || k == RightKey)) {
+       (k == UpKey || k == DownKey || k == LeftKey|| k == RightKey)) {
       return 0;
    }
 
@@ -80,14 +80,14 @@ int CustInput::handle(int e)
 /*
  * Used to handle "paste" within the toolbar's Clear button.
  */
-class CustHighlightButton : public HighlightButton {
+class NewHighlightButton : public HighlightButton {
 public:
-   CustHighlightButton(int x, int y, int w, int h, const char *l=0) :
+   NewHighlightButton(int x, int y, int w, int h, const char *l=0) :
       HighlightButton(x,y,w,h,l) {};
    int handle(int e);
 };
 
-int CustHighlightButton::handle(int e)
+int NewHighlightButton::handle(int e)
 {
    if (e == PASTE) {
       const char* t = event_text();
@@ -105,9 +105,9 @@ int CustHighlightButton::handle(int e)
 /*
  * Used to resize the progress boxes automatically.
  */
-class CustProgressBox : public InvisibleBox {
+class NewProgressBox : public InvisibleBox {
 public:
-   CustProgressBox(int x, int y, int w, int h, const char *l=0) :
+   NewProgressBox(int x, int y, int w, int h, const char *l=0) :
       InvisibleBox(x,y,w,h,l) {};
    void update_label(const char *lbl) {
       static int padding = 0;
@@ -138,6 +138,14 @@ public:
 //
 
 /*
+ * Callback handler for the close window event.
+ */
+static void close_window_cb(Widget *wid, void *data)
+{
+   a_UIcmd_close_bw(data);
+}
+
+/*
  * Callback for the search button.
  */
 static void search_cb(Widget *wid, void *data)
@@ -273,15 +281,15 @@ static void fullscreen_cb(Widget *wid, void *data)
 /*
  * Callback for the bug meter button.
  */
-static void bugmeter_cb(Widget *wid, void *data)
+static void bugmeter_cb(Widget *w, void *data)
 {
    int k = event_key();
    if (k && k <= 7)
       MSG("[BugMeter], mouse button %d was pressed\n", k);
    if (k == 1) {
-      a_UIcmd_view_page_bugs(wid->window()->user_data());
+      a_UIcmd_view_page_bugs(((UI*)data)->user_data());
    } else if (k == 3) {
-      a_UIcmd_bugmeter_popup(wid->window()->user_data());
+      a_UIcmd_bugmeter_popup(((UI*)data)->user_data());
    }
 }
 
@@ -407,14 +415,14 @@ PackedGroup *UI::make_location()
    Button *b;
    PackedGroup *pg = new PackedGroup(0,0,0,0);
    pg->begin();
-    Clear = b = new CustHighlightButton(2,2,16,22,0);
+    Clear = b = new NewHighlightButton(2,2,16,22,0);
     ImgClear = new xpmImage(new_s_xpm);
     b->image(ImgClear);
     b->tooltip("Clear the URL box.\nMiddle-click to paste a URL.");
     b->callback(clear_cb, (void *)this);
     b->clear_tab_to_focus();
 
-    Input *i = Location = new CustInput(0,0,0,0,0);
+    Input *i = Location = new NewInput(0,0,0,0,0);
     i->tooltip("Location");
     i->color(CuteColor);
     i->when(WHEN_ENTER_KEY);
@@ -443,12 +451,12 @@ PackedGroup *UI::make_progress_bars(int wide, int thin_up)
    ProgBox = new PackedGroup(0,0,0,0);
    ProgBox->begin();
     // Images
-    IProg = new CustProgressBox(0,0,0,0);
+    IProg = new NewProgressBox(0,0,0,0);
     IProg->box(thin_up ? THIN_UP_BOX : EMBOSSED_BOX);
     IProg->labelcolor(GRAY10);
     IProg->update_label(wide ? "Images\n0 of 0" : "0 of 0");
     // Page
-    PProg = new CustProgressBox(0,0,0,0);
+    PProg = new NewProgressBox(0,0,0,0);
     PProg->box(thin_up ? THIN_UP_BOX : EMBOSSED_BOX);
     PProg->labelcolor(GRAY10);
     PProg->update_label(wide ? "Page\n0.0KB" : "0.0KB");
@@ -468,14 +476,14 @@ static void menubar_cb(Widget *wid, void *data)
    if (strcmp((char*)data, "nb") == 0) {
       a_UIcmd_browser_window_new(wid->window()->w(), wid->window()->h(), ui);
    } else if (strcmp((char*)data, "of") == 0) {
-      a_UIcmd_open_file(wid->window()->user_data());
+      a_UIcmd_open_file(ui->user_data());
    } else if (strcmp((char*)data, "ou") == 0) {
       if (ui->get_panelmode() == UI_HIDDEN) {
          ui->set_panelmode(UI_TEMPORARILY_SHOW_PANELS);
       }
       ui->focus_location();
    } else if (strcmp((char*)data, "cw") == 0) {
-      a_UIcmd_close_bw(wid->window()->user_data());
+      a_UIcmd_close_bw(ui->user_data());
    } else if (strcmp((char*)data, "ed") == 0) {
       a_UIcmd_close_all_bw();
    }
@@ -601,11 +609,11 @@ Group *UI::make_panel(int ww)
  * User Interface constructor
  */ 
 UI::UI(int win_w, int win_h, const char* label, const UI *cur_ui) :
-  Group(0, 0, win_w, win_h, label)
+  Window(win_w, win_h, label)
 {
    int s_h = 20;
+   clear_double_buffer();
 
-   Tabs = NULL;
    TopGroup = new PackedGroup(0, 0, win_w, win_h);
    add(TopGroup);
    resizable(TopGroup);
@@ -625,6 +633,10 @@ UI::UI(int win_w, int win_h, const char* label, const UI *cur_ui) :
    }
 
 
+   // Set handler for the close window event
+   // (the argument is set later via user_data())
+   callback(close_window_cb);
+
    // Control panel
    Panel = make_panel(win_w);
    TopGroup->add(Panel);
@@ -643,7 +655,7 @@ UI::UI(int win_w, int win_h, const char* label, const UI *cur_ui) :
    MainIdx = TopGroup->find(Main);
 
    // Find text bar
-   findbar = new Findbar(win_w, 30);
+   findbar = new Findbar(win_w, 30, this);
    TopGroup->add(findbar); 
 
    // Status Panel
@@ -717,7 +729,6 @@ UI::UI(int win_w, int win_h, const char* label, const UI *cur_ui) :
  */
 UI::~UI()
 {
-   _MSG("UI::~UI()\n");
    delete_panel_images();
    delete_status_panel_images();
    delete ImgFullScreenOn;
@@ -740,22 +751,27 @@ void UI::delete_status_panel_images()
  */
 int UI::handle(int event)
 {
-   MSG("UI::handle event=%d (%d,%d)\n", event, event_x(), event_y());
-   _MSG("Panel->h()=%d Main->h()=%d\n", Panel->h() , Main->h());
-
+   _MSG("UI::handle event=%d\n", event);
    int ret = 0, k = event_key();
 
-   // We're only interested in some flags
-   unsigned modifier = event_state() & (SHIFT | CTRL | ALT);
+   // We're only interested in some flags 
+   // (not whether numlock is on for example)
+   unsigned modifier = event_state() & (SHIFT | CTRL | ALT | META);
 
+   // Let FLTK pass these events to child widgets.
    if (event == KEY) {
-      return 0; // Receive as shortcut
+      if (k == UpKey || k == DownKey || k == SpaceKey ||
+          k == LeftKey || k == RightKey)
+         return 0;
+      // Ignore Escape for main window.
+      if (k == EscapeKey)
+         ret = 1;
 
    } else if (event == SHORTCUT) {
-      // Handle keyboard shortcuts here.
+      // Handle these shortcuts here.
       if (modifier == CTRL) {
          if (k == 'b') {
-            a_UIcmd_book(this->window()->user_data());
+            a_UIcmd_book(user_data());
             ret = 1;
          } else if (k == 'f') {
             set_findbar_visibility(1);
@@ -770,48 +786,44 @@ int UI::handle(int event)
             a_UIcmd_browser_window_new(w(), h(), this);
             ret = 1;
          } else if (k == 'o') {
-            a_UIcmd_open_file(this->window()->user_data());
+            a_UIcmd_open_file(user_data());
             ret = 1;
          } else if (k == 'q') {
-            a_UIcmd_close_bw(this->window()->user_data());
+            a_UIcmd_close_bw(user_data());
             ret = 1;
          } else if (k == 'r') {
-            a_UIcmd_reload(this->window()->user_data());
+            a_UIcmd_reload(user_data());
             ret = 1;
          } else if (k == 's') {
-            a_UIcmd_search_dialog(this->window()->user_data());
+            a_UIcmd_search_dialog(user_data());
             ret = 1;
          } else if (k == ' ') {
             panelmode_cb_i();
             ret = 1;
          }
-      } else {
-         // Back and Forward navigation shortcuts
-         if (modifier == 0 && (k == BackSpaceKey ||  k == ',')) {
-            a_UIcmd_back(this->window()->user_data());
-            ret = 1;
-         } else if ((modifier == 0 && k == '.') ||
-                    (modifier == SHIFT && k == BackSpaceKey)) {
-            a_UIcmd_forw(this->window()->user_data());
-            ret = 1;
-         }
       }
 
-   } else if (event == FOCUS_CHANGE) {
-      // The "bw" for this tab is stored in the parent window.
-      // Update "bw" each time we switch tabs.
-      window()->user_data(vbw());
-      ret = 0;
+      if (event_key_state(LeftAltKey) && modifier == ALT && k == 'q') {
+         a_UIcmd_close_all_bw();
+         ret = 1;
+      }
+
+      // Back and Forward navigation shortcuts
+      if ((modifier == 0 && k == BackSpaceKey) ||
+          (modifier == 0 && k == ',')) {
+         a_UIcmd_back(user_data());
+         ret = 1;
+      } else if ((modifier == SHIFT && k == BackSpaceKey) ||
+                 (modifier == 0 &&k == '.')) {
+         a_UIcmd_forw(user_data());
+         ret = 1;
+      }
    }
 
-   if (!ret)
-      ret = Group::handle(event);
+   if (ret == 0) {
+      ret = Window::handle(event);
+   }
    return ret;
-
-   // if (event_key_state(LeftAltKey) && modifier == ALT && k == 'q') {
-   //    a_UIcmd_close_all_bw();
-   //    ret = 1;
-   // }
 }
 
 
@@ -847,14 +859,6 @@ void UI::focus_location()
 }
 
 /*
- * Focus Main area.
- */
-void UI::focus_main()
-{
-   Main->take_focus();
-}
-
-/*
  * Set a new message in the status bar.
  */
 void UI::set_status(const char *str)
@@ -1071,8 +1075,8 @@ void UI::set_page_title(const char *label)
    char title[128];
 
    snprintf(title, 128, "Dillo: %s", label);
-   this->window()->copy_label(title);
-   this->window()->redraw_label();
+   this->copy_label(title);
+   this->redraw_label();
 }
 
 /*
diff --git a/src/ui.hh b/src/ui.hh
index b8dd5810..d99bfef4 100644
--- a/src/ui.hh
+++ b/src/ui.hh
@@ -12,7 +12,6 @@
 #include <fltk/Image.h>
 #include <fltk/MultiImage.h>
 #include <fltk/MenuBuild.h>
-#include <fltk/TabGroup.h>
 
 #include "findbar.hh"
 
@@ -37,21 +36,18 @@ typedef enum {
 } UIPanelmode;
 
 // Private class 
-class CustProgressBox;
+class NewProgressBox;
 
 //
 // UI class definition -------------------------------------------------------
 //
-class UI : public fltk::Group {
-   void *Bw;
-   TabGroup *Tabs;
-
+class UI : public fltk::Window {
    Group *TopGroup;
    Button *Back, *Forw, *Home, *Reload, *Save, *Stop, *Bookmarks,
           *Clear, *Search, *FullScreen, *ImageLoad, *BugMeter;
    Input  *Location;
    PackedGroup *ProgBox;
-   CustProgressBox *PProg, *IProg;
+   NewProgressBox *PProg, *IProg;
    Image *ImgLeftIns, *ImgLeftSens, *ImgRightIns, *ImgRightSens,
          *ImgStopIns, *ImgStopSens, *ImgFullScreenOn, *ImgFullScreenOff,
          *ImgImageLoadOn, *ImgImageLoadOff, *ImgMeterOK, *ImgMeterBug,
@@ -88,7 +84,6 @@ public:
    const char *get_location();
    void set_location(const char *str);
    void focus_location();
-   void focus_main();
    void set_status(const char *str);
    void set_page_prog(size_t nbytes, int cmd);
    void set_img_prog(int n_img, int t_img, int cmd);
@@ -101,14 +96,10 @@ public:
    void set_panelmode(UIPanelmode mode);
    UIPanelmode get_panelmode();
    void set_findbar_visibility(bool visible);
+
    Widget *fullscreen_button() { return FullScreen; }
    void fullscreen_toggle() { FullScreen->do_callback(); }
 
-   TabGroup *tabs() { return Tabs; }
-   void tabs(TabGroup *tabs) { Tabs = tabs; }
-   void *vbw() { return Bw; }
-   void vbw(void *v_bw) { Bw = v_bw; }
-
    // Hooks to method callbacks
    void panel_cb_i();
    void color_change_cb_i();
diff --git a/src/uicmd.cc b/src/uicmd.cc
index 0fc47cee..93f49adf 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -16,7 +16,6 @@
 #include <stdarg.h>
 #include <math.h>       /* for rint */
 #include <fltk/Widget.h>
-#include <fltk/TabGroup.h>
 
 #include "dir.h"
 #include "ui.hh"
@@ -33,53 +32,28 @@
 
 #include "nav.h"
 
-// Handy macro
-#define BW2UI(bw) ((UI*)(bw->ui))
-
 // Platform idependent part
 using namespace dw::core;
 // FLTK related
 using namespace dw::fltk;
 
+typedef struct {
+   UI *ui;
+   BrowserWindow *bw;
+} Uibw;
 
 /*
  * Local data
  */
+// A matching table for all open ui/bw pairs
+// BUG: must be dynamic.
+static Uibw uibws[32];
+static int uibws_num = 0, uibws_max = 32;
+
 static char *save_dir = NULL;
 
 using namespace fltk;
 
-//
-// For custom handling of keyboard
-//
-class CustTabGroup : public fltk::TabGroup {
-public:
-   CustTabGroup (int x, int y, int ww, int wh, const char *lbl=0) :
-      TabGroup(x,y,ww,wh,lbl) {};
-   int handle(int e) {
-      // Don't focus with arrow keys
-      printf("CustTabGroup::handle %d\n", e);
-      int k = event_key();
-      // We're only interested in some flags
-      unsigned modifier = event_state() & (SHIFT | CTRL | ALT);
-      if (e == KEY) {
-         if (k == UpKey || k == DownKey || k == TabKey) {
-            return 0;
-         } else if (k == LeftKey || k == RightKey) {
-            if (modifier == SHIFT) {
-               int i = value();
-               if (k == LeftKey) {i = i ? i-1 : children()-1;}
-               else {i++; if (i >= children()) i = 0;}
-               if (value(i)) do_callback();
-               return 1;
-            }
-            return 0;
-         }
-      }
-      return TabGroup::handle(e);
-   }
-};
-
 
 /*
  * Create a new UI and its associated BrowserWindow data structure.
@@ -87,50 +61,24 @@ public:
  */
 BrowserWindow *a_UIcmd_browser_window_new(int ww, int wh, const void *v_ui)
 {
-   static TabGroup *DilloTabs = NULL;
-   BrowserWindow *new_bw = NULL;
-
    if (ww <= 0 || wh <= 0) {
       // Set default geometry from dillorc.
       ww = prefs.width;
       wh = prefs.height;
    }
 
-   if (!DilloTabs) {
-       {Window *o = new Window(ww, wh);
-        o->shortcut(0); // Ignore Escape
-        o->clear_double_buffer();
-        DilloTabs = new CustTabGroup(0, 0, ww, wh);
-        DilloTabs->selection_color(156);
-        //DilloTabs->clear_tab_to_focus();
-        o->add(DilloTabs);
-       }
-       wh -= 20;
-   }
-
-   fltk::Group* o = new fltk::Group(0, 20, ww, wh, "Label1");
-   o->clear_tab_to_focus();
-   o->clear_click_to_focus();
-   DilloTabs->add(o);
-
    // Create and set the UI
-   UI *new_ui = new UI(ww, wh, "", (UI*) v_ui);
+   UI *new_ui = new UI(ww, wh, "Dillo: UI", (UI*) v_ui);
    new_ui->set_status("http://www.dillo.org/");
-   new_ui->tabs(DilloTabs);
    //new_ui->set_location("http://dillo.org/");
    //new_ui->customize(12);
 
-   o->add(new_ui);
-   DilloTabs->resizable(o);
-   DilloTabs->window()->resizable(new_ui);
-   DilloTabs->window()->show();
-
    if (v_ui == NULL && prefs.xpos >= 0 && prefs.ypos >= 0) {
       // position the first window according to preferences
       fltk::Rectangle r;
-      new_ui->window()->borders(&r);
+      new_ui->borders(&r);
       // borders() gives x and y border sizes as negative values
-      new_ui->window()->position(prefs.xpos - r.x(), prefs.ypos - r.y());
+      new_ui->position(prefs.xpos - r.x(), prefs.ypos - r.y());
    }
 
    // Now create the Dw render layout and viewport
@@ -145,17 +93,23 @@ BrowserWindow *a_UIcmd_browser_window_new(int ww, int wh, const void *v_ui)
    viewport->setScrollStep((int) rint(14.0 * prefs.font_factor));
 
    // Now, create a new browser window structure
-   new_bw = a_Bw_new(ww, wh, 0);
-
-   // Store new_bw for callback data inside UI
-   new_ui->vbw(new_bw);
+   BrowserWindow *new_bw = a_Bw_new(ww, wh, 0);
 
+   // Set new_bw as callback data for UI
+   new_ui->user_data(new_bw);
    // Reference the UI from the bw
    new_bw->ui = (void *)new_ui;
    // Copy the layout pointer into the bw data
    new_bw->render_layout = (void*)layout;
 
-   //new_ui->show();
+   // insert the new ui/bw pair in the table
+   if (uibws_num < uibws_max) {
+      uibws[uibws_num].ui = new_ui;
+      uibws[uibws_num].bw = new_bw;
+      uibws_num++;
+   }
+
+   new_ui->show();
 
    return new_bw;
 }
@@ -166,19 +120,12 @@ BrowserWindow *a_UIcmd_browser_window_new(int ww, int wh, const void *v_ui)
 void a_UIcmd_close_bw(void *vbw)
 {
    BrowserWindow *bw = (BrowserWindow *)vbw;
-   UI *ui = BW2UI(bw);
+   UI *ui = (UI*)bw->ui;
    Layout *layout = (Layout*)bw->render_layout;
 
    MSG("a_UIcmd_close_bw\n");
    a_Bw_stop_clients(bw, BW_Root + BW_Img + Bw_Force);
    delete(layout);
-   if (ui->tabs()) {
-      ui->tabs()->remove(ui);
-      if (ui->tabs()->value() != -1)
-         ui->tabs()->selected_child()->take_focus();
-      else
-         ui->tabs()->window()->hide();
-   }
    delete(ui);
    a_Bw_free(bw);
 }
@@ -615,6 +562,8 @@ void a_UIcmd_nav_jump(BrowserWindow *bw, int offset, int new_bw)
 
 // UI binding functions -------------------------------------------------------
 
+#define BW2UI(bw) ((UI*)(bw->ui))
+
 /*
  * Return browser window width and height
  */
@@ -808,11 +757,3 @@ void a_UIcmd_findtext_reset(BrowserWindow *bw)
    a_UIcmd_set_msg(bw, "");
 }
 
-/*
- * Focus the rendered area.
- */
-void a_UIcmd_focus_main_area(BrowserWindow *bw)
-{
-   BW2UI(bw)->focus_main();
-}
-
diff --git a/src/uicmd.hh b/src/uicmd.hh
index ec1223ec..b469beef 100644
--- a/src/uicmd.hh
+++ b/src/uicmd.hh
@@ -31,7 +31,6 @@ void a_UIcmd_fullscreen_toggle(BrowserWindow *bw);
 void a_UIcmd_findtext_dialog(BrowserWindow *bw);
 void a_UIcmd_findtext_search(BrowserWindow *bw, const char *key, int case_sens);
 void a_UIcmd_findtext_reset(BrowserWindow *bw);
-void a_UIcmd_focus_main_area(BrowserWindow *bw);
 void a_UIcmd_page_popup(void *vbw, const DilloUrl *url,
                         const char *bugs_txt, bool_t unloaded_imgs);
 void a_UIcmd_link_popup(void *vbw, const DilloUrl *url);