Focus behavior of the URL entry field

Opening a new tab will now set input focus to the URL field.

Switching tabs when the URL field is focused will select the full new URL.

There was an issue previously where selecting a bookmark while the URL field was focused would cause unexpected behavior. The URL was first unfocused and that would trigger the document to fetch the URL that was in the input field.

3 files changed, 14 insertions, 7 deletions

diff --git a/src/app.c b/src/app.c
index 0916919e..347e3661 100644
--- a/src/app.c
+++ b/src/app.c
@@ -959,7 +959,7 @@ iBool handleCommand_App(const char *cmd) {
         const iBool isDuplicate = argLabel_Command(cmd, "duplicate") != 0;
         newTab_App(isDuplicate ? document_App() : NULL, iTrue);
         if (!isDuplicate) {
-            postCommand_App("navigate.home");
+            postCommand_App("navigate.home focus:1");
         }
         return iTrue;
     }
@@ -1055,6 +1055,9 @@ iBool handleCommand_App(const char *cmd) {
                     cstr_String(constAt_StringSet(urls, iRandoms(0, size_StringSet(urls)))));
             }
         }
+        if (argLabel_Command(cmd, "focus")) {
+            postCommand_App("navigate.focus");
+        }
         return iTrue;
     }
     else if (equal_Command(cmd, "bookmark.add")) {
diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index d29548f1..0fcca40a 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -181,8 +181,14 @@ void setText_InputWidget(iInputWidget *d, const iString *text) {
     iConstForEach(String, i, text) {
         pushBack_Array(&d->text, &i.value);
     }
-    iZap(d->mark);
-    d->cursor = iMin(d->cursor, size_Array(&d->text));
+    if (isFocused_Widget(d)) {
+        d->cursor = size_Array(&d->text);
+        selectAll_InputWidget(d);
+    }
+    else {
+        d->cursor = iMin(d->cursor, size_Array(&d->text));
+        iZap(d->mark);
+    }
     refresh_Widget(as_Widget(d));
 }
 
diff --git a/src/ui/window.c b/src/ui/window.c
index b90b2b55..41d8078f 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -236,7 +236,8 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
             setText_InputWidget(url, url_DocumentWidget(document_App()));
             return iTrue;
         }
-        if (arg_Command(cmd) && !isFocused_Widget(findWidget_App("lookup"))) {
+        if (arg_Command(cmd) && argLabel_Command(cmd, "enter") &&
+            !isFocused_Widget(findWidget_App("lookup"))) {
             postCommandf_App(
                 "open url:%s",
                 cstr_String(absoluteUrl_String(&iStringLiteral(""), text_InputWidget(url))));
@@ -261,9 +262,6 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
             }
             else if (equal_Command(cmd, "document.request.started")) {
                 iInputWidget *url = findChild_Widget(navBar, "url");
-                if (isFocused_Widget(as_Widget(url))) {
-                    setFocus_Widget(NULL);
-                }
                 setTextCStr_InputWidget(url, suffixPtr_Command(cmd, "url"));
                 updateTextCStr_LabelWidget(reloadButton, stopCStr_);
                 return iFalse;