Fix Keysym names for named Keysyms and test them agains xkbcommon

Author: pentamassiv

.github/workflows/CI.yml

@@ -47,6 +47,10 @@ jobs:
       - uses: actions/checkout@v4
         with:
           submodules: true
+      - name:  Install dependencies
+      run:   |
+          sudo apt-get update -q -y && sudo apt-get upgrade -y
+          sudo apt-get install -y libxkbcommon-dev
       - name: Install Rust
         uses: dtolnay/rust-toolchain@master
         with:

Cargo.toml

@@ -12,6 +12,7 @@ rust-version = "1.58.1"
 [dev-dependencies]
 bytemuck = "1.12.3"
 x11rb = "0.12.0"
+xkbcommon = "0.7.0" # Used for testing
 
 [workspace]
 members = [

keysym-generator/src/main.rs

@@ -103,7 +103,7 @@ pub mod key {{
 #[allow(unreachable_patterns)]
 pub(crate) const fn name(keysym: Keysym) -> Option<&'static str> {
     match keysym {
-        Keysym::NoSymbol => Some(\"XK_NoSymbol\"),\n"
+        Keysym::NoSymbol => Some(\"NoSymbol\"),\n"
         .to_string();
 
     // we're looking for lines of the following form:
@@ -210,7 +210,8 @@ pub(crate) const fn name(keysym: Keysym) -> Option<&'static str> {
                 writeln!(
                     keysym_dump,
                     "        Keysym::{} => Some(\"{}\"),",
-                    &keysym_name, &name
+                    &keysym_name,
+                    &name.replace("XK_", "")
                 )
                 .unwrap();
             }
@@ -226,6 +227,15 @@ pub(crate) const fn name(keysym: Keysym) -> Option<&'static str> {
     // Write out the keysym dump.
     keysym_dump.push_str(
         "
+        unicode_sym if unicode_sym.is_unnamed_unicode_key() => {
+            /*
+            TODO: Fix the names of keysyms representing unnamed unicodes. This is the equivalent code from xkbcommon
+            Taken from https://github.com/xkbcommon/libxkbcommon/blob/6073565903488cb5b9a8d37fdc4a7c2f9d7ad04d/src/keysym.c#L84:
+                const int width = (ks & 0xff0000UL) ? 8 : 4;
+                return snprintf(buffer, size, \"U%0*lX\", width, ks & 0xffffffUL);
+            */
+            None
+        }
         _ => None,
     }
 }",