16 files changed, 174 insertions, 122 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aac03046..c9037986 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@
 cmake_minimum_required (VERSION 3.9)
 
 project (Lagrange
-    VERSION 1.6.2
+    VERSION 1.6.3
     DESCRIPTION "A Beautiful Gemini Client"
     LANGUAGES C
 )
diff --git a/README.md b/README.md
index 3aa3d4e8..3d9df1db 100644
--- a/README.md
+++ b/README.md
@@ -49,16 +49,16 @@ The required tools are a C11 compiler (e.g., Clang or GCC), CMake and `pkg-confi
 
 ### Unicode text rendering
 
-Lagrange relies on the [HarfBuzz](https://harfbuzz.github.io) and [GNU FriBidi](https://github.com/fribidi/fribidi/) libraries for handling complex scripts and bidirectional text. This repository includes these two libraries as submodules. By default, HarfBuzz and GNU FriBidi will be compiled as part of the app, without any additional dependencies. This allows the app to be built on systems where these libraries are not readily available.
+Lagrange relies on the [HarfBuzz](https://harfbuzz.github.io) and [GNU FriBidi](https://github.com/fribidi/fribidi/) libraries for handling complex scripts and bidirectional text. This repository includes these two libraries as submodules. By default, if HarfBuzz and GNU FriBidi are not available on the system, they will be compiled as part of the app without any additional dependencies.
 
 Note that compiling these libraries has the following requirements:
 
 * HarfBuzz requires a C++ compiler. 
 * GNU FriBidi cannot be compiled with CMake; you need to have [Meson](https://mesonbuild.com) and [Ninja](https://ninja-build.org).
 
-If these requirements cannot be met, or you would prefer the use the system-provided HarfBuzz and GNU FriBidi, the build options can be changed. See the table below for `ENABLE_HARFBUZZ_MINIMAL` and `ENABLE_FRIBIDI_BUILD` (set both to **NO**). Note that a system-provided HarfBuzz likely has dependencies to other libraries, such as FreeType and GLib.
+If these requirements cannot be met, or you would prefer the use the system-provided HarfBuzz and GNU FriBidi, please refer to the list of build options below: `ENABLE_HARFBUZZ_MINIMAL` and `ENABLE_FRIBIDI_BUILD` should both be set to **NO**. Note that a system-provided HarfBuzz likely has dependencies to other libraries, such as FreeType and GLib.
 
-You also may disable HarfBuzz and/or GNU FriBidi entirely. The old text renderer that supports only non-complex left-to-right scripts is then used.
+You also may disable HarfBuzz and/or GNU FriBidi entirely. The old text renderer that only supports non-complex left-to-right scripts is then used.
 
 ### Installing to a custom directory
 
diff --git a/res/about/version.gmi b/res/about/version.gmi
index c06868c3..c45a8853 100644
--- a/res/about/version.gmi
+++ b/res/about/version.gmi
@@ -6,6 +6,16 @@
 ```
 # Release notes
 
+## 1.6.3
+* Select all text in an input field using Shift+Ctrl+A (macOS: ⌘A).
+* Input fields do not lose focus when the window becomes inactive, making it easier to resume input afterwards.
+* Fixed delay after switching to split view mode.
+* Fixed what gets drawn in an empty tab, before a document is available for rendering (e.g., after switching to split view mode).
+* Fixed highlighting the domain name in URL input fields.
+* Fixed hiding the Gemini URL scheme in input fields when the window is narrow.
+* Fixed the line break key modifier inadvertently affecting URL input fields, where line breaks are not allowed.
+* Fixed the line break key modifier affecting the upload dialog's text field.
+
 ## 1.6.2
 * Added `--tab-url` to print currently active tab's URL.
 * Upload dialog expands to full window height when the entered text is long.
@@ -16,7 +26,7 @@
 * Fixed incorrect behavior in input fields when typing or deleting text while holding down the Shift key.
 * Fixed crash in Upload dialog if server responds with a redirect.
 * Fixed buffered graphics (UI, fonts) getting lost under rare circumstances.
-* Fixed drawing of wrapped text when the app is compiled with HarfBuzz.
+* Fixed drawing of wrapped text when the app is compiled without HarfBuzz.
 * macOS: Fixed UI not updating when system dark mode is toggled while the window is hidden.
 
 ## 1.6.1
diff --git a/res/fi.skyjake.Lagrange.appdata.xml b/res/fi.skyjake.Lagrange.appdata.xml
index 247d2f0b..1db2717c 100644
--- a/res/fi.skyjake.Lagrange.appdata.xml
+++ b/res/fi.skyjake.Lagrange.appdata.xml
@@ -70,8 +70,6 @@
                         redirect.</li>
                     <li>Fixed buffered graphics (UI, fonts) getting lost under rare
                         circumstances.</li>
