From ce5aa6d40e2618c042f3799e1ab7e57e878797b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= <sedivy.miro@gmail.com>
Date: Wed, 31 Mar 2021 20:25:53 +0200
Subject: [PATCH] keysyms remap in custom module.

---
 src/component/overlay.vue                 | 29 +++--------------------
 src/component/utils/keyboard-remapping.ts | 23 ++++++++++++++++++
 2 files changed, 26 insertions(+), 26 deletions(-)
 create mode 100644 src/component/utils/keyboard-remapping.ts

diff --git a/src/component/overlay.vue b/src/component/overlay.vue
index c124bcb1..f8a65b0b 100644
--- a/src/component/overlay.vue
+++ b/src/component/overlay.vue
@@ -34,6 +34,7 @@
   import { Vue, Component, Ref, Prop, Watch } from 'vue-property-decorator'
 
   import GuacamoleKeyboard from './utils/guacamole-keyboard'
+  import { keySymsRemap } from './utils/keyboard-remapping'
   import { getFilesFromDataTansfer } from './utils/file-upload'
   import { NekoWebRTC } from './internal/webrtc'
   import { Scroll } from './types/state'
@@ -47,13 +48,6 @@
     'zPADwoFouPut3uzO12UyQSoclkotrt9ocAHKZnr8UhAP4bvg/gIs+UMfaaMTZTFOUkHo8/B/AEwAWjl5pV+j1dZ//g4xUMBo8YY/cqlcqhNvffAJxq40dmA5' +
     'bFPoAjrev5EfwZQNfoKbju/u1ri/PvfgKYGMl+K2I7b8U7wA5wpgC/AgAA///Yyif1MZXzRQAAAABJRU5ErkJggg==) 4 4, crosshair'
 
-  const KeyTable = {
-    XK_Meta_L: 0xffe7, // Left meta
-    XK_Meta_R: 0xffe8, // Right meta
-    XK_Control_L: 0xffe3, // Left control
-    XK_Control_R: 0xffe4, // Right control
-  }
-
   @Component({
     name: 'neko-overlay',
   })
@@ -98,23 +92,6 @@
       return 'url(' + uri + ') ' + x + ' ' + y + ', auto'
     }
 
-    keyRemap(key: number) {
-      const isMac = navigator && navigator.platform.match(/^mac/i)
-      const isiOS = navigator && navigator.platform.match(/ipad|iphone|ipod/i)
-
-      // switch command with ctrl on mac and ios
-      if (isMac || isiOS) {
-        switch (key) {
-          case KeyTable.XK_Meta_L:
-            return KeyTable.XK_Control_L
-          case KeyTable.XK_Meta_R:
-            return KeyTable.XK_Control_R
-        }
-      }
-
-      return key
-    }
-
     mounted() {
       this._ctx = this._overlay.getContext('2d')
 
@@ -134,7 +111,7 @@
         }
 
         this.webrtc.send('keydown', {
-          key: this.keyRemap(key),
+          key: keySymsRemap(key),
         })
         return false
       }
@@ -148,7 +125,7 @@
         }
 
         this.webrtc.send('keyup', {
-          key: this.keyRemap(key),
+          key: keySymsRemap(key),
         })
       }
       this.keyboard.listenTo(this._overlay)
diff --git a/src/component/utils/keyboard-remapping.ts b/src/component/utils/keyboard-remapping.ts
new file mode 100644
index 00000000..d9d9cdbf
--- /dev/null
+++ b/src/component/utils/keyboard-remapping.ts
@@ -0,0 +1,23 @@
+const KeyTable = {
+  XK_Meta_L: 0xffe7, // Left meta
+  XK_Meta_R: 0xffe8, // Right meta
+  XK_Control_L: 0xffe3, // Left control
+  XK_Control_R: 0xffe4, // Right control
+}
+
+export const keySymsRemap = function (key: number) {
+  const isMac = navigator && navigator.platform.match(/^mac/i)
+  const isiOS = navigator && navigator.platform.match(/ipad|iphone|ipod/i)
+
+  // switch command with ctrl on mac and ios
+  if (isMac || isiOS) {
+    switch (key) {
+      case KeyTable.XK_Meta_L:
+        return KeyTable.XK_Control_L
+      case KeyTable.XK_Meta_R:
+        return KeyTable.XK_Control_R
+    }
+  }
+
+  return key
+}