8 files changed, 104 insertions, 81 deletions

diff --git a/src/ui/color.c b/src/ui/color.c
index a6ba18e4..6c51bc06 100644
--- a/src/ui/color.c
+++ b/src/ui/color.c
@@ -468,12 +468,12 @@ const char *escape_Color(int color) {
         return esc[color];
     }
     /* TODO: Conflict with format strings! "%" (37) may be used as the color value. */
-    /* Double-\r is used for range extension. */
+    /* Double-\v is used for range extension. */
     if (color + asciiBase_ColorEscape > 127) {
         iAssert(color - asciiExtended_ColorEscape + asciiBase_ColorEscape <= 127);
-        return format_CStr("\r\r%c", color - asciiExtended_ColorEscape + asciiBase_ColorEscape);
+        return format_CStr("\v\v%c", color - asciiExtended_ColorEscape + asciiBase_ColorEscape);
     }
-    return format_CStr("\r%c", color + asciiBase_ColorEscape);
+    return format_CStr("\v%c", color + asciiBase_ColorEscape);
 }
 
 iHSLColor setSat_HSLColor(iHSLColor d, float sat) {
diff --git a/src/ui/color.h b/src/ui/color.h
index d2fa3c00..aafc1794 100644
--- a/src/ui/color.h
+++ b/src/ui/color.h
@@ -187,26 +187,26 @@ iLocalDef iBool isRegularText_ColorId(enum iColorId d) {
 #define asciiBase_ColorEscape       33
 #define asciiExtended_ColorEscape   (128 - asciiBase_ColorEscape)
 
-#define restore_ColorEscape         "\r\x24" /* ASCII Cancel */
-#define black_ColorEscape           "\r!"
-#define gray25_ColorEscape          "\r\""
-#define gray50_ColorEscape          "\r#"
-#define gray75_ColorEscape          "\r$"
-#define white_ColorEscape           "\r%"
-#define brown_ColorEscape           "\r&"
-#define orange_ColorEscape          "\r'"
-#define teal_ColorEscape            "\r("
-#define cyan_ColorEscape            "\r)"
-#define yellow_ColorEscape          "\r*"
-#define red_ColorEscape             "\r+"
-#define magenta_ColorEscape         "\r,"
-#define blue_ColorEscape            "\r-"
-#define green_ColorEscape           "\r."
-#define uiText_ColorEscape          "\r4"
-#define uiTextAction_ColorEscape    "\r<"
-#define uiTextCaution_ColorEscape   "\r="
-#define uiTextStrong_ColorEscape    "\r:"
-#define uiHeading_ColorEscape       "\rR"
+#define restore_ColorEscape         "\v\x24" /* ASCII Cancel */
+#define black_ColorEscape           "\v!"
+#define gray25_ColorEscape          "\v\""
+#define gray50_ColorEscape          "\v#"
+#define gray75_ColorEscape          "\v$"
+#define white_ColorEscape           "\v%"
+#define brown_ColorEscape           "\v&"
+#define orange_ColorEscape          "\v'"
+#define teal_ColorEscape            "\v("
+#define cyan_ColorEscape            "\v)"
+#define yellow_ColorEscape          "\v*"
+#define red_ColorEscape             "\v+"
+#define magenta_ColorEscape         "\v,"
+#define blue_ColorEscape            "\v-"
+#define green_ColorEscape           "\v."
+#define uiText_ColorEscape          "\v4"
+#define uiTextAction_ColorEscape    "\v<"
+#define uiTextCaution_ColorEscape   "\v="
+#define uiTextStrong_ColorEscape    "\v:"
+#define uiHeading_ColorEscape       "\vR"
 
 iDeclareType(Color)
 iDeclareType(HSLColor)
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 6184a75a..29e264e8 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1016,9 +1016,7 @@ static void showOrHidePinningIndicator_DocumentWidget_(iDocumentWidget *d) {
                          isPinned_DocumentWidget_(d));
 }
 
-void setSource_DocumentWidget(iDocumentWidget *d, const iString *source) {
-    setUrl_GmDocument(d->doc, d->mod.url);
-    setSource_GmDocument(d->doc, source, documentWidth_DocumentWidget_(d));
+static void documentWasChanged_DocumentWidget_(iDocumentWidget *d) {
     documentRunsInvalidated_DocumentWidget_(d);
     updateWindowTitle_DocumentWidget_(d);
     updateVisible_DocumentWidget_(d);
@@ -1034,7 +1032,23 @@ void setSource_DocumentWidget(iDocumentWidget *d, const iString *source) {
             d->flags |= otherRootByDefault_DocumentWidgetFlag;
         }
     }
-    showOrHidePinningIndicator_DocumentWidget_(d);
+    showOrHidePinningIndicator_DocumentWidget_(d);    
+}
+
+void setSource_DocumentWidget(iDocumentWidget *d, const iString *source) {
+    setUrl_GmDocument(d->doc, d->mod.url);
+    setSource_GmDocument(d->doc,
+                         source,
+                         documentWidth_DocumentWidget_(d),
+                         isFinished_GmRequest(d->request) ? final_GmDocumentUpdate
+                                                          : partial_GmDocumentUpdate);
+    documentWasChanged_DocumentWidget_(d);
+}
+
+static void replaceDocument_DocumentWidget_(iDocumentWidget *d, iGmDocument *newDoc) {
+    iRelease(d->doc);
+    d->doc = ref_Object(newDoc);
+    documentWasChanged_DocumentWidget_(d);
 }
 
 static void updateTheme_DocumentWidget_(iDocumentWidget *d) {
@@ -1144,15 +1158,15 @@ static void showErrorPage_DocumentWidget_(iDocumentWidget *d, enum iGmStatusCode
             2);
     }
     setBanner_GmDocument(d->doc, useBanner ? bannerType_DocumentWidget_(d) : none_GmDocumentBanner);
-    setFormat_GmDocument(d->doc, gemini_GmDocumentFormat);
+    setFormat_GmDocument(d->doc, gemini_SourceFormat);
     translate_Lang(src);
+    d->state = ready_RequestState;
     setSource_DocumentWidget(d, src);
     updateTheme_DocumentWidget_(d);
     reset_SmoothScroll(&d->scrollY);
     init_Anim(&d->sideOpacity, 0);
     init_Anim(&d->altTextOpacity, 0);
     resetWideRuns_DocumentWidget_(d);
-    d->state = ready_RequestState;
 }
 
 static void updateFetchProgress_DocumentWidget_(iDocumentWidget *d) {
@@ -1264,9 +1278,9 @@ static void postProcessRequestContent_DocumentWidget_(iDocumentWidget *d, iBool
                     2);
             }
             if (preloadCoverImage_Gempub(d->sourceGempub, d->doc)) {
-                redoLayout_GmDocument(d->doc);
-                updateVisible_DocumentWidget_(d);
-                invalidate_DocumentWidget_(d);
+            redoLayout_GmDocument(d->doc);
+            updateVisible_DocumentWidget_(d);
+            invalidate_DocumentWidget_(d);
             }
         }
         else if (equal_String(d->mod.url, indexPageUrl_Gempub(d->sourceGempub))) {
@@ -1348,7 +1362,9 @@ static void postProcessRequestContent_DocumentWidget_(iDocumentWidget *d, iBool
     }
 }
 
