Customizable navbar button actions

9 files changed, 100 insertions, 23 deletions

diff --git a/res/about/version.gmi b/res/about/version.gmi
index 3745a7cb..d5e701c3 100644
--- a/res/about/version.gmi
+++ b/res/about/version.gmi
@@ -9,6 +9,7 @@
 ## 1.10
 New features:
 * macOS: Trackpad swipe navigation.
+* Customizable navbar actions. Right-click on a button to change its action. (Identity and hamburger buttons cannot be changed.)
 * Identity toolbar menu can be used to switch between alternate identities. If you have used multiple identities on one site, this makes it more convenient to switch between them.
 * Added "Edit Page with Titan": opens the upload dialog with current page's content prefilled.
 * Added "Paste Preceding Line" in the input prompt dialog. Potential use cases include user-editable sections on a page and suggested/example input values.
@@ -35,6 +36,8 @@ Changes and enhancements:
 Fixes:
 * Fixed a history caching issue: if there were multiple instances of the same URL in history, only the latest one's content would be used when navigating back/forward.
 * Fixed handling of reserved characters in URLs (cf. RFC 3986, section 2.2).
+* Fixed the copy/paste context menu not showing in input fields.
+* Fixed duplicated warnings showing in the page banner.
 * Fixed very narrow input fields causing the app to hang.
 * Fixed initial scroll position in multiline input fields.
 * Fixed lookup results list becoming too narrow.
