New keyboard API for Linux

CHANGELOG.md

@@ -10,6 +10,7 @@ And please only add new entries to the top of this list, right below the `# Unre
 
 - Build docs on `docs.rs` for iOS and Android as well.
 - **Breaking:** Removed the `WindowAttributes` struct, since all its functionality is accessible from `WindowBuilder`.
+- Added `WindowBuilder::transparent` getter to check if the user set `transparent` attribute.
 - On macOS, Fix emitting `Event::LoopDestroyed` on CMD+Q.
 - On macOS, fixed an issue where having multiple windows would prevent run_return from ever returning.
 - On Wayland, fix bug where the cursor wouldn't hide in GNOME.

Cargo.toml

@@ -34,8 +34,8 @@ targets = [
 
 [features]
 default = ["x11", "wayland", "wayland-dlopen", "wayland-csd-adwaita"]
-x11 = ["x11-dl", "mio", "percent-encoding", "parking_lot"]
-wayland = ["wayland-client", "wayland-protocols", "sctk"]
+x11 = ["x11-dl", "mio", "percent-encoding", "parking_lot", "xkbcommon-dl/x11"]
+wayland = ["wayland-client", "wayland-protocols", "sctk", "memmap2"]
 wayland-dlopen = ["sctk/dlopen", "wayland-client/dlopen"]
 wayland-csd-adwaita = ["sctk-adwaita", "sctk-adwaita/title"]
 wayland-csd-adwaita-notitle = ["sctk-adwaita"]
@@ -112,6 +112,8 @@ x11-dl = { version = "2.18.5", optional = true }
 percent-encoding = { version = "2.0", optional = true }
 parking_lot = { version = "0.12.0", optional = true }
 libc = "0.2.64"
+memmap2 = { version = "0.2.1", optional = true }
+xkbcommon-dl = { git = "https://github.com/maroider/xkbcommon-dl", rev = "900832888ad6f11011d1369befb344a9aa8a9610" }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies.web_sys]
 package = "web-sys"

src/keyboard.rs

@@ -175,11 +175,12 @@ pub enum NativeKeyCode {
     Unidentified,
     Windows(u16),
     MacOS(u32),
-    XKB(u32),
+    XkbCode(u32),
+    XkbSym(u32),
 }
 impl std::fmt::Debug for NativeKeyCode {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        use NativeKeyCode::{MacOS, Unidentified, Windows, XKB};
+        use NativeKeyCode::{MacOS, Unidentified, Windows, XkbCode, XkbSym};
         let mut debug_tuple;
         match self {
             Unidentified => {
@@ -193,9 +194,13 @@ impl std::fmt::Debug for NativeKeyCode {
                 debug_tuple = f.debug_tuple(name_of!(MacOS));
                 debug_tuple.field(v);
             }
-            XKB(v) => {
-                debug_tuple = f.debug_tuple(name_of!(XKB));
-                debug_tuple.field(v);
+            XkbCode(v) => {
+                debug_tuple = f.debug_tuple(name_of!(XkbCode));
+                debug_tuple.field(&format_args!("0x{:04X}", v));
+            }
+            XkbSym(v) => {
+                debug_tuple = f.debug_tuple(name_of!(XkbSym));
+                debug_tuple.field(&format_args!("0x{:04X}", v));
             }
         }
         debug_tuple.finish()
@@ -536,6 +541,9 @@ pub enum KeyCode {
     AudioVolumeMute,
     AudioVolumeUp,
     WakeUp,
+    // Legacy modifier key. Also called "Super" in certain places.
+    Meta,
+    // Legacy modifier key.
     Hyper,
     Turbo,
     Abort,
@@ -731,6 +739,9 @@ pub enum Key<'a> {
     /// The Symbol modifier key (used on some virtual keyboards).
     Symbol,
     SymbolLock,
+    // Legacy modifier key. Also called "Super" in certain places.
+    Meta,
+    // Legacy modifier key.
     Hyper,
     /// Used to enable "super" modifier function for interpreting concurrent or subsequent keyboard
     /// input. This key value is used for the "Windows Logo" key and the Apple `Command` or `⌘` key.

src/platform/scancode.rs

@@ -20,6 +20,7 @@ pub trait KeyCodeExtScancode {
     ///
     /// ## Platform-specific
     /// - **Windows:** A 16bit extended scancode
+    /// - **Wayland/X11**: A 32-bit X11-style keycode.
     // TODO: Describe what this value contains for each platform
     fn to_scancode(self) -> Option<u32>;
 

src/platform/unix.rs

@@ -11,8 +11,12 @@ use std::os::raw;
 use std::{ptr, sync::Arc};
 
 use crate::{
+    event::KeyEvent,
     event_loop::{EventLoopBuilder, EventLoopWindowTarget},
+    keyboard::{Key, KeyCode},
     monitor::MonitorHandle,
+    platform::{modifier_supplement::KeyEventExtModifierSupplement, scancode::KeyCodeExtScancode},
+    platform_impl::common::keymap,
     window::{Window, WindowBuilder},
 };
 
@@ -434,3 +438,25 @@ impl MonitorHandleExtUnix for MonitorHandle {
         self.inner.native_identifier()
     }
 }
+
+impl KeyEventExtModifierSupplement for KeyEvent {
+    #[inline]
+    fn text_with_all_modifiers(&self) -> Option<&str> {
+        self.platform_specific.text_with_all_modifiers
+    }
+
+    #[inline]
+    fn key_without_modifiers(&self) -> Key<'static> {
+        self.platform_specific.key_without_modifiers
+    }
+}
+
+impl KeyCodeExtScancode for KeyCode {
+    fn from_scancode(scancode: u32) -> KeyCode {
+        keymap::raw_keycode_to_keycode(scancode)
+    }
+
+    fn to_scancode(self) -> Option<u32> {
+        keymap::keycode_to_raw(self)
+    }
+}