-                    <li>Fixed drawing of wrapped text when the app is compiled with
-                        HarfBuzz.</li>
                     <li>macOS: Fixed UI not updating when system dark mode is toggled
                         while the window is hidden.</li>
                 </ul>
diff --git a/res/lang/fi.bin b/res/lang/fi.bin
index 7b7b6c28..2f1bb18f 100644
--- a/res/lang/fi.bin
+++ b/res/lang/fi.bin
diff --git a/res/lang/ie.bin b/res/lang/ie.bin
index 97c02a90..a8bce39d 100644
--- a/res/lang/ie.bin
+++ b/res/lang/ie.bin
diff --git a/res/lang/sr.bin b/res/lang/sr.bin
index 4a299323..df8e532b 100644
--- a/res/lang/sr.bin
+++ b/res/lang/sr.bin
diff --git a/res/lang/tok.bin b/res/lang/tok.bin
index 4cd4212d..f2b59891 100644
--- a/res/lang/tok.bin
+++ b/res/lang/tok.bin
diff --git a/src/app.c b/src/app.c
index 8318eee4..bcd06722 100644
--- a/src/app.c
+++ b/src/app.c
@@ -1992,6 +1992,7 @@ iBool handleCommand_App(const char *cmd) {
             (argLabel_Command(cmd, "axis") ? vertical_WindowSplit : 0) | (arg_Command(cmd) << 1);
         const char *url = suffixPtr_Command(cmd, "url");
         setCStr_String(get_Window()->pendingSplitUrl, url ? url : "");
+        postRefresh_App();
         return iTrue;
     }
     else if (equal_Command(cmd, "window.retain")) {
diff --git a/src/gmcerts.h b/src/gmcerts.h
index 1a9480f7..02a41c14 100644
--- a/src/gmcerts.h
+++ b/src/gmcerts.h
@@ -60,9 +60,10 @@ iDeclareTypeConstructionArgs(GmCerts, const char *saveDir)
 
 typedef iBool (*iGmCertsIdentityFilterFunc)(void *context, const iGmIdentity *);
 
-iBool               checkTrust_GmCerts      (iGmCerts *, iRangecc domain, uint16_t port, const iTlsCertificate *cert);
-void                setTrusted_GmCerts      (iGmCerts *, iRangecc domain, uint16_t port, const iBlock *fingerprint,
-                                             const iDate *validUntil);
+iBool               checkTrust_GmCerts      (iGmCerts *, iRangecc domain, uint16_t port,
+                                             const iTlsCertificate *cert);
+void                setTrusted_GmCerts      (iGmCerts *, iRangecc domain, uint16_t port,
+                                             const iBlock *fingerprint, const iDate *validUntil);
 iTime               domainValidUntil_GmCerts(const iGmCerts *, iRangecc domain, uint16_t port);
 
 /**
@@ -81,7 +82,8 @@ iGmIdentity *       newIdentity_GmCerts     (iGmCerts *, int flags, iDate validU
                                              const iString *userId, const iString *domain,
                                              const iString *org, const iString *country);
 
-void                importIdentity_GmCerts  (iGmCerts *, iTlsCertificate *cert, const iString *notes); /* takes ownership */
+void                importIdentity_GmCerts  (iGmCerts *, iTlsCertificate *cert,
+                                             const iString *notes); /* takes ownership */
 void                deleteIdentity_GmCerts  (iGmCerts *, iGmIdentity *identity);
 void                saveIdentities_GmCerts  (const iGmCerts *);
 
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index e1be27c2..703d1d13 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -493,7 +493,7 @@ static int documentWidth_DocumentWidget_(const iDocumentWidget *d) {
     const iPrefs * prefs    = prefs_App();
     const int      minWidth = 50 * gap_UI; /* lines must fit a word at least */
     const float    adjust   = iClamp((float) bounds.size.x / gap_UI / 11 - 12,
-                                     -2.0f, 10.0f); /* adapt to width */
+                                     -1.0f, 10.0f); /* adapt to width */
     //printf("%f\n", adjust); fflush(stdout);
     return iMini(iMax(minWidth, bounds.size.x - gap_UI * (d->pageMargin + adjust) * 2),
                  fontSize_UI * prefs->lineWidth * prefs->zoomPercent / 100);
@@ -4796,64 +4796,67 @@ static void draw_DocumentWidget_(const iDocumentWidget *d) {
     };
     init_Paint(&ctx.paint);
     render_DocumentWidget_(d, &ctx, iFalse /* just the mandatory parts */);
-    setClip_Paint(&ctx.paint, clipBounds);
-    int yTop = docBounds.pos.y - pos_SmoothScroll(&d->scrollY);
-    draw_VisBuf(d->visBuf, init_I2(bounds.pos.x, yTop), ySpan_Rect(bounds));
-    /* Text markers. */
+    int         yTop             = docBounds.pos.y - pos_SmoothScroll(&d->scrollY);
+    const iBool isDocEmpty       = size_GmDocument(d->doc).y == 0;
     const iBool isTouchSelecting = (flags_Widget(w) & touchDrag_WidgetFlag) != 0;
-    if (!isEmpty_Range(&d->foundMark) || !isEmpty_Range(&d->selectMark)) {
-        SDL_Renderer *render = renderer_Window(get_Window());
-        ctx.firstMarkRect = zero_Rect();
-        ctx.lastMarkRect = zero_Rect();
-        SDL_SetRenderDrawBlendMode(render,
-                                   isDark_ColorTheme(colorTheme_App()) ? SDL_BLENDMODE_ADD
-                                                                       : SDL_BLENDMODE_BLEND);
-        ctx.viewPos = topLeft_Rect(docBounds);
-        /* Marker starting outside the visible range? */
-        if (d->visibleRuns.start) {
-            if (!isEmpty_Range(&d->selectMark) &&
-                d->selectMark.start < d->visibleRuns.start->text.start &&
-                d->selectMark.end > d->visibleRuns.start->text.start) {
-                ctx.inSelectMark = iTrue;
+    if (!isDocEmpty) {
+        setClip_Paint(&ctx.paint, clipBounds);
+        draw_VisBuf(d->visBuf, init_I2(bounds.pos.x, yTop), ySpan_Rect(bounds));
+        /* Text markers. */
+        if (!isEmpty_Range(&d->foundMark) || !isEmpty_Range(&d->selectMark)) {
+            SDL_Renderer *render = renderer_Window(get_Window());
+            ctx.firstMarkRect = zero_Rect();
+            ctx.lastMarkRect = zero_Rect();
+            SDL_SetRenderDrawBlendMode(render,
+                                       isDark_ColorTheme(colorTheme_App()) ? SDL_BLENDMODE_ADD
+                                                                           : SDL_BLENDMODE_BLEND);
+            ctx.viewPos = topLeft_Rect(docBounds);
+            /* Marker starting outside the visible range? */
+            if (d->visibleRuns.start) {
+                if (!isEmpty_Range(&d->selectMark) &&
+                    d->selectMark.start < d->visibleRuns.start->text.start &&
+                    d->selectMark.end > d->visibleRuns.start->text.start) {
+                    ctx.inSelectMark = iTrue;
+                }
+                if (isEmpty_Range(&d->foundMark) &&
+                    d->foundMark.start < d->visibleRuns.start->text.start &&
+                    d->foundMark.end > d->visibleRuns.start->text.start) {
+                    ctx.inFoundMark = iTrue;
+                }
             }
-            if (isEmpty_Range(&d->foundMark) &&
-                d->foundMark.start < d->visibleRuns.start->text.start &&
-                d->foundMark.end > d->visibleRuns.start->text.start) {
-                ctx.inFoundMark = iTrue;
+            render_GmDocument(d->doc, vis, drawMark_DrawContext_, &ctx);
+            SDL_SetRenderDrawBlendMode(render, SDL_BLENDMODE_NONE);
+            /* Selection range pins. */
+            if (isTouchSelecting) {
+                drawPin_(&ctx.paint, ctx.firstMarkRect, 0);
+                drawPin_(&ctx.paint, ctx.lastMarkRect, 1);
             }
         }
-        render_GmDocument(d->doc, vis, drawMark_DrawContext_, &ctx);
-        SDL_SetRenderDrawBlendMode(render, SDL_BLENDMODE_NONE);
-        /* Selection range pins. */
-        if (isTouchSelecting) {
-            drawPin_(&ctx.paint, ctx.firstMarkRect, 0);
-            drawPin_(&ctx.paint, ctx.lastMarkRect, 1);
-        }
-    }
-    drawMedia_DocumentWidget_(d, &ctx.paint);
-    /* Fill the top and bottom, in case the document is short. */
-    if (yTop > top_Rect(bounds)) {
-        fillRect_Paint(&ctx.paint,
-                       (iRect){ bounds.pos, init_I2(bounds.size.x, yTop - top_Rect(bounds)) },
-                       hasSiteBanner_GmDocument(d->doc) ? tmBannerBackground_ColorId
-                                                        : tmBackground_ColorId);
-    }
-    const int yBottom = yTop + size_GmDocument(d->doc).y + 1;
-    if (yBottom < bottom_Rect(bounds)) {
-        fillRect_Paint(&ctx.paint,
-                       init_Rect(bounds.pos.x, yBottom, bounds.size.x, bottom_Rect(bounds) - yBottom),
-                       tmBackground_ColorId);
-    }
-    unsetClip_Paint(&ctx.paint);
-    drawSideElements_DocumentWidget_(d);
-    if (prefs_App()->hoverLink && d->hoverLink) {
-        const int      font     = uiLabel_FontId;
-        const iRangecc linkUrl  = range_String(linkUrl_GmDocument(d->doc, d->hoverLink->linkId));
-        const iInt2    size     = measureRange_Text(font, linkUrl).bounds.size;
-        const iRect    linkRect = { addY_I2(bottomLeft_Rect(bounds), -size.y),
-                                    addX_I2(size, 2 * gap_UI) };
-        fillRect_Paint(&ctx.paint, linkRect, tmBackground_ColorId);
-        drawRange_Text(font, addX_I2(topLeft_Rect(linkRect), gap_UI), tmParagraph_ColorId, linkUrl);
+        drawMedia_DocumentWidget_(d, &ctx.paint);
+        /* Fill the top and bottom, in case the document is short. */   
+        if (yTop > top_Rect(bounds)) {
+            fillRect_Paint(&ctx.paint,
+                           (iRect){ bounds.pos, init_I2(bounds.size.x, yTop - top_Rect(bounds)) },
+                           hasSiteBanner_GmDocument(d->doc) ? tmBannerBackground_ColorId
+                                                            : tmBackground_ColorId);
+        }
+        const int yBottom = yTop + size_GmDocument(d->doc).y + 1;
+        if (yBottom < bottom_Rect(bounds)) {
+            fillRect_Paint(&ctx.paint,
+                           init_Rect(bounds.pos.x, yBottom, bounds.size.x, bottom_Rect(bounds) - yBottom),
+                           tmBackground_ColorId);
+        }
+        unsetClip_Paint(&ctx.paint);
+        drawSideElements_DocumentWidget_(d);
+        if (prefs_App()->hoverLink && d->hoverLink) {
+            const int      font     = uiLabel_FontId;
+            const iRangecc linkUrl  = range_String(linkUrl_GmDocument(d->doc, d->hoverLink->linkId));
+            const iInt2    size     = measureRange_Text(font, linkUrl).bounds.size;
+            const iRect    linkRect = { addY_I2(bottomLeft_Rect(bounds), -size.y),
+                                        addX_I2(size, 2 * gap_UI) };
+            fillRect_Paint(&ctx.paint, linkRect, tmBackground_ColorId);
+            drawRange_Text(font, addX_I2(topLeft_Rect(linkRect), gap_UI), tmParagraph_ColorId, linkUrl);
+        }
     }
     if (colorTheme_App() == pureWhite_ColorTheme) {
         drawHLine_Paint(&ctx.paint, topLeft_Rect(bounds), width_Rect(bounds), uiSeparator_ColorId);
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index bd6927a6..9f233345 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -188,9 +188,9 @@ enum iInputWidgetFlag {
     markWords_InputWidgetFlag        = iBit(8),
     needUpdateBuffer_InputWidgetFlag = iBit(9),
     enterKeyEnabled_InputWidgetFlag  = iBit(10),
-    enterKeyInsertsLineFeed_InputWidgetFlag
-                                     = iBit(11),
+    lineBreaksEnabled_InputWidgetFlag= iBit(11),
     needBackup_InputWidgetFlag       = iBit(12),
+    useReturnKeyBehavior_InputWidgetFlag = iBit(13),
 };
 
 /*----------------------------------------------------------------------------------------------*/
@@ -567,6 +567,28 @@ static void updateAllLinesAndResizeHeight_InputWidget_(iInputWidget *d) {
     }
 }
 
+static uint32_t cursorTimer_(uint32_t interval, void *w) {
+    iInputWidget *d = w;
+    if (d->cursorVis > 1) {
+        d->cursorVis--;
+    }
+    else {
+        d->cursorVis ^= 1;
+    }
+    refresh_Widget(w);
+    return interval;
+}
+
+static void startOrStopCursorTimer_InputWidget_(iInputWidget *d, iBool doStart) {
+    if (doStart && !d->timer) {
+        d->timer = SDL_AddTimer(refreshInterval_InputWidget_, cursorTimer_, d);        
+    }
+    else if (!doStart && d->timer) {
+        SDL_RemoveTimer(d->timer);
+        d->timer = 0;
+    }
+}
+
 void init_InputWidget(iInputWidget *d, size_t maxLen) {
     iWidget *w = &d->widget;
     init_Widget(w);
@@ -588,10 +610,11 @@ void init_InputWidget(iInputWidget *d, size_t maxLen) {
     d->cursor       = zero_I2();
     d->prevCursor   = zero_I2();
     d->lastUpdateWidth = 0;
-    d->inFlags         = eatEscape_InputWidgetFlag | enterKeyEnabled_InputWidgetFlag;
-    if (deviceType_App() != desktop_AppDeviceType) {
-        d->inFlags |= enterKeyInsertsLineFeed_InputWidgetFlag;
-    }
+    d->inFlags         = eatEscape_InputWidgetFlag | enterKeyEnabled_InputWidgetFlag |
+                         lineBreaksEnabled_InputWidgetFlag | useReturnKeyBehavior_InputWidgetFlag;
+    //    if (deviceType_App() != desktop_AppDeviceType) {
+    //        d->inFlags |= enterKeyInsertsLineFeed_InputWidgetFlag;
+    //    }
     iZap(d->mark);
     setMaxLen_InputWidget(d, maxLen);
     d->visWrapLines.start = 0;
@@ -627,9 +650,7 @@ void deinit_InputWidget(iInputWidget *d) {
     delete_TextBuf(d->buffered);
     clearUndo_InputWidget_(d);
     deinit_Array(&d->undoStack);
-    if (d->timer) {
-        SDL_RemoveTimer(d->timer);
-    }
+    startOrStopCursorTimer_InputWidget_(d, iFalse);    
     deinit_String(&d->srcHint);
     deinit_String(&d->hint);
     deinit_String(&d->oldText);
@@ -670,7 +691,6 @@ void setMode_InputWidget(iInputWidget *d, enum iInputMode mode) {
     d->mode = mode;
 }
 
-#if 0
 static void restoreDefaultScheme_(iString *url) {
     iUrl parts;
     init_Url(&parts, url);
@@ -685,17 +705,14 @@ static const iString *omitDefaultScheme_(iString *url) {
     }
     return url;
 }
-#endif
 
 const iString *text_InputWidget(const iInputWidget *d) {
     if (d) {
         iString *text = collect_String(text_InputWidget_(d));
-#if 0
         if (d->inFlags & isUrl_InputWidgetFlag) {
             /* Add the "gemini" scheme back if one is omitted. */
             restoreDefaultScheme_(text);
         }
-#endif
         return text;
     }
     return collectNew_String();
@@ -732,14 +749,18 @@ void setValidator_InputWidget(iInputWidget *d, iInputWidgetValidatorFunc validat
     d->validatorContext = context;
 }
 
-void setEnterInsertsLF_InputWidget(iInputWidget *d, iBool enterInsertsLF) {
-    iChangeFlags(d->inFlags, enterKeyInsertsLineFeed_InputWidgetFlag, enterInsertsLF);
+void setLineBreaksEnabled_InputWidget(iInputWidget *d, iBool lineBreaksEnabled) {
+    iChangeFlags(d->inFlags, lineBreaksEnabled_InputWidgetFlag, lineBreaksEnabled);
 }
 
 void setEnterKeyEnabled_InputWidget(iInputWidget *d, iBool enterKeyEnabled) {
     iChangeFlags(d->inFlags, enterKeyEnabled_InputWidgetFlag, enterKeyEnabled);
 }
 
+void setUseReturnKeyBehavior_InputWidget(iInputWidget *d, iBool useReturnKeyBehavior) {
+    iChangeFlags(d->inFlags, useReturnKeyBehavior_InputWidgetFlag, useReturnKeyBehavior);
+}
+
 void setHint_InputWidget(iInputWidget *d, const char *hintText) {
     /* Keep original for retranslations. */
     setCStr_String(&d->srcHint, hintText);
@@ -795,6 +816,22 @@ static void updateBuffered_InputWidget_(iInputWidget *d) {
         for (int i = visRange.start; i < visRange.end; i++) {
             append_String(visText, &line_InputWidget_(d, i)->text);
         }
+        if (d->inFlags & isUrl_InputWidgetFlag) {
+            /* Highlight the host name. */
+            iUrl parts;
+            init_Url(&parts, visText);
+            if (!isEmpty_Range(&parts.host)) {
+                const char *cstr = cstr_String(visText);
+                insertData_Block(&visText->chars,
+                                 parts.host.end - cstr,
+                                 restore_ColorEscape,
+                                 strlen(restore_ColorEscape));
+                insertData_Block(&visText->chars,
+                                 parts.host.start - cstr,
+                                 uiTextStrong_ColorEscape,
+                                 strlen(uiTextStrong_ColorEscape));
+            }
+        }
         iWrapText wt = wrap_InputWidget_(d, 0);
         wt.text = range_String(visText);
         const int fg = uiInputText_ColorId;
@@ -828,12 +865,10 @@ void setText_InputWidget(iInputWidget *d, const iString *text) {
             punyEncodeUrlHost_String(enc);
             text = enc;
         }
-#if 0
         /* Omit the default (Gemini) scheme if there isn't much space. */
         if (isNarrow_Root(as_Widget(d)->root)) {
             text = omitDefaultScheme_(collect_String(copy_String(text)));
         }
-#endif
     }
     clearUndo_InputWidget_(d);
     iString *nfcText = collect_String(copy_String(text));
@@ -848,10 +883,6 @@ void setText_InputWidget(iInputWidget *d, const iString *text) {
     if (!isFocused_Widget(d)) {
         iZap(d->mark);
     }
-//    else {
-//        d->cursor.y = iMin(d->cursor.y, (int) size_Array(&d->lines) - 1);
-//        d->cursor.x = iMin(d->cursor.x, size_String(&cursorLine_InputWidget_(d)->text));
-//    }
     if (!isFocused_Widget(d)) {
         d->inFlags |= needUpdateBuffer_InputWidgetFlag;
     }
@@ -866,18 +897,6 @@ void setTextCStr_InputWidget(iInputWidget *d, const char *cstr) {
     delete_String(str);
 }
 
-static uint32_t cursorTimer_(uint32_t interval, void *w) {
-    iInputWidget *d = w;
-    if (d->cursorVis > 1) {
-        d->cursorVis--;
-    }
-    else {
-        d->cursorVis ^= 1;
-    }
-    refresh_Widget(w);
-    return interval;
-}
-
 static size_t cursorToIndex_InputWidget_(const iInputWidget *d, iInt2 pos) {
     if (pos.y < 0) {
         return 0;
@@ -930,7 +949,7 @@ void begin_InputWidget(iInputWidget *d) {
     setFlags_Widget(w, selected_WidgetFlag, iTrue);
     showCursor_InputWidget_(d);
     refresh_Widget(w);
-    d->timer = SDL_AddTimer(refreshInterval_InputWidget_, cursorTimer_, d);
+    startOrStopCursorTimer_InputWidget_(d, iTrue);
     d->inFlags &= ~enterPressed_InputWidgetFlag;
     if (d->inFlags & selectAllOnFocus_InputWidgetFlag) {
         d->mark = (iRanges){ 0, lastLine_InputWidget_(d)->range.end };
@@ -955,8 +974,7 @@ void end_InputWidget(iInputWidget *d, iBool accept) {
         splitToLines_(&d->oldText, &d->lines);
     }
     d->inFlags |= needUpdateBuffer_InputWidgetFlag;
-    SDL_RemoveTimer(d->timer);
-    d->timer = 0;
+    startOrStopCursorTimer_InputWidget_(d, iFalse);
     SDL_StopTextInput();
     setFlags_Widget(w, selected_WidgetFlag | keepOnTop_WidgetFlag, iFalse);
     const char *id = cstr_String(id_Widget(as_Widget(d)));
@@ -1383,17 +1401,29 @@ static iBool isArrowUpDownConsumed_InputWidget_(const iInputWidget *d) {
     return d->maxWrapLines > 1;
 }
 
+static iBool checkLineBreakMods_InputWidget_(const iInputWidget *d, int mods) {
+    if (d->inFlags & useReturnKeyBehavior_InputWidgetFlag) {
+        return mods == lineBreakKeyMod_ReturnKeyBehavior(prefs_App()->returnKey);
+    }
+    return mods == 0;
+}
+
+static iBool checkAcceptMods_InputWidget_(const iInputWidget *d, int mods) {
+    if (d->inFlags & useReturnKeyBehavior_InputWidgetFlag) {
+        return mods == acceptKeyMod_ReturnKeyBehavior(prefs_App()->returnKey);
+    }
+    return mods == 0;
+}
+
 static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d);
     /* Resize according to width immediately. */
     if (d->lastUpdateWidth != w->rect.size.x) {
         d->inFlags |= needUpdateBuffer_InputWidgetFlag;
-#if 0
         if (d->inFlags & isUrl_InputWidgetFlag) {
             /* Restore/omit the default scheme if necessary. */
             setText_InputWidget(d, text_InputWidget(d));
         }
-#endif
         updateAllLinesAndResizeHeight_InputWidget_(d);
         d->lastUpdateWidth = w->rect.size.x;
     }
@@ -1401,6 +1431,13 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
         begin_InputWidget(d);
         return iFalse;
     }
+    else if (isEditing_InputWidget_(d) && (isCommand_UserEvent(ev, "window.focus.lost") ||
+                                           isCommand_UserEvent(ev, "window.focus.gained"))) {
+        startOrStopCursorTimer_InputWidget_(d, isCommand_UserEvent(ev, "window.focus.gained"));
+        d->cursorVis = 1;
+        refresh_Widget(d);
+        return iFalse;
+    }
     else if (isCommand_UserEvent(ev, "keyroot.changed")) {
         d->inFlags |= needUpdateBuffer_InputWidgetFlag;
     }
@@ -1614,10 +1651,10 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                 return iTrue;
             case SDLK_RETURN:
             case SDLK_KP_ENTER:
-                if (~d->inFlags & isSensitive_InputWidgetFlag && d->maxLen == 0) {
-                    if (mods == lineBreakKeyMod_ReturnKeyBehavior(prefs_App()->returnKey) ||
-                        (~d->inFlags & isUrl_InputWidgetFlag &&
-                         d->inFlags & enterKeyInsertsLineFeed_InputWidgetFlag)) {
+                if (~d->inFlags & isSensitive_InputWidgetFlag &&
+                    ~d->inFlags & isUrl_InputWidgetFlag &&
+                    d->inFlags & lineBreaksEnabled_InputWidgetFlag && d->maxLen == 0) {
+                    if (checkLineBreakMods_InputWidget_(d, mods)) {
                         pushUndo_InputWidget_(d);
                         deleteMarked_InputWidget_(d);
                         insertChar_InputWidget_(d, '\n');
@@ -1626,7 +1663,8 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                     }
                 }
                 if (d->inFlags & enterKeyEnabled_InputWidgetFlag &&
-                    mods == acceptKeyMod_ReturnKeyBehavior(prefs_App()->returnKey)) {
+                    (checkAcceptMods_InputWidget_(d, mods) ||
+                     (~d->inFlags & lineBreaksEnabled_InputWidgetFlag))) {
                     d->inFlags |= enterPressed_InputWidgetFlag;
                     setFocus_Widget(NULL);
                     return iTrue;
@@ -1728,6 +1766,9 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
             case SDLK_a:
 #if defined (iPlatformApple)
                 if (mods == KMOD_PRIMARY) {
+#else
+                if (mods == (KMOD_PRIMARY | KMOD_SHIFT)) {
+#endif
                     selectAll_InputWidget(d);
                     d->mark.start = 0;
                     d->mark.end   = cursorToIndex_InputWidget_(d, curMax);
@@ -1736,7 +1777,6 @@ static iBool processEvent_InputWidget_(iInputWidget *d, const SDL_Event *ev) {
                     refresh_Widget(w);
                     return iTrue;
                 }
-#endif
                 /* fall through for Emacs-style Home/End */
             case SDLK_e:
                 if (mods == KMOD_CTRL || mods == (KMOD_CTRL | KMOD_SHIFT)) {
diff --git a/src/ui/inputwidget.h b/src/ui/inputwidget.h
index a94291ed..0d327ca6 100644
--- a/src/ui/inputwidget.h
+++ b/src/ui/inputwidget.h
@@ -50,8 +50,9 @@ void    setFont_InputWidget             (iInputWidget *, int fontId);
 void    setContentPadding_InputWidget   (iInputWidget *, int left, int right); /* only affects the text entry */
 void    setLineLimits_InputWidget       (iInputWidget *, int minLines, int maxLines);
 void    setValidator_InputWidget        (iInputWidget *, iInputWidgetValidatorFunc validator, void *context);
-void    setEnterInsertsLF_InputWidget   (iInputWidget *, iBool enterInsertsLF);
+void    setLineBreaksEnabled_InputWidget(iInputWidget *, iBool lineBreaksEnabled);
 void    setEnterKeyEnabled_InputWidget  (iInputWidget *, iBool enterKeyEnabled);
+void    setUseReturnKeyBehavior_InputWidget(iInputWidget *, iBool useReturnKeyBehavior);
 void    setBackupFileName_InputWidget   (iInputWidget *, const char *fileName);
 void    begin_InputWidget               (iInputWidget *);
 void    end_InputWidget                 (iInputWidget *, iBool accept);
diff --git a/src/ui/root.c b/src/ui/root.c
index 9d92c44e..a8b9f998 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -358,9 +358,9 @@ static iBool handleRootCommands_(iWidget *root, const char *cmd) {
         return iTrue;
     }
     else if (equal_Command(cmd, "window.focus.lost")) {
-#if !defined (iPlatformMobile) /* apps don't share input focus on mobile */
-        setFocus_Widget(NULL);
-#endif
+//#if !defined (iPlatformMobile) /* apps don't share input focus on mobile */
+//        setFocus_Widget(NULL);
+//#endif
         setTextColor_LabelWidget(findWidget_App("winbar.app"), uiAnnotation_ColorId);
         setTextColor_LabelWidget(findWidget_App("winbar.title"), uiAnnotation_ColorId);
         return iFalse;
@@ -1077,6 +1077,7 @@ void createUserInterface_Root(iRoot *d) {
             setSelectAllOnFocus_InputWidget(url, iTrue);
             setId_Widget(as_Widget(url), "url");
             setLineLimits_InputWidget(url, 1, 1); /* just one line while not focused */
+            setLineBreaksEnabled_InputWidget(url, iFalse);
             setUrlContent_InputWidget(url, iTrue);
             setNotifyEdits_InputWidget(url, iTrue);
             setTextCStr_InputWidget(url, "gemini://");
@@ -1272,7 +1273,7 @@ void createUserInterface_Root(iRoot *d) {
         setHint_InputWidget(input, "${hint.findtext}");
         setSelectAllOnFocus_InputWidget(input, iTrue);
         setEatEscape_InputWidget(input, iFalse); /* unfocus and close with one keypress */
-        setEnterInsertsLF_InputWidget(input, iFalse);
+        setLineBreaksEnabled_InputWidget(input, iFalse);
         setId_Widget(addChildFlags_Widget(searchBar, iClob(input), expand_WidgetFlag),
                      "find.input");
         addChild_Widget(searchBar, iClob(newIcon_LabelWidget("  \u2b9f  ", 'g', KMOD_PRIMARY, "find.next")));
diff --git a/src/ui/uploadwidget.c b/src/ui/uploadwidget.c
index 7bfa73bd..57b6b6b7 100644
--- a/src/ui/uploadwidget.c
+++ b/src/ui/uploadwidget.c
@@ -116,8 +116,8 @@ void init_UploadWidget(iUploadWidget *d) {
         setId_Widget(as_Widget(d->input), "upload.text");
         setFont_InputWidget(d->input, monospace_FontId);
         setLineLimits_InputWidget(d->input, 7, 20);
+        setUseReturnKeyBehavior_InputWidget(d->input, iFalse); /* traditional text editor */        
         setHint_InputWidget(d->input, "${hint.upload.text}");
-        setEnterInsertsLF_InputWidget(d->input, iTrue);
         setFixedSize_Widget(as_Widget(d->input), init_I2(120 * gap_UI, -1));
         addChild_Widget(page, iClob(d->input));
         appendFramelessTabPage_Widget(tabs, iClob(page), "${heading.upload.text}", '1', 0);
diff --git a/src/ui/visbuf.c b/src/ui/visbuf.c
index 88a5fd60..503d0a2f 100644
--- a/src/ui/visbuf.c
+++ b/src/ui/visbuf.c
@@ -58,18 +58,14 @@ void alloc_VisBuf(iVisBuf *d, const iInt2 size, int granularity) {
             if (tex->texture) {
                 SDL_DestroyTexture(tex->texture);
             }
+            SDL_Renderer *rend = renderer_Window(get_Window());
             tex->texture =
-                SDL_CreateTexture(renderer_Window(get_Window()),
+                SDL_CreateTexture(rend,
                                   SDL_PIXELFORMAT_RGBA8888,
                                   SDL_TEXTUREACCESS_STATIC | SDL_TEXTUREACCESS_TARGET,
                                   texSize.x,
                                   texSize.y);
             SDL_SetTextureBlendMode(tex->texture, SDL_BLENDMODE_NONE);
-//            tex->origin = i * texSize.y;
-//            iZap(tex->validRange);
-//          if (d->invalidUserData) {
-//                d->invalidUserData(i, d->buffers[i].user);
-//            }
         }
         invalidate_VisBuf(d);
     }