5 files changed, 90 insertions, 19 deletions

diff --git a/src/ui/bindingswidget.c b/src/ui/bindingswidget.c
index a6e9f6a0..ff68ea7b 100644
--- a/src/ui/bindingswidget.c
+++ b/src/ui/bindingswidget.c
@@ -75,6 +75,8 @@ struct Impl_BindingsWidget {
     iWidget widget;
     iListWidget *list;
     size_t activePos;
+    size_t contextPos;
+    iWidget *menu;
 };
 
 iDefineObjectConstruction(BindingsWidget)
@@ -108,11 +110,17 @@ void init_BindingsWidget(iBindingsWidget *d) {
     init_Widget(w);
     setFlags_Widget(w, resizeChildren_WidgetFlag, iTrue);
     d->activePos = iInvalidPos;
+    d->contextPos = iInvalidPos;
     d->list = new_ListWidget();
     setItemHeight_ListWidget(d->list, lineHeight_Text(uiLabel_FontId) * 1.5f);
     setPadding_Widget(as_Widget(d->list), 0, gap_UI, 0, gap_UI);
     addChild_Widget(w, iClob(d->list));
     updateItems_BindingsWidget_(d);
+    d->menu = makeMenu_Widget(
+        w,
+        (iMenuItem[]){ { "Reset to Default", 0, 0, "binding.reset" },
+                       { uiTextCaution_ColorEscape "Clear", 0, 0, "binding.clear" } },
+        2);
 }
 
 void deinit_BindingsWidget(iBindingsWidget *d) {
@@ -145,9 +153,38 @@ static iBool processEvent_BindingsWidget_(iBindingsWidget *d, const SDL_Event *e
     iWidget *   w   = as_Widget(d);
     const char *cmd = command_UserEvent(ev);
     if (isCommand_Widget(w, ev, "list.clicked")) {
-        setActiveItem_BindingsWidget_(d, arg_Command(cmd));
+        const size_t index = (size_t) arg_Command(cmd);
+        setActiveItem_BindingsWidget_(d, d->activePos != index ? index : iInvalidPos);
         return iTrue;
     }
+    else if (isCommand_Widget(w, ev, "menu.closed")) {
+        invalidateItem_ListWidget(d->list, d->contextPos);
+    }
+    else if (isCommand_Widget(w, ev, "binding.reset")) {
+        iBindingItem *item = item_ListWidget(d->list, d->contextPos);
+        if (item) {
+            reset_Binding(item->id);
+            updateItems_BindingsWidget_(d);
+        }
+        return iTrue;
+    }
+    else if (isCommand_Widget(w, ev, "binding.clear")) {
+        setKey_BindingItem_(item_ListWidget(d->list, d->contextPos), 0, 0);
+        invalidateItem_ListWidget(d->list, d->contextPos);
+        d->contextPos = iInvalidPos;
+        postCommand_App("bindings.changed");
+        return iTrue;
+    }
+    if (ev->type == SDL_MOUSEBUTTONDOWN && ev->button.button == SDL_BUTTON_RIGHT) {
+        if (!isVisible_Widget(d->menu)) {
+            d->contextPos = hoverItemIndex_ListWidget(d->list);
+        }
+    }
+    if (d->contextPos != iInvalidPos) {
+        processContextMenuEvent_Widget(d->menu, ev, {
+            setActiveItem_BindingsWidget_(d, iInvalidPos);
+        });
+    }
     /* Waiting for a keypress? */
     if (d->activePos != iInvalidPos) {
         if (ev->type == SDL_KEYDOWN && !isMod_Sym(ev->key.keysym.sym)) {
@@ -175,8 +212,11 @@ static void draw_BindingItem_(const iBindingItem *d, iPaint *p, iRect itemRect,
     const int   line       = lineHeight_Text(font);
     int         fg         = uiText_ColorId;
     const iBool isPressing = isMouseDown_ListWidget(list) || d->isWaitingForEvent;
-    const iBool isHover    = (isHover_Widget(constAs_Widget(list)) &&
-                              constHoverItem_ListWidget(list) == d);
+    const iBindingsWidget *parent = (const iBindingsWidget *) parent_Widget(list);
+    const iBool isMenuOpen = isVisible_Widget(parent->menu);
+    const iBool isHover = ((!isMenuOpen && isHover_Widget(constAs_Widget(list)) &&
+                            constHoverItem_ListWidget(list) == d) ||
+                           (isMenuOpen && constItem_ListWidget(list, parent->contextPos) == d));
     if (isHover || isPressing) {
         fg = isPressing ? uiTextPressed_ColorId : uiTextFramelessHover_ColorId;
         fillRect_Paint(p,
diff --git a/src/ui/keys.c b/src/ui/keys.c
index 6d68cc57..5b88bfcf 100644
--- a/src/ui/keys.c
+++ b/src/ui/keys.c
@@ -56,23 +56,34 @@ static void clear_Keys_(iKeys *d) {
     }
 }
 
-static void bindDefaults_(void) {
-    /* TODO: This indirection could be used for localization, although all UI strings
-       would need to be similarly handled. */
-    bindLabel_Keys(1, "scroll.top", SDLK_HOME, 0, "Jump to top");
-    bindLabel_Keys(2, "scroll.bottom", SDLK_END, 0, "Jump to bottom");
-    bindLabel_Keys(10, "scroll.step arg:-1", SDLK_UP, 0, "Scroll up");
-    bindLabel_Keys(11, "scroll.step arg:1", SDLK_DOWN, 0, "Scroll down");
-    bindLabel_Keys(20, "scroll.page arg:-1", SDLK_PAGEUP, 0, "Scroll up half a page");
-    bindLabel_Keys(21, "scroll.page arg:1", SDLK_PAGEDOWN, 0, "Scroll down half a page");
-    bindLabel_Keys(30, "navigate.back", navigateBack_KeyShortcut, "Go back");
-    bindLabel_Keys(31, "navigate.forward", navigateForward_KeyShortcut, "Go forward");
-    bindLabel_Keys(32, "navigate.parent", navigateParent_KeyShortcut, "Go to parent directory");
-    bindLabel_Keys(33, "navigate.root", navigateRoot_KeyShortcut, "Go to site root");
-    bindLabel_Keys(40, "document.linkkeys", 'f', 0, "Open link via keyboard");
+/* TODO: This indirection could be used for localization, although all UI strings
+   would need to be similarly handled. */
+static const struct { int id; iMenuItem bind; } defaultBindings_[] = {
+    { 1,  { "Jump to top",               SDLK_HOME, 0,                  "scroll.top"         } },
+    { 2,  { "Jump to bottom",            SDLK_END, 0,                   "scroll.bottom"      } },
+    { 10, { "Scroll up",                 SDLK_UP, 0,                    "scroll.step arg:-1" } },
+    { 11, { "Scroll down",               SDLK_DOWN, 0,                  "scroll.step arg:1"  } },
+    { 20, { "Scroll up half a page",     SDLK_PAGEUP, 0,                "scroll.page arg:-1" } },
+    { 21, { "Scroll down half a page",   SDLK_PAGEDOWN, 0,              "scroll.page arg:1"  } },
+    { 30, { "Go back",                   navigateBack_KeyShortcut,      "navigate.back"      } },
+    { 31, { "Go forward",                navigateForward_KeyShortcut,   "navigate.forward"   } },
+    { 32, { "Go to parent directory",    navigateParent_KeyShortcut,    "navigate.parent"    } },
+    { 33, { "Go to site root",           navigateRoot_KeyShortcut,      "navigate.root"      } },
+    { 40, { "Open link via keyboard",    'f', 0,                        "document.linkkeys"} },
     /* The following cannot currently be changed (built-in duplicates). */
-    bind_Keys(1000, "scroll.page arg:-1", SDLK_SPACE, KMOD_SHIFT);
-    bind_Keys(1001, "scroll.page arg:1", SDLK_SPACE, 0);
+    { 1000, { NULL, SDLK_SPACE, KMOD_SHIFT, "scroll.page arg:-1" } },
+    { 1001, { NULL, SDLK_SPACE, 0, "scroll.page arg:1" } },
+};
+
+static void bindDefaults_(void) {
+    iForIndices(i, defaultBindings_) {
+        const int       id   = defaultBindings_[i].id;
+        const iMenuItem bind = defaultBindings_[i].bind;
+        bind_Keys(id, bind.command, bind.key, bind.kmods);
+        if (bind.label) {
+            setLabel_Keys(id, bind.label);
+        }
+    }
 }
 
 static iBinding *find_Keys_(iKeys *d, int key, int mods) {
@@ -121,6 +132,20 @@ void setKey_Binding(int id, int key, int mods) {
     }
 }
 
+void reset_Binding(int id) {
+    iBinding *bind = findId_Keys_(&keys_, id);
+    if (bind) {
+        iForIndices(i, defaultBindings_) {
+            if (defaultBindings_[i].id == id) {
+                bind->key  = defaultBindings_[i].bind.key;
+                bind->mods = defaultBindings_[i].bind.kmods;
+                updateLookup_Keys_(&keys_);
+                break;
+            }
+        }
+    }
+}
+
 /*----------------------------------------------------------------------------------------------*/
 
 static const char *filename_Keys_ = "bindings.txt";
diff --git a/src/ui/keys.h b/src/ui/keys.h
index 5bc9141c..0cd97e2a 100644
--- a/src/ui/keys.h
+++ b/src/ui/keys.h
@@ -59,6 +59,7 @@ struct Impl_Binding {
 };
 
 void            setKey_Binding      (int id, int key, int mods);
+void            reset_Binding       (int id);
 
 /*----------------------------------------------------------------------------------------------*/
 
diff --git a/src/ui/listwidget.c b/src/ui/listwidget.c
index 6f0405d7..39b9bfe5 100644
--- a/src/ui/listwidget.c
+++ b/src/ui/listwidget.c
@@ -228,6 +228,10 @@ iAnyObject *hoverItem_ListWidget(iListWidget *d) {
     return item_ListWidget(d, d->hoverItem);
 }
 
+size_t hoverItemIndex_ListWidget(const iListWidget *d) {
+    return d->hoverItem;
+}
+
 static void setHoverItem_ListWidget_(iListWidget *d, size_t index) {
     if (index < size_PtrArray(&d->items)) {
         const iListItem *item = at_PtrArray(&d->items, index);
diff --git a/src/ui/listwidget.h b/src/ui/listwidget.h
index 11f1672e..26c1ac9e 100644
--- a/src/ui/listwidget.h
+++ b/src/ui/listwidget.h
@@ -74,6 +74,7 @@ int                 visCount_ListWidget         (const iListWidget *);
 size_t              itemIndex_ListWidget        (const iListWidget *, iInt2 pos);
 const iAnyObject *  constItem_ListWidget        (const iListWidget *, size_t index);
 const iAnyObject *  constHoverItem_ListWidget   (const iListWidget *);
+size_t              hoverItemIndex_ListWidget   (const iListWidget *);
 
 iLocalDef iBool isEmpty_ListWidget(const iListWidget *d) { return numItems_ListWidget(d) == 0; }