InputWidget: In a narrow window, omit the default URL scheme

The default URL scheme is "gemini". If missing, it will always be added back when making requests. This allows it to be omitted from the URL input field if space needs saving.

Other schemes, like "gopher", won't be omitted.

3 files changed, 33 insertions, 5 deletions

diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index 06e6373e..04d3ff69 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -258,9 +258,26 @@ static iString *visText_InputWidget_(const iInputWidget *d) {
 static void updateBuffered_InputWidget_(iInputWidget *d) {
     if (isFinishedLaunching_App()) {
         invalidateBuffered_InputWidget_(d);
-        iString *visText = visText_InputWidget_(d);
-        d->buffered = new_TextBuf(d->font, cstr_String(visText));
-        delete_String(visText);
+        iString *bufText = NULL;
+        if (d->inFlags & isUrl_InputWidgetFlag) {
+            /* Highlight the host name. */
+            iUrl parts;
+            const iString *text = text_InputWidget(d);
+            init_Url(&parts, text);
+            if (!isEmpty_Range(&parts.host)) {
+                bufText = new_String();
+                appendRange_String(bufText, (iRangecc){ constBegin_String(text), parts.host.start });
+                appendCStr_String(bufText, uiTextStrong_ColorEscape);
+                appendRange_String(bufText, parts.host);
+                appendCStr_String(bufText, restore_ColorEscape);
+                appendRange_String(bufText, (iRangecc){ parts.host.end, constEnd_String(text) });
+            }
+        }
+        if (!bufText) {
+            bufText = visText_InputWidget_(d);
+        }
+        d->buffered = new_TextBuf(d->font, uiInputText_ColorId, cstr_String(bufText));
+        delete_String(bufText);
     }
 }
 
@@ -275,6 +292,12 @@ void setText_InputWidget(iInputWidget *d, const iString *text) {
             punyEncodeUrlHost_String(enc);
             text = enc;
         }
+        /* Omit the default (Gemini) scheme if the window is narrow. */
+        if (isNarrow_Window(get_Window()) && startsWithCase_String(text, "gemini:")) {
+            iString *shortened = collect_String(copy_String(text));
+            remove_Block(&shortened->chars, 0, 7);
+            text = shortened;
+        }
     }
     clearUndo_InputWidget_(d);
     clear_Array(&d->text);
@@ -919,7 +942,7 @@ static void draw_InputWidget_(const iInputWidget *d) {
     }
     if (d->buffered && !isFocused && !isHint) {
         /* Most input widgets will use this, since only one is focused at a time. */
-        draw_TextBuf(d->buffered, textOrigin, uiInputText_ColorId);
+        draw_TextBuf(d->buffered, textOrigin, white_ColorId);
     }
     else {
         draw_Text(d->font,
diff --git a/src/ui/window.c b/src/ui/window.c
index 6e81c14c..5d5b8e0c 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -536,10 +536,14 @@ static int navBarAvailableSpace_(iWidget *navBar) {
     return avail;
 }
 
+iBool isNarrow_Window(const iWindow *d) {
+    return width_Rect(safeRootRect_Window(d)) / gap_UI < 140;
+}
+
 static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
     if (equal_Command(cmd, "window.resized") || equal_Command(cmd, "metrics.changed")) {
         const iBool isPhone = deviceType_App() == phone_AppDeviceType;
-        const iBool isNarrow = !isPhone && width_Rect(bounds_Widget(navBar)) / gap_UI < 140;
+        const iBool isNarrow = !isPhone && isNarrow_Window(get_Window());
         /* Adjust navbar padding. */ {
             int hPad = isPhone || isNarrow ? gap_UI / 2 : gap_UI * 3 / 2;
             int vPad = gap_UI * 3 / 2;
diff --git a/src/ui/window.h b/src/ui/window.h
index 98c63957..9ac3bc00 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -104,6 +104,7 @@ uint32_t    frameTime_Window        (const iWindow *);
 SDL_Renderer *renderer_Window       (const iWindow *);
 int         snap_Window             (const iWindow *);
 iBool       isFullscreen_Window     (const iWindow *);
+iBool       isNarrow_Window         (const iWindow *);
 
 iWindow *   get_Window              (void);