4 files changed, 63 insertions, 26 deletions

diff --git a/src/app.c b/src/app.c
index 624e5899..52b004e2 100644
--- a/src/app.c
+++ b/src/app.c
@@ -1177,9 +1177,7 @@ static int run_App_(iApp *d) {
         runTickers_App_(d);
         refresh_App();
         /* Change the widget tree while we are not iterating through it. */
-        if (d->window->splitMode != d->window->pendingSplitMode) {
-            setSplitMode_Window(d->window, d->window->pendingSplitMode);
-        }
+        checkPendingSplit_Window(d->window);
         recycle_Garbage();
     }
     SDL_DelEventWatch(resizeWatcher_, d);
@@ -1691,14 +1689,16 @@ iBool handleCommand_App(const char *cmd) {
         return iTrue;
     }
     else if (equal_Command(cmd, "ui.split")) {
+        if (argLabel_Command(cmd, "swap")) {
+            swapRoots_Window(d->window);
+            return iTrue;
+        }
         d->window->pendingSplitMode =
             (argLabel_Command(cmd, "axis") ? vertical_WindowSplit : 0) | (arg_Command(cmd) << 1);
+        const char *url = suffixPtr_Command(cmd, "url");
+        setCStr_String(get_Window()->pendingSplitUrl, url ? url : "");
         return iTrue;
     }