-static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse *response,
+static void updateDocument_DocumentWidget_(iDocumentWidget *d,
+                                           const iGmResponse *response,
+                                           iGmDocument *cachedDoc,
                                            const iBool isInitialUpdate) {
     if (d->state == ready_RequestState) {
         return;
@@ -1371,7 +1387,7 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse
         if (isSuccess_GmStatusCode(statusCode)) {
             /* Check the MIME type. */
             iRangecc charset = range_CStr("utf-8");
-            enum iGmDocumentFormat docFormat = undefined_GmDocumentFormat;
+            enum iSourceFormat docFormat = undefined_SourceFormat;
             const iString *mimeStr = collect_String(lower_String(&response->meta)); /* for convenience */
             set_String(&d->sourceMime, mimeStr);
             iRangecc mime = range_String(mimeStr);
@@ -1380,20 +1396,20 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse
                 iRangecc param = seg;
                 trim_Rangecc(&param);
                 if (equal_Rangecc(param, "text/gemini")) {
-                    docFormat = gemini_GmDocumentFormat;
+                    docFormat = gemini_SourceFormat;
                     setRange_String(&d->sourceMime, param);
                 }
                 else if (startsWith_Rangecc(param, "text/") ||
                          equal_Rangecc(param, "application/json") ||
                          equal_Rangecc(param, "application/x-pem-file") ||
                          equal_Rangecc(param, "application/pem-certificate-chain")) {
-                    docFormat = plainText_GmDocumentFormat;
+                    docFormat = plainText_SourceFormat;
                     setRange_String(&d->sourceMime, param);
                 }
                 else if (equal_Rangecc(param, "application/zip") ||
                          (startsWith_Rangecc(param, "application/") &&
                           endsWithCase_Rangecc(param, "+zip"))) {
-                    docFormat = gemini_GmDocumentFormat;
+                    docFormat = gemini_SourceFormat;
                     setRange_String(&d->sourceMime, param);
                     iString *key = collectNew_String();
                     toString_Sym(SDLK_s, KMOD_PRIMARY, key);
@@ -1420,9 +1436,10 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse
                          startsWith_Rangecc(param, "audio/")) {
                     const iBool isAudio = startsWith_Rangecc(param, "audio/");
                     /* Make a simple document with an image or audio player. */
-                    docFormat = gemini_GmDocumentFormat;
+                    docFormat = gemini_SourceFormat;
                     setRange_String(&d->sourceMime, param);
                     const iGmLinkId imgLinkId = 1; /* there's only the one link */
+                    /* TODO: Do the image loading in `postProcessRequestContent_DocumentWidget_()` */
                     if ((isAudio && isInitialUpdate) || (!isAudio && isRequestFinished)) {
                         const char *linkTitle =
                             startsWith_String(mimeStr, "image/") ? "Image" : "Audio";
@@ -1464,7 +1481,7 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse
                     }
                 }
             }
-            if (docFormat == undefined_GmDocumentFormat) {
+            if (docFormat == undefined_SourceFormat) {
                 showErrorPage_DocumentWidget_(d, unsupportedMimeType_GmStatusCode, &response->meta);
                 deinit_String(&str);
                 return;
@@ -1476,7 +1493,10 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d, const iGmResponse
                            collect_String(decode_Block(&str.chars, cstr_Rangecc(charset))));
             }
         }
-        if (setSource) {
+        if (cachedDoc) {
+            replaceDocument_DocumentWidget_(d, cachedDoc);
+        }
+        else if (setSource) {
             setSource_DocumentWidget(d, &str);
         }
         deinit_String(&str);
@@ -1556,14 +1576,15 @@ static void cacheDocumentGlyphs_DocumentWidget_(const iDocumentWidget *d) {
 }
 
 static void updateFromCachedResponse_DocumentWidget_(iDocumentWidget *d, float normScrollY,
-                                                     const iGmResponse *resp) {
+                                                     const iGmResponse *resp, iGmDocument *cachedDoc) {
     setLinkNumberMode_DocumentWidget_(d, iFalse);
     clear_ObjectList(d->media);
     delete_Gempub(d->sourceGempub);
     d->sourceGempub = NULL;
-    reset_GmDocument(d->doc);
+    iRelease(d->doc);
     destroy_Widget(d->footerButtons);
     d->footerButtons = NULL;
+    d->doc = new_GmDocument();
     resetWideRuns_DocumentWidget_(d);
     d->state = fetching_RequestState;
     /* Do the fetch. */ {
@@ -1574,10 +1595,11 @@ static void updateFromCachedResponse_DocumentWidget_(iDocumentWidget *d, float n
         d->sourceStatus = success_GmStatusCode;
         format_String(&d->sourceHeader, cstr_Lang("pageinfo.header.cached"));
         set_Block(&d->sourceContent, &resp->body);
-        updateDocument_DocumentWidget_(d, resp, iTrue);
-        postProcessRequestContent_DocumentWidget_(d, iTrue);
+        updateDocument_DocumentWidget_(d, resp, cachedDoc, iTrue);
+        setCachedDocument_History(d->mod.history, d->doc);
     }
     d->state = ready_RequestState;
+    postProcessRequestContent_DocumentWidget_(d, iTrue);
     init_Anim(&d->altTextOpacity, 0);
     reset_SmoothScroll(&d->scrollY);
     init_Anim(&d->scrollY.pos, d->initNormScrollY * size_GmDocument(d->doc).y);
@@ -1587,13 +1609,15 @@ static void updateFromCachedResponse_DocumentWidget_(iDocumentWidget *d, float n
     cacheDocumentGlyphs_DocumentWidget_(d);
     d->drawBufs->flags |= updateTimestampBuf_DrawBufsFlag | updateSideBuf_DrawBufsFlag;
     d->flags &= ~urlChanged_DocumentWidgetFlag;
-    postCommandf_Root(as_Widget(d)->root, "document.changed doc:%p url:%s", d, cstr_String(d->mod.url));
+    postCommandf_Root(
+        as_Widget(d)->root, "document.changed doc:%p url:%s", d, cstr_String(d->mod.url));
 }
 
 static iBool updateFromHistory_DocumentWidget_(iDocumentWidget *d) {
     const iRecentUrl *recent = findUrl_History(d->mod.history, withSpacesEncoded_String(d->mod.url));
     if (recent && recent->cachedResponse) {
-        updateFromCachedResponse_DocumentWidget_(d, recent->normScrollY, recent->cachedResponse);
+        updateFromCachedResponse_DocumentWidget_(
+            d, recent->normScrollY, recent->cachedResponse, recent->cachedDoc);
         return iTrue;
     }
     else if (!isEmpty_String(d->mod.url)) {
@@ -1843,13 +1867,14 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
                     /* Keep scroll position when reloading the same page. */
                     reset_SmoothScroll(&d->scrollY);
                 }
-                reset_GmDocument(d->doc); /* new content incoming */
+                iRelease(d->doc); /* new content incoming */
+                d->doc = new_GmDocument();
                 delete_Gempub(d->sourceGempub);
                 d->sourceGempub = NULL;
                 destroy_Widget(d->footerButtons);
                 d->footerButtons = NULL;
                 resetWideRuns_DocumentWidget_(d);
-                updateDocument_DocumentWidget_(d, resp, iTrue);
+                updateDocument_DocumentWidget_(d, resp, NULL, iTrue);
                 break;
             case categoryRedirect_GmStatusCode:
                 if (isEmpty_String(&resp->meta)) {
@@ -1900,7 +1925,7 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
         switch (category_GmStatusCode(statusCode)) {
             case categorySuccess_GmStatusCode:
                 /* More content available. */
-                updateDocument_DocumentWidget_(d, resp, iFalse);
+                updateDocument_DocumentWidget_(d, resp, NULL, iFalse);
                 break;
             default:
                 break;
@@ -2085,16 +2110,16 @@ static const iString *saveToDownloads_(const iString *url, const iString *mime,
             exportDownloadedFile_iOS(savePath);
 #else
             if (showDialog) {
-                const iMenuItem items[2] = {
-                    { "${dlg.save.opendownload}", 0, 0,
-                        format_CStr("!open url:%s", cstrCollect_String(makeFileUrl_String(savePath))) },
-                    { "${dlg.message.ok}", 0, 0, "message.ok" },
-                };
-                makeMessage_Widget(uiHeading_ColorEscape "${heading.save}",
+            const iMenuItem items[2] = {
+                { "${dlg.save.opendownload}", 0, 0,
+                    format_CStr("!open url:%s", cstrCollect_String(makeFileUrl_String(savePath))) },
+                { "${dlg.message.ok}", 0, 0, "message.ok" },
+            };
+            makeMessage_Widget(uiHeading_ColorEscape "${heading.save}",
                                    format_CStr("%s\n${dlg.save.size} %.3f %s",
                                                cstr_String(path_File(f)),
-                                               isMega ? size / 1.0e6f : (size / 1.0e3f),
-                                               isMega ? "${mb}" : "${kb}"),
+                                           isMega ? size / 1.0e6f : (size / 1.0e3f),
+                                           isMega ? "${mb}" : "${kb}"),
                                    items,
                                    iElemCount(items));
             }
@@ -2520,6 +2545,7 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
                 (startsWithCase_String(meta_GmRequest(d->request), "text/") ||
                  !cmp_String(&d->sourceMime, mimeType_Gempub))) {
                 setCachedResponse_History(d->mod.history, lockResponse_GmRequest(d->request));
+                setCachedDocument_History(d->mod.history, d->doc); /* keeps a ref */
                 unlockResponse_GmRequest(d->request);
             }
         }
@@ -3875,9 +3901,9 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
             int bg = tmBackgroundOpenLink_ColorId;
             const int frame = tmFrameOpenLink_ColorId;
             iRect     wideRect = { init_I2(left_Rect(d->widgetBounds), visPos.y),
-                                   init_I2(width_Rect(d->widgetBounds) +
+                               init_I2(width_Rect(d->widgetBounds) +
                                            width_Widget(d->widget->scroll),
-                                           height_Rect(run->visBounds)) };
+                                       height_Rect(run->visBounds)) };
             /* The first line is composed of two runs that may be drawn in either order, so
                only draw half of the background. */
             if (run->flags & decoration_GmRunFlag) {
@@ -3940,7 +3966,7 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
                     drawCentered_Text(defaultContentSmall_FontId,
                                       circleArea,
                                       iTrue,
-                                      tmQuote_ColorId,
+                                    tmQuote_ColorId,
                                       "%lc",
                                       (int) ordChar);
                     goto runDrawn;
@@ -4624,8 +4650,8 @@ static void setUrl_DocumentWidget_(iDocumentWidget *d, const iString *url) {
     if (!equal_String(d->mod.url, url)) {
         d->flags |= urlChanged_DocumentWidgetFlag;
         set_String(d->mod.url, url);
-    }
 }    
+}
 
 void setUrlFromCache_DocumentWidget(iDocumentWidget *d, const iString *url, iBool isFromCache) {
     setLinkNumberMode_DocumentWidget_(d, iFalse);
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 32fb5ccb..cf128017 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -714,12 +714,12 @@ iLocalDef iBool isLastLine_InputWidget_(const iInputWidget *d, const iInputLine
 }
 
 static size_t indexForRelativeX_InputWidget_(const iInputWidget *d, int x, const iInputLine *line) {
+    size_t index = line->offset;
     if (x <= 0) {
-        return line->offset;
+        return index;
     }
     const char *endPos;
     tryAdvanceNoWrap_Text(d->font, range_String(&line->text), x, &endPos);
-    size_t index = line->offset;
     if (endPos == constEnd_String(&line->text)) {
         index += line->len;
     }
diff --git a/src/ui/inputwidget.h b/src/ui/inputwidget.h
index 5c39aae0..f8c5bf1e 100644
--- a/src/ui/inputwidget.h
+++ b/src/ui/inputwidget.h
@@ -41,20 +41,20 @@ struct Impl_InputWidgetContentPadding {
 
 typedef void (*iInputWidgetValidatorFunc)(iInputWidget *, void *context);
 
-void    setHint_InputWidget     (iInputWidget *, const char *hintText);
-void    setMode_InputWidget     (iInputWidget *, enum iInputMode mode);
-void    setMaxLen_InputWidget   (iInputWidget *, size_t maxLen);
-void    setText_InputWidget     (iInputWidget *, const iString *text);
-void    setTextCStr_InputWidget (iInputWidget *, const char *cstr);
-void    setFont_InputWidget     (iInputWidget *, int fontId);
-void    setCursor_InputWidget   (iInputWidget *, size_t pos);
+void    setHint_InputWidget             (iInputWidget *, const char *hintText);
+void    setMode_InputWidget             (iInputWidget *, enum iInputMode mode);
+void    setMaxLen_InputWidget           (iInputWidget *, size_t maxLen);
+void    setText_InputWidget             (iInputWidget *, const iString *text);
+void    setTextCStr_InputWidget         (iInputWidget *, const char *cstr);
+void    setFont_InputWidget             (iInputWidget *, int fontId);
+void    setCursor_InputWidget           (iInputWidget *, size_t pos);
 void    setContentPadding_InputWidget   (iInputWidget *, int left, int right); /* only affects the text entry */
 void    setMaxLayoutLines_InputWidget   (iInputWidget *, size_t maxLayoutLines);
 void    setValidator_InputWidget        (iInputWidget *, iInputWidgetValidatorFunc validator, void *context);
 void    setEnterKeyEnabled_InputWidget  (iInputWidget *, iBool enterKeyEnabled);
-void    begin_InputWidget       (iInputWidget *);
-void    end_InputWidget         (iInputWidget *, iBool accept);
-void    selectAll_InputWidget   (iInputWidget *);
+void    begin_InputWidget               (iInputWidget *);
+void    end_InputWidget                 (iInputWidget *, iBool accept);
+void    selectAll_InputWidget           (iInputWidget *);
 
 void    setSelectAllOnFocus_InputWidget (iInputWidget *, iBool selectAllOnFocus);
 void    setSensitiveContent_InputWidget (iInputWidget *, iBool isSensitive);
@@ -62,15 +62,13 @@ void    setUrlContent_InputWidget       (iInputWidget *, iBool isUrl);
 void    setNotifyEdits_InputWidget      (iInputWidget *, iBool notifyEdits);
 void    setEatEscape_InputWidget        (iInputWidget *, iBool eatEscape);
 
-const iString * text_InputWidget            (const iInputWidget *);
+iInputWidgetContentPadding  contentPadding_InputWidget  (const iInputWidget *);
+const iString *             text_InputWidget            (const iInputWidget *);
 
 iLocalDef const char *cstrText_InputWidget(const iInputWidget *d) {
     return cstr_String(text_InputWidget(d));
 }
 
-iInputWidgetContentPadding
-                contentPadding_InputWidget  (const iInputWidget *);
-
 iLocalDef iInputWidget *newHint_InputWidget(size_t maxLen, const char *hint) {
     iInputWidget *d = new_InputWidget(maxLen);
     setHint_InputWidget(d, hint);
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index 95f281be..ed023961 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -206,7 +206,7 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int
         }
     }
     int colorEscape = none_ColorId;
-    if (startsWith_String(&d->label, "\r")) {
+    if (startsWith_String(&d->label, "\v")) {
         colorEscape = cstr_String(&d->label)[1] - asciiBase_ColorEscape; /* TODO: can be two bytes long */
     }
     if (isHover_LabelWidget_(d)) {
diff --git a/src/ui/text.c b/src/ui/text.c
index 55fd4254..ffe08fca 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -1010,10 +1010,10 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
                 prevCh = 0;
                 continue;
             }
-            if (ch == '\r') { /* color change */
+            if (ch == '\v') { /* color change */
                 iChar esc = nextChar_(&chPos, args->text.end);
                 int colorNum = args->color;
-                if (esc == '\r') { /* Extended range. */
+                if (esc == '\v') { /* Extended range. */
                     esc = nextChar_(&chPos, args->text.end) + asciiExtended_ColorEscape;
                     colorNum = esc - asciiBase_ColorEscape;
                 }
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 543b8bc9..4eac7ecf 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -321,7 +321,6 @@ static iBool setWidth_Widget_(iWidget *d, int width) {
             d->rect.size.x = width;
             TRACE(d, "width has changed to %d", width);
             if (class_Widget(d)->sizeChanged) {
-                const int oldHeight = d->rect.size.y;
                 class_Widget(d)->sizeChanged(d);
             }
             return iTrue;