2-row-height key support

tmk · Jan 16, 2025 · 910edab · 910edab
1 parent 6e9fdb8
commit 910edab
Show file tree

Hide file tree

Showing 17 changed files with 83 additions and 83 deletions.
diff --git a/editor/common/keymap_editor.css b/editor/common/keymap_editor.css
@@ -5,12 +5,11 @@ html * {
 textarea {
     font-family:monospace;
 }
-.key, .keync {
+.key {
     box-shadow:inset -3px -3px 3px 3px #a0a0a0;
     background-color:#ffffff;
     border-radius:6px;
     /* border:0px solid #dcdcdc; */
-    display:inline-block;
     color:#777777;
     font-family:helvetica, arial, sans-serif;
     font-size:12px;
@@ -22,6 +21,8 @@ textarea {
     overflow: hidden;
     margin: 0px 0px 0px 0px;
     white-space: normal;
+    position:relative;
+    z-index: 10;
 }
 .key:hover {
     box-shadow:inset -3px -3px 3px 3px #707070;
@@ -103,28 +104,33 @@ textarea {
 .btn975  { width:483px }  /* 507 - 24 */
 .btn1000 { width:496px }  /* 520 - 24 */
 
-.spc025 { width:13px;  visibility:hidden; padding:0; border:0; margin:0; }
-.spc050 { width:26px;  visibility:hidden; padding:0; border:0; margin:0; }
-.spc075 { width:39px;  visibility:hidden; padding:0; border:0; margin:0; }
-.spc100 { width:52px;  visibility:hidden; padding:0; border:0; margin:0; }
-.spc125 { width:65px;  visibility:hidden; padding:0; border:0; margin:0; }
-.spc150 { width:78px;  visibility:hidden; padding:0; border:0; margin:0; }
-.spc175 { width:91px;  visibility:hidden; padding:0; border:0; margin:0; }
-.spc200 { width:104px; visibility:hidden; padding:0; border:0; margin:0; }
-.spc225 { width:117px; visibility:hidden; padding:0; border:0; margin:0; }
-.spc250 { width:130px; visibility:hidden; padding:0; border:0; margin:0; }
-.spc275 { width:143px; visibility:hidden; padding:0; border:0; margin:0; }
-.spc300 { width:156px; visibility:hidden; padding:0; border:0; margin:0; }
+.spc025 { width:13px;  height: 0px; visibility:hidden; padding:0; border:0; margin:0; z-index: 1; }
+.spc050 { width:26px;  height: 0px; visibility:hidden; padding:0; border:0; margin:0; z-index: 1; }
+.spc075 { width:39px;  height: 0px; visibility:hidden; padding:0; border:0; margin:0; z-index: 1; }
+.spc100 { width:52px;  height: 0px; visibility:hidden; padding:0; border:0; margin:0; z-index: 1; }
+.spc125 { width:65px;  height: 0px; visibility:hidden; padding:0; border:0; margin:0; z-index: 1; }
+.spc150 { width:78px;  height: 0px; visibility:hidden; padding:0; border:0; margin:0; z-index: 1; }
+.spc175 { width:91px;  height: 0px; visibility:hidden; padding:0; border:0; margin:0; z-index: 1; }
+.spc200 { width:104px; height: 0px; visibility:hidden; padding:0; border:0; margin:0; z-index: 1; }
+.spc225 { width:117px; height: 0px; visibility:hidden; padding:0; border:0; margin:0; z-index: 1; }
+.spc250 { width:130px; height: 0px; visibility:hidden; padding:0; border:0; margin:0; z-index: 1; }
+.spc275 { width:143px; height: 0px; visibility:hidden; padding:0; border:0; margin:0; z-index: 1; }
+.spc300 { width:156px; height: 0px; visibility:hidden; padding:0; border:0; margin:0; z-index: 1; }
 
 .keyboard-row {
     width: auto;
     white-space: nowrap;
+    height: 52px;
+    display: inline-flex;
+    flex-direction: row;
 }
 
 .keyboard-outline {
     /* stop displaying whitespace between keys */
     font-size: 0;
     padding: 20px 0 0 0;
+    display: inline-flex;
+    flex-direction: column;
 }
 
 .keyboard-pane {
@@ -156,3 +162,8 @@ textarea {
 }
 
 .center { text-align: center; }
+
+.height200 {
+    z-index: 5;
+    height: 80px;
+}
diff --git a/editor/unimap/layout-83key_xt.html b/editor/unimap/layout-83key_xt.html
@@ -37,11 +37,11 @@
     <div id="key-13" class="key" tabindex="2">P</div>
     <div id="key-2f" class="key" tabindex="2">[</div>
     <div id="key-30" class="key btn125" tabindex="2">]</div>
-    <div id="keync"  class="keync" title="empty"></div>
+    <div id="key-28" class="key height200" tabindex="2">Enter</div>
     <div id="key-5f" class="key" tabindex="7">KP7</div>
     <div id="key-60" class="key" tabindex="7">KP8</div>
     <div id="key-61" class="key" tabindex="7">KP9</div>
-    <div id="key-56" class="key" tabindex="7">KP-</div>
+    <div id="key-56" class="key height200" tabindex="7">KP-</div>
     </div>
 
     <div class='keyboard-row'>
@@ -60,12 +60,12 @@
     <div id="key-0f" class="key" tabindex="3">L</div>
     <div id="key-33" class="key" tabindex="3">;</div>
     <div id="key-34" class="key" tabindex="3">'</div>
-    <div id="key-35" class="key" tabindex="1">`</div>
-    <div id="key-28" class="key" tabindex="3">Enter</div>
+    <div id="key-35" class="key" tabindex="3">`</div>
+    <div class="key spc100"></div>
     <div id="key-5c" class="key" tabindex="7">KP4</div>
     <div id="key-5d" class="key" tabindex="7">KP5</div>
     <div id="key-5e" class="key" tabindex="7">KP6</div>
-    <div id="keync"  class="keync" title="empty"></div>
+
     </div>
 
     <div class='keyboard-row'>
@@ -89,7 +89,7 @@
     <div id="key-59" class="key" tabindex="7">KP1</div>
     <div id="key-5a" class="key" tabindex="7">KP2</div>
     <div id="key-5b" class="key" tabindex="7">KP3</div>
-    <div id="key-57" class="key" tabindex="7">KP+</div>
+    <div id="key-57" class="key height200" tabindex="7">KP+</div>
     </div>
 
     <div class='keyboard-row'>
@@ -101,7 +101,6 @@
     <div id="key-39" class="key btn200" tabindex="5">Caps</div>
     <div id="key-62" class="key btn200" tabindex="7">KP0</div>
     <div id="key-63" class="key btn200" tabindex="7">KP.</div>
-    <div id="keync"  class="keync" title="empty"></div>
     </div>
 
 <!-- Keys not existed:

diff --git a/editor/unimap/layout-adb_usb.html b/editor/unimap/layout-adb_usb.html
@@ -137,7 +137,7 @@
     <div id="key-59" class="key" tabindex="7">KP1</div>
     <div id="key-5a" class="key" tabindex="7">KP2</div>
     <div id="key-5b" class="key" tabindex="7">KP3</div>
-    <div id="key-58" class="key" tabindex="7">KPEnt</div>
+    <div id="key-58" class="key height200" tabindex="7">KPEnt</div>
     </div>
 
     <div class='keyboard-row'>
@@ -165,5 +165,7 @@
     </div>
 
     <div class='keyboard-pane'>
+    <p>
     Note: On Standard keyboard right modifier keys are identical to left ones. On Extended keyboard left and right modifier keys are discriminated excepft for Command.
+    </p>
     </div>
diff --git a/editor/unimap/layout-archimedes.html b/editor/unimap/layout-archimedes.html
@@ -121,7 +121,7 @@
     <div id="key-59" class="key" tabindex="7">KP1</div>
     <div id="key-5a" class="key" tabindex="7">KP2</div>
     <div id="key-5b" class="key" tabindex="7">KP3</div>
-    <div id="key-58" class="key" tabindex="7">KPEnt</div>
+    <div id="key-58" class="key height200" tabindex="7">KPEnt</div>
     </div>
 
     <div class='keyboard-row'>
@@ -139,5 +139,4 @@
     <div class="key spc050"></div>
     <div id="key-62" class="key btn200" tabindex="7">KP0</div>
     <div id="key-63" class="key" tabindex="7">KP.</div>
-    <div id="key-58" class="key" tabindex="7">KPEnt</div>
     </div>
diff --git a/editor/unimap/layout-fc980c.html b/editor/unimap/layout-fc980c.html
@@ -66,7 +66,7 @@
     <div id="key-5f" class="key" tabindex="7">KP7</div>
     <div id="key-60" class="key" tabindex="7">KP8</div>
     <div id="key-61" class="key" tabindex="7">KP9</div>
-    <div id="key-57" class="key" tabindex="7">KP+</div>
+    <div id="key-57" class="key height200" tabindex="7">KP+</div>
     </div>
 
     <div class='keyboard-row'>
@@ -87,7 +87,6 @@
     <div id="key-5c" class="key" tabindex="7">KP4</div>
     <div id="key-5d" class="key" tabindex="7">KP5</div>
     <div id="key-5e" class="key" tabindex="7">KP6</div>
-    <div id="keync"  class="keync" title="Part of upper key"></div>
     </div>
 
     <div class='keyboard-row'>
@@ -109,7 +108,7 @@
     <div id="key-59" class="key" tabindex="7">KP1</div>
     <div id="key-5a" class="key" tabindex="7">KP2</div>
     <div id="key-5b" class="key" tabindex="7">KP3</div>
-    <div id="key-58" class="key" tabindex="7">KPEnt</div>
+    <div id="key-58" class="key height200" tabindex="7">KPEnt</div>
     </div>
 
     <div class='keyboard-row'>
@@ -127,5 +126,4 @@
     <div class="key spc025"></div>
     <div id="key-62" class="key" tabindex="7">KP0</div>
     <div id="key-63" class="key" tabindex="7">KP.</div>
-    <div id="keync"  class="keync" title="Part of upper key"></div>
     </div>
diff --git a/editor/unimap/layout-hhkb_jp.html b/editor/unimap/layout-hhkb_jp.html
@@ -30,6 +30,7 @@
     <div id="key-13" class="key" tabindex="2">P</div>
     <div id="key-2f" class="key" tabindex="2">[</div>
     <div id="key-30" class="key" tabindex="2">]</div>
+    <div id="key-28" class="key btn150 height200" tabindex="3">Enter</div>
     <div class="key spc150"></div>
     </div>
 
@@ -47,7 +48,6 @@
     <div id="key-33" class="key" tabindex="3">;</div>
     <div id="key-34" class="key" tabindex="3">'</div>
     <div id="key-32" class="key" tabindex="3">Iso#</div>
-    <div id="key-28" class="key btn125" tabindex="3">Enter</div>
     </div>
 
     <div class='keyboard-row'>

diff --git a/editor/unimap/layout-ibm4704_usb_107key.html b/editor/unimap/layout-ibm4704_usb_107key.html
@@ -123,7 +123,7 @@
     <div id="key-7b" class="key"        tabindex="5">LGui</div>
     <div id="key-7a" class="key btn150" tabindex="5">LAlt</div>
     <div id="key-2c" class="key btn700" tabindex="5">Space</div>
-    <div id="keync"  class="keync btn150" title="This is not configurable. Identical to left side corresponding key of space bar."></div>
+    <div id="key-7a" class="key btn150" tabindex="5">LAlt</div>
     <div id="key-7f" class="key"        tabindex="5">RGui</div>
     <div id="key-7c" class="key btn150" tabindex="5">RCtl</div>
     <div class="key spc050"></div>

diff --git a/editor/unimap/layout-ibm4704_usb_alps102key.html b/editor/unimap/layout-ibm4704_usb_alps102key.html
@@ -111,7 +111,7 @@
     <div id="key-7b" class="key"        tabindex="5">LGui</div>
     <div id="key-7a" class="key btn150" tabindex="5">LAlt</div>
     <div id="key-2c" class="key btn700" tabindex="5">Space</div>
-    <div id="keync"  class="keync btn150" title="This is not configurable. Identical to left side corresponding key of space bar."></div>
+    <div id="key-7a" class="key btn150" tabindex="5">LAlt</div>
     <div id="key-7f" class="key"        tabindex="5">RGui</div>
     <div id="key-7c" class="key btn250" tabindex="5">RCtl</div>
     <div class="key spc050"></div>

diff --git a/editor/unimap/layout-m0110_usb.html b/editor/unimap/layout-m0110_usb.html
@@ -80,7 +80,7 @@
     <div id="key-59" class="key" tabindex="7">KP1</div>
     <div id="key-5a" class="key" tabindex="7">KP2</div>
     <div id="key-5b" class="key" tabindex="7">KP3</div>
-    <div id="key-58" class="key" tabindex="7">KPEnt</div>
+    <div id="key-58" class="key height200" tabindex="7">KPEnt</div>
     </div>
 
     <div class='keyboard-row'>
@@ -94,7 +94,6 @@
     <div class="key spc050"></div>
     <div id="key-62" class="key btn200" tabindex="7">KP0</div>
     <div id="key-63" class="key" tabindex="7">KP.</div>
-    <div id="key-58" class="key">KPEnt</div>
     </div>
 
 <!--

diff --git a/editor/unimap/layout-m0110_usb_intl.html b/editor/unimap/layout-m0110_usb_intl.html
@@ -34,7 +34,7 @@
     <div id="key-13" class="key" tabindex="2">P</div>
     <div id="key-2f" class="key" tabindex="2">[</div>
     <div id="key-30" class="key" tabindex="2">]</div>
-    <div id="key-31" class="key" tabindex="2">\</div>
+    <div id="key-31" class="key height200" tabindex="2">Enter</div>
     <div class="key spc050"></div>
     <div id="key-5f" class="key" tabindex="7">KP7</div>
     <div id="key-60" class="key" tabindex="7">KP8</div>
@@ -55,8 +55,8 @@
     <div id="key-0f" class="key" tabindex="3">L</div>
     <div id="key-33" class="key" tabindex="3">;</div>
     <div id="key-34" class="key" tabindex="3">'</div>
-    <div id="key-28" class="key" tabindex="3">Enter</div>
-    <div id="key-31" class="key btn075">\</div>
+    <div id="key-28" class="key" tabindex="3">Iso#</div>
+    <div class="key spc075"></div>
     <div class="key spc050"></div>
     <div id="key-5c" class="key" tabindex="7">KP4</div>
     <div id="key-5d" class="key" tabindex="7">KP5</div>
@@ -82,7 +82,7 @@
     <div id="key-59" class="key" tabindex="7">KP1</div>
     <div id="key-5a" class="key" tabindex="7">KP2</div>
     <div id="key-5b" class="key" tabindex="7">KP3</div>
-    <div id="key-58" class="key" tabindex="7">KPEnt</div>
+    <div id="key-58" class="key height200" tabindex="7">KPEnt</div>
     </div>
 
     <div class='keyboard-row'>
@@ -96,7 +96,6 @@
     <div class="key spc050"></div>
     <div id="key-62" class="key btn200" tabindex="7">KP0</div>
     <div id="key-63" class="key" tabindex="7">KP.</div>
-    <div id="key-58" class="key">KPEnt</div>
     </div>
 
 <!--

diff --git a/editor/unimap/layout-m0110_usb_m0110a.html b/editor/unimap/layout-m0110_usb_m0110a.html
@@ -34,7 +34,7 @@
     <div id="key-13" class="key" tabindex="2">P</div>
     <div id="key-2f" class="key" tabindex="2">[</div>
     <div id="key-30" class="key" tabindex="2">]</div>
-    <div id="key-28" class="key">Enter</div>
+    <div id="key-28" class="key height200">Enter</div>
     <div class="key spc050"></div>
     <div id="key-5f" class="key" tabindex="7">KP7</div>
     <div id="key-60" class="key" tabindex="7">KP8</div>
@@ -81,7 +81,7 @@
     <div id="key-59" class="key" tabindex="7">KP1</div>
     <div id="key-5a" class="key" tabindex="7">KP2</div>
     <div id="key-5b" class="key" tabindex="7">KP3</div>
-    <div id="key-58" class="key" tabindex="7">KPEnt</div>
+    <div id="key-58" class="key height200" tabindex="7">KPEnt</div>
     </div>
 
     <div class='keyboard-row'>
@@ -95,5 +95,4 @@
     <div class="key spc050"></div>
     <div id="key-62" class="key btn200" tabindex="7">KP0</div>
     <div id="key-63" class="key" tabindex="7">KP.</div>
-    <div id="key-58" class="key">KPEnt</div>
     </div>
diff --git a/editor/unimap/layout-news_411.html b/editor/unimap/layout-news_411.html
@@ -102,7 +102,7 @@
     <div id="key-62" class="key" tabindex="7">KP0</div>
     <div id="key-52" class="key" tabindex="7">Up</div>
     <div id="key-63" class="key" tabindex="7">KP.</div>
-    <div id="key-58" class="key" tabindex="7">KPEnt</div>
+    <div id="key-58" class="key height200" tabindex="7">KPEnt</div>
     </div>
 
     <div class='keyboard-row'>
@@ -118,5 +118,4 @@
     <div id="key-50" class="key" tabindex="7">Left</div>
     <div id="key-51" class="key" tabindex="7">Down</div>
     <div id="key-4f" class="key" tabindex="7">Right</div>
-    <div id="key-58" class="key" tabindex="7">KPEnt</div>
     </div>
diff --git a/editor/unimap/layout-news_5461.html b/editor/unimap/layout-news_5461.html
@@ -93,7 +93,7 @@
     <div id="key-59" class="key" tabindex="7">KP1</div>
     <div id="key-5a" class="key" tabindex="7">KP2</div>
     <div id="key-5b" class="key" tabindex="7">KP3</div>
-    <div id="key-58" class="key" tabindex="7">KPEnt</div>
+    <div id="key-58" class="key height200" tabindex="7">KPEnt</div>
     </div>
 
     <div class='keyboard-row'>
@@ -116,7 +116,6 @@
     <div id="key-62" class="key" tabindex="7">KP0</div>
     <div id="key-63" class="key" tabindex="7">KP.</div>
     <div id="key-52" class="key" tabindex="7">Up</div>
-    <div id="key-58" class="key" tabindex="7">KPEnt</div>
     </div>
 
     <div class='keyboard-row'>

diff --git a/editor/unimap/layout-next_usb.html b/editor/unimap/layout-next_usb.html
@@ -1,5 +1,4 @@
     <div class='keyboard-row'>
-    <div class='keyboard-row'>
     <div id="key-35" class="key" tabindex="1">`</div>
     <div id="key-1e" class="key" tabindex="1">1</div>
     <div id="key-1f" class="key" tabindex="1">2</div>
@@ -97,7 +96,7 @@
     <div id="key-59" class="key" tabindex="7">KP1</div>
     <div id="key-5a" class="key" tabindex="7">KP2</div>
     <div id="key-5b" class="key" tabindex="7">KP3</div>
-    <div id="key-58" class="key" tabindex="7">KPEnt</div>
+    <div id="key-58" class="key height200" tabindex="7">KPEnt</div>
     </div>
 
     <div class='keyboard-row'>

diff --git a/editor/unimap/layout-pc9801.html b/editor/unimap/layout-pc9801.html
@@ -65,7 +65,7 @@
     <div id="key-13" class="key" tabindex="2">P</div>
     <div id="key-2f" class="key" tabindex="2">[</div>
     <div id="key-30" class="key" tabindex="2">]</div>
-    <div id="key-28" class="key btn175" tabindex="3">Enter</div>
+    <div id="key-28" class="key btn175 height200" tabindex="3">Enter</div>
     <div class="key spc050"></div>
     <div id="key-4e" class="key" tabindex="6">Page Down</div>
     <div id="key-4b" class="key" tabindex="6">Page Up</div>
@@ -91,7 +91,7 @@
     <div id="key-33" class="key" tabindex="3">;</div>
     <div id="key-34" class="key" tabindex="3">'</div>
     <div id="key-31" class="key" tabindex="2">\</div>
-    <div id="key-28" class="key btn150" tabindex="3">Enter</div>
+    <div class="key spc150"></div>
     <div class="key spc050"></div>
     <div id="key-52" class="key btn200 center" tabindex="6">Up</div>
     <div class="key spc050"></div>

diff --git a/editor/unimap/layout-sun_type5.html b/editor/unimap/layout-sun_type5.html
@@ -87,7 +87,7 @@
     <div id="key-5f" class="key" tabindex="7">KP7</div>
     <div id="key-60" class="key" tabindex="7">KP8</div>
     <div id="key-61" class="key" tabindex="7">KP9</div>
-    <div id="key-57" class="key" tabindex="7">KP+</div>
+    <div id="key-57" class="key height200" tabindex="7">KP+</div>
     </div>
 
     <div class='keyboard-row'>
@@ -115,7 +115,6 @@
     <div id="key-5c" class="key" tabindex="7">KP4</div>
     <div id="key-5d" class="key" tabindex="7">KP5</div>
     <div id="key-5e" class="key" tabindex="7">KP6</div>
-    <div id="keync"  class="keync" title="Ignored"></div>
     </div>
 
     <div class='keyboard-row'>
@@ -144,7 +143,7 @@
     <div id="key-59" class="key" tabindex="7">KP1</div>
     <div id="key-5a" class="key" tabindex="7">KP2</div>
     <div id="key-5b" class="key" tabindex="7">KP3</div>
-    <div id="key-58" class="key" tabindex="7">KPEnt</div>
+    <div id="key-58" class="key height200" tabindex="7">KPEnt</div>
     </div>
 
     <div class='keyboard-row'>
@@ -168,5 +167,4 @@
     <div class="key spc050"></div>
     <div id="key-62" class="key btn200" tabindex="7">KP0</div>
     <div id="key-63" class="key" tabindex="7">KP.</div>
-    <div id="keync"  class="keync" title="Ignored"></div>
     </div>