Merge pull request #3319 from matt335672/colemak_support

Colemak support
neutrinolabs · Nov 29, 2024 · 3d853d5 · 3d853d5
2 parents 600549c + 53079c4
commit 3d853d5
Show file tree

Hide file tree

Showing 32 changed files with 771 additions and 89 deletions.
diff --git a/genkeymap/dump-keymaps.sh b/genkeymap/dump-keymaps.sh
@@ -18,7 +18,10 @@ kbgen()
     desc="$2"
     os="$3"
     shift 3
-    setxkbmap "$@"
+    if ! setxkbmap "$@"; then
+        echo "Failed to run setxkbmap $*" >&2
+        return 1
+    fi
     ./xrdp-genkeymap \
         -c "Description: $desc" \
         -c "Operating system: $os" \
@@ -68,7 +71,8 @@ fi
 kbgen 0406 "da-DK"        "$os" -model pc105 -layout dk
 kbgen 0407 "de-DE"        "$os" -model pc104 -layout de
 kbgen 0409 "en-US"        "$os" -model pc104 -layout us
-kbgen 10409 "en-US"       "$os" -model pc104 -layout dvorak
+kbgen 10409 "en-US"       "$os" -model pc104 -layout us -variant dvorak
+kbgen 60409 "en-US"       "$os" -model pc104 -layout us -variant colemak
 kbgen 040a "es-ES_tradnl" "$os" -model pc105 -layout es
 kbgen 040b "fi-FI"        "$os" -model pc105 -layout 'fi'
 kbgen 040c "fr-FR"        "$os" -model pc105 -layout fr

diff --git a/genkeymap/genkeymap.c b/genkeymap/genkeymap.c
@@ -317,6 +317,34 @@ output_file_section(FILE *outf,
 }
 
 
+/*****************************************************************************/
+/**
+ * Determine is caps-lock is supported. Some layouts (e.g. Colemak) do not
+ * support this key.
+ *
+ * @param dpy X display
+ * @reurn boolean
+ */
+static int
+is_caps_lock_supported(Display *dpy)
+{
+    char dummy[4];
+    KeySym ks;
+    XKeyPressedEvent e =
+    {
+        .type = KeyPress,
+        .serial = 16,
+        .send_event = True,
+        .display = dpy,
+        .state = 0,
+        .keycode = scancode_to_x11_keycode(SCANCODE_CAPS_KEY),
+        .same_screen = True
+    };
+
+    (void)XLookupString(&e, dummy, sizeof(dummy), &ks, NULL);
+    return (ks == XK_Caps_Lock || ks == XK_Eisu_toggle);
+}
+
 /*****************************************************************************/
 /**
  * Main
@@ -345,6 +373,7 @@ int main(int argc, char **argv)
     const char *keycode_set = NULL;
     struct kbd_info *kbd_info = NULL;
     int status = 1;
+    int caps_lock_supported;
 
     setlocale(LC_CTYPE, "");
     if (strrchr(argv[0], '/') != NULL)
@@ -418,6 +447,8 @@ int main(int argc, char **argv)
         goto finish;
     }
 
+    caps_lock_supported = is_caps_lock_supported(dpy);
+
     fprintf(outf, "# Created by %s V" PACKAGE_VERSION
             "\n# Key code set: %s\n",
             programname, keycode_set);
@@ -430,10 +461,18 @@ int main(int argc, char **argv)
     }
 
     fprintf(outf, "\n[General]\nversion=" KEYMAP_FILE_FORMAT_VERSION "\n");
+    fprintf(outf, "caps_lock_supported=%s\n",
+            (caps_lock_supported) ? "true" : "false");
 
     for (idx = 0; idx < NUM_STATES; idx++) /* Sections and states */
     {
-        output_file_section(outf, dpy, sections[idx], states[idx]);
+        int mod_state =  states[idx];
+        if (!caps_lock_supported && ((mod_state & 2) != 0))
+        {
+            // Skip this section as it's for caps lock
+            continue;
+        }
+        output_file_section(outf, dpy, sections[idx], mod_state);
     }
 
     status = 0; // Successful run

