5 files changed, 83 insertions, 58 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index a89eb0eb..3f655db5 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1863,7 +1863,12 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
         updateTrust_DocumentWidget_(d, resp);
         init_Anim(&d->sideOpacity, 0);
         init_Anim(&d->altTextOpacity, 0);
-        format_String(&d->sourceHeader, "%d %s", statusCode, get_GmError(statusCode)->title);
+        format_String(&d->sourceHeader,
+                      "%d %s",
+                      statusCode,
+                      isEmpty_String(&resp->meta) && !isSuccess_GmStatusCode(statusCode)
+                          ? get_GmError(statusCode)->title
+                          : cstr_String(&resp->meta));
         d->sourceStatus = statusCode;
         switch (category_GmStatusCode(statusCode)) {
             case categoryInput_GmStatusCode: {
@@ -2773,14 +2778,12 @@ static iBool handleCommand_DocumentWidget_(iDocumentWidget *d, const char *cmd)
              id_GmRequest(d->request) == argU32Label_Command(cmd, "reqid")) {
         set_Block(&d->sourceContent, body_GmRequest(d->request));
         if (!isSuccess_GmStatusCode(status_GmRequest(d->request))) {
+            /* TODO: Why is this here? Can it be removed? */
             format_String(&d->sourceHeader,
                           "%d %s",
                           status_GmRequest(d->request),
                           cstr_String(meta_GmRequest(d->request)));
         }
-        else {
-            clear_String(&d->sourceHeader);
-        }
         updateFetchProgress_DocumentWidget_(d);
         checkResponse_DocumentWidget_(d);
         if (category_GmStatusCode(status_GmRequest(d->request)) == categorySuccess_GmStatusCode) {
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 9f233345..2f0cabbb 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -360,35 +360,64 @@ static int endX_InputWidget_(const iInputWidget *d, int y) {
     return line->range.end - (isLastLine_InputWidget_(d, line) ? 0 : 1) - line->range.start;
 }
 
+static iBool isCursorFocusable_Char_(iChar c) {
+    return !isDefaultIgnorable_Char(c) &&
+           !isVariationSelector_Char(c) &&
+           !isFitzpatrickType_Char(c);
+}
+
+static iChar at_InputWidget_(const iInputWidget *d, iInt2 pos) {
+    if (pos.y >= 0 && pos.y < size_Array(&d->lines) &&
+        pos.x >= 0 && pos.x <= endX_InputWidget_(d, pos.y)) {
+        iChar ch = 0;
+        decodeBytes_MultibyteChar(charPos_InputWidget_(d, pos),
+                                  constEnd_String(lineString_InputWidget_(d, pos.y)),
+                                  &ch);
+        return ch;
+    }
+    return ' ';
+}
+
 static iInt2 movedCursor_InputWidget_(const iInputWidget *d, iInt2 pos, int xDir, int yDir) {
-    iChar ch;
-    if (xDir < 0) {
-        if (pos.x == 0) {
-            if (pos.y > 0) {
-                pos.x = endX_InputWidget_(d, --pos.y);
+    iChar ch = 0;
+    int   n  = 0;
+    /* TODO: The cursor should never land on any combining codepoints either. */
+    for (;;) {
+        if (xDir < 0) {
+            if (pos.x == 0) {
+                if (pos.y > 0) {
+                    pos.x = endX_InputWidget_(d, --pos.y);
+                }
             }
-        }
-        else {
-            iAssert(pos.x > 0);
-            int n = decodePrecedingBytes_MultibyteChar(charPos_InputWidget_(d, pos),
+            else {
+                iAssert(pos.x > 0);
+                n = decodePrecedingBytes_MultibyteChar(charPos_InputWidget_(d, pos),
                                                        cstr_String(lineString_InputWidget_(d, pos.y)),
                                                        &ch);
-            pos.x -= n;
-        }
-    }
-    else if (xDir > 0) {
-        if (pos.x == endX_InputWidget_(d, pos.y)) {
-            if (pos.y < size_Array(&d->lines) - 1) {
-                pos.y++;
-                pos.x = 0;
+                pos.x -= n;
+                if (!isCursorFocusable_Char_(at_InputWidget_(d, pos))) {
+                    continue;
+                }
             }
         }
-        else {
-            int n = decodeBytes_MultibyteChar(charPos_InputWidget_(d, pos),
+        else if (xDir > 0) {
+            if (pos.x == endX_InputWidget_(d, pos.y)) {
+                if (pos.y < size_Array(&d->lines) - 1) {
+                    pos.y++;
+                    pos.x = 0;
+                }
+            }
+            else {
+                n = decodeBytes_MultibyteChar(charPos_InputWidget_(d, pos),
                                               constEnd_String(lineString_InputWidget_(d, pos.y)),
                                               &ch);
-            pos.x += n;
+                pos.x += n;
+                if (!isCursorFocusable_Char_(at_InputWidget_(d, pos))) {
+                    continue;
+                }
+            }
         }
+        break;
     }
     return pos;
 }
@@ -1026,7 +1055,9 @@ static void insertRange_InputWidget_(iInputWidget *d, iRangecc range) {
             cstr_String(&line->text) + d->cursor.x, constEnd_String(&line->text)
         });
         truncate_String(&line->text, d->cursor.x);
-        appendCStr_String(&line->text, "\n");
+        if (!endsWith_String(&line->text, "\n")) {
+            appendCStr_String(&line->text, "\n");
+        }
         insert_Array(&d->lines, ++d->cursor.y, &split);
         d->cursor.x = 0;
     }
@@ -1059,6 +1090,8 @@ void setCursor_InputWidget(iInputWidget *d, iInt2 pos) {
     iAssert(!isEmpty_Array(&d->lines));
     pos.x = iClamp(pos.x, 0, endX_InputWidget_(d, pos.y));
     d->cursor = pos;
+    iChar ch = at_InputWidget_(d, pos);
+    printf("cursor x:%d ch:%08x (%lc)\n", pos.x, ch, (int)ch);
     /* Update selection. */
     if (isMarking_()) {
         if (isEmpty_Range(&d->mark)) {
@@ -1221,18 +1254,6 @@ static iBool deleteMarked_InputWidget_(iInputWidget *d) {
     return iFalse;
 }
 
-static iChar at_InputWidget_(const iInputWidget *d, iInt2 pos) {
-    if (pos.y >= 0 && pos.y < size_Array(&d->lines) &&
-        pos.x >= 0 && pos.x <= endX_InputWidget_(d, pos.y)) {
-        iChar ch = 0;
-        decodeBytes_MultibyteChar(charPos_InputWidget_(d, pos),
-                                  constEnd_String(lineString_InputWidget_(d, pos.y)),
-                                  &ch);
-        return ch;
-    }
-    return ' ';
-}
-
 static iBool isWordChar_InputWidget_(const iInputWidget *d, iInt2 pos) {
     return isAlphaNumeric_Char(at_InputWidget_(d, pos));
 }
diff --git a/src/ui/text.c b/src/ui/text.c
index 0a8386e4..639d8f13 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -1433,6 +1433,7 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
     iBool        isFirst            = iTrue;
     const iBool  checkHitPoint      = wrap && !isEqual_I2(wrap->hitPoint, zero_I2());
     const iBool  checkHitChar       = wrap && wrap->hitChar;
+    iBool        wasCharHit         = iFalse;
     while (!isEmpty_Range(&wrapRuns)) {
         if (isFirst) {
             isFirst = iFalse;
@@ -1452,9 +1453,10 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
             for (size_t runIndex = wrapRuns.start; runIndex < wrapRuns.end; runIndex++) {
                 const iAttributedRun *run = at_Array(&attrText.runs, runIndex);
                 if (run->flags.isLineBreak) {
-                    if (checkHitChar) {
+                    if (checkHitChar && !wasCharHit) {
                         if (wrap->hitChar == sourcePtr_AttributedText_(&attrText, run->logical.start)) {
                             wrap->hitAdvance_out = init_I2(wrapAdvance, yCursor);
+                            wasCharHit = iTrue;
                         }
                     }
                     wrapPosRange.end   = run->logical.start;
@@ -1479,9 +1481,10 @@ static iRect run_Font_(iFont *d, const iRunArgs *args) {
                     if (logPos < wrapPosRange.start || logPos >= wrapPosRange.end) {
                         continue;
                     }
-                    if (checkHitChar) {
+                    if (checkHitChar && !wasCharHit) {
                         if (wrap->hitChar == sourcePtr_AttributedText_(&attrText, logPos)) {
                             wrap->hitAdvance_out = init_I2(wrapAdvance, yCursor);
+                            wasCharHit = iTrue;
                         }
                     }
                     /* Check if the hit point is on the left side of this line. */
diff --git a/src/ui/uploadwidget.c b/src/ui/uploadwidget.c
index 57b6b6b7..5e1ee493 100644
--- a/src/ui/uploadwidget.c
+++ b/src/ui/uploadwidget.c
@@ -149,7 +149,7 @@ void init_UploadWidget(iUploadWidget *d) {
         iWidget *buttons =
             makeDialogButtons_Widget((iMenuItem[]){ { "${upload.port}", 0, 0, "upload.setport" },
                                                     { "---", 0, 0, NULL },
-                                                    { "${cancel}", SDLK_ESCAPE, 0, "upload.cancel" },
+                                                    { "${close}", SDLK_ESCAPE, 0, "upload.cancel" },
                                                     { uiTextAction_ColorEscape "${dlg.upload.send}",
                                                       SDLK_RETURN,
                                                       KMOD_PRIMARY,
diff --git a/src/ui/window.c b/src/ui/window.c
index 86d22b1c..1727b988 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -219,25 +219,23 @@ static void updateSize_Window_(iWindow *d, iBool notifyAlways) {
     size->y -= d->keyboardHeight;
     if (notifyAlways || !isEqual_I2(oldSize, *size)) {
         windowSizeChanged_Window_(d);
-        const iBool isHoriz = (d->place.lastNotifiedSize.x != size->x);
-        const iBool isVert  = (d->place.lastNotifiedSize.y != size->y);
-        postCommandf_App("window.resized width:%d height:%d horiz:%d vert:%d",
-                         size->x,
-                         size->y,
-                         isHoriz,
-                         isVert);
-        postCommand_App("widget.overflow"); /* check bounds with updated sizes */
+        if (!isEqual_I2(*size, d->place.lastNotifiedSize)) {
+            const iBool isHoriz = (d->place.lastNotifiedSize.x != size->x);
+            const iBool isVert  = (d->place.lastNotifiedSize.y != size->y);
+            postCommandf_App("window.resized width:%d height:%d horiz:%d vert:%d",
+                             size->x,
+                             size->y,
+                             isHoriz,
+                             isVert);
+            postCommand_App("widget.overflow"); /* check bounds with updated sizes */
+        }
         postRefresh_App();
         d->place.lastNotifiedSize = *size;
     }
 }
 
 void drawWhileResizing_Window(iWindow *d, int w, int h) {
-    /* This is called while a window resize is in progress, so we can be pretty confident
-       the size has actually changed. */
-    d->size = coord_Window(d, w, h);
-    windowSizeChanged_Window_(d);
-    draw_Window(d);
+    draw_Window(d);        
 }
 
 static float pixelRatio_Window_(const iWindow *d) {
@@ -489,7 +487,7 @@ void init_Window(iWindow *d, iRect rect) {
     SDL_GetRendererOutputSize(d->render, &d->size.x, &d->size.y);
     setupUserInterface_Window(d);
     postCommand_App("~bindings.changed"); /* update from bindings */
-    updateSize_Window_(d, iFalse);
+    //updateSize_Window_(d, iFalse);
     /* Load the border shadow texture. */ {
         SDL_Surface *surf = loadImage_(&imageShadow_Embedded, 0);
         d->borderShadow = SDL_CreateTextureFromSurface(d->render, surf);
@@ -728,7 +726,7 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
         }
         case SDL_WINDOWEVENT_RESIZED:
             if (d->isMinimized) {
-                updateSize_Window_(d, iTrue);
+                //updateSize_Window_(d, iTrue);
                 return iTrue;
             }
             if (unsnap_Window_(d, NULL)) {
@@ -739,7 +737,7 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
                 //printf("normal rect set (resize)\n"); fflush(stdout);
             }
             checkPixelRatioChange_Window_(d);
-            updateSize_Window_(d, iTrue /* we were already redrawing during the resize */);
+            //updateSize_Window_(d, iTrue /* we were already redrawing during the resize */);
             postRefresh_App();
             return iTrue;
         case SDL_WINDOWEVENT_RESTORED:
@@ -1014,7 +1012,7 @@ void draw_Window(iWindow *d) {
     if (d->isDrawFrozen) {
         return;
     }
-#if defined (iPlatformMobile)
+//#if defined (iPlatformMobile)
     /* Check if root needs resizing. */ {
         iInt2 renderSize;
         SDL_GetRendererOutputSize(d->render, &renderSize.x, &renderSize.y);
@@ -1023,7 +1021,7 @@ void draw_Window(iWindow *d) {
             processEvents_App(postedEventsOnly_AppEventMode);
         }
     }
-#endif
+//#endif
     const int   winFlags = SDL_GetWindowFlags(d->win);
     const iBool gotFocus = (winFlags & SDL_WINDOW_INPUT_FOCUS) != 0;
     iPaint p;