GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-14 02:00:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed #10

Browse Source
This commit is contained in:
Devaev Maxim 2020-09-23 21:23:10 +03:00
parent 3f74311485
commit f605e91bf2
5 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
genmap.py
View File

@ -84,11 +84,12 @@ def _resolve_keysym(name: str) -> int:
def _parse_x11_names(names: str) -> Set[_X11Key]: def _parse_x11_names(names: str) -> Set[_X11Key]:
keys: Set[_X11Key] = set() keys: Set[_X11Key] = set()
for name in names.split(","): if names:
shift = name.startswith("^") for name in names.split(","):
name = (name[1:] if shift else name) shift = name.startswith("^")
code = _resolve_keysym(name) name = (name[1:] if shift else name)
keys.add(_X11Key(name, code, shift)) code = _resolve_keysym(name)
keys.add(_X11Key(name, code, shift))
return keys return keys
@ -118,7 +119,7 @@ def _read_keymap_csv(path: str) -> List[_KeyMapping]:
otg_key=_parse_otg_key(row["otg_key"]), otg_key=_parse_otg_key(row["otg_key"]),
ps2_key=_parse_ps2_key(row["ps2_key"]), ps2_key=_parse_ps2_key(row["ps2_key"]),
at1_code=int(row["at1_code"], 16), at1_code=int(row["at1_code"], 16),
x11_keys=_parse_x11_names(row["x11_names"]), x11_keys=_parse_x11_names(row["x11_names"] or ""),
)) ))
return keymap return keymap

2
keymap.csv
View File

@ -104,4 +104,4 @@ Numpad9,102,KEYPAD_9,0x61,reg:0x7d,0x49,XK_KP_9
Numpad0,103,KEYPAD_0,0x62,reg:0x70,0x52,XK_KP_0 Numpad0,103,KEYPAD_0,0x62,reg:0x70,0x52,XK_KP_0
NumpadDecimal,104,KEYPAD_DOT,0x63,reg:0x71,0x53,XK_KP_Decimal NumpadDecimal,104,KEYPAD_DOT,0x63,reg:0x71,0x53,XK_KP_Decimal
Power,105,KEY_POWER,0x66,spec:0x5e,0xe05e,XK_XF86_Sleep Power,105,KEY_POWER,0x66,spec:0x5e,0xe05e,XK_XF86_Sleep
IntlBackslash,106,KEY_NON_US,0x64,reg:0x61,0x56,"^XK_greater,XK_less" IntlBackslash,106,KEY_NON_US,0x64,reg:0x61,0x56

Can't render this file because it has a wrong number of fields in line 107.

2
kvmd/keyboard/mappings.py
View File

@ -294,8 +294,6 @@ X11_TO_AT1 = {
65456: At1Key(code=82, shift=False), # XK_KP_0 65456: At1Key(code=82, shift=False), # XK_KP_0
65454: At1Key(code=83, shift=False), # XK_KP_Decimal 65454: At1Key(code=83, shift=False), # XK_KP_Decimal
65301: At1Key(code=84, shift=False), # XK_Sys_Req 65301: At1Key(code=84, shift=False), # XK_Sys_Req
60: At1Key(code=86, shift=False), # XK_less
62: At1Key(code=86, shift=True), # XK_greater
65480: At1Key(code=87, shift=False), # XK_F11 65480: At1Key(code=87, shift=False), # XK_F11
65481: At1Key(code=88, shift=False), # XK_F12 65481: At1Key(code=88, shift=False), # XK_F12
65421: At1Key(code=57372, shift=False), # XK_KP_Enter 65421: At1Key(code=57372, shift=False), # XK_KP_Enter

13
web/kvm/index.html
View File

@ -681,14 +681,10 @@
</div> </div>
</div> </div>
<div class="keypad-row"> <div class="keypad-row">
<div class="modifier wide-3 left small" data-code="ShiftLeft"> <div class="modifier wide-4 left small" data-code="ShiftLeft">
<div class="label"><b>&bull;</b><br>Shift <div class="label"><b>&bull;</b><br>Shift
</div> </div>
</div> </div>
<div class="key small" data-code="IntlBackslash">
<div class="label">
</div>
</div>
<div class="key single" data-code="KeyZ"> <div class="key single" data-code="KeyZ">
<div class="label">Z <div class="label">Z
</div> </div>
@ -729,7 +725,7 @@
<div class="label">?<br>/ <div class="label">?<br>/
</div> </div>
</div> </div>
<div class="modifier wide-3 right small" data-code="ShiftRight"> <div class="modifier wide-4 right small" data-code="ShiftRight">
<div class="label"><b>&bull;</b><br>Shift <div class="label"><b>&bull;</b><br>Shift
</div> </div>
</div> </div>
@ -837,7 +833,10 @@
<div class="keypad-row"> <div class="keypad-row">
<div class="empty-key"></div> <div class="empty-key"></div>
<div class="empty-key"></div> <div class="empty-key"></div>
<div class="empty-key"></div> <div class="key small" data-code="IntlBackslash">
<div class="label">N/US
</div>
</div>
<div class="key small" data-code="Power"> <div class="key small" data-code="Power">
<div class="label">PWR <div class="label">PWR
</div> </div>

7
web/kvm/window-keyboard.pug
View File

@ -51,14 +51,13 @@ mixin lamp(cls)
+key("Quote") "#[br]' +key("Quote") "#[br]'
+key("Enter", "wide-3 right small") Enter#[br]&crarr; +key("Enter", "wide-3 right small") Enter#[br]&crarr;
div(class="keypad-row") div(class="keypad-row")
+modifier("ShiftLeft", "wide-3 left small") Shift +modifier("ShiftLeft", "wide-4 left small") Shift
+key("IntlBackslash", "small")
each key in ["Z", "X", "C", "V", "B", "N", "M"] each key in ["Z", "X", "C", "V", "B", "N", "M"]
+key(`Key${key}`, "single") #{key} +key(`Key${key}`, "single") #{key}
+key("Comma") &lt;#[br], +key("Comma") &lt;#[br],
+key("Period") &gt;#[br]. +key("Period") &gt;#[br].
+key("Slash") ?#[br]/ +key("Slash") ?#[br]/
+modifier("ShiftRight", "wide-3 right small") Shift +modifier("ShiftRight", "wide-4 right small") Shift
div(class="keypad-row") div(class="keypad-row")
+modifier("ControlLeft", "wide-1 left small") Ctrl +modifier("ControlLeft", "wide-1 left small") Ctrl
+modifier("MetaLeft", "wide-1 left small") Win +modifier("MetaLeft", "wide-1 left small") Win
@ -96,7 +95,7 @@ mixin lamp(cls)
div(class="keypad-row") div(class="keypad-row")
+empty_key() +empty_key()
+empty_key() +empty_key()
+empty_key() +key("IntlBackslash", "small") N/US
+key("Power", "small") PWR +key("Power", "small") PWR
hr hr
div(class="keypad-row") div(class="keypad-row")