From 7e4236a82fc2a7cbef11a5f31fbc194e2f43521c Mon Sep 17 00:00:00 2001
From: takase1121 <20792268+takase1121@users.noreply.github.com>
Date: Wed, 8 Sep 2021 23:09:20 +0800
Subject: [PATCH 1/2] add keymap.unbind(), update contextmenu to use
 keymap.get_binding()

This is something probably people are looking for...
---
 data/core/contextmenu.lua |  2 +-
 data/core/keymap.lua      | 39 ++++++++++++++++++++++++++++++++-------
 2 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/data/core/contextmenu.lua b/data/core/contextmenu.lua
index 36247597..d6131cdf 100644
--- a/data/core/contextmenu.lua
+++ b/data/core/contextmenu.lua
@@ -49,7 +49,7 @@ function ContextMenu:register(predicate, items)
   local width, height = 0, 0 --precalculate the size of context menu
   for i, item in ipairs(items) do
     if item ~= DIVIDER then
-      item.info = keymap.reverse_map[item.command]
+      item.info = keymap.get_binding(item.command)
     end
     local lw, lh = get_item_size(item)
     width = math.max(width, lw)
diff --git a/data/core/keymap.lua b/data/core/keymap.lua
index 2be0dfc7..759362d1 100644
--- a/data/core/keymap.lua
+++ b/data/core/keymap.lua
@@ -5,10 +5,9 @@ keymap.modkeys = {}
 keymap.map = {}
 keymap.reverse_map = {}
 
-local macos = rawget(_G, "MACOS")
 
 -- Thanks to mathewmariani, taken from his lite-macos github repository.
-local modkeys_os = require("core.modkeys-" .. (macos and "macos" or "generic"))
+local modkeys_os = require("core.modkeys-" .. (MACOS and "macos" or "generic"))
 local modkey_map = modkeys_os.map
 local modkeys = modkeys_os.keys
 
@@ -30,14 +29,15 @@ function keymap.add_direct(map)
     end
     keymap.map[stroke] = commands
     for _, cmd in ipairs(commands) do
-      keymap.reverse_map[cmd] = stroke
+      keymap.reverse_map[cmd] = keymap.reverse_map[cmd] or {}
+      table.insert(keymap.reverse_map[cmd], stroke)
     end
   end
 end
 
 function keymap.add(map, overwrite)
   for stroke, commands in pairs(map) do
-    if macos then
+    if MACOS then
       stroke = stroke:gsub("%f[%a]ctrl%f[%A]", "cmd")
     end
     if type(commands) == "string" then
@@ -52,14 +52,39 @@ function keymap.add(map, overwrite)
       end
     end
     for _, cmd in ipairs(commands) do
-      keymap.reverse_map[cmd] = stroke
+      keymap.reverse_map[cmd] = keymap.reverse_map[cmd] or {}
+      table.insert(keymap.reverse_map[cmd], stroke)
     end
   end
 end
 
 
+local function remove_only(tbl, k, v)
+  for key, values in pairs(tbl) do
+    if key == k then
+      if v then
+        for i, value in ipairs(values) do
+          if value == v then
+            table.remove(values, i)
+          end
+        end
+      else
+        tbl[key] = nil
+      end
+      break
+    end
+  end
+end
+
+
+function keymap.unbind(cmd, key)
+  remove_only(keymap.map, key, cmd)
+  remove_only(keymap.reverse_map, cmd, key)
+end
+
+
 function keymap.get_binding(cmd)
-  return keymap.reverse_map[cmd]
+  return table.unpack(keymap.reverse_map[cmd] or {})
 end
 
 
@@ -94,7 +119,7 @@ function keymap.on_key_released(k)
 end
 
 
-if macos then
+if MACOS then
   local keymap_macos = require("core.keymap-macos")
   keymap_macos(keymap)
   return keymap

From 5cc23348a1a7d106aaee36c0eb88b42ed2c9b725 Mon Sep 17 00:00:00 2001
From: takase1121 <20792268+takase1121@users.noreply.github.com>
Date: Wed, 8 Sep 2021 23:17:50 +0800
Subject: [PATCH 2/2] reverse the order of args in keymap.unbind

---
 data/core/keymap.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/core/keymap.lua b/data/core/keymap.lua
index 759362d1..8fd2b05b 100644
--- a/data/core/keymap.lua
+++ b/data/core/keymap.lua
@@ -77,7 +77,7 @@ local function remove_only(tbl, k, v)
 end
 
 
-function keymap.unbind(cmd, key)
+function keymap.unbind(key, cmd)
   remove_only(keymap.map, key, cmd)
   remove_only(keymap.reverse_map, cmd, key)
 end