7 files changed, 132 insertions, 78 deletions

diff --git a/src/app.c b/src/app.c
index 5b31faa7..e88abe20 100644
--- a/src/app.c
+++ b/src/app.c
@@ -389,6 +389,20 @@ iBool handleCommand_App(const char *cmd) {
 #endif
         return iFalse;
     }
+    else if (equal_Command(cmd, "tabs.new")) {
+        iWidget *tabs = findWidget_App("doctabs");
+        iWidget *newTabButton = findChild_Widget(tabs, "newtab");
+        removeChild_Widget(newTabButton->parent, newTabButton);
+        iDocumentWidget *newDoc = new_DocumentWidget();
+        setId_Widget(as_Widget(newDoc), format_CStr("document%03d", tabCount_Widget(tabs)));
+        appendTabPage_Widget(tabs, iClob(newDoc), "", 0, 0);
+        addChild_Widget(findChild_Widget(tabs, "tabs.buttons"), iClob(newTabButton));
+        postCommandf_App("tabs.switch page:%p", newDoc);
+        postCommand_App("navigate.home");
+        arrange_Widget(tabs);
+        refresh_Widget(tabs);
+        return iTrue;
+    }
     else if (equal_Command(cmd, "quit")) {
         SDL_Event ev;
         ev.type = SDL_QUIT;
diff --git a/src/app.h b/src/app.h
index 64c1f64d..d10da7c3 100644
--- a/src/app.h
+++ b/src/app.h
@@ -5,6 +5,7 @@
 #include <the_Foundation/string.h>
 #include <the_Foundation/time.h>
 
+iDeclareType(DocumentWidget)
 iDeclareType(GmCerts)
 iDeclareType(Visited)
 iDeclareType(Window)
@@ -26,8 +27,11 @@ void        processEvents_App   (enum iAppEventMode mode);
 iBool       handleCommand_App   (const char *cmd);
 void        refresh_App         (void);
 
-iGmCerts *  certs_App       (void);
-iVisited *  visited_App     (void);
+iGmCerts *          certs_App           (void);
+iVisited *          visited_App         (void);
+iDocumentWidget *   document_App        (void);
+iDocumentWidget *   document_Command    (const char *cmd);
+
 
 iAny *      findWidget_App      (const char *id);
 void        addTicker_App       (void (*ticker)(iAny *), iAny *context);
diff --git a/src/ui/command.c b/src/ui/command.c
index b79c8bcf..c0828343 100644
--- a/src/ui/command.c
+++ b/src/ui/command.c
@@ -6,7 +6,7 @@
 
 iBool equal_Command(const char *cmdWithArgs, const char *cmd) {
     if (strchr(cmdWithArgs, ':')) {
-        return beginsWith_CStr(cmdWithArgs, cmd) && cmdWithArgs[strlen(cmd)] == ' ';
+        return startsWith_CStr(cmdWithArgs, cmd) && cmdWithArgs[strlen(cmd)] == ' ';
     }
     return equal_CStr(cmdWithArgs, cmd);
 }
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index a1299727..7ae43458 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -109,7 +109,7 @@ iDefineObjectConstruction(DocumentWidget)
 void init_DocumentWidget(iDocumentWidget *d) {
     iWidget *w = as_Widget(d);
     init_Widget(w);
-    setId_Widget(w, "document");
+    setId_Widget(w, "document000");
     iZap(d->certExpiry);
     d->history          = new_History();
     d->state            = blank_DocumentState;
@@ -195,13 +195,13 @@ static void requestUpdated_DocumentWidget_(iAnyObject *obj) {
     iDocumentWidget *d = obj;
     const int wasUpdated = exchange_Atomic(&d->isRequestUpdated, iTrue);
     if (!wasUpdated) {
-        postCommand_Widget(obj, "document.request.updated request:%p", d->request);
+        postCommand_Widget(obj, "document.request.updated doc:%p request:%p", d, d->request);
     }
 }
 
 static void requestFinished_DocumentWidget_(iAnyObject *obj) {
     iDocumentWidget *d = obj;
-    postCommand_Widget(obj, "document.request.finished request:%p", d->request);
+    postCommand_Widget(obj, "document.request.finished doc:%p request:%p", d, d->request);
 }
 
 static iRangei visibleRange_DocumentWidget_(const iDocumentWidget *d) {
@@ -330,6 +330,16 @@ static void showErrorPage_DocumentWidget_(iDocumentWidget *d, enum iGmStatusCode
     d->state = ready_DocumentState;
 }
 
+static void updateTheme_DocumentWidget_(iDocumentWidget *d) {
+    if (isEmpty_String(d->titleUser)) {
+        setThemeSeed_GmDocument(d->doc,
+                                collect_Block(newRange_Block(urlHost_String(d->url))));
+    }
+    else {
+        setThemeSeed_GmDocument(d->doc, &d->titleUser->chars);
+    }
+}
+
 static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse *response) {
     if (d->state == ready_DocumentState) {
         return;
@@ -339,15 +349,7 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse
     const enum iGmStatusCode statusCode = response->statusCode;
     if (category_GmStatusCode(statusCode) != categoryInput_GmStatusCode) {
         iString str;
-        /* Update theme. */ {
-            if (isEmpty_String(d->titleUser)) {
-                setThemeSeed_GmDocument(d->doc,
-                                        collect_Block(newRange_Block(urlHost_String(d->url))));
-            }
-            else {
-                setThemeSeed_GmDocument(d->doc, &d->titleUser->chars);
-            }
-        }
+        updateTheme_DocumentWidget_(d);
         initBlock_String(&str, &response->body);
         if (category_GmStatusCode(statusCode) == categorySuccess_GmStatusCode) {
             /* Check the MIME type. */
@@ -392,7 +394,7 @@ static void fetch_DocumentWidget_(iDocumentWidget *d) {
         iRelease(d->request);
         d->request = NULL;
     }
-    postCommandf_App("document.request.started url:%s", cstr_String(d->url));
+    postCommandf_App("document.request.started doc:%p url:%s", d, cstr_String(d->url));
     clear_ObjectList(d->media);
     d->certFlags = 0;
     d->state = fetching_DocumentState;
@@ -632,7 +634,7 @@ static iBool requestMedia_DocumentWidget_(iDocumentWidget *d, iGmLinkId linkId)
     return iFalse;
 }
 
-static iBool handleMediaEvent_DocumentWidget_(iDocumentWidget *d, const char *cmd) {
+static iBool handleMediaCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd) {
     iMediaRequest *req = pointerLabel_Command(cmd, "request");
     if (!req || req->doc != d) {
         return iFalse; /* not our request */
@@ -680,9 +682,9 @@ static void changeTextSize_DocumentWidget_(iDocumentWidget *d, int delta) {
     postCommandf_App("font.setfactor arg:%d", d->textSizePercent);
 }
 
-static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *ev) {
+static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd) {
     iWidget *w = as_Widget(d);
-    if (isResize_UserEvent(ev) || isCommand_UserEvent(ev, "font.changed")) {
+    if (equal_Command(cmd, "window.resized") || equal_Command(cmd, "font.changed")) {
         const iGmRun *mid = middleRun_DocumentWidget_(d);
         const char *midLoc = (mid ? mid->text.start : NULL);
         setWidth_GmDocument(d->doc, documentWidth_DocumentWidget_(d));
@@ -696,9 +698,16 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
         }
         refresh_Widget(w);
     }
-    else if (isCommand_UserEvent(ev, "server.showcert")) {
+    else if (equal_Command(cmd, "tabs.changed")) {
+        if (cmp_String(id_Widget(w), suffixPtr_Command(cmd, "id")) == 0) {
+            /* Set palette for our document. */
+            updateTheme_DocumentWidget_(d);
+        }
+        return iFalse;
+    }
+    else if (equal_Command(cmd, "server.showcert")) {
         const char *unchecked = red_ColorEscape   "\u2610";
-        const char *checked   = green_ColorEscape "\u2611";        
+        const char *checked   = green_ColorEscape "\u2611";
         makeMessage_Widget(
             cyan_ColorEscape "CERTIFICATE STATUS",
             format_CStr("%s%s  Domain name %s\n"
@@ -721,7 +730,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                         d->certFlags & trusted_GmCertFlag ? "Trusted on first use" : "Not trusted"));
         return iTrue;
     }
-    else if (isCommand_UserEvent(ev, "copy")) {
+    else if (equal_Command(cmd, "copy")) {
         if (d->selectMark.start) {
             iRangecc mark = d->selectMark;
             if (mark.start > mark.end) {
@@ -733,7 +742,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
             return iTrue;
         }
     }
-    else if (isCommand_Widget(w, ev, "document.copylink")) {
+    else if (equalWidget_Command(cmd, w, "document.copylink")) {
         if (d->hoverLink) {
             SDL_SetClipboardText(cstr_String(
                 absoluteUrl_String(d->url, linkUrl_GmDocument(d->doc, d->hoverLink->linkId))));
@@ -743,8 +752,8 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
         }
         return iTrue;
     }
-    else if (isCommand_UserEvent(ev, "document.input.submit")) {
-        iString *value = collect_String(suffix_Command(command_UserEvent(ev), "value"));
+    else if (equal_Command(cmd, "document.input.submit")) {
+        iString *value = collect_String(suffix_Command(cmd, "value"));
         urlEncode_String(value);
         iString *url = collect_String(copy_String(d->url));
         const size_t qPos = indexOfCStr_String(url, "?");
@@ -756,19 +765,18 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
         postCommandf_App("open url:%s", cstr_String(url));
         return iTrue;
     }
-    else if (isCommand_UserEvent(ev, "valueinput.cancelled") &&
-             cmp_String(string_Command(command_UserEvent(ev), "id"), "document.input.submit") ==
-                 0) {
+    else if (equal_Command(cmd, "valueinput.cancelled") &&
+             cmp_String(string_Command(cmd, "id"), "document.input.submit") == 0) {
         postCommand_App("navigate.back");
         return iTrue;
     }
-    else if (isCommand_Widget(w, ev, "document.request.updated") &&
-             pointerLabel_Command(command_UserEvent(ev), "request") == d->request) {
+    else if (equalWidget_Command(cmd, w, "document.request.updated") &&
+             pointerLabel_Command(cmd, "request") == d->request) {
         checkResponse_DocumentWidget_(d);
         return iFalse;
     }
-    else if (isCommand_Widget(w, ev, "document.request.finished") &&
-             pointerLabel_Command(command_UserEvent(ev), "request") == d->request) {
+    else if (equalWidget_Command(cmd, w, "document.request.finished") &&
+             pointerLabel_Command(cmd, "request") == d->request) {
         checkResponse_DocumentWidget_(d);
         d->state = ready_DocumentState;
         setCachedResponse_History(d->history, response_GmRequest(d->request));
@@ -776,45 +784,46 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
         postCommandf_App("document.changed url:%s", cstr_String(d->url));
         return iFalse;
     }
-    else if (isCommand_UserEvent(ev, "document.request.cancelled")) {
+    else if (equal_Command(cmd, "document.request.cancelled") && document_Command(cmd) == d) {
         postCommand_App("navigate.back");
         return iFalse;
     }
-    else if (isCommand_UserEvent(ev, "document.stop")) {
+    else if (equal_Command(cmd, "document.stop")) {
         if (d->request) {
-            postCommandf_App("document.request.cancelled url:%s", cstr_String(d->url));
+            postCommandf_App("document.request.cancelled doc:%p url:%s", d, cstr_String(d->url));
             iReleasePtr(&d->request);
             d->state = ready_DocumentState;
+            return iTrue;
         }
-        return iTrue;
     }
-    else if (isCommand_UserEvent(ev, "media.updated") || isCommand_UserEvent(ev, "media.finished")) {
-        return handleMediaEvent_DocumentWidget_(d, command_UserEvent(ev));
+    else if (equal_Command(cmd, "media.updated") || equal_Command(cmd, "media.finished")) {
+        return handleMediaCommand_DocumentWidget_(d, cmd);
     }
-    else if (isCommand_UserEvent(ev, "document.reload")) {
+    else if (equal_Command(cmd, "document.reload") && document_App() == d) {
         fetch_DocumentWidget_(d);
         return iTrue;
     }
-    else if (isCommand_UserEvent(ev, "navigate.back")) {
+    else if (equal_Command(cmd, "navigate.back") && document_App() == d) {
         goBack_History(d->history);
         return iTrue;
     }
-    else if (isCommand_UserEvent(ev, "navigate.forward")) {
+    else if (equal_Command(cmd, "navigate.forward") && document_App() == d) {
         goForward_History(d->history);
         return iTrue;
     }
-    else if (isCommand_Widget(w, ev, "scroll.moved")) {
-        d->scrollY = arg_Command(command_UserEvent(ev));
+    else if (equalWidget_Command(cmd, w, "scroll.moved")) {
+        d->scrollY = arg_Command(cmd);
         updateVisible_DocumentWidget_(d);
         return iTrue;
     }
-    else if (isCommand_Widget(w, ev, "scroll.page")) {
-        scroll_DocumentWidget_(
-            d, arg_Command(command_UserEvent(ev)) * height_Rect(documentBounds_DocumentWidget_(d)));
+    else if (equalWidget_Command(cmd, w, "scroll.page")) {
+        scroll_DocumentWidget_(d,
+                               arg_Command(cmd) * height_Rect(documentBounds_DocumentWidget_(d)));
         return iTrue;
     }
-    else if (isCommand_UserEvent(ev, "find.next") || isCommand_UserEvent(ev, "find.prev")) {
-        const int dir = isCommand_UserEvent(ev, "find.next") ? +1 : -1;
+    else if ((equal_Command(cmd, "find.next") || equal_Command(cmd, "find.prev")) &&
+             document_App() == d) {
+        const int dir = equal_Command(cmd, "find.next") ? +1 : -1;
         iRangecc (*finder)(const iGmDocument *, const iString *, const char *) =
             dir > 0 ? findText_GmDocument : findTextBefore_GmDocument;
         iInputWidget *find = findWidget_App("find.input");
@@ -824,7 +833,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
         else {
             const iBool wrap = d->foundMark.start != NULL;
             d->foundMark     = finder(d->doc, text_InputWidget(find), dir > 0 ? d->foundMark.end
-                                                                              : d->foundMark.start);
+                                                                          : d->foundMark.start);
             if (!d->foundMark.start && wrap) {
                 /* Wrap around. */
                 d->foundMark = finder(d->doc, text_InputWidget(find), NULL);
@@ -838,14 +847,26 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
         }
         refresh_Widget(w);
         return iTrue;
-    }   
-    else if (isCommand_UserEvent(ev, "find.clearmark")) {
+    }
+    else if (equal_Command(cmd, "find.clearmark")) {
         if (d->foundMark.start) {
             d->foundMark = iNullRange;
             refresh_Widget(w);
         }
         return iTrue;
     }
+    return iFalse;
+}
+
+static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *ev) {
+    iWidget *w = as_Widget(d);
+    if (ev->type == SDL_USEREVENT && ev->user.code == command_UserEventCode) {
+        if (!handleCommand_DocumentWidget_(d, command_UserEvent(ev))) {
+            /* Base class commands. */
+            return processEvent_Widget(w, ev);
+        }
+        return iTrue;
+    }
     if (ev->type == SDL_KEYDOWN) {
         const int mods = keyMods_Sym(ev->key.keysym.mod);
         const int key = ev->key.keysym.sym;
diff --git a/src/ui/widget.c b/src/ui/widget.c
index b07b5709..0db8b8fd 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -551,11 +551,18 @@ iBool isSelected_Widget(const iWidget *d) {
     return (d->flags & selected_WidgetFlag) != 0;
 }
 
+iBool equalWidget_Command(const char *cmd, const iWidget *widget, const char *checkCommand) {
+    if (equal_Command(cmd, checkCommand)) {
+        const iWidget *src = pointer_Command(cmd);
+        iAssert(!src || strstr(cmd, " ptr:"));
+        return src == widget || hasParent_Widget(src, widget);
+    }
+    return iFalse;
+}
+
 iBool isCommand_Widget(const iWidget *d, const SDL_Event *ev, const char *cmd) {
-    if (isCommand_UserEvent(ev, cmd)) {
-        const iWidget *src = pointer_Command(command_UserEvent(ev));
-        iAssert(!src || strstr(ev->user.data1, " ptr:"));
-        return src == d || hasParent_Widget(src, d);
+    if (ev->type == SDL_USEREVENT && ev->user.code == command_UserEventCode) {
+        return equalWidget_Command(command_UserEvent(ev), d, cmd);
     }
     return iFalse;
 }
diff --git a/src/ui/widget.h b/src/ui/widget.h
index 7208a755..0aff6505 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -140,3 +140,5 @@ iWidget *hover_Widget       (void);
 void    unhover_Widget      (void);
 void    setMouseGrab_Widget (iWidget *);
 iWidget *mouseGrab_Widget   (void);
+
+iBool   equalWidget_Command (const char *cmd, const iWidget *widget, const char *checkCommand);
diff --git a/src/ui/window.c b/src/ui/window.c
index defe998f..1f05b80d 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -107,29 +107,34 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
             return iTrue;
         }
     }
-    else if (equal_Command(cmd, "document.changed")) {
-        iInputWidget *url = findWidget_App("url");
-        const iString *urlStr = collect_String(suffix_Command(cmd, "url"));
-        visitUrl_Visited(visited_App(), urlStr);
-        setText_InputWidget(url, urlStr);
-        updateTextCStr_LabelWidget(findChild_Widget(navBar, "reload"), reloadCStr_);
-        return iFalse;
-    }
-    else if (equal_Command(cmd, "document.request.cancelled")) {
-        updateTextCStr_LabelWidget(findChild_Widget(navBar, "reload"), reloadCStr_);
-        return iFalse;
-    }
-    else if (equal_Command(cmd, "document.request.started")) {
-        iInputWidget *url = findChild_Widget(navBar, "url");
-        if (isFocused_Widget(as_Widget(url))) {
-            setFocus_Widget(NULL);
+    else if (startsWith_CStr(cmd, "document.")) {
+        /* React to the current document only. */
+        if (document_Command(cmd) == document_App()) {
+            iLabelWidget *reloadButton = findChild_Widget(navBar, "reload");
+            if (equal_Command(cmd, "document.changed")) {
+                iInputWidget *url = findWidget_App("url");
+                const iString *urlStr = collect_String(suffix_Command(cmd, "url"));
+                setText_InputWidget(url, urlStr);
+                updateTextCStr_LabelWidget(reloadButton, reloadCStr_);
+                return iFalse;
+            }
+            else if (equal_Command(cmd, "document.request.cancelled")) {
+                updateTextCStr_LabelWidget(reloadButton, reloadCStr_);
+                return iFalse;
+            }
+            else if (equal_Command(cmd, "document.request.started")) {
+                iInputWidget *url = findChild_Widget(navBar, "url");
+                if (isFocused_Widget(as_Widget(url))) {
+                    setFocus_Widget(NULL);
+                }
+                setTextCStr_InputWidget(url, suffixPtr_Command(cmd, "url"));
+                updateTextCStr_LabelWidget(reloadButton, stopCStr_);
+                return iFalse;
+            }
         }
-        setTextCStr_InputWidget(url, suffixPtr_Command(cmd, "url"));
-        updateTextCStr_LabelWidget(findChild_Widget(navBar, "reload"), stopCStr_);
-        return iFalse;
     }
     else if (equal_Command(cmd, "navigate.reload")) {
-        iDocumentWidget *doc = findWidget_App("document");
+        iDocumentWidget *doc = document_Command(cmd);
         if (isRequestOngoing_DocumentWidget(doc)) {
             postCommand_App("document.stop");
         }
@@ -224,15 +229,16 @@ static void setupUserInterface_Window(iWindow *d) {
         setAlignVisually_LabelWidget(fileMenu, iTrue);
         addChild_Widget(navBar, iClob(fileMenu));
     }
-
     /* Tab bar. */ {
         iWidget *tabBar = makeTabs_Widget(div);
         setId_Widget(tabBar, "doctabs");
         setFlags_Widget(tabBar, expand_WidgetFlag, iTrue);
         setBackgroundColor_Widget(tabBar, gray25_ColorId);
         appendTabPage_Widget(tabBar, iClob(new_DocumentWidget()), "Document", '1', KMOD_PRIMARY);
-        addChild_Widget(findChild_Widget(tabBar, "tabs.buttons"),
-                        iClob(newIcon_LabelWidget("\u2795", 't', KMOD_PRIMARY, "tabs.new")));
+        setId_Widget(
+            addChild_Widget(findChild_Widget(tabBar, "tabs.buttons"),
+                            iClob(newIcon_LabelWidget("\u2795", 't', KMOD_PRIMARY, "tabs.new"))),
+            "newtab");
     }
     /* Search bar. */ {
         iWidget *searchBar = new_Widget();