From d927ac90e71080127f43d88ca22a9b6498b871a2 Mon Sep 17 00:00:00 2001
From: lyswhut <lyswhut@qq.com>
Date: Fri, 8 Apr 2022 14:04:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8C=89=E9=94=AE=E7=9B=91?=
 =?UTF-8?q?=E5=90=AC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer-lyric/components/core/ControlBar.vue | 5 +----
 src/renderer/event/index.js                       | 5 +++--
 src/renderer/utils/keyBind.js                     | 5 ++++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/renderer-lyric/components/core/ControlBar.vue b/src/renderer-lyric/components/core/ControlBar.vue
index 4811d768..8c29d555 100644
--- a/src/renderer-lyric/components/core/ControlBar.vue
+++ b/src/renderer-lyric/components/core/ControlBar.vue
@@ -51,7 +51,7 @@ div(:class="$style.container")
 </template>
 
 <script>
-import { rendererSend, rendererOn, NAMES } from '../../../common/ipc'
+import { rendererSend, NAMES } from '../../../common/ipc'
 import { toRaw } from 'vue'
 
 export default {
@@ -108,9 +108,6 @@ export default {
   },
   mounted() {
     this.config = JSON.parse(JSON.stringify(this.lrcConfig))
-    rendererOn(NAMES.winLyric.key_down, (event, key) => {
-
-    })
   },
   methods: {
     sendEvent() {
diff --git a/src/renderer/event/index.js b/src/renderer/event/index.js
index e7947b15..108105b5 100644
--- a/src/renderer/event/index.js
+++ b/src/renderer/event/index.js
@@ -20,7 +20,7 @@ rendererInvoke(NAMES.mainWindow.get_hot_key).then(({ local, global }) => {
 })
 
 eventHub.on(baseName.bindKey, () => {
-  keyBind.bindKey((key, type, event, keys) => {
+  keyBind.bindKey((key, eventKey, type, event, keys) => {
     // console.log(`key_${key}_${type}`)
     eventHub.emit(baseName.key_down, { event, keys, key, type })
     // console.log(event, key)
@@ -38,7 +38,8 @@ eventHub.on(baseName.bindKey, () => {
       eventHub.emit(appHotKeyConfig.local.keys[key].action)
       return
     }
-    eventHub.emit(`key_${key}_${type}`, { event, keys, key, type })
+    eventHub.emit(`key_${key}_${type}`, { event, keys, key, eventKey, type })
+    if (key != eventKey) eventHub.emit(`key_${eventKey}_${type}`, { event, keys, key, eventKey, type })
   })
   registerCommonEvents()
 })
diff --git a/src/renderer/utils/keyBind.js b/src/renderer/utils/keyBind.js
index b5294d7e..fdea03d8 100644
--- a/src/renderer/utils/keyBind.js
+++ b/src/renderer/utils/keyBind.js
@@ -3,12 +3,15 @@ import { isMac } from '../../common/utils'
 const downKeys = new Set()
 
 const handleEvent = (type, event, keys) => {
+  let eventKey = event.key
   if (isMac) {
     let index = keys.indexOf('meta')
     if (index > -1) keys.splice(index, 1, 'mod')
+    if (eventKey == 'Meta') eventKey = 'mod'
   } else {
     let index = keys.indexOf('ctrl')
     if (index > -1) keys.splice(index, 1, 'mod')
+    if (eventKey == 'Control') eventKey = 'mod'
   }
   let key = keys.join('+')
 
@@ -20,7 +23,7 @@ const handleEvent = (type, event, keys) => {
       downKeys.delete(key)
       break
   }
-  handleSendEvent(key, type, event, keys)
+  handleSendEvent(key, eventKey, type, event, keys)
 }
 
 // 修饰键处理