From d5d615bfd3d7955cc6ac7bf885182ae417680de6 Mon Sep 17 00:00:00 2001
From: Dimava <dimava2@ya.ru>
Date: Sat, 30 May 2020 11:11:26 +0300
Subject: [PATCH] change MouseEvent keyCode to event.button + 1

---
 src/js/core/input_distributor.js |  8 ++++----
 src/js/game/key_action_mapper.js | 10 +++++-----
 src/js/states/keybindings.js     |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/js/core/input_distributor.js b/src/js/core/input_distributor.js
index 439b8dfe..e46a3076 100644
--- a/src/js/core/input_distributor.js
+++ b/src/js/core/input_distributor.js
@@ -185,10 +185,10 @@ export class InputDistributor {
      * @param {KeyboardEvent | MouseEvent} event
      */
     handleKeydown(event) {
-        const keyCode = event instanceof MouseEvent ? event.button : event.keyCode;
+        const keyCode = event instanceof MouseEvent ? event.button + 1 : event.keyCode;
         if (
-            keyCode === 3 ||
-            keyCode === 4 || // MB3 / MB4
+            keyCode === 4 || // MB4
+            keyCode === 5 || // MB5
             keyCode === 9 || // TAB
             keyCode === 16 || // SHIFT
             keyCode === 17 || // CTRL
@@ -225,7 +225,7 @@ export class InputDistributor {
      * @param {KeyboardEvent | MouseEvent} event
      */
     handleKeyup(event) {
-        const keyCode = event instanceof MouseEvent ? event.button : event.keyCode;
+        const keyCode = event instanceof MouseEvent ? event.button + 1 : event.keyCode;
         this.keysDown.delete(keyCode);
 
         this.forwardToReceiver("keyup", {
diff --git a/src/js/game/key_action_mapper.js b/src/js/game/key_action_mapper.js
index bd49d29e..69511362 100644
--- a/src/js/game/key_action_mapper.js
+++ b/src/js/game/key_action_mapper.js
@@ -86,15 +86,15 @@ for (const categoryId in KEYMAPPINGS) {
  */
 export function getStringForKeyCode(code) {
     switch (code) {
-        case 0:
-            return "LMB";
         case 1:
-            return "MMB";
+            return "LMB";
         case 2:
-            return "RMB";
+            return "MMB";
         case 3:
-            return "MB4";
+            return "RMB";
         case 4:
+            return "MB4";
+        case 5:
             return "MB5";
         case 8:
             return "⌫";
diff --git a/src/js/states/keybindings.js b/src/js/states/keybindings.js
index f4aad427..28bb05d5 100644
--- a/src/js/states/keybindings.js
+++ b/src/js/states/keybindings.js
@@ -127,7 +127,7 @@ export class KeybindingsState extends TextualGameState {
                 return;
             }
             event.preventDefault();
-            const keyCode = event.button;
+            const keyCode = event.button + 1;
 
             this.app.settings.updateKeybindingOverride(id, keyCode);