diff --git a/src/app.c b/src/app.c
index d4e09d6f..4045610e 100644
--- a/src/app.c
+++ b/src/app.c
@@ -248,6 +248,9 @@ static iString *serializePrefs_App_(const iApp *d) {
     appendFormat_String(str, "linewidth.set arg:%d\n", d->prefs.lineWidth);
     appendFormat_String(str, "linespacing.set arg:%f\n", d->prefs.lineSpacing);
     appendFormat_String(str, "returnkey.set arg:%d\n", d->prefs.returnKey);
+    for (size_t i = 0; i < iElemCount(d->prefs.navbarActions); i++) {
+        appendFormat_String(str, "navbar.action.set arg:%d button:%d\n", d->prefs.navbarActions[i], i);
+    }
 #if defined (iPlatformMobile)
     appendFormat_String(str, "toolbar.action.set arg:%d button:0\n", d->prefs.toolbarActions[0]);
     appendFormat_String(str, "toolbar.action.set arg:%d button:1\n", d->prefs.toolbarActions[1]);
@@ -961,6 +964,8 @@ static void init_App_(iApp *d, int argc, char **argv) {
     if (!loadState_App_(d)) {
         postCommand_Root(NULL, "open url:about:help");
     }
+    postCommand_App("~navbar.actions.changed");
+    postCommand_App("~toolbar.actions.changed");
     postCommand_Root(NULL, "~window.unfreeze");
     postCommand_Root(NULL, "font.reset");
     d->autoReloadTimer = SDL_AddTimer(60 * 1000, postAutoReloadCommand_App_, NULL);
@@ -2291,10 +2296,20 @@ iBool handleCommand_App(const char *cmd) {
         }
         return iTrue;
     }
+    else if (equal_Command(cmd, "navbar.action.set")) {
+        d->prefs.navbarActions[iClamp(argLabel_Command(cmd, "button"), 0, maxNavbarActions_Prefs - 1)] =
+            iClamp(arg_Command(cmd), 0, max_ToolbarAction - 1);
+        if (!isFrozen) {
+            postCommand_App("~navbar.actions.changed");
+        }
+        return iTrue;
+    }
     else if (equal_Command(cmd, "toolbar.action.set")) {
         d->prefs.toolbarActions[iClamp(argLabel_Command(cmd, "button"), 0, 1)] =
             iClamp(arg_Command(cmd), 0, max_ToolbarAction - 1);
-        postCommand_App("~toolbar.actions.changed");
+        if (!isFrozen) {
+            postCommand_App("~toolbar.actions.changed");
+        }
         return iTrue;        
     }
     else if (equal_Command(cmd, "translation.languages")) {
diff --git a/src/defs.h b/src/defs.h
index d2e13294..e2edd100 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -80,6 +80,7 @@ enum iToolbarAction {
     editPage_ToolbarAction    = 10,
     findText_ToolbarAction    = 11,
     settings_ToolbarAction    = 12,
+    sidebar_ToolbarAction     = 13, /* desktop only */
     max_ToolbarAction
 };
 
@@ -116,7 +117,7 @@ iLocalDef int acceptKeyMod_ReturnKeyBehavior(int behavior) {
 
 #define menu_Icon           "\U0001d362"
 #define rightArrowhead_Icon "\u27a4"
-#define leftArrowhead_Icon  "\u27a4"
+#define leftArrowhead_Icon  "\u2b9c"
 #define warning_Icon        "\u26a0"
 #define openLock_Icon       "\U0001f513"
 #define closedLock_Icon     "\U0001f512"
@@ -124,7 +125,7 @@ iLocalDef int acceptKeyMod_ReturnKeyBehavior(int behavior) {
 #define reload_Icon         "\U0001f503"
 #define backArrow_Icon      "\U0001f870"
 #define forwardArrow_Icon   "\U0001f872"
-#define upArrow_Icon        "\u2191"
+#define upArrow_Icon        "\U0001f871"
 #define upArrowBar_Icon     "\u2912"
 #define downArrowBar_Icon   "\u2913"
 #define rightArrowWhite_Icon "\u21e8"
diff --git a/src/fontpack.c b/src/fontpack.c
index 79f35526..a440234e 100644
--- a/src/fontpack.c
+++ b/src/fontpack.c
@@ -818,7 +818,7 @@ const iArray *actions_FontPack(const iFontPack *d, iBool showInstalled) {
         pushBack_Array(
             items,
             &(iMenuItem){ format_Lang(isEnabled ? close_Icon " ${fontpack.disable}"
-                                                : leftArrowhead_Icon " ${fontpack.enable}",
+                                                : "${fontpack.enable}",
                                       fpId),
                           0,
                           0,
diff --git a/src/prefs.c b/src/prefs.c
index 3aa05f01..6164ca25 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -44,6 +44,10 @@ void init_Prefs(iPrefs *d) {
     d->uiAnimations      = iTrue;
     d->uiScale           = 1.0f; /* default set elsewhere */
     d->zoomPercent       = 100;
+    d->navbarActions[0]  = back_ToolbarAction;
+    d->navbarActions[1]  = forward_ToolbarAction;
+    d->navbarActions[2]  = sidebar_ToolbarAction;
+    d->navbarActions[3]  = home_ToolbarAction;
 #if defined (iPlatformAndroidMobile)
     /* Android has a system-wide back button so no need to have a duplicate. */
     d->toolbarActions[0] = closeTab_ToolbarAction;
diff --git a/src/prefs.h b/src/prefs.h
index 43f7fc0e..ea864f51 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -101,6 +101,8 @@ enum iPrefsBool {
     max_PrefsBool
 };
 
+#define maxNavbarActions_Prefs  4
+
 /* TODO: Use a systematic command naming convention for notifications. */
 
 struct Impl_Prefs {
@@ -159,6 +161,7 @@ struct Impl_Prefs {
     enum iColorAccent accent;
     /* Window and User Interface */
     float            uiScale;
+    enum iToolbarAction navbarActions[maxNavbarActions_Prefs];
     enum iToolbarAction toolbarActions[2];
     /* Document presentation */
     int              zoomPercent;
diff --git a/src/ui/mobile.c b/src/ui/mobile.c
index e34cad3a..cf955423 100644
--- a/src/ui/mobile.c
+++ b/src/ui/mobile.c
@@ -50,7 +50,8 @@ const iToolbarActionSpec toolbarActions_Mobile[max_ToolbarAction] = {
     { upload_Icon, "${menu.page.upload}", "document.upload" },
     { edit_Icon, "${menu.page.upload.edit}", "document.upload copy:1" },
     { magnifyingGlass_Icon, "${menu.find}", "focus.set id:find.input" },
-    { gear_Icon, "${menu.settings}", "preferences" },        
+    { gear_Icon, "${menu.settings}", "preferences" },
+    { leftHalf_Icon, "${menu.sidebar.left}", "sidebar.toggle" },        
 };
 
 iBool isUsingPanelLayout_Mobile(void) {
diff --git a/src/ui/root.c b/src/ui/root.c
index 0a366996..a3c2e0ae 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -596,11 +596,17 @@ static void updateNavBarIdentity_(iWidget *navBar) {
 }
 
 static void updateNavDirButtons_(iWidget *navBar) {
-    const iHistory *history = history_DocumentWidget(document_App());
-    iBool atOldest = atOldest_History(history);
-    iBool atNewest = atNewest_History(history);
-    setFlags_Widget(findChild_Widget(navBar, "navbar.back"), disabled_WidgetFlag, atOldest);
-    setFlags_Widget(findChild_Widget(navBar, "navbar.forward"), disabled_WidgetFlag, atNewest);
+    iBeginCollect();
+    const iHistory *history  = history_DocumentWidget(document_App());
+    const iBool     atOldest = atOldest_History(history);
+    const iBool     atNewest = atNewest_History(history);
+    /* Reset button state. */
+    for (size_t i = 0; i < maxNavbarActions_Prefs; i++) {
+        const char *id = format_CStr("navbar.action%d", i + 1);
+        setFlags_Widget(findChild_Widget(navBar, id), disabled_WidgetFlag, iFalse);
+    }
+    setFlags_Widget(as_Widget(findMenuItem_Widget(navBar, "navigate.back")), disabled_WidgetFlag, atOldest);
+    setFlags_Widget(as_Widget(findMenuItem_Widget(navBar, "navigate.forward")), disabled_WidgetFlag, atNewest);
     iWidget *toolBar = findWidget_App("toolbar");
     if (toolBar) {
         /* Reset the state. */
@@ -618,6 +624,7 @@ static void updateNavDirButtons_(iWidget *navBar) {
         setOutline_LabelWidget(fwd, atNewest);
         refresh_Widget(toolBar);
     }
+    iEndCollect();
 }
 
 static const char *loadAnimationCStr_(void) {
@@ -777,7 +784,7 @@ static void updateNavBarSize_(iWidget *navBar) {
     /* Button sizing. */
     if (isNarrow ^ ((flags_Widget(navBar) & tight_WidgetFlag) != 0)) {
         setFlags_Widget(navBar, tight_WidgetFlag, isNarrow);
-        showCollapsed_Widget(findChild_Widget(navBar, "navbar.sidebar"), !isNarrow);
+        showCollapsed_Widget(findChild_Widget(navBar, "navbar.action3"), !isNarrow);
         iObjectList *lists[] = {
             children_Widget(navBar),
             children_Widget(findChild_Widget(navBar, "url")),
@@ -798,8 +805,8 @@ static void updateNavBarSize_(iWidget *navBar) {
         updateUrlInputContentPadding_(navBar);
     }
     if (isPhone) {
-        static const char *buttons[] = { "navbar.back",  "navbar.forward", "navbar.sidebar",
-                                         "navbar.ident", "navbar.home",    "navbar.menu" };
+        static const char *buttons[] = { "navbar.action1", "navbar.action2", "navbar.action3",
+                                         "navbar.action4", "navbar.ident",   "navbar.menu" };
         iWidget *toolBar = findWidget_Root("toolbar");
         setVisualOffset_Widget(toolBar, 0, 0, 0);
         setFlags_Widget(toolBar, hidden_WidgetFlag, isLandscape_App());
@@ -824,6 +831,22 @@ static void updateNavBarSize_(iWidget *navBar) {
     postCommand_Widget(navBar, "layout.changed id:navbar");
 }
 
+static void updateNavBarActions_(iWidget *navBar) {
+    const iPrefs *prefs = prefs_App();
+    for (size_t i = 0; i < iElemCount(prefs->navbarActions); i++) {
+        iBeginCollect();
+        const int action = prefs->navbarActions[i];
+        iLabelWidget *button =
+            findChild_Widget(navBar, format_CStr("navbar.action%d", i + 1));
+        if (button) {
+            setFlags_Widget(as_Widget(button), disabled_WidgetFlag, iFalse);
+            updateTextCStr_LabelWidget(button, toolbarActions_Mobile[action].icon);
+            setCommand_LabelWidget(button, collectNewCStr_String(toolbarActions_Mobile[action].command));
+        }
+        iEndCollect();
+    }
+}
+
 static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
     if (equal_Command(cmd, "window.resized") || equal_Command(cmd, "metrics.changed")) {
         updateNavBarSize_(navBar);
@@ -836,6 +859,33 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
         }
         return iFalse;
     }
+    else if (equal_Command(cmd, "navbar.actions.changed")) {
+        updateNavBarActions_(navBar);
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "contextclick")) {
+        const iRangecc id = range_Command(cmd, "id");
+        if (id.start && startsWith_CStr(id.start, "navbar.action")) {
+            const int buttonIndex = id.end[-1] - '1';
+            iArray items;
+            init_Array(&items, sizeof(iMenuItem));
+            for (size_t i = 0; i < max_ToolbarAction; i++) {
+                pushBack_Array(
+                    &items,
+                    &(iMenuItem){
+                        format_CStr(
+                            "%s %s", toolbarActions_Mobile[i].icon, toolbarActions_Mobile[i].label),
+                        0,
+                        0,
+                        format_CStr("navbar.action.set arg:%d button:%d", i, buttonIndex) });
+            }
+            openMenu_Widget(
+                makeMenu_Widget(get_Root()->widget, constData_Array(&items), size_Array(&items)),
+                coord_Command(cmd));
+            deinit_Array(&items);
+        }
+        return iFalse;
+    }
     else if (equal_Command(cmd, "navigate.focus")) {
         /* The upload dialog has its own path field. */
         if (findWidget_App("upload")) {
@@ -1068,9 +1118,7 @@ static iBool handleSearchBarCommands_(iWidget *searchBar, const char *cmd) {
 static void updateToolBarActions_(iWidget *toolBar) {
     const iPrefs *prefs = prefs_App();
     for (int i = 0; i < 2; i++) {
-        int action = prefs->toolbarActions[i]
-                         ? prefs->toolbarActions[i]
-                         : (i == 0 ? back_ToolbarAction : forward_ToolbarAction);
+        const int action = prefs->toolbarActions[i];
         iLabelWidget *button =
             findChild_Widget(toolBar, i == 0 ? "toolbar.action1" : "toolbar.action2");
         if (button) {
@@ -1260,14 +1308,14 @@ void createUserInterface_Root(iRoot *d) {
         addUnsplitButton_(navBar);
 #endif
         iWidget *navBack;
-        setId_Widget(navBack = addChildFlags_Widget(navBar, iClob(newIcon_LabelWidget(backArrow_Icon, 0, 0, "navigate.back")), collapse_WidgetFlag), "navbar.back");
-        setId_Widget(addChildFlags_Widget(navBar, iClob(newIcon_LabelWidget(forwardArrow_Icon, 0, 0, "navigate.forward")), collapse_WidgetFlag), "navbar.forward");
+        setId_Widget(navBack = addChildFlags_Widget(navBar, iClob(newIcon_LabelWidget(backArrow_Icon, 0, 0, "navigate.back")), collapse_WidgetFlag), "navbar.action1");
+        setId_Widget(addChildFlags_Widget(navBar, iClob(newIcon_LabelWidget(forwardArrow_Icon, 0, 0, "navigate.forward")), collapse_WidgetFlag), "navbar.action2");
         /* Button for toggling the left sidebar. */
         setId_Widget(addChildFlags_Widget(
                          navBar,
                          iClob(newIcon_LabelWidget(leftHalf_Icon, 0, 0, "sidebar.toggle")),
                          collapse_WidgetFlag),
-                     "navbar.sidebar");
+                     "navbar.action3");
         addChildFlags_Widget(navBar, iClob(new_Widget()), expand_WidgetFlag);
         iInputWidget *url;
         /* URL input field. */ {
@@ -1421,9 +1469,9 @@ void createUserInterface_Root(iRoot *d) {
         addChildFlags_Widget(navBar, iClob(new_Widget()), expand_WidgetFlag);
         setId_Widget(addChildFlags_Widget(navBar,
                                           iClob(newIcon_LabelWidget(
-                                              home_Icon, SDLK_h, KMOD_PRIMARY | KMOD_SHIFT, "navigate.home")),
+                                              home_Icon, 0, 0, "navigate.home")),
                                           collapse_WidgetFlag),
-                     "navbar.home");
+                     "navbar.action4");
 #if defined (iPlatformMobile)
         const iBool isPhone = (deviceType_App() == phone_AppDeviceType);
 #endif
@@ -1583,6 +1631,7 @@ void createUserInterface_Root(iRoot *d) {
         setId_Widget(menu, "toolbar.menu"); /* view menu */
     }
 #endif
+    updateNavBarActions_(navBar);
     updatePadding_Root(d);
     /* Global context menus. */ {
         iWidget *tabsMenu = makeMenu_Widget(
@@ -1651,6 +1700,7 @@ void createUserInterface_Root(iRoot *d) {
         setId_Widget(splitMenu, "splitmenu");
     }
     /* Global keyboard shortcuts. */ {
+        addAction_Widget(root, SDLK_h, KMOD_PRIMARY | KMOD_SHIFT, "navigate.home");
         addAction_Widget(root, 'l', KMOD_PRIMARY, "navigate.focus");
         addAction_Widget(root, 'f', KMOD_PRIMARY, "focus.set id:find.input");
         addAction_Widget(root, '1', KMOD_PRIMARY, "sidebar.mode arg:0 toggle:1");
diff --git a/src/ui/util.c b/src/ui/util.c
index 0adaebb6..41e645de 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -2404,10 +2404,10 @@ iWidget *makePreferences_Widget(void) {
           format_CStr("returnkey.set arg:%d", acceptWithPrimaryMod_ReturnKeyBehavior) },
         { NULL }
     };
-    iMenuItem toolbarActionItems[2][max_ToolbarAction + 1];
+    iMenuItem toolbarActionItems[2][max_ToolbarAction];
     iZap(toolbarActionItems);
     for (int j = 0; j < 2; j++) {
-        for (int i = 0; i < max_ToolbarAction; i++) {
+        for (int i = 0; i < sidebar_ToolbarAction; i++) {
             toolbarActionItems[j][i].label = toolbarActions_Mobile[i].label;
             toolbarActionItems[j][i].command =
                 format_CStr("toolbar.action.set arg:%d button:%d", i, j);