-//    else if (equal_Command(cmd, "window.updatelayout")) {
-//        resize_Window(d->window, -1, -1);
-//        return iTrue;
-//    }
     else if (equal_Command(cmd, "window.retain")) {
         d->prefs.retainWindowSize = arg_Command(cmd);
         return iTrue;
@@ -1993,6 +1993,13 @@ iBool handleCommand_App(const char *cmd) {
             return iTrue;
         }
         const int newTab = argLabel_Command(cmd, "newtab");
+        if (newTab & otherRoot_OpenTabFlag && numRoots_Window(get_Window()) == 1) {
+            /* Need to split first. */
+            postCommandf_App("ui.split arg:3 newtab:%d url:%s",
+                             newTab & ~otherRoot_OpenTabFlag,
+                             cstr_String(url));
+            return iTrue;
+        }
         iRoot *root = get_Root();
         iRoot *oldRoot = root;
         if (newTab & otherRoot_OpenTabFlag) {
diff --git a/src/ui/root.c b/src/ui/root.c
index cd6959c4..bec42719 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -1252,7 +1252,8 @@ void createUserInterface_Root(iRoot *d) {
                                                 },
                                             4);
         iWidget *splitMenu = makeMenu_Widget(root, (iMenuItem[]){
-            { "Single Frame", '1', 0, "ui.split arg:0" },
+            { "Merge Tabs", '1', 0, "ui.split arg:0" },
+            { "Swap Sides", SDLK_x, 0, "ui.split swap:1" },
             { "---", 0, 0, NULL },
             { "Horizontal", '2', 0, "ui.split arg:3 axis:0" },
             { "Horizontal 1:2", SDLK_d, 0, "ui.split arg:1 axis:0" },
diff --git a/src/ui/window.c b/src/ui/window.c
index b3840602..e78bb81e 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -403,6 +403,7 @@ void init_Window(iWindow *d, iRect rect) {
     d->size = zero_I2(); /* will be updated below */
     iZap(d->roots);
     d->splitMode = d->pendingSplitMode = 0;
+    d->pendingSplitUrl = new_String();
     d->hover = NULL;
     d->mouseGrab = NULL;
     d->focus = NULL;
@@ -414,6 +415,7 @@ void init_Window(iWindow *d, iRect rect) {
     d->isDrawFrozen = iTrue;
     d->isExposed = iFalse;
     d->isMinimized = iFalse;
+    d->isInvalidated = iFalse; /* set when posting event, to avoid repeated events */
     d->isMouseInside = iTrue;
     d->ignoreClick = iFalse;
     d->focusGainedAt = 0;
@@ -521,6 +523,7 @@ void deinit_Window(iWindow *d) {
         }
     }
     setCurrent_Root(NULL);
+    delete_String(d->pendingSplitUrl);
     deinit_Text();
     SDL_DestroyRenderer(d->render);
     SDL_DestroyWindow(d->win);
@@ -561,10 +564,12 @@ iRoot *otherRoot_Window(const iWindow *d, iRoot *root) {
     return root == d->roots[0] && d->roots[1] ? d->roots[1] : d->roots[0];
 }
 
-static void invalidate_Window_(iWindow *d) {
-    iUnused(d);
-    resetFonts_Text();
-    postCommand_App("theme.changed auto:1"); /* forces UI invalidation */
+void invalidate_Window(iWindow *d) {
+    if (d && !d->isInvalidated) {
+        d->isInvalidated = iTrue;
+        resetFonts_Text();
+        postCommand_App("theme.changed auto:1"); /* forces UI invalidation */
+    }
 }
 
 static iBool isNormalPlacement_Window_(const iWindow *d) {
@@ -734,7 +739,7 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
             return iTrue;
         case SDL_WINDOWEVENT_RESTORED:
             updateSize_Window_(d, iTrue);
-            invalidate_Window_(d);
+            invalidate_Window(d);
             d->isMinimized = iFalse;
             postRefresh_App();
             return iTrue;
@@ -809,7 +814,7 @@ iBool processEvent_Window(iWindow *d, const SDL_Event *ev) {
         }
         case SDL_RENDER_TARGETS_RESET:
         case SDL_RENDER_DEVICE_RESET: {
-            invalidate_Window_(d);
+            invalidate_Window(d);
             break;
         }
         default: {
@@ -892,7 +897,7 @@ iBool processEvent_Window(iWindow *d, const SDL_Event *ev) {
                 removeMacMenus_();
                 insertMacMenus_();
 #endif
-                invalidate_Window_(d);
+                invalidate_Window(d);
                 iForIndices(i, d->roots) {
                     if (d->roots[i]) {
                         updatePreferencesLayout_Widget(findChild_Widget(d->roots[i]->widget, "prefs"));
@@ -1008,6 +1013,7 @@ void draw_Window(iWindow *d) {
     /* Draw widgets. */
     d->frameTime = SDL_GetTicks();
     if (isExposed_Window(d)) {
+        d->isInvalidated = iFalse;
         iForIndices(i, d->roots) {
             iRoot *root = d->roots[i];
             if (root) {
@@ -1159,7 +1165,25 @@ void setKeyboardHeight_Window(iWindow *d, int height) {
     }
 }
 
-void setSplitMode_Window(iWindow *d, int splitMode) {
+void checkPendingSplit_Window(iWindow *d) {
+    if (d->splitMode != d->pendingSplitMode) {
+        setSplitMode_Window(d, d->pendingSplitMode);
+        if (!isEmpty_String(d->pendingSplitUrl)) {
+            postCommandf_Root(d->keyRoot, "open url:%s", cstr_String(d->pendingSplitUrl));
+            clear_String(d->pendingSplitUrl);
+        }
+    }
+}
+
+void swapRoots_Window(iWindow *d) {
+    if (numRoots_Window(d) == 2) {
+        iSwap(iRoot *, d->roots[0], d->roots[1]);
+        updateSize_Window_(d, iTrue);
+    }
+}
+
+void setSplitMode_Window(iWindow *d, int splitFlags) {
+    const int splitMode = splitFlags & mode_WindowSplit;
     iAssert(current_Root() == NULL);
     if (d->splitMode != splitMode) {
         int oldCount = numRoots_Window(d);
@@ -1183,7 +1207,7 @@ void setSplitMode_Window(iWindow *d, int splitMode) {
             moveTabButtonToEnd_Widget(findChild_Widget(docTabs, "newtab"));
             iRelease(tabs);
         }
-        else if ((splitMode & mask_WindowSplit) && oldCount == 1) {
+        else if (splitMode && oldCount == 1) {
             /* Add a second root. */
             iDocumentWidget *moved = document_Root(d->roots[0]);
             iAssert(d->roots[1] == NULL);
@@ -1201,10 +1225,11 @@ void setSplitMode_Window(iWindow *d, int splitMode) {
                     iRelease(removeTabPage_Widget(docTabs1, 0)); /* delete the default tab */
                     setRoot_Widget(as_Widget(moved), d->roots[1]);
                     prependTabPage_Widget(docTabs1, iClob(moved), "", 0, 0);
-                    //showTabPage_Widget(docTabs1, as_Widget(moved));
-                    postCommandf_App("tabs.switch page:%p", moved);
+                    if (~splitFlags & noEvents_WindowSplit) {
+                        postCommandf_App("tabs.switch page:%p", moved);
+                    }
                 }
-                else {
+                else if (~splitFlags & noEvents_WindowSplit) {
                     postCommand_Root(d->roots[1], "navigate.home");
                 }
             }
@@ -1232,12 +1257,10 @@ void setSplitMode_Window(iWindow *d, int splitMode) {
             }
         }
 #endif
-//        windowSizeChanged_Window_(d);
-        updateSize_Window_(d, iTrue);
-//        postCommand_App("window.resized");
-  //      postCommand_App("metrics.resized");
-//        postCommand_App("window.updatelayout");
-        postCommand_App("window.unfreeze");
+        if (~splitFlags & noEvents_WindowSplit) {
+            updateSize_Window_(d, iTrue);
+            postCommand_App("window.unfreeze");
+        }
     }
 }
 
diff --git a/src/ui/window.h b/src/ui/window.h
index ad577ce4..677001e5 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -65,6 +65,7 @@ enum iWindowSplit {
     mode_WindowSplit     = vertical_WindowSplit | equal_WindowSplit,
     mask_WindowSplit     = equal_WindowSplit,
     merge_WindowSplit    = iBit(10),
+    noEvents_WindowSplit = iBit(11),
 };
 
 struct Impl_Window {
@@ -74,12 +75,14 @@ struct Impl_Window {
     iBool         isExposed;
     iBool         isMinimized;
     iBool         isMouseInside;
+    iBool         isInvalidated;
     iBool         ignoreClick;
     uint32_t      focusGainedAt;
     SDL_Renderer *render;
     iInt2         size;
     int           splitMode;
     int           pendingSplitMode;
+    iString *     pendingSplitUrl; /* URL to open in a newly opened split */
     iRoot *       roots[2];     /* root widget and UI state; second one is for split mode */
     iRoot *       keyRoot;      /* root that has the current keyboard input focus */
     iWidget *     hover;
@@ -101,6 +104,7 @@ struct Impl_Window {
 
 iBool       processEvent_Window     (iWindow *, const SDL_Event *);
 iBool       dispatchEvent_Window    (iWindow *, const SDL_Event *);
+void        invalidate_Window       (iWindow *); /* discard all cached graphics */
 void        draw_Window             (iWindow *);
 void        drawWhileResizing_Window(iWindow *d, int w, int h); /* workaround for SDL bug */
 void        resize_Window           (iWindow *, int w, int h);
@@ -114,6 +118,8 @@ void        setKeyboardHeight_Window(iWindow *, int height);
 void        setSplitMode_Window     (iWindow *, int splitMode);
 void        showToolbars_Window     (iWindow *, iBool show);
 iBool       postContextClick_Window (iWindow *, const SDL_MouseButtonEvent *);
+void        checkPendingSplit_Window(iWindow *);
+void        swapRoots_Window        (iWindow *);
 
 uint32_t    id_Window               (const iWindow *);
 iInt2       size_Window             (const iWindow *);