From 4a799b09e71d4acc1b63f791b55aeb73b88cc310 Mon Sep 17 00:00:00 2001 From: mwiegand Date: Sat, 19 Nov 2022 20:59:48 +0100 Subject: [PATCH] wip --- experiments/keyboard/keyboard.erb | 8 +- experiments/keyboard/keyboard.html | 216 +++++++++++++++-------------- experiments/keyboard/keyboard.rb | 5 +- 3 files changed, 121 insertions(+), 108 deletions(-) diff --git a/experiments/keyboard/keyboard.erb b/experiments/keyboard/keyboard.erb index ebae4e1..bc1478a 100644 --- a/experiments/keyboard/keyboard.erb +++ b/experiments/keyboard/keyboard.erb @@ -24,6 +24,12 @@ dominant-baseline: middle; text-anchor: middle; } + .keycap_text.known { + fill: #000; + } + .keycap_text.unknown { + fill: #888; + } @@ -36,7 +42,7 @@ <% keys.each do |key| %> - <%= key[:symbol] %> + <%= key[:label] %> <% end %> diff --git a/experiments/keyboard/keyboard.html b/experiments/keyboard/keyboard.html index 17b2075..23813b2 100644 --- a/experiments/keyboard/keyboard.html +++ b/experiments/keyboard/keyboard.html @@ -24,6 +24,12 @@ dominant-baseline: middle; text-anchor: middle; } + .keycap_text.known { + fill: #000; + } + .keycap_text.unknown { + fill: #888; + } @@ -54,527 +60,527 @@ - ESC + ESC - F1 + F1 - F2 + F2 - F3 + F3 - F4 + F4 - F5 + F5 - F6 + F6 - F7 + F7 - F8 + F8 - F9 + F9 - F10 + F10 - F11 + F11 - F12 + F12 - PNT + PNT - ROL + ROL - ⏸ + ⏸ - ^ + ^ - 1 + 1 - 2 + 2 - 3 + 3 - 4 + 4 - 5 + 5 - 6 + 6 - 7 + 7 - 8 + 8 - 9 + 9 - 0 + 0 - ß + ß - ´ + ´ - ⇦ + ⇦ - INS + INS - ⌂ + ⌂ - PUP + PUP - NUM + NUM - / + / - * + * - - + - - ↹ + ↹ - Q + Q - W + W - E + E - R + R - T + T - Z + Z - U + U - I + I - O + O - P + P - Ü + Ü - + + + - ↵ + ↵ - ⇨ + ⇨ - ⇥ + ⇥ - PDN + PDN - 7 + 7 - 8 + 8 - 9 + 9 - + + + - ⇪ + ⇪ - A + A - S + S - D + D - F + F - G + G - H + H - J + J - K + K - L + L - Ö + Ö - Ä + Ä - # + # - 4 + 4 - 5 + 5 - 6 + 6 - SHIFT + SHIFT - < + < - Y + Y - X + X - C + C - V + V - B + B - N + N - M + M - , + , - . + . - - + - - SHIFT + SHIFT - ↑ + ↑ - 1 + 1 - 2 + 2 - 3 + 3 - ↵ + ↵ - CTL + CTL - SUP + SUP - ALT + ALT - SPACE + SPACE - AGR + AGR - SUP + SUP - ≡ + ≡ - CTL + CTL - ← + ← - ↓ + ↓ - → + → - 0 + 0 - ⇨ + ⇨ diff --git a/experiments/keyboard/keyboard.rb b/experiments/keyboard/keyboard.rb index 52ed90d..ef6a60e 100755 --- a/experiments/keyboard/keyboard.rb +++ b/experiments/keyboard/keyboard.rb @@ -364,7 +364,7 @@ keyboard = { 2.25 => 'TAB:h1.5 Q W E R T Z U I O P Ü + ENT:enter_iso :.25 DEL END PDN :.25 7 8 9 +:v2', 3.25 => 'CAPS:h1.75 A S D F G H J K L Ö Ä # :1.25 :.25 :1 :1 :1 :.25 4 5 6', 4.25 => 'SHIFT:h1.25 < Y X C V B N M , . - SHIFT:h2.75 :.25 :1 ARU :1 :.25 1 2 3 ENT:v2', - 5.25 => 'CTL:h1.25 SUP:h1.25 ALT:h1.25 SPACE:h6.5 AGR:h1.25 SUP:h1.25 MENU CTL:h1.25 :.25 ARL ARD ARR :.25 0:h2 DEL' + 5.25 => 'CTL:h1.25 SUP:h1.25 ALT:h1.25 SPC:h6.5 AGR:h1.25 SUP:h1.25 MENU CTL:h1.25 :.25 ARL ARD ARR :.25 0:h2 DEL' } keyboard_keys = [] @@ -381,7 +381,8 @@ keyboard.each do |row_v, row_text| key = keys.find{|k| k[:short] == short} keycap ||= :h1 keyboard_keys.append({ - symbol: key ? key[:keycap] : short, + is_known: !!key, + label: key ? key[:keycap] : short, keycap: keycap, x: row_h + keycaps[keycap.to_sym][:width]/2.0, y: 0.5 + row_v,