summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDevaev Maxim <[email protected]>2018-07-27 12:48:49 +0300
committerDevaev Maxim <[email protected]>2018-07-27 12:48:49 +0300
commitdcedf161425a233bde1fe85bb2f4836ba57d1f0a (patch)
tree8e5067f318a00cbfe5499f2a0f8ce49592ce9f53
parentd2da0829b98e9aca474867f5ce9d5929f8b234af (diff)
added pause and scrlk keys
-rw-r--r--hid/keymap.in5
-rw-r--r--hid/src/keymap.h2
-rw-r--r--kvmd/kvmd/data/keymap.yaml2
-rw-r--r--kvmd/web/css/keyboard.css2
-rw-r--r--kvmd/web/index.html8
5 files changed, 12 insertions, 7 deletions
diff --git a/hid/keymap.in b/hid/keymap.in
index 8c574b63..da9ddf25 100644
--- a/hid/keymap.in
+++ b/hid/keymap.in
@@ -1,4 +1,5 @@
# https://github.com/NicoHood/HID/blob/master/src/HID-APIs/ImprovedKeylayouts.h
+# https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/code
1 KEY_A KeyA
2 KEY_B KeyB
3 KEY_C KeyC
@@ -83,9 +84,9 @@
82 KEY_RIGHT_SHIFT ShiftRight
83 KEY_RIGHT_ALT AltRight
84 KEY_RIGHT_GUI MetaRight
-# KEY_PAUSE
+85 KEY_PAUSE Pause
+86 KEY_SCROLL_LOCK ScrollLock
# KEY_NON_US_NUM
-# KEY_SCROLL_LOCK
# KEY_NUM_LOCK
# KEYPAD_DIVIDE
# KEYPAD_MULTIPLY
diff --git a/hid/src/keymap.h b/hid/src/keymap.h
index 7e5f24b7..8066be91 100644
--- a/hid/src/keymap.h
+++ b/hid/src/keymap.h
@@ -64,6 +64,7 @@ INLINE KeyboardKeycode keymap(uint8_t code) {
case 16: return KEY_P;
case 72: return KEY_PAGE_DOWN;
case 69: return KEY_PAGE_UP;
+ case 85: return KEY_PAUSE;
case 51: return KEY_PERIOD;
case 66: return KEY_PRINT;
case 17: return KEY_Q;
@@ -76,6 +77,7 @@ INLINE KeyboardKeycode keymap(uint8_t code) {
case 84: return KEY_RIGHT_GUI;
case 82: return KEY_RIGHT_SHIFT;
case 19: return KEY_S;
+ case 86: return KEY_SCROLL_LOCK;
case 47: return KEY_SEMICOLON;
case 52: return KEY_SLASH;
case 41: return KEY_SPACE;
diff --git a/kvmd/kvmd/data/keymap.yaml b/kvmd/kvmd/data/keymap.yaml
index 1904c639..be7fee25 100644
--- a/kvmd/kvmd/data/keymap.yaml
+++ b/kvmd/kvmd/data/keymap.yaml
@@ -73,9 +73,11 @@ MetaRight: 84
Minus: 42
PageDown: 72
PageUp: 69
+Pause: 85
Period: 51
PrintScreen: 66
Quote: 48
+ScrollLock: 86
Semicolon: 47
ShiftLeft: 78
ShiftRight: 82
diff --git a/kvmd/web/css/keyboard.css b/kvmd/web/css/keyboard.css
index abbe2037..0a50ce66 100644
--- a/kvmd/web/css/keyboard.css
+++ b/kvmd/web/css/keyboard.css
@@ -28,7 +28,6 @@ div#keyboard div.key, div.modifier, div.empty-key {
margin-right: 5px;
padding: 0;
width: 40px;
- height: 40px;
}
div#keyboard div.key, div.modifier {
font-size: 0.9em;
@@ -42,6 +41,7 @@ div#keyboard div.key, div.modifier {
color: var(--fg-color-normal);
background-color: var(--bg-color-gray);
cursor: pointer;
+ height: 40px;
}
div#keyboard div.key:hover, div.modifier:hover {
color: var(--fg-color-intensive);
diff --git a/kvmd/web/index.html b/kvmd/web/index.html
index bf8a7d7c..8766aae5 100644
--- a/kvmd/web/index.html
+++ b/kvmd/web/index.html
@@ -298,8 +298,9 @@
</div>
<div class="keyboard-block">
<div class="keyboard-row">
- <div class="empty-key" style="width:28px"></div>
- <div id="PrintScreen" class="modifier wide-4 right small"><p><b>&bull;</b><br>PrtSc / SysRq</p></div>
+ <div id="PrintScreen" class="modifier small"><p><b>&bull;</b><br>Pt/Sq</p></div>
+ <div id="ScrollLock" class="key small"><p>ScrLk</p></div>
+ <div id="Pause" class="key small"><p>P/Brk</p></div>
</div>
<div class="keyboard-row">
<div id="Insert" class="key small"><p>Ins</p></div>
@@ -311,8 +312,7 @@
<div id="End" class="key small"><p>End</p></div>
<div id="PageDown" class="key small"><p>PgDn</p></div>
</div>
- <div class="keyboard-row">
- </div>
+ <div class="keyboard-row"></div>
<div class="keyboard-row">
<div class="empty-key"></div>
<div id="ArrowUp" class="key"><p>&uarr;</p></div>