12 files changed, 354 insertions, 136 deletions

diff --git a/src/ui/color.h b/src/ui/color.h
index 2c481d13..51d3370f 100644
--- a/src/ui/color.h
+++ b/src/ui/color.h
@@ -48,7 +48,7 @@ enum iColorId {
     gray50_ColorId,
     gray75_ColorId,
     white_ColorId,
-    brown_ColorId,    
+    brown_ColorId,
     orange_ColorId,
     teal_ColorId,
     cyan_ColorId,
@@ -109,6 +109,7 @@ enum iColorId {
     tmParagraph_ColorId,
     tmFirstParagraph_ColorId,
     tmQuote_ColorId,
+    tmQuoteIcon_ColorId,
     tmPreformatted_ColorId,
     tmHeading1_ColorId,
     tmHeading2_ColorId,
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index fce548b4..70e66180 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -36,6 +36,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "../gmutil.h"
 
 #include <the_Foundation/file.h>
+#include <the_Foundation/fileinfo.h>
 #include <the_Foundation/objectlist.h>
 #include <the_Foundation/path.h>
 #include <the_Foundation/ptrarray.h>
@@ -46,6 +47,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include <SDL_timer.h>
 #include <SDL_render.h>
 #include <ctype.h>
+#include <errno.h>
 
 iDeclareClass(MediaRequest)
 
@@ -54,16 +56,12 @@ struct Impl_MediaRequest {
     iDocumentWidget *doc;
     iGmLinkId        linkId;
     iGmRequest *     req;
-    iAtomicInt       isUpdated;
 };
 
 static void updated_MediaRequest_(iAnyObject *obj) {
     iMediaRequest *d = obj;
-    int wasUpdated = exchange_Atomic(&d->isUpdated, iTrue);
-    if (!wasUpdated) {
         postCommandf_App("media.updated link:%u request:%p", d->linkId, d);
     }
-}
 
 static void finished_MediaRequest_(iAnyObject *obj) {
     iMediaRequest *d = obj;
@@ -77,7 +75,6 @@ void init_MediaRequest(iMediaRequest *d, iDocumentWidget *doc, iGmLinkId linkId,
     setUrl_GmRequest(d->req, url);
     iConnect(GmRequest, d->req, updated, d, updated_MediaRequest_);
     iConnect(GmRequest, d->req, finished, d, finished_MediaRequest_);
-    set_Atomic(&d->isUpdated, iFalse);
     submit_GmRequest(d->req);
 }
 
@@ -105,8 +102,8 @@ struct Impl_Model {
 };
 
 void init_Model(iModel *d) {
-    d->history         = new_History();
-    d->url             = new_String();
+    d->history = new_History();
+    d->url     = new_String();
 }
 
 void deinit_Model(iModel *d) {
@@ -147,6 +144,8 @@ struct Impl_DocumentWidget {
     iGmRequest *   request;
     iAtomicInt     isRequestUpdated; /* request has new content, need to parse it */
     iObjectList *  media;
+    iString        sourceMime;
+    iBlock         sourceContent; /* original content as received, for saving */
     iGmDocument *  doc;
     int            certFlags;
     iDate          certExpiry;
@@ -208,6 +207,8 @@ void init_DocumentWidget(iDocumentWidget *d) {
     d->showLinkNumbers  = iFalse;
     d->visBuf           = new_VisBuf();
     d->invalidRuns      = new_PtrSet();
+    init_String(&d->sourceMime);
+    init_Block(&d->sourceContent, 0);
     init_PtrArray(&d->visibleLinks);
     init_Click(&d->click, d, SDL_BUTTON_LEFT);
     addChild_Widget(w, iClob(d->scroll = new_ScrollWidget()));
@@ -225,6 +226,8 @@ void deinit_DocumentWidget(iDocumentWidget *d) {
     delete_PtrSet(d->invalidRuns);
     iRelease(d->media);
     iRelease(d->request);
+    deinit_Block(&d->sourceContent);
+    deinit_String(&d->sourceMime);
     iRelease(d->doc);
     deinit_PtrArray(&d->visibleLinks);
     delete_String(d->certSubject);
@@ -269,7 +272,7 @@ static iRect documentBounds_DocumentWidget_(const iDocumentWidget *d) {
 }
 
 static int forceBreakWidth_DocumentWidget_(const iDocumentWidget *d) {
-    if (isLineWrapForced_App()) {
+    if (forceLineWrap_App()) {
         const iRect bounds    = bounds_Widget(constAs_Widget(d));
         const iRect docBounds = documentBounds_DocumentWidget_(d);
         return right_Rect(bounds) - left_Rect(docBounds) - gap_UI * d->pageMargin;
@@ -363,8 +366,12 @@ static void updateHover_DocumentWidget_(iDocumentWidget *d, iInt2 mouse) {
     if (isHover_Widget(w) && !contains_Widget(constAs_Widget(d->scroll), mouse)) {
         setCursor_Window(get_Window(),
                          d->hoverLink ? SDL_SYSTEM_CURSOR_HAND : SDL_SYSTEM_CURSOR_IBEAM);
+        if (d->hoverLink &&
+            linkFlags_GmDocument(d->doc, d->hoverLink->linkId) & permanent_GmLinkFlag) {
+            setCursor_Window(get_Window(), SDL_SYSTEM_CURSOR_ARROW); /* not dismissable */
     }
 }
+}
 
 static void updateVisible_DocumentWidget_(iDocumentWidget *d) {
     const iRangei visRange = visibleRange_DocumentWidget_(d);
@@ -507,9 +514,17 @@ static void showErrorPage_DocumentWidget_(iDocumentWidget *d, enum iGmStatusCode
             case certificateNotValid_GmStatusCode:
                 appendFormat_String(src, "\n\n%s", cstr_String(meta));
                 break;
-            case unsupportedMimeType_GmStatusCode:
-                appendFormat_String(src, "\n```\n%s\n```\n", cstr_String(meta));
+            case unsupportedMimeType_GmStatusCode: {
+                iString *key = collectNew_String();
+                toString_Sym(SDLK_s, KMOD_PRIMARY, key);
+                appendFormat_String(src,
+                                    "\n```\n%s\n```\n"
+                                    "You can save it as a file to your Downloads folder, though. "
+                                    "Press %s or select Save Page from the menu.",
+                                    cstr_String(meta),
+                                    cstr_String(key));
                 break;
+            }
             case slowDown_GmStatusCode:
                 appendFormat_String(src, "\n\nWait %s seconds before your next request.",
                                     cstr_String(meta));
@@ -534,6 +549,20 @@ static void updateTheme_DocumentWidget_(iDocumentWidget *d) {
     }
 }
 
+static void updateFetchProgress_DocumentWidget_(iDocumentWidget *d) {
+    iLabelWidget *prog   = findWidget_App("document.progress");
+    const size_t  dlSize = d->request ? size_Block(body_GmRequest(d->request)) : 0;
+    setFlags_Widget(as_Widget(prog), hidden_WidgetFlag, dlSize < 250000);
+    if (isVisible_Widget(prog)) {
+        updateText_LabelWidget(prog,
+                               collectNewFormat_String("%s%.3f MB",
+                                                       isFinished_GmRequest(d->request)
+                                                           ? uiHeading_ColorEscape
+                                                           : uiTextCaution_ColorEscape,
+                                                       dlSize / 1.0e6f));
+    }
+}
+
 static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse *response) {
     if (d->state == ready_RequestState) {
         return;
@@ -545,12 +574,15 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse
         iString str;
         invalidate_DocumentWidget_(d);
         updateTheme_DocumentWidget_(d);
+        clear_String(&d->sourceMime);
+//        set_Block(&d->sourceContent, &response->body);
         initBlock_String(&str, &response->body);
         if (category_GmStatusCode(statusCode) == categorySuccess_GmStatusCode) {
             /* Check the MIME type. */
             iRangecc charset = range_CStr("utf-8");
             enum iGmDocumentFormat docFormat = undefined_GmDocumentFormat;
             const iString *mimeStr = collect_String(lower_String(&response->meta)); /* for convenience */
+            set_String(&d->sourceMime, mimeStr);
             iRangecc mime = range_String(mimeStr);
             iRangecc seg = iNullRange;
             while (nextSplit_Rangecc(mime, ";", &seg)) {
@@ -558,12 +590,15 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse
                 trim_Rangecc(&param);
                 if (equal_Rangecc(param, "text/plain")) {
                     docFormat = plainText_GmDocumentFormat;
+                    setRange_String(&d->sourceMime, param);
                 }
                 else if (equal_Rangecc(param, "text/gemini")) {
                     docFormat = gemini_GmDocumentFormat;
+                    setRange_String(&d->sourceMime, param);
                 }
                 else if (startsWith_Rangecc(param, "image/")) {
                     docFormat = gemini_GmDocumentFormat;
+                    setRange_String(&d->sourceMime, param);
                     if (!d->request || isFinished_GmRequest(d->request)) {
                         /* Make a simple document with an image. */
                         const char *imageTitle = "Image";
@@ -573,9 +608,9 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse
                             imageTitle =
                                 baseName_Path(collect_String(newRange_String(parts.path))).start;
                         }
-                        format_String(
-                            &str, "=> %s %s\n", cstr_String(d->mod.url), imageTitle);
-                        setImage_GmDocument(d->doc, 1, mimeStr, &response->body);
+                        format_String(&str, "=> %s %s\n", cstr_String(d->mod.url), imageTitle);
+                        setImage_GmDocument(
+                            d->doc, 1, mimeStr, &response->body, iFalse /* it's fixed */);
                     }
                     else {
                         clear_String(&str);
@@ -747,7 +782,9 @@ void setRedirectCount_DocumentWidget(iDocumentWidget *d, int count) {
 }
 
 iBool isRequestOngoing_DocumentWidget(const iDocumentWidget *d) {
-    return d->state == fetching_RequestState || d->state == receivedPartialResponse_RequestState;
+    /*return d->state == fetching_RequestState ||
+            d->state == receivedPartialResponse_RequestState;*/
+    return d->request != NULL;
 }
 
 static void scroll_DocumentWidget_(iDocumentWidget *d, int offset) {
@@ -961,7 +998,9 @@ static iBool handleMediaCommand_DocumentWidget_(iDocumentWidget *d, const char *
         return iFalse; /* not our request */
     }
     if (equal_Command(cmd, "media.updated")) {
-        /* TODO: Show a progress indicator */
+        /* Update the link's progress. */
+        invalidateLink_DocumentWidget_(d, req->linkId);
+        refresh_Widget(d);
         return iTrue;
     }
     else if (equal_Command(cmd, "media.finished")) {
@@ -974,7 +1013,7 @@ static iBool handleMediaCommand_DocumentWidget_(iDocumentWidget *d, const char *
 //                   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));
+                                    body_GmRequest(req->req), iTrue);
                 updateVisible_DocumentWidget_(d);
                 invalidate_DocumentWidget_(d);
                 refresh_Widget(as_Widget(d));
@@ -999,20 +1038,6 @@ static void allocVisBuffer_DocumentWidget_(const iDocumentWidget *d) {
     }
     else {
         dealloc_VisBuf(d->visBuf);
-#if 0
-        iZap(d->visBuffer->validRange);
-        d->visBuffer->size = size;
-        iAssert(size.x > 0);
-        iForIndices(i, d->visBuffer->texture) {
-            d->visBuffer->texture[i] =
-                SDL_CreateTexture(renderer_Window(get_Window()),
-                                  SDL_PIXELFORMAT_RGBA8888,
-                                  SDL_TEXTUREACCESS_STATIC | SDL_TEXTUREACCESS_TARGET,
-                                  size.x,
-                                  size.y);
-            SDL_SetTextureBlendMode(d->visBuffer->texture[i], SDL_BLENDMODE_NONE);
-        }
-#endif
     }
 }
 
@@ -1054,6 +1079,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
             updateTheme_DocumentWidget_(d);
             updateTrust_DocumentWidget_(d, NULL);
             updateSize_DocumentWidget(d);
+            updateFetchProgress_DocumentWidget_(d);
         }
         updateWindowTitle_DocumentWidget_(d);
         allocVisBuffer_DocumentWidget_(d);
@@ -1135,17 +1161,25 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
     }
     else if (equalWidget_Command(cmd, w, "document.request.updated") &&
              pointerLabel_Command(cmd, "request") == d->request) {
+        set_Block(&d->sourceContent, body_GmRequest(d->request));
+        if (document_App() == d) {
+            updateFetchProgress_DocumentWidget_(d);
+        }
         checkResponse_DocumentWidget_(d);
+        set_Atomic(&d->isRequestUpdated, iFalse); /* ready to be notified again */
         return iFalse;
     }
     else if (equalWidget_Command(cmd, w, "document.request.finished") &&
              pointerLabel_Command(cmd, "request") == d->request) {
+        set_Block(&d->sourceContent, body_GmRequest(d->request));
+        updateFetchProgress_DocumentWidget_(d);
         checkResponse_DocumentWidget_(d);
         resetSmoothScroll_DocumentWidget_(d);
         d->scrollY = d->initNormScrollY * size_GmDocument(d->doc).y;
         d->state = ready_RequestState;
         /* The response may be cached. */ {
-            if (!equal_Rangecc(urlScheme_String(d->mod.url), "about")) {
+            if (!equal_Rangecc(urlScheme_String(d->mod.url), "about") &&
+                startsWithCase_String(meta_GmRequest(d->request), "text/")) {
                 setCachedResponse_History(d->mod.history, response_GmRequest(d->request));
             }
         }
@@ -1159,20 +1193,102 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
         cancel_GmRequest(d->request);
         return iFalse;
     }
+    /*
     else if (equal_Command(cmd, "document.request.cancelled") && document_Command(cmd) == d) {
         postCommand_App("navigate.back");
         return iFalse;
     }
+    */
+    else if (equal_Command(cmd, "media.updated") || equal_Command(cmd, "media.finished")) {
+        return handleMediaCommand_DocumentWidget_(d, cmd);
+    }
     else if (equal_Command(cmd, "document.stop") && document_App() == d) {
         if (d->request) {
-            postCommandf_App("document.request.cancelled doc:%p url:%s", d, cstr_String(d->mod.url));
+            postCommandf_App(
+                "document.request.cancelled doc:%p url:%s", d, cstr_String(d->mod.url));
             iReleasePtr(&d->request);
+            if (d->state != ready_RequestState) {
             d->state = ready_RequestState;
+                postCommand_App("navigate.back");
+            }
+            updateFetchProgress_DocumentWidget_(d);
             return iTrue;
         }
     }
-    else if (equal_Command(cmd, "media.updated") || equal_Command(cmd, "media.finished")) {
-        return handleMediaCommand_DocumentWidget_(d, cmd);
+    else if (equal_Command(cmd, "document.save") && document_App() == d) {
+        if (d->request) {
+            makeMessage_Widget(uiTextCaution_ColorEscape "PAGE INCOMPLETE",
+                               "The page contents are still being downloaded.");
+        }
+        else if (!isEmpty_Block(&d->sourceContent)) {
+            /* Figure out a file name from the URL. */
+            /* TODO: Make this a utility function. */
+            iUrl parts;
+            init_Url(&parts, d->mod.url);
+            while (startsWith_Rangecc(parts.path, "/")) {
+                parts.path.start++;
+            }
+            while (endsWith_Rangecc(parts.path, "/")) {
+                parts.path.end--;
+            }
+            iString *name = collectNewCStr_String("pagecontent");
+            if (isEmpty_Range(&parts.path)) {
+                if (!isEmpty_Range(&parts.host)) {
+                    setRange_String(name, parts.host);
+                    replace_Block(&name->chars, '.', '_');
+                }
+            }
+            else {
+                iRangecc fn = { parts.path.start + lastIndexOfCStr_Rangecc(parts.path, "/") + 1,
+                                parts.path.end };
+                if (!isEmpty_Range(&fn)) {
+                    setRange_String(name, fn);
+                }
+            }
+            iString *savePath = concat_Path(downloadDir_App(), name);
+            if (lastIndexOfCStr_String(savePath, ".") == iInvalidPos) {
+                /* No extension specified in URL. */
+                if (startsWith_String(&d->sourceMime, "text/gemini")) {
+                    appendCStr_String(savePath, ".gmi");
+                }
+                else if (startsWith_String(&d->sourceMime, "text/")) {
+                    appendCStr_String(savePath, ".txt");
+                }
+                else if (startsWith_String(&d->sourceMime, "image/")) {
+                    appendCStr_String(savePath, cstr_String(&d->sourceMime) + 6);
+            if (fileExists_FileInfo(savePath)) {
+        }
+    }
+                /* Make it unique. */
+                iDate now;
+                initCurrent_Date(&now);
+                size_t insPos = lastIndexOfCStr_String(savePath, ".");
+                if (insPos == iInvalidPos) {
+                    insPos = size_String(savePath);
+                }
+                const iString *date = collect_String(format_Date(&now, "_%Y-%m-%d_%H%M%S"));
+                insertData_Block(&savePath->chars, insPos, cstr_String(date), size_String(date));
+            }
+            /* Write the file. */ {
+                iFile *f = new_File(savePath);
+                if (open_File(f, writeOnly_FileMode)) {
+                    write_File(f, &d->sourceContent);
+                    const size_t size   = size_Block(&d->sourceContent);
+                    const iBool  isMega = size >= 1000000;
+                    makeMessage_Widget(uiHeading_ColorEscape "PAGE SAVED",
+                                       format_CStr("%s\nSize: %.3f %s", cstr_String(path_File(f)),
+                                                   isMega ? size / 1.0e6f : (size / 1.0e3f),
+                                                   isMega ? "MB" : "KB"));
+                }
+                else {
+                    makeMessage_Widget(uiTextCaution_ColorEscape "ERROR SAVING PAGE",
+                                       strerror(errno));
+                }
+                iRelease(f);
+            }
+            delete_String(savePath);
+        }
+        return iTrue;
     }
     else if (equal_Command(cmd, "document.reload") && document_App() == d) {
         d->initNormScrollY = normScrollPos_DocumentWidget_(d);
@@ -1368,7 +1484,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
             case '`': {
                 iBlock *seed = new_Block(64);
                 for (size_t i = 0; i < 64; ++i) {
-                    setByte_Block(seed, i, iRandom(0, 255));
+                    setByte_Block(seed, i, iRandom(0, 256));
                 }
                 setThemeSeed_GmDocument(d->doc, seed);
                 delete_Block(seed);
@@ -1400,8 +1516,8 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
         }
         smoothScroll_DocumentWidget_(
             d,
-            -3 * ev->wheel.y * lineHeight_Text(default_FontId),
-            gap_UI * smoothSpeed_DocumentWidget_ +
+            -3 * ev->wheel.y * lineHeight_Text(paragraph_FontId),
+            gap_Text * smoothSpeed_DocumentWidget_ +
                 (isSmoothScrolling_DocumentWidget_(d) ? d->smoothSpeed : 0));
 #endif
         d->noHoverWhileScrolling = iTrue;
@@ -1433,23 +1549,48 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                 }
                 iArray items;
                 init_Array(&items, sizeof(iMenuItem));
+                if (d->contextLink) {
+                    pushBackN_Array(
+                        &items,
+                        (iMenuItem[]){ { "Open Link in New Tab",
+                              0,
+                              0,
+                              format_CStr("!open newtab:1 url:%s",
+                                          cstr_String(linkUrl_GmDocument(
+                                              d->doc, d->contextLink->linkId))) },
+                            { "---", 0, 0, NULL },
+                            { "Copy Link",
+                              0,
+                              0,
+                              "document.copylink" }},
+                        3);
+                }
+                else {
+                    if (!isEmpty_Range(&d->selectMark)) {
                 pushBackN_Array(
                     &items,
+                            (iMenuItem[]){ { "Copy", 0, 0, "copy" }, { "---", 0, 0, NULL } },
+                            2);
+                    }
+                    pushBackN_Array(
+                        &items,
                     (iMenuItem[]){
                         { "Go Back", navigateBack_KeyShortcut, "navigate.back" },
                         { "Go Forward", navigateForward_KeyShortcut, "navigate.forward" },
                         { "Reload Page", reload_KeyShortcut, "navigate.reload" },
                         { "---", 0, 0, NULL },
-                        { d->contextLink ? "Copy Link URL" : "Copy Page URL",
-                          0,
-                          0,
-                          "document.copylink" },
-                        { isEmpty_Range(&d->selectMark) ? "Copy Full Source" : "Copy Selected",
-                          'c',
-                          KMOD_PRIMARY,
-                          "copy" },
-                    },
+                            { "Copy Page URL", 0, 0, "document.copylink" },
+                            { "---", 0, 0, NULL } },
                     6);
+                    if (isEmpty_Range(&d->selectMark)) {
+                        pushBackN_Array(
+                            &items,
+                            (iMenuItem[]){
+                                { "Copy Page Source", 'c', KMOD_PRIMARY, "copy" },
+                                { "Save to Downloads", SDLK_s, KMOD_PRIMARY, "document.save" } },
+                            2);
+                    }
+                }
                 d->menu = makeMenu_Widget(w, data_Array(&items), size_Array(&items));
                 deinit_Array(&items);
             }
@@ -1489,10 +1630,16 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                     iAssert(linkId);
                     /* Media links are opened inline by default. */
                     if (isMediaLink_GmDocument(d->doc, linkId)) {
+                        const int linkFlags = linkFlags_GmDocument(d->doc, linkId);
+                        if (linkFlags & content_GmLinkFlag && linkFlags & permanent_GmLinkFlag) {
+                            /* We have the image and it cannot be dismissed, so nothing
+                               further to do. */
+                            return iTrue;
+                        }
                         if (!requestMedia_DocumentWidget_(d, linkId)) {
-                            if (linkFlags_GmDocument(d->doc, linkId) & content_GmLinkFlag) {
+                            if (linkFlags & content_GmLinkFlag) {
                                 /* Dismiss shown content on click. */
-                                setImage_GmDocument(d->doc, linkId, NULL, NULL);
+                                setImage_GmDocument(d->doc, linkId, NULL, NULL, iTrue);
                                 d->hoverLink = NULL;
                                 scroll_DocumentWidget_(d, 0);
                                 updateVisible_DocumentWidget_(d);
@@ -1505,7 +1652,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                                 iMediaRequest *req = findMediaRequest_DocumentWidget_(d, linkId);
                                 if (req) {
                                     setImage_GmDocument(d->doc, linkId, meta_GmRequest(req->req),
-                                                        body_GmRequest(req->req));
+                                                        body_GmRequest(req->req), iTrue);
                                     updateVisible_DocumentWidget_(d);
                                     invalidate_DocumentWidget_(d);
                                     refresh_Widget(w);
@@ -1671,8 +1818,8 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
         const int flags = linkFlags_GmDocument(doc, run->linkId);
         const iRect linkRect = moved_Rect(run->visBounds, origin);
         iMediaRequest *mr = NULL;
-        /* Show inline content. */
-        if (flags & content_GmLinkFlag) {
+        /* Show metadata about inline content. */
+        if (flags & content_GmLinkFlag && run->flags & endOfLine_GmRunFlag) {
             fg = linkColor_GmDocument(doc, run->linkId, textHover_GmLinkPart);
             iAssert(!isEmpty_Rect(run->bounds));
             iGmImageInfo info;
@@ -1704,7 +1851,8 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
                 draw_Text(metaFont,
                           topRight_Rect(linkRect),
                           tmInlineContentMetadata_ColorId,
-                          " \u2014 Fetching\u2026");
+                          " \u2014 Fetching\u2026 (%.1f MB)",
+                          (float) size_Block(body_GmRequest(mr->req)) / 1.0e6f);
             }
         }
         else if (isHover) {
@@ -1713,20 +1861,23 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
             const int       flags  = linkFlags_GmDocument(doc, linkId);
             iUrl parts;
             init_Url(&parts, url);
-            fg = linkColor_GmDocument(doc, linkId, textHover_GmLinkPart);
-            const iBool showHost  = (!isEmpty_Range(&parts.host) && flags & userFriendly_GmLinkFlag);
+            fg                    = linkColor_GmDocument(doc, linkId, textHover_GmLinkPart);
+            const iBool showHost  = (flags & humanReadable_GmLinkFlag &&
+                                    (!isEmpty_Range(&parts.host) || flags & mailto_GmLinkFlag));
             const iBool showImage = (flags & imageFileExtension_GmLinkFlag) != 0;
             const iBool showAudio = (flags & audioFileExtension_GmLinkFlag) != 0;
             iString str;
             init_String(&str);
+            /* Show scheme and host. */
             if (run->flags & endOfLine_GmRunFlag &&
                 (flags & (imageFileExtension_GmLinkFlag | audioFileExtension_GmLinkFlag) ||
                  showHost)) {
-                format_String(
-                    &str,
+                format_String(&str,
                     " \u2014%s%s%s\r%c%s",
                     showHost ? " " : "",
-                    showHost ? (!equalCase_Rangecc(parts.scheme, "gemini")
+                              showHost ? (flags & mailto_GmLinkFlag
+                                              ? cstr_String(url)
+                                              : ~flags & gemini_GmLinkFlag
                                     ? format_CStr("%s://%s",
                                                   cstr_Rangecc(parts.scheme),
                                                   cstr_Rangecc(parts.host))
@@ -1735,7 +1886,8 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
                     showHost && (showImage || showAudio) ? " \u2014" : "",
                     showImage || showAudio
                         ? asciiBase_ColorEscape + fg
-                        : (asciiBase_ColorEscape + linkColor_GmDocument(doc, run->linkId, domain_GmLinkPart)),
+                                  : (asciiBase_ColorEscape +
+                                     linkColor_GmDocument(doc, run->linkId, domain_GmLinkPart)),
                     showImage ? " View Image \U0001f5bc"
                               : showAudio ? " Play Audio \U0001f3b5" : "");
             }
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 11098c80..2d6d84dd 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -182,6 +182,7 @@ void setText_InputWidget(iInputWidget *d, const iString *text) {
         pushBack_Array(&d->text, &i.value);
     }
     iZap(d->mark);
+    d->cursor = iMin(d->cursor, size_Array(&d->text));
     refresh_Widget(as_Widget(d));
 }
 
@@ -733,6 +734,7 @@ static void draw_InputWidget_(const iInputWidget *d) {
         deinit_String(&cur);
     }
     delete_String(text);
+    drawChildren_Widget(w);
 }
 
 iBeginDefineSubclass(InputWidget, Widget)
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index 8b2506e7..28f43173 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -94,54 +94,7 @@ static iBool processEvent_LabelWidget_(iLabelWidget *d, const SDL_Event *ev) {
 }
 
 static void keyStr_LabelWidget_(const iLabelWidget *d, iString *str) {
-#if defined (iPlatformApple)
-    if (d->kmods & KMOD_CTRL) {
-        appendChar_String(str, 0x2303);
-    }
-    if (d->kmods & KMOD_ALT) {
-        appendChar_String(str, 0x2325);
-    }
-    if (d->kmods & KMOD_SHIFT) {
-        appendChar_String(str, 0x21e7);
-    }
-    if (d->kmods & KMOD_GUI) {
-        appendChar_String(str, 0x2318);
-    }
-#else
-    if (d->kmods & KMOD_CTRL) {
-        appendCStr_String(str, "Ctrl+");
-    }
-    if (d->kmods & KMOD_ALT) {
-        appendCStr_String(str, "Alt+");
-    }
-    if (d->kmods & KMOD_SHIFT) {
-        appendCStr_String(str, "Shift+");
-    }
-    if (d->kmods & KMOD_GUI) {
-        appendCStr_String(str, "Meta+");
-    }
-#endif
-    if (d->key == 0x20) {
-        appendCStr_String(str, "Space");
-    }
-    else if (d->key == SDLK_LEFT) {
-        appendChar_String(str, 0x2190);
-    }
-    else if (d->key == SDLK_RIGHT) {
-        appendChar_String(str, 0x2192);
-    }
-    else if (d->key < 128 && (isalnum(d->key) || ispunct(d->key))) {
-        appendChar_String(str, upper_Char(d->key));
-    }
-    else if (d->key == SDLK_BACKSPACE) {
-        appendChar_String(str, 0x232b); /* Erase to the Left */
-    }
-    else if (d->key == SDLK_DELETE) {
-        appendChar_String(str, 0x2326); /* Erase to the Right */
-    }
-    else {
-        appendCStr_String(str, SDL_GetKeyName(d->key));
-    }
+    toString_Sym(d->key, d->kmods, str);
 }
 
 static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int *frame1, int *frame2) {
diff --git a/src/ui/lookupwidget.c b/src/ui/lookupwidget.c
index b7de5872..dcde7d79 100644
--- a/src/ui/lookupwidget.c
+++ b/src/ui/lookupwidget.c
@@ -265,7 +265,7 @@ static void searchIdentities_LookupJob_(iLookupJob *d) {
 
 static iThreadResult worker_LookupWidget_(iThread *thread) {
     iLookupWidget *d = userData_Thread(thread);
-    printf("[LookupWidget] worker is running\n"); fflush(stdout);
+//    printf("[LookupWidget] worker is running\n"); fflush(stdout);
     lock_Mutex(d->mtx);
     for (;;) {
         wait_Condition(&d->jobAvailable, d->mtx);
@@ -312,13 +312,13 @@ static iThreadResult worker_LookupWidget_(iThread *thread) {
             /* Previous results haven't been taken yet. */
             delete_LookupJob(d->finishedJob);
         }
-        printf("[LookupWidget] worker has %zu results\n", size_PtrArray(&job->results));
+//        printf("[LookupWidget] worker has %zu results\n", size_PtrArray(&job->results));
         fflush(stdout);
         d->finishedJob = job;
         postCommand_Widget(as_Widget(d), "lookup.ready");
     }
     unlock_Mutex(d->mtx);
-    printf("[LookupWidget] worker has quit\n"); fflush(stdout);
+//    printf("[LookupWidget] worker has quit\n"); fflush(stdout);
     return 0;
 }
 
diff --git a/src/ui/util.c b/src/ui/util.c
index 0af33138..ff6f8822 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -52,6 +52,57 @@ const char *command_UserEvent(const SDL_Event *d) {
     return "";
 }
 
+void toString_Sym(int key, int kmods, iString *str) {
+#if defined (iPlatformApple)
+    if (kmods & KMOD_CTRL) {
+        appendChar_String(str, 0x2303);
+    }
+    if (kmods & KMOD_ALT) {
+        appendChar_String(str, 0x2325);
+    }
+    if (kmods & KMOD_SHIFT) {
+        appendChar_String(str, 0x21e7);
+    }
+    if (kmods & KMOD_GUI) {
+        appendChar_String(str, 0x2318);
+    }
+#else
+    if (kmods & KMOD_CTRL) {
+        appendCStr_String(str, "Ctrl+");
+    }
+    if (kmods & KMOD_ALT) {
+        appendCStr_String(str, "Alt+");
+    }
+    if (kmods & KMOD_SHIFT) {
+        appendCStr_String(str, "Shift+");
+    }
+    if (kmods & KMOD_GUI) {
+        appendCStr_String(str, "Meta+");
+    }
+#endif
+    if (key == 0x20) {
+        appendCStr_String(str, "Space");
+    }
+    else if (key == SDLK_LEFT) {
+        appendChar_String(str, 0x2190);
+    }
+    else if (key == SDLK_RIGHT) {
+        appendChar_String(str, 0x2192);
+    }
+    else if (key < 128 && (isalnum(key) || ispunct(key))) {
+        appendChar_String(str, upper_Char(key));
+    }
+    else if (key == SDLK_BACKSPACE) {
+        appendChar_String(str, 0x232b); /* Erase to the Left */
+    }
+    else if (key == SDLK_DELETE) {
+        appendChar_String(str, 0x2326); /* Erase to the Right */
+    }
+    else {
+        appendCStr_String(str, SDL_GetKeyName(key));
+    }
+}
+
 int keyMods_Sym(int kmods) {
     kmods &= (KMOD_SHIFT | KMOD_ALT | KMOD_CTRL | KMOD_GUI);
     /* Don't treat left/right modifiers differently. */
@@ -192,6 +243,12 @@ iWidget *addAction_Widget(iWidget *parent, int key, int kmods, const char *comma
 
 /*-----------------------------------------------------------------------------------------------*/
 
+static iBool isCommandIgnoredByMenus_(const char *cmd) {
+    return equal_Command(cmd, "media.updated") || equal_Command(cmd, "document.request.updated") ||
+           equal_Command(cmd, "window.resized") ||
+           (equal_Command(cmd, "mouse.clicked") && !arg_Command(cmd)); /* button released */
+}
+
 static iBool menuHandler_(iWidget *menu, const char *cmd) {
     if (isVisible_Widget(menu)) {
         if (equalWidget_Command(cmd, menu, "menu.opened")) {
@@ -201,13 +258,13 @@ static iBool menuHandler_(iWidget *menu, const char *cmd) {
             /* Don't reopen self; instead, root will close the menu. */
             return iFalse;
         }
-        if (equal_Command(cmd, "mouse.clicked") && arg_Command(cmd)) {
+        if ((equal_Command(cmd, "mouse.clicked") || equal_Command(cmd, "mouse.missed")) &&
+            arg_Command(cmd)) {
             /* Dismiss open menus when clicking outside them. */
             closeMenu_Widget(menu);
             return iTrue;
         }
-        if (!equal_Command(cmd, "window.resized") &&
-            !(equal_Command(cmd, "mouse.clicked") && !arg_Command(cmd)) /* ignore button release */) {
+        if (!isCommandIgnoredByMenus_(cmd)) {
             closeMenu_Widget(menu);
         }
     }
@@ -252,6 +309,7 @@ void openMenu_Widget(iWidget *d, iInt2 coord) {
     postCommand_App("cancel"); /* dismiss any other menus */
     processEvents_App(postedEventsOnly_AppEventMode);
     setFlags_Widget(d, hidden_WidgetFlag, iFalse);
+    setFlags_Widget(d, commandOnMouseMiss_WidgetFlag, iTrue);
     setFlags_Widget(findChild_Widget(d, "menu.cancel"), disabled_WidgetFlag, iFalse);
     arrange_Widget(d);
     d->rect.pos = coord;
@@ -681,10 +739,9 @@ void updateValueInput_Widget(iWidget *d, const char *title, const char *prompt)
 
 static iBool messageHandler_(iWidget *msg, const char *cmd) {
     /* Almost any command dismisses the sheet. */
-//    if (equal_Command(cmd, "menu.closed")) {
-//        return iFalse;
-//    }
-    destroy_Widget(msg);
+    if (!(equal_Command(cmd, "media.updated") || equal_Command(cmd, "document.request.updated"))) {
+        destroy_Widget(msg);
+    }
     return iFalse;
 }
 
@@ -755,14 +812,16 @@ iWidget *makePreferences_Widget(void) {
     addChild_Widget(dlg, iClob(page));
     setFlags_Widget(page, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
     iWidget *headings = addChildFlags_Widget(
-        page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);    
+        page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
     iWidget *values = addChildFlags_Widget(
         page, iClob(new_Widget()), arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag);
+    addChild_Widget(headings, iClob(makeHeading_Widget("Downloads folder:")));
+    setId_Widget(addChild_Widget(values, iClob(new_InputWidget(0))), "prefs.downloads");
 #if defined (iPlatformApple) || defined (iPlatformMSys)
     addChild_Widget(headings, iClob(makeHeading_Widget("Use system theme:")));
     addChild_Widget(values, iClob(makeToggle_Widget("prefs.ostheme")));
 #endif
-    addChild_Widget(headings, iClob(makeHeading_Widget("Theme:")));    
+    addChild_Widget(headings, iClob(makeHeading_Widget("Theme:")));
     iWidget *themes = new_Widget();
     /* Themes. */ {
         setId_Widget(addChild_Widget(themes, iClob(new_LabelWidget("Pure Black", 0, 0, "theme.set arg:0"))), "prefs.theme.0");
@@ -782,8 +841,9 @@ iWidget *makePreferences_Widget(void) {
     addChild_Widget(headings, iClob(makeHeading_Widget("HTTP proxy:")));
     setId_Widget(addChild_Widget(values, iClob(new_InputWidget(0))), "prefs.proxy.http");
     arrange_Widget(dlg);
-    /* Text input widths. */ {
+    /* Set text input widths. */ {
         const int inputWidth = width_Rect(page->rect) - width_Rect(headings->rect);
+        as_Widget(findChild_Widget(values, "prefs.downloads"))->rect.size.x = inputWidth;
         as_Widget(findChild_Widget(values, "prefs.proxy.http"))->rect.size.x = inputWidth;
         as_Widget(findChild_Widget(values, "prefs.proxy.gopher"))->rect.size.x = inputWidth;
     }
diff --git a/src/ui/util.h b/src/ui/util.h
index 8ca9dd53..5590d008 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -49,6 +49,7 @@ iLocalDef iBool isResize_UserEvent(const SDL_Event *d) {
 #endif
 
 int         keyMods_Sym         (int kmods); /* shift, alt, control, or gui */
+void        toString_Sym        (int key, int kmods, iString *str);
 
 iRangei     intersect_Rangei    (iRangei a, iRangei b);
 iRangei     union_Rangei        (iRangei a, iRangei b);
diff --git a/src/ui/visbuf.c b/src/ui/visbuf.c
index 64d861c6..8a66c300 100644
--- a/src/ui/visbuf.c
+++ b/src/ui/visbuf.c
@@ -37,6 +37,7 @@ void deinit_VisBuf(iVisBuf *d) {
 
 void invalidate_VisBuf(iVisBuf *d) {
     iForIndices(i, d->buffers) {
+        d->buffers[i].origin = i * d->texSize.y;
         iZap(d->buffers[i].validRange);
     }
 }
diff --git a/src/ui/widget.c b/src/ui/widget.c
index d3f28b08..05bb62cc 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -542,6 +542,15 @@ iBool processEvent_Widget(iWidget *d, const SDL_Event *ev) {
             break;
         }
     }
+    if (d->flags & commandOnMouseMiss_WidgetFlag && ev->type == SDL_MOUSEBUTTONDOWN &&
+        !contains_Widget(d, init_I2(ev->button.x, ev->button.y))) {
+        postCommand_Widget(d,
+                           "mouse.missed arg:%d button:%d coord:%d %d",
+                           ev->type == SDL_MOUSEBUTTONDOWN ? 1 : 0,
+                           ev->button.button,
+                           ev->button.x,
+                           ev->button.y);
+    }
     if (d->flags & mouseModal_WidgetFlag && isMouseEvent_(ev)) {
         setCursor_Window(get_Window(), SDL_SYSTEM_CURSOR_ARROW);
         return iTrue;
diff --git a/src/ui/widget.h b/src/ui/widget.h
index 25208c30..fa4fbe0f 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -58,6 +58,7 @@ enum iWidgetFlag {
     tight_WidgetFlag          = iBit(12), /* smaller padding */
     keepOnTop_WidgetFlag      = iBit(13), /* gets events first; drawn last */
     mouseModal_WidgetFlag     = iBit(14), /* eats all unprocessed mouse events */
+    commandOnMouseMiss_WidgetFlag = iBit(15),
     /* arrange behavior */
     fixedPosition_WidgetFlag               = iBit(16),
     arrangeHorizontal_WidgetFlag           = iBit(17), /* arrange children horizontally */
diff --git a/src/ui/window.c b/src/ui/window.c
index 0a63a941..8ebb67a8 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -91,10 +91,13 @@ static iBool handleRootCommands_(iWidget *root, const char *cmd) {
 #endif
 
 #if !defined (iHaveNativeMenus)
+/* TODO: Submenus wouldn't hurt here. */
 static const iMenuItem navMenuItems[] = {
     { "New Tab", 't', KMOD_PRIMARY, "tabs.new" },
     { "Open Location...", SDLK_l, KMOD_PRIMARY, "focus.set id:url" },
     { "---", 0, 0, NULL },
+    { "Save to Downloads", SDLK_s, KMOD_PRIMARY, "document.save" },
+    { "---", 0, 0, NULL },
     { "Copy Source Text", SDLK_c, KMOD_PRIMARY, "copy" },
     { "Bookmark This Page", SDLK_d, KMOD_PRIMARY, "bookmark.add" },
     { "---", 0, 0, NULL },
@@ -104,7 +107,7 @@ static const iMenuItem navMenuItems[] = {
     { "Reset Zoom", SDLK_0, KMOD_PRIMARY, "zoom.set arg:100" },
     { "---", 0, 0, NULL },
     { "Preferences...", SDLK_COMMA, KMOD_PRIMARY, "preferences" },
-    { "Help", 0, 0, "!open url:about:help" },
+    { "Help", SDLK_F1, 0, "!open url:about:help" },
     { "Release Notes", 0, 0, "!open url:about:version" },
     { "---", 0, 0, NULL },
     { "Quit Lagrange", 'q', KMOD_PRIMARY, "quit" }
@@ -116,6 +119,8 @@ static const iMenuItem navMenuItems[] = {
 static const iMenuItem fileMenuItems[] = {
     { "New Tab", SDLK_t, KMOD_PRIMARY, "tabs.new" },
     { "Open Location...", SDLK_l, KMOD_PRIMARY, "focus.set id:url" },
+    { "---", 0, 0, NULL },
+    { "Save to Downloads", SDLK_s, KMOD_PRIMARY, "document.save" },
 };
 
 static const iMenuItem editMenuItems[] = {
@@ -362,12 +367,24 @@ static void setupUserInterface_Window(iWindow *d) {
         setId_Widget(as_Widget(lock), "navbar.lock");
         setFont_LabelWidget(lock, defaultSymbols_FontId);
         updateTextCStr_LabelWidget(lock, "\U0001f512");
-        iInputWidget *url = new_InputWidget(0);
-        setSelectAllOnFocus_InputWidget(url, iTrue);
-        setId_Widget(as_Widget(url), "url");
-        setNotifyEdits_InputWidget(url, iTrue);
-        setTextCStr_InputWidget(url, "gemini://");
-        addChildFlags_Widget(navBar, iClob(url), expand_WidgetFlag);
+        /* URL input field. */ {
+            iInputWidget *url = new_InputWidget(0);
+            setSelectAllOnFocus_InputWidget(url, iTrue);
+            setId_Widget(as_Widget(url), "url");
+            setNotifyEdits_InputWidget(url, iTrue);
+            setTextCStr_InputWidget(url, "gemini://");
+            addChildFlags_Widget(navBar, iClob(url), expand_WidgetFlag);
+            /* Download progress indicator is inside the input field, but hidden normally. */
+            setPadding_Widget(as_Widget(url),0, 0, gap_UI * 1, 0);
+            iLabelWidget *progress = new_LabelWidget(uiTextCaution_ColorEscape "00.000 MB", 0, 0, NULL);
+            setId_Widget(as_Widget(progress), "document.progress");
+            setAlignVisually_LabelWidget(progress, iTrue);
+            shrink_Rect(&as_Widget(progress)->rect, init_I2(0, gap_UI));
+            addChildFlags_Widget(as_Widget(url),
+                                 iClob(progress),
+                                 moveToParentRightEdge_WidgetFlag);
+            setBackgroundColor_Widget(as_Widget(progress), uiBackground_ColorId);
+        }
         setId_Widget(addChild_Widget(
                          navBar, iClob(newIcon_LabelWidget(reloadCStr_, 0, 0, "navigate.reload"))),
                      "reload");
@@ -477,26 +494,36 @@ static void drawBlank_Window_(iWindow *d) {
     SDL_RenderPresent(d->render);
 }
 
-// #define ENABLE_SWRENDER
+iBool create_Window_(iWindow *d, iRect rect, uint32_t flags) {
+    flags |= SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI;
+    if (SDL_CreateWindowAndRenderer(
+            width_Rect(rect), height_Rect(rect), flags, &d->win, &d->render)) {
+        return iFalse;
+    }
+    return iTrue;
+}
 
 void init_Window(iWindow *d, iRect rect) {
     theWindow_ = d;
     iZap(d->cursors);
+    d->initialPos = rect.pos;
     d->pendingCursor = NULL;
     d->isDrawFrozen = iTrue;
-    uint32_t flags = SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI;
-#if defined (ENABLE_SWRENDER)
-    SDL_SetHint(SDL_HINT_RENDER_DRIVER, "software");
-#elif defined (iPlatformApple)
+    uint32_t flags = 0;
+#if defined (iPlatformApple)
     SDL_SetHint(SDL_HINT_RENDER_DRIVER, "metal");
 #else
     flags |= SDL_WINDOW_OPENGL;
 #endif
     SDL_SetHint(SDL_HINT_RENDER_VSYNC, "1");
-    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);
+    /* First try SDL's default renderer that should be the best option. */
+    if (forceSoftwareRender_App() || !create_Window_(d, rect, flags)) {
+        /* No luck, maybe software only? This should always work as long as there is a display. */
+        SDL_SetHint(SDL_HINT_RENDER_DRIVER, "software");
+        if (!create_Window_(d, rect, 0)) {
+            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));
@@ -571,6 +598,16 @@ SDL_Renderer *renderer_Window(const iWindow *d) {
 
 static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
     switch (ev->event) {
+#if defined (LAGRANGE_ENABLE_WINDOWPOS_FIX)
+        case SDL_WINDOWEVENT_EXPOSED:
+            if (d->initialPos.x >= 0) {
+                int bx, by;
+                SDL_GetWindowBordersSize(d->win, &by, &bx, NULL, NULL);
+                SDL_SetWindowPosition(d->win, d->initialPos.x + bx, d->initialPos.y + by);
+                d->initialPos = init1_I2(-1);
+            }
+            return iFalse;
+#endif
         case SDL_WINDOWEVENT_MOVED:
             /* No need to do anything. */
             return iTrue;
diff --git a/src/ui/window.h b/src/ui/window.h
index 4aec2fa7..b067d30e 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -34,6 +34,7 @@ iDeclareTypeConstructionArgs(Window, iRect rect)
 
 struct Impl_Window {
     SDL_Window *  win;
+    iInt2         initialPos;
     iBool         isDrawFrozen; /* avoids premature draws while restoring window state */
     SDL_Renderer *render;
     iWidget *     root;