diff --git a/instfiles/Makefile.am b/instfiles/Makefile.am
@@ -51,6 +51,7 @@ dist_startscript_DATA = \
   km-00000816.toml \
   km-0000100c.toml \
   km-00010409.toml \
+  km-00060409.toml \
   km-19360409.toml
 
 #

diff --git a/instfiles/km-00000406.toml b/instfiles/km-00000406.toml
@@ -2,10 +2,11 @@
 # Key code set: evdev+aliases(qwerty)
 # setxkbmap -rules evdev -model pc105 -layout dk
 # Description: da-DK
-# Operating system: Ubuntu 22.04.4 LTS
+# Operating system: Ubuntu 22.04.5 LTS
 
 [General]
 version=2
+caps_lock_supported=true
 
 [noshift]
 01="65307:U+001B"  # Escape

diff --git a/instfiles/km-00000407.toml b/instfiles/km-00000407.toml
@@ -2,10 +2,11 @@
 # Key code set: evdev+aliases(qwertz)
 # setxkbmap -rules evdev -model pc104 -layout de
 # Description: de-DE
-# Operating system: Ubuntu 22.04.4 LTS
+# Operating system: Ubuntu 22.04.5 LTS
 
 [General]
 version=2
+caps_lock_supported=true
 
 [noshift]
 01="65307:U+001B"  # Escape

diff --git a/instfiles/km-00000409.toml b/instfiles/km-00000409.toml
@@ -2,10 +2,11 @@
 # Key code set: evdev+aliases(qwerty)
 # setxkbmap -rules evdev -model pc104 -layout us
 # Description: en-US
-# Operating system: Ubuntu 22.04.4 LTS
+# Operating system: Ubuntu 22.04.5 LTS
 
 [General]
 version=2
+caps_lock_supported=true
 
 [noshift]
 01="65307:U+001B"  # Escape

diff --git a/instfiles/km-0000040a.toml b/instfiles/km-0000040a.toml
@@ -2,10 +2,11 @@
 # Key code set: evdev+aliases(qwerty)
 # setxkbmap -rules evdev -model pc105 -layout es
 # Description: es-ES_tradnl
-# Operating system: Ubuntu 22.04.4 LTS
+# Operating system: Ubuntu 22.04.5 LTS
 
 [General]
 version=2
+caps_lock_supported=true
 
 [noshift]
 01="65307:U+001B"  # Escape

diff --git a/instfiles/km-0000040b.toml b/instfiles/km-0000040b.toml
@@ -2,10 +2,11 @@
 # Key code set: evdev+aliases(qwerty)
 # setxkbmap -rules evdev -model pc105 -layout fi
 # Description: fi-FI
-# Operating system: Ubuntu 22.04.4 LTS
+# Operating system: Ubuntu 22.04.5 LTS
 
 [General]
 version=2
+caps_lock_supported=true
 
 [noshift]
 01="65307:U+001B"  # Escape

diff --git a/instfiles/km-0000040c.toml b/instfiles/km-0000040c.toml
@@ -2,10 +2,11 @@
 # Key code set: evdev+aliases(azerty)
 # setxkbmap -rules evdev -model pc105 -layout fr
 # Description: fr-FR
-# Operating system: Ubuntu 22.04.4 LTS
+# Operating system: Ubuntu 22.04.5 LTS
 
 [General]
 version=2
+caps_lock_supported=true
 
 [noshift]
 01="65307:U+001B"  # Escape

diff --git a/instfiles/km-00000410.toml b/instfiles/km-00000410.toml
@@ -2,10 +2,11 @@
 # Key code set: evdev+aliases(qwerty)
 # setxkbmap -rules evdev -model pc104 -layout it
 # Description: it-IT
-# Operating system: Ubuntu 22.04.4 LTS
+# Operating system: Ubuntu 22.04.5 LTS
 
 [General]
 version=2
+caps_lock_supported=true
 
 [noshift]
 01="65307:U+001B"  # Escape

