Cleaner window initialization

Create the window using the correct size and position, and don’t show the window contents while app state is being restored.

5 files changed, 77 insertions, 44 deletions

diff --git a/src/app.c b/src/app.c
index cbd2b114..bdd345f7 100644
--- a/src/app.c
+++ b/src/app.c
@@ -55,19 +55,20 @@ static const char *stateFileName_App_   = "state.bin";
 
 struct Impl_App {
     iCommandLine args;
-    iBool        commandEcho; /* --echo */
-    iBool        running;
-    iWindow *    window;
-    iSortedArray tickers;
-    iBool        pendingRefresh;
     iGmCerts *   certs;
     iVisited *   visited;
     iBookmarks * bookmarks;
-    int          zoomPercent;
+    iWindow *    window;
+    iSortedArray tickers;
+    iBool        running;
+    iBool        pendingRefresh;
     int          tabEnum;
     /* Preferences: */
+    iBool        commandEcho; /* --echo */
     iBool        retainWindowSize;
+    iRect        initialWindowRect;
     float        uiScale;
+    int          zoomPercent;
 };
 
 static iApp app_;
@@ -101,9 +102,10 @@ static iString *serializePrefs_App_(const iApp *d) {
         int w, h, x, y;
         SDL_GetWindowSize(d->window->win, &w, &h);
         SDL_GetWindowPosition(d->window->win, &x, &y);
-        appendFormat_String(str, "restorewindow width:%d height:%d coord:%d %d\n", w, h, x, y);
+        appendFormat_String(str, "window.setrect width:%d height:%d coord:%d %d\n", w, h, x, y);
         appendFormat_String(str, "sidebar.width arg:%d\n", width_SidebarWidget(sidebar));
     }
+    appendFormat_String(str, "retainwindow arg:%d\n", d->retainWindowSize);
     if (isVisible_Widget(constAs_Widget(sidebar))) {
         appendCStr_String(str, "sidebar.toggle\n");
     }
