flik/termora
1
0
Fork 0
mirror of https://github.com/TermoraDev/termora.git synced 2026-01-16 02:12:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: compatible with multiple keyboard layouts

Browse Source
This commit is contained in:
hstyi
2025-07-19 23:28:15 +08:00
committed by hstyi
parent 8ec7e416ea
commit fdc1b0c07d
4 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/kotlin/app/termora/TermoraFrame.kt
View File

@@ -251,6 +251,7 @@ class TermoraFrame : JFrame(), DataProvider {
}
@Suppress("CascadeIf")
private fun registerKeyStroke(
actionMap: ActionMap,
inputMap: InputMap,
@@ -259,7 +260,18 @@ class TermoraFrame : JFrame(), DataProvider {
) {
val keyShortcutActionId = "KeyShortcutAction_${randomUUID()}"
actionMap.put(keyShortcutActionId, redirectAction(actionIds))
// https://github.com/TermoraDev/termora/issues/902
val plusKeys = mutableSetOf(KeyEvent.VK_PLUS, KeyEvent.VK_EQUALS, KeyEvent.VK_ADD)
if (plusKeys.contains(keyStroke.keyCode)) {
plusKeys.remove(keyStroke.keyCode)
for (keyCode in plusKeys) {
inputMap.put(KeyStroke.getKeyStroke(keyCode, keyStroke.modifiers), keyShortcutActionId)
}
}
inputMap.put(keyStroke, keyShortcutActionId)
}
private fun redirectAction(actionIds: List<String>): Action {

3
src/main/kotlin/app/termora/keymap/KeyShortcut.kt
View File

@@ -8,6 +8,7 @@ import javax.swing.KeyStroke
class KeyShortcut(val keyStroke: KeyStroke) : Shortcut() {
companion object {
@Suppress("CascadeIf")
fun toHumanText(keyStroke: KeyStroke): String {
var text = keyStroke.toString()
@@ -22,6 +23,8 @@ class KeyShortcut(val keyStroke: KeyStroke) : Shortcut() {
text = text.replace("EQUALS", "+")
} else if (keyStroke.keyCode == KeyEvent.VK_MINUS) {
text = text.replace("MINUS", "-")
} else if (keyStroke.keyCode == KeyEvent.VK_PLUS) {
text = text.replace("PLUS", "+")
}
text = text.toCharArray().joinToString(" + ")

18
src/main/kotlin/app/termora/keymap/Keymap.kt
View File

@@ -3,6 +3,7 @@ package app.termora.keymap
import app.termora.Application.ohMyJson
import app.termora.randomUUID
import kotlinx.serialization.json.*
import java.awt.event.KeyEvent
import javax.swing.KeyStroke
open class Keymap(
@@ -103,9 +104,26 @@ open class Keymap(
open fun getActionIds(shortcut: Shortcut): List<String> {
val actionIds = mutableListOf<String>()
shortcuts[shortcut]?.let { actionIds.addAll(it) }
// https://github.com/TermoraDev/termora/issues/902
if (actionIds.isEmpty()) {
if (shortcut is KeyShortcut) {
val plusKeys = mutableSetOf(KeyEvent.VK_PLUS, KeyEvent.VK_EQUALS, KeyEvent.VK_ADD)
if (plusKeys.contains(shortcut.keyStroke.keyCode)) {
plusKeys.remove(shortcut.keyStroke.keyCode)
for (keyCode in plusKeys) {
val c = KeyShortcut(KeyStroke.getKeyStroke(keyCode, shortcut.keyStroke.modifiers))
shortcuts[c]?.let { actionIds.addAll(it) }
}
}
}
}
if (actionIds.isEmpty()) {
parent?.getActionIds(shortcut)?.let { actionIds.addAll(it) }
}
return actionIds
}

2
src/main/kotlin/app/termora/keymap/KeymapPanel.kt
View File

@@ -50,6 +50,8 @@ class KeymapPanel : JPanel(BorderLayout()) {
allowKeyCodes.add(KeyEvent.VK_EQUALS)
allowKeyCodes.add(KeyEvent.VK_MINUS)
// https://github.com/TermoraDev/termora/issues/902
allowKeyCodes.add(KeyEvent.VK_PLUS)
copyBtn.toolTipText = I18n.getString("termora.welcome.contextmenu.copy")