diff --git a/instfiles/km-00000411.toml b/instfiles/km-00000411.toml
@@ -2,10 +2,11 @@
 # Key code set: evdev+aliases(qwerty)
 # setxkbmap -rules evdev -model pc105 -layout jp -variant OADG109A
 # Description: ja-JP
-# Operating system: Ubuntu 22.04.4 LTS
+# Operating system: Ubuntu 22.04.5 LTS
 
 [General]
 version=2
+caps_lock_supported=true
 
 [noshift]
 01="65307:U+001B"  # Escape

diff --git a/instfiles/km-00000412.toml b/instfiles/km-00000412.toml
@@ -2,10 +2,11 @@
 # Key code set: evdev+aliases(qwerty)
 # setxkbmap -rules evdev -model pc105 -layout kr
 # Description: ko-KR
-# Operating system: Ubuntu 22.04.4 LTS
+# Operating system: Ubuntu 22.04.5 LTS
 
 [General]
 version=2
+caps_lock_supported=true
 
 [noshift]
 01="65307:U+001B"  # Escape

diff --git a/instfiles/km-00000414.toml b/instfiles/km-00000414.toml
@@ -2,10 +2,11 @@
 # Key code set: evdev+aliases(qwerty)
 # setxkbmap -rules evdev -model pc105 -layout no
 # Description: nb-NO
-# Operating system: Ubuntu 22.04.4 LTS
+# Operating system: Ubuntu 22.04.5 LTS
 
 [General]
 version=2
+caps_lock_supported=true
 
 [noshift]
 01="65307:U+001B"  # Escape

diff --git a/instfiles/km-00000415.toml b/instfiles/km-00000415.toml
@@ -2,10 +2,11 @@
 # Key code set: evdev+aliases(qwerty)
 # setxkbmap -rules evdev -model pc104 -layout pl
 # Description: pl-PL
-# Operating system: Ubuntu 22.04.4 LTS
+# Operating system: Ubuntu 22.04.5 LTS
 
 [General]
 version=2
+caps_lock_supported=true
 
 [noshift]
 01="65307:U+001B"  # Escape

diff --git a/instfiles/km-00000416.toml b/instfiles/km-00000416.toml
@@ -2,10 +2,11 @@
 # Key code set: evdev+aliases(qwerty)
 # setxkbmap -rules evdev -model pc105 -layout br
 # Description: pt-BR
-# Operating system: Ubuntu 22.04.4 LTS
+# Operating system: Ubuntu 22.04.5 LTS
 
 [General]
 version=2
+caps_lock_supported=true
 
 [noshift]
 01="65307:U+001B"  # Escape

diff --git a/instfiles/km-00000419.toml b/instfiles/km-00000419.toml
@@ -2,10 +2,11 @@
 # Key code set: evdev+aliases(qwerty)
 # setxkbmap -rules evdev -model pc104 -layout ru
 # Description: ru-RU
-# Operating system: Ubuntu 22.04.4 LTS
+# Operating system: Ubuntu 22.04.5 LTS
 
 [General]
 version=2
+caps_lock_supported=true
 
 [noshift]
 01="65307:U+001B"  # Escape

diff --git a/instfiles/km-0000041d.toml b/instfiles/km-0000041d.toml
@@ -2,10 +2,11 @@
 # Key code set: evdev+aliases(qwerty)
 # setxkbmap -rules evdev -model pc104 -layout se
 # Description: sv-SE
-# Operating system: Ubuntu 22.04.4 LTS
+# Operating system: Ubuntu 22.04.5 LTS
 
 [General]
 version=2
+caps_lock_supported=true
 
 [noshift]
 01="65307:U+001B"  # Escape

diff --git a/instfiles/km-00000807.toml b/instfiles/km-00000807.toml
@@ -2,10 +2,11 @@
 # Key code set: evdev+aliases(qwertz)
 # setxkbmap -rules evdev -model pc105 -layout ch
 # Description: de-CH