@@ -127,16 +129,22 @@ static void loadPrefs_App_(iApp *d) {
         const iRangecc src = range_String(str);
         iRangecc line = iNullRange;
         while (nextSplit_Rangecc(&src, "\n", &line)) {
-            iString cmd;
-            initRange_String(&cmd, line);
-            if (equal_Command(cstr_String(&cmd), "uiscale")) {
-                /* Must be handled before the window is created. */
-                setUiScale_Window(get_Window(), argf_Command(cstr_String(&cmd)));
+            iString cmdStr;
+            initRange_String(&cmdStr, line);
+            const char *cmd = cstr_String(&cmdStr);
+            /* Window init commands must be handled before the window is created. */
+            if (equal_Command(cmd, "uiscale")) {
+                setUiScale_Window(get_Window(), argf_Command(cmd));
+            }
+            else if (equal_Command(cmd, "window.setrect")) {
+                const iInt2 pos = coord_Command(cmd);
+                d->initialWindowRect = init_Rect(
+                    pos.x, pos.y, argLabel_Command(cmd, "width"), argLabel_Command(cmd, "height"));
             }
             else {
-                postCommandString_App(&cmd);
+                postCommandString_App(&cmdStr);
             }
-            deinit_String(&cmd);
+            deinit_String(&cmdStr);
         }
         delete_String(str);
     }
@@ -221,16 +229,17 @@ static void saveState_App_(const iApp *d) {
 static void init_App_(iApp *d, int argc, char **argv) {
     init_CommandLine(&d->args, argc, argv);
     init_SortedArray(&d->tickers, sizeof(iTicker), cmp_Ticker_);
-    d->commandEcho      = checkArgument_CommandLine(&d->args, "echo") != NULL;
-    d->running          = iFalse;
-    d->window           = NULL;
-    d->retainWindowSize = iTrue;
-    d->pendingRefresh   = iFalse;
-    d->zoomPercent      = 100;
-    d->certs            = new_GmCerts(dataDir_App_);
-    d->visited          = new_Visited();
-    d->bookmarks        = new_Bookmarks();
-    d->tabEnum          = 0;
+    d->commandEcho       = checkArgument_CommandLine(&d->args, "echo") != NULL;
+    d->initialWindowRect = init_Rect(-1, -1, 800, 500);
+    d->running           = iFalse;
+    d->window            = NULL;
+    d->retainWindowSize  = iTrue;
+    d->pendingRefresh    = iFalse;
+    d->zoomPercent       = 100;
+    d->certs             = new_GmCerts(dataDir_App_);
+    d->visited           = new_Visited();
+    d->bookmarks         = new_Bookmarks();
+    d->tabEnum           = 0; /* generates unique IDs for tab pages */
     loadPrefs_App_(d);
     load_Visited(d->visited, dataDir_App_);
     load_Bookmarks(d->bookmarks, dataDir_App_);
@@ -244,11 +253,12 @@ static void init_App_(iApp *d, int argc, char **argv) {
         }
     }
 #endif
-    d->window = new_Window();
+    d->window = new_Window(d->initialWindowRect);
     /* Widget state init. */
     if (!loadState_App_(d)) {
         postCommand_App("navigate.home");
     }
+    postCommand_App("window.unblank");
 }
 
 static void deinit_App(iApp *d) {
@@ -423,6 +433,8 @@ static iBool handlePrefsCommands_(iWidget *d, const char *cmd) {
     if (equal_Command(cmd, "prefs.dismiss") || equal_Command(cmd, "preferences")) {
         setUiScale_Window(get_Window(),
                           toFloat_String(text_InputWidget(findChild_Widget(d, "prefs.uiscale"))));
+        postCommandf_App("retainwindow arg:%d",
+                         isSelected_Widget(findChild_Widget(d, "prefs.retainwindow")));
         destroy_Widget(d);
         return iTrue;
     }
@@ -472,7 +484,11 @@ iDocumentWidget *newTab_App(const iDocumentWidget *duplicateOf) {
 
 iBool handleCommand_App(const char *cmd) {
     iApp *d = &app_;
-    if (equal_Command(cmd, "open")) {
+    if (equal_Command(cmd, "retainwindow")) {
+        d->retainWindowSize = arg_Command(cmd);
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "open")) {
         const iString *url = collect_String(newCStr_String(suffixPtr_Command(cmd, "url")));
         iUrl parts;
         init_Url(&parts, url);
@@ -569,12 +585,6 @@ iBool handleCommand_App(const char *cmd) {
                             collectNewFormat_String("%g", uiScale_Window(d->window)));
         setCommandHandler_Widget(dlg, handlePrefsCommands_);
     }
-    else if (equal_Command(cmd, "restorewindow")) {
-        d->retainWindowSize = iTrue;
-        resize_Window(d->window, argLabel_Command(cmd, "width"), argLabel_Command(cmd, "height"));
-        const iInt2 pos = coord_Command(cmd);
-        SDL_SetWindowPosition(d->window->win, pos.x, pos.y);
-    }
     else if (equal_Command(cmd, "navigate.home")) {
         postCommand_App("open url:about:home");
         return iTrue;
diff --git a/src/gmdocument.c b/src/gmdocument.c
index ed1d1cae..d140b065 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -648,8 +648,8 @@ void setThemeSeed_GmDocument(iGmDocument *d, const iBlock *seed) {
                                0.8f * (d->themeSeed >> 24) / 255.0f,
                                0.06f + 0.09f * ((d->themeSeed >> 5) & 0x7) / 7.0f,
                                1.0f };
-            printf("background: %d %f %f\n", (int) base.hue, base.sat, base.lum);
-            printf("isDarkBgSat: %d\n", isDarkBgSat);
+//            printf("background: %d %f %f\n", (int) base.hue, base.sat, base.lum);
+//            printf("isDarkBgSat: %d\n", isDarkBgSat);
             setHsl_Color(tmBackground_ColorId, base);
 
             setHsl_Color(tmBannerBackground_ColorId, addSatLum_HSLColor(base, 0.1f, 0.04f * (isBannerLighter ? 1 : -1)));
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 7e4bdc73..2e53e6ef 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -808,10 +808,10 @@ static iBool handleMediaCommand_DocumentWidget_(iDocumentWidget *d, const char *
         const enum iGmStatusCode code = status_GmRequest(req->req);
         /* Give the media to the document for presentation. */
         if (code == success_GmStatusCode) {
-            printf("media finished: %s\n  size: %zu\n  type: %s\n",
-                   cstr_String(url_GmRequest(req->req)),
-                   size_Block(body_GmRequest(req->req)),
-                   cstr_String(meta_GmRequest(req->req)));
+//            printf("media finished: %s\n  size: %zu\n  type: %s\n",
+//                   cstr_String(url_GmRequest(req->req)),
+//                   size_Block(body_GmRequest(req->req)),
+//                   cstr_String(meta_GmRequest(req->req)));
             if (startsWith_String(meta_GmRequest(req->req), "image/")) {
                 setImage_GmDocument(d->doc, req->linkId, meta_GmRequest(req->req),
                                     body_GmRequest(req->req));
diff --git a/src/ui/window.c b/src/ui/window.c
index 4f59ef1a..315c4243 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -36,7 +36,7 @@ static float initialUiScale_ = 1.0f;
 static float initialUiScale_ = 1.1f;
 #endif
 
-iDefineTypeConstruction(Window)
+iDefineTypeConstructionArgs(Window, (iRect rect), rect)
 
 static iBool handleRootCommands_(iWidget *root, const char *cmd) {
     iUnused(root);
@@ -354,8 +354,16 @@ static float pixelRatio_Window_(const iWindow *d) {
     return (float) dx / (float) x;
 }
 
-void init_Window(iWindow *d) {
+static void drawBlank_Window_(iWindow *d) {
+    const iColor bg = get_Color(gray25_ColorId);
+    SDL_SetRenderDrawColor(d->render, bg.r, bg.g, bg.b, 255);
+    SDL_RenderClear(d->render);
+    SDL_RenderPresent(d->render);
+}
+
+void init_Window(iWindow *d, iRect rect) {
     theWindow_ = d;
+    d->isBlank = iTrue;
     uint32_t flags = SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI;
 #if defined (iPlatformApple)
     SDL_SetHint(SDL_HINT_RENDER_DRIVER, "metal");
@@ -363,17 +371,22 @@ void init_Window(iWindow *d) {
     flags |= SDL_WINDOW_OPENGL;
 #endif
     SDL_SetHint(SDL_HINT_RENDER_VSYNC, "1");
-    if (SDL_CreateWindowAndRenderer(800, 500, flags, &d->win, &d->render)) {
+    if (SDL_CreateWindowAndRenderer(
+            width_Rect(rect), height_Rect(rect), flags, &d->win, &d->render)) {
         fprintf(stderr, "Error when creating window: %s\n", SDL_GetError());
         exit(-2);
     }
+    if (left_Rect(rect) >= 0) {
+        SDL_SetWindowPosition(d->win, left_Rect(rect), top_Rect(rect));
+    }
     SDL_SetWindowMinimumSize(d->win, 640, 400);
-    SDL_SetWindowTitle(d->win, "Lagrange");
+    SDL_SetWindowTitle(d->win, "Lagrange");    
     /* Some info. */ {
         SDL_RendererInfo info;
         SDL_GetRendererInfo(d->render, &info);
         printf("[window] renderer: %s\n", info.name);
     }
+    drawBlank_Window_(d);
     d->uiScale = initialUiScale_;
     d->pixelRatio = pixelRatio_Window_(d);
     setPixelRatio_Metrics(d->pixelRatio * d->uiScale);
@@ -447,6 +460,11 @@ iBool processEvent_Window(iWindow *d, const SDL_Event *ev) {
         }
         default: {
             SDL_Event event = *ev;
+            if (event.type == SDL_USEREVENT && isCommand_UserEvent(ev, "window.unblank")) {
+                d->isBlank = iFalse;
+                postRefresh_App();
+                return iTrue;
+            }
             /* Map mouse pointer coordinate to our coordinate system. */
             if (event.type == SDL_MOUSEMOTION) {
                 const iInt2 pos = coord_Window(d, event.motion.x, event.motion.y);
@@ -479,6 +497,10 @@ iBool processEvent_Window(iWindow *d, const SDL_Event *ev) {
 
 void draw_Window(iWindow *d) {
     /* Clear the window. */
+    if (d->isBlank) {
+        drawBlank_Window_(d);
+        return;
+    }
     SDL_SetRenderDrawColor(d->render, 0, 0, 0, 255);
     SDL_RenderClear(d->render);
     /* Draw widgets. */
diff --git a/src/ui/window.h b/src/ui/window.h
index 413c454c..6f4e01ce 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -2,16 +2,17 @@
 
 #include "widget.h"
 
-#include <the_Foundation/defs.h>
+#include <the_Foundation/rect.h>
 #include <SDL_events.h>
 #include <SDL_render.h>
 #include <SDL_video.h>
 
 iDeclareType(Window)
-iDeclareTypeConstruction(Window)
+iDeclareTypeConstructionArgs(Window, iRect rect)
 
 struct Impl_Window {
     SDL_Window *  win;
+    iBool         isBlank; /* avoids premature draws while restoring window state */
     SDL_Renderer *render;
     iWidget *     root;
     float         pixelRatio;