6 files changed, 50 insertions, 22 deletions

diff --git a/src/app.c b/src/app.c
index 6d172c02..a50a4553 100644
--- a/src/app.c
+++ b/src/app.c
@@ -882,13 +882,25 @@ const iString *debugInfo_App(void) {
     extern char **environ; /* The environment variables. */
     iApp *d = &app_;
     iString *msg = collectNew_String();
+    iObjectList *docs = iClob(listDocuments_App(NULL));
     format_String(msg, "# Debug information\n");
+    appendFormat_String(msg, "## Memory usage\n"); {
+        iMemInfo total = { 0, 0 };
+        iForEach(ObjectList, i, docs) {
+            iDocumentWidget *doc = i.object;
+            iMemInfo usage = memoryUsage_History(history_DocumentWidget(doc));
+            total.cacheSize += usage.cacheSize;
+            total.memorySize += usage.memorySize;
+        }
+        appendFormat_String(msg, "Total cache: %.3f MB\n", total.cacheSize / 1.0e6f);
+        appendFormat_String(msg, "Total memory: %.3f MB\n", total.memorySize / 1.0e6f);
+    }
     appendFormat_String(msg, "## Documents\n");
-    iForEach(ObjectList, k, iClob(listDocuments_App(NULL))) {
+    iForEach(ObjectList, k, docs) {
         iDocumentWidget *doc = k.object;
         appendFormat_String(msg, "### Tab %d.%zu: %s\n",
-                            constAs_Widget(doc)->root == get_Window()->roots[0] ? 0 : 1,
-                            childIndex_Widget(constAs_Widget(doc)->parent, k.object),
+                            constAs_Widget(doc)->root == get_Window()->roots[0] ? 1 : 2,
+                            childIndex_Widget(constAs_Widget(doc)->parent, k.object) + 1,
                             cstr_String(bookmarkTitle_DocumentWidget(doc)));
         append_String(msg, collect_String(debugInfo_History(history_DocumentWidget(doc))));
     }
diff --git a/src/gmdocument.c b/src/gmdocument.c
index 4fc0dd5e..3daa4714 100644
--- a/src/gmdocument.c
+++ b/src/gmdocument.c
@@ -1505,7 +1505,7 @@ static void normalize_GmDocument(iGmDocument *d) {
     set_String(&d->source, collect_String(normalized));
     printf("orig:%zu norm:%zu\n", size_String(&d->unormSource), size_String(&d->source));
     /* normalized source has an extra newline at the end */
-    iAssert(wasNormalized || equal_String(&d->unormSource, &d->source));
+//    iAssert(wasNormalized || equal_String(&d->unormSource, &d->source));
 }
 
 void setUrl_GmDocument(iGmDocument *d, const iString *url) {
diff --git a/src/history.c b/src/history.c
index 58ffa5c4..87cf28e6 100644
--- a/src/history.c
+++ b/src/history.c
@@ -108,6 +108,16 @@ iHistory *copy_History(const iHistory *d) {
     return copy;
 }
 
+iMemInfo memoryUsage_History(const iHistory *d) {
+    iMemInfo mem = { 0, 0 };
+    iConstForEach(Array, i, &d->recent) {
+        const iRecentUrl *item = i.value;
+        mem.cacheSize  += cacheSize_RecentUrl(item);
+        mem.memorySize += memorySize_RecentUrl(item);
+    }
+    return mem;
+}
+
 iString *debugInfo_History(const iHistory *d) {
     iString *str = new_String();
     format_String(str,
diff --git a/src/history.h b/src/history.h
index 1acf7049..ccc19d27 100644
--- a/src/history.h
+++ b/src/history.h
@@ -41,6 +41,13 @@ struct Impl_RecentUrl {
     iGmDocument *cachedDoc;      /* cached copy of the presentation: layout and media (not serialized) */
 };
 
+iDeclareType(MemInfo)
+
+struct Impl_MemInfo {
+    size_t cacheSize;   /* number of bytes stored persistently */
+    size_t memorySize;  /* number of bytes stored in RAM */
+};
+
 /*----------------------------------------------------------------------------------------------*/
 
 iDeclareType(History)
@@ -78,4 +85,4 @@ const iGmResponse *
 size_t      cacheSize_History           (const iHistory *);
 
 iString *   debugInfo_History           (const iHistory *);
-
+iMemInfo    memoryUsage_History         (const iHistory *);
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 5f86f5bf..6719fb40 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -658,12 +658,12 @@ void setCursor_InputWidget(iInputWidget *d, size_t pos) {
 }
 
 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 += length_String(&line->text);
     }
@@ -691,10 +691,10 @@ static iBool moveCursorByLine_InputWidget_(iInputWidget *d, int dir) {
     }
     if (newCursor != iInvalidPos) {
         /* Clamp it to the current line. */
-        newCursor = iMax(newCursor, line->offset);
         newCursor = iMin(newCursor, line->offset + length_String(&line->text) -
                          /* last line is allowed to go to the cursorMax */
                          ((const void *) line < constAt_Array(&d->lines, numLines - 1) ? 1 : 0));
+        newCursor = iMax(newCursor, line->offset);
         setCursor_InputWidget(d, newCursor);
         return iTrue;
     }
@@ -1311,7 +1311,7 @@ static void draw_InputWidget_(const iInputWidget *d) {
                                    .x;
                 fillRect_Paint(&p,
                                (iRect){ addX_I2(drawPos, iMin(m1, m2)),
-                                        init_I2(iAbs(m2 - m1), lineHeight_Text(d->font)) },
+                                        init_I2(iMax(gap_UI / 3, iAbs(m2 - m1)), lineHeight_Text(d->font)) },
                                uiMarked_ColorId);
             }
         }
diff --git a/src/ui/inputwidget.h b/src/ui/inputwidget.h
index cb32a29c..70553488 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,9 +62,8 @@ 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 *);
+iInputWidgetContentPadding  contentPadding_InputWidget  (const iInputWidget *);
+const iString *             text_InputWidget            (const iInputWidget *);
 
 iLocalDef iInputWidget *newHint_InputWidget(size_t maxLen, const char *hint) {
     iInputWidget *d = new_InputWidget(maxLen);