From 81103fe8aaa2ab035fe4672a3587a8bae4c52ff8 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 25 Jan 2025 17:39:21 +1100
Subject: [PATCH] Update Mousekeys (#1391)

---
 src/longFormKeycodes.js                       | 54 +++++++++++++------
 src/store/modules/keycodes/app-media-mouse.js | 37 +++++++------
 2 files changed, 58 insertions(+), 33 deletions(-)

diff --git a/src/longFormKeycodes.js b/src/longFormKeycodes.js
index 73fa0292f4..aa103a0c83 100644
--- a/src/longFormKeycodes.js
+++ b/src/longFormKeycodes.js
@@ -129,22 +129,44 @@ export const longFormKeycodes = {
   MAGIC_EE_HANDS_RIGHT: 'EH_RGHT',
 
   // Mouse Keys
-  KC_MS_UP: 'KC_MS_U',
-  KC_MS_DOWN: 'KC_MS_D',
-  KC_MS_LEFT: 'KC_MS_L',
-  KC_MS_RIGHT: 'KC_MS_R',
-  KC_MS_BTN1: 'KC_BTN1',
-  KC_MS_BTN2: 'KC_BTN2',
-  KC_MS_BTN3: 'KC_BTN3',
-  KC_MS_BTN4: 'KC_BTN4',
-  KC_MS_BTN5: 'KC_BTN5',
-  KC_MS_WH_UP: 'KC_WH_U',
-  KC_MS_WH_DOWN: 'KC_WH_D',
-  KC_MS_WH_LEFT: 'KC_WH_L',
-  KC_MS_WH_RIGHT: 'KC_WH_R',
-  KC_MS_ACCEL0: 'KC_ACL0',
-  KC_MS_ACCEL1: 'KC_ACL1',
-  KC_MS_ACCEL2: 'KC_ACL2',
+  KC_MS_UP: 'MS_UP',
+  KC_MS_DOWN: 'MS_DOWN',
+  KC_MS_LEFT: 'MS_LEFT',
+  KC_MS_RIGHT: 'MS_RGHT',
+  KC_MS_BTN1: 'MS_BTN1',
+  KC_MS_BTN2: 'MS_BTN2',
+  KC_MS_BTN3: 'MS_BTN3',
+  KC_MS_BTN4: 'MS_BTN4',
+  KC_MS_BTN5: 'MS_BTN5',
+  KC_MS_BTN6: 'MS_BTN6',
+  KC_MS_BTN7: 'MS_BTN7',
+  KC_MS_BTN8: 'MS_BTN8',
+  KC_MS_WH_UP: 'MS_WHLU',
+  KC_MS_WH_DOWN: 'MS_WHLD',
+  KC_MS_WH_LEFT: 'MS_WHLL',
+  KC_MS_WH_RIGHT: 'MS_WHLR',
+  KC_MS_ACCEL0: 'MS_ACL0',
+  KC_MS_ACCEL1: 'MS_ACL1',
+  KC_MS_ACCEL2: 'MS_ACL2',
+  KC_MS_U: 'MS_UP',
+  KC_MS_D: 'MS_DOWN',
+  KC_MS_L: 'MS_LEFT',
+  KC_MS_R: 'MS_RGHT',
+  KC_BTN1: 'MS_BTN1',
+  KC_BTN2: 'MS_BTN2',
+  KC_BTN3: 'MS_BTN3',
+  KC_BTN4: 'MS_BTN4',
+  KC_BTN5: 'MS_BTN5',
+  KC_BTN6: 'MS_BTN6',
+  KC_BTN7: 'MS_BTN7',
+  KC_BTN8: 'MS_BTN8',
+  KC_WH_U: 'MS_WHLU',
+  KC_WH_D: 'MS_WHLD',
+  KC_WH_L: 'MS_WHLL',
+  KC_WH_R: 'MS_WHLR',
+  KC_ACL0: 'MS_ACL0',
+  KC_ACL1: 'MS_ACL1',
+  KC_ACL2: 'MS_ACL2',
 
   // Modifiers
   // Change short-form mod wrappers to long-form
diff --git a/src/store/modules/keycodes/app-media-mouse.js b/src/store/modules/keycodes/app-media-mouse.js
index 7af6eaa299..85c7336cbe 100644
--- a/src/store/modules/keycodes/app-media-mouse.js
+++ b/src/store/modules/keycodes/app-media-mouse.js
@@ -125,35 +125,38 @@ export default [
 
   { label: 'Mouse Keys', width: 'label' },
 
-  { name: 'Mouse ⏶', code: 'KC_MS_U', title: 'Mouse Cursor Up' },
-  { name: 'Mouse ⏷', code: 'KC_MS_D', title: 'Mouse Cursor Down' },
-  { name: 'Mouse ⏴', code: 'KC_MS_L', title: 'Mouse Cursor Left' },
-  { name: 'Mouse ⏵', code: 'KC_MS_R', title: 'Mouse Cursor Right' },
+  { name: 'Mouse ⏶', code: 'MS_UP', title: 'Mouse Cursor Up' },
+  { name: 'Mouse ⏷', code: 'MS_DOWN', title: 'Mouse Cursor Down' },
+  { name: 'Mouse ⏴', code: 'MS_LEFT', title: 'Mouse Cursor Left' },
+  { name: 'Mouse ⏵', code: 'MS_RGHT', title: 'Mouse Cursor Right' },
   { width: 250 },
-  { name: 'Mouse 1', code: 'KC_BTN1', title: 'Mouse Button 1' },
-  { name: 'Mouse 2', code: 'KC_BTN2', title: 'Mouse Button 2' },
-  { name: 'Mouse 3', code: 'KC_BTN3', title: 'Mouse Button 3' },
-  { name: 'Mouse 4', code: 'KC_BTN4', title: 'Mouse Button 4' },
-  { name: 'Mouse 5', code: 'KC_BTN5', title: 'Mouse Button 5' },
-  { width: 250 },
-  { name: 'Mouse Wheel ⏶', code: 'KC_WH_U', title: 'Mouse Wheel Up' },
-  { name: 'Mouse Wheel ⏷', code: 'KC_WH_D', title: 'Mouse Wheel Down' },
-  { name: 'Mouse Wheel ⏴', code: 'KC_WH_L', title: 'Mouse Wheel Left' },
-  { name: 'Mouse Wheel ⏵', code: 'KC_WH_R', title: 'Mouse Wheel Right' },
+  { name: 'Mouse 1', code: 'MS_BTN1', title: 'Mouse Button 1' },
+  { name: 'Mouse 2', code: 'MS_BTN2', title: 'Mouse Button 2' },
+  { name: 'Mouse 3', code: 'MS_BTN3', title: 'Mouse Button 3' },
+  { name: 'Mouse 4', code: 'MS_BTN4', title: 'Mouse Button 4' },
+  { name: 'Mouse 5', code: 'MS_BTN5', title: 'Mouse Button 5' },
+  { name: 'Mouse 6', code: 'MS_BTN6', title: 'Mouse Button 6' },
+  { name: 'Mouse 7', code: 'MS_BTN7', title: 'Mouse Button 7' },
+  { name: 'Mouse 8', code: 'MS_BTN8', title: 'Mouse Button 8' },
+  { width: 0 },
+  { name: 'Mouse Whl ⏶', code: 'MS_WHLU', title: 'Mouse Wheel Up' },
+  { name: 'Mouse Whl ⏷', code: 'MS_WHLD', title: 'Mouse Wheel Down' },
+  { name: 'Mouse Whl ⏴', code: 'MS_WHLL', title: 'Mouse Wheel Left' },
+  { name: 'Mouse Whl ⏵', code: 'MS_WHLR', title: 'Mouse Wheel Right' },
   { width: 250 },
   {
     name: 'Mouse Accel 0',
-    code: 'KC_ACL0',
+    code: 'MS_ACL0',
     title: 'Set mouse acceleration to 0'
   },
   {
     name: 'Mouse Accel 1',
-    code: 'KC_ACL1',
+    code: 'MS_ACL1',
     title: 'Set mouse acceleration to 1'
   },
   {
     name: 'Mouse Accel 2',
-    code: 'KC_ACL2',
+    code: 'MS_ACL2',
     title: 'Set mouse acceleration to 2'
   },