-# Operating system: Ubuntu 22.04.4 LTS
+# Operating system: Ubuntu 22.04.5 LTS
 
 [General]
 version=2
+caps_lock_supported=true
 
 [noshift]
 01="65307:U+001B"  # Escape

diff --git a/instfiles/km-00000809.toml b/instfiles/km-00000809.toml
@@ -2,10 +2,11 @@
 # Key code set: evdev+aliases(qwerty)
 # setxkbmap -rules evdev -model pc105 -layout gb
 # Description: en-GB
-# Operating system: Ubuntu 22.04.4 LTS
+# Operating system: Ubuntu 22.04.5 LTS
 
 [General]
 version=2
+caps_lock_supported=true
 
 [noshift]
 01="65307:U+001B"  # Escape

diff --git a/instfiles/km-0000080a.toml b/instfiles/km-0000080a.toml
@@ -2,10 +2,11 @@
 # Key code set: evdev+aliases(qwerty)
 # setxkbmap -rules evdev -model pc105 -layout latam
 # Description: es-MX
-# Operating system: Ubuntu 22.04.4 LTS
+# Operating system: Ubuntu 22.04.5 LTS
 
 [General]
 version=2
+caps_lock_supported=true
 
 [noshift]
 01="65307:U+001B"  # Escape

diff --git a/instfiles/km-0000080c.toml b/instfiles/km-0000080c.toml
@@ -2,10 +2,11 @@
 # Key code set: evdev+aliases(azerty)
 # setxkbmap -rules evdev -model pc105 -layout be -variant oss
 # Description: fr-BE
-# Operating system: Ubuntu 22.04.4 LTS
+# Operating system: Ubuntu 22.04.5 LTS
 
 [General]
 version=2
+caps_lock_supported=true
 
 [noshift]
 01="65307:U+001B"  # Escape

diff --git a/instfiles/km-00000813.toml b/instfiles/km-00000813.toml
@@ -2,10 +2,11 @@
 # Key code set: evdev+aliases(azerty)
 # setxkbmap -rules evdev -model pc105 -layout be
 # Description: nl-BE
-# Operating system: Ubuntu 22.04.4 LTS
+# Operating system: Ubuntu 22.04.5 LTS
 
 [General]
 version=2
+caps_lock_supported=true
 
 [noshift]
 01="65307:U+001B"  # Escape

diff --git a/instfiles/km-00000816.toml b/instfiles/km-00000816.toml
@@ -2,10 +2,11 @@
 # Key code set: evdev+aliases(qwerty)
 # setxkbmap -rules evdev -model pc104 -layout pt
 # Description: pt-PT
-# Operating system: Ubuntu 22.04.4 LTS
+# Operating system: Ubuntu 22.04.5 LTS
 
 [General]
 version=2
+caps_lock_supported=true
 
 [noshift]
 01="65307:U+001B"  # Escape

diff --git a/instfiles/km-0000100c.toml b/instfiles/km-0000100c.toml
@@ -2,10 +2,11 @@
 # Key code set: evdev+aliases(qwertz)
 # setxkbmap -rules evdev -model pc105 -layout ch -variant fr
 # Description: fr-CH
-# Operating system: Ubuntu 22.04.4 LTS
+# Operating system: Ubuntu 22.04.5 LTS
 
 [General]
 version=2
+caps_lock_supported=true
 
 [noshift]
 01="65307:U+001B"  # Escape

diff --git a/instfiles/km-00010409.toml b/instfiles/km-00010409.toml
@@ -1,11 +1,12 @@
 # Created by xrdp-genkeymap V0.10.80
 # Key code set: evdev+aliases(qwerty)
-# setxkbmap -rules evdev -model pc104 -layout dvorak
+# setxkbmap -rules evdev -model pc104 -layout us -variant dvorak
 # Description: en-US
-# Operating system: Ubuntu 22.04.4 LTS
+# Operating system: Ubuntu 22.04.5 LTS
 
 [General]
 version=2
+caps_lock_supported=true
 
 [noshift]
 01="65307:U+001B"  # Escape