test

crates/gpui/src/platform/linux/wayland/client.rs

@@ -1147,6 +1147,7 @@ impl Dispatch<wl_keyboard::WlKeyboard, ()> for WaylandClientStatePtr {
     ) {
         let mut client = this.get_client();
         let mut state = client.borrow_mut();
+        println!("Keyboard event: {event:#?}");
         match event {
             wl_keyboard::Event::RepeatInfo { rate, delay } => {
                 state.repeat.characters_per_second = rate as u32;
@@ -1261,14 +1262,17 @@ impl Dispatch<wl_keyboard::WlKeyboard, ()> for WaylandClientStatePtr {
                 };
                 let focused_window = focused_window.clone();
 
-                let keymap_state = state.keymap_state.as_ref().unwrap();
+                let modifiers = state.modifiers.clone();
+                let keymap_state = state.keymap_state.as_mut().unwrap();
                 let keycode = Keycode::from(key + MIN_KEYCODE);
                 let keysym = keymap_state.key_get_one_sym(keycode);
 
+                println!("Key state: {key_state:?}");
                 match key_state {
                     wl_keyboard::KeyState::Pressed if !keysym.is_modifier_key() => {
-                        let mut keystroke =
-                            Keystroke::from_xkb(&keymap_state, state.modifiers, keycode);
+                        keymap_state.update_key(keycode, xkb::KeyDirection::Down);
+                        let mut keystroke = Keystroke::from_xkb(&keymap_state, modifiers, keycode);
+                        println!("Key down: {keystroke:?}");
                         if let Some(mut compose) = state.compose_state.take() {
                             compose.feed(keysym);
                             match compose.status() {
@@ -1352,8 +1356,9 @@ impl Dispatch<wl_keyboard::WlKeyboard, ()> for WaylandClientStatePtr {
                         focused_window.handle_input(input);
                     }
                     wl_keyboard::KeyState::Released if !keysym.is_modifier_key() => {
+                        keymap_state.update_key(keycode, xkb::KeyDirection::Up);
                         let input = PlatformInput::KeyUp(KeyUpEvent {
-                            keystroke: Keystroke::from_xkb(keymap_state, state.modifiers, keycode),
+                            keystroke: Keystroke::from_xkb(keymap_state, modifiers, keycode),
                         });
 
                         if state.repeat.current_keycode == Some(keycode) {
@@ -1391,6 +1396,7 @@ impl Dispatch<zwp_text_input_v3::ZwpTextInputV3, ()> for WaylandClientStatePtr {
                 this.disable_ime();
             }
             zwp_text_input_v3::Event::CommitString { text } => {
+                println!(" zwp_text_input_v3::Event::CommitString {text:?}");
                 state.composing = false;
                 let Some(window) = state.keyboard_focused_window.clone() else {
                     return;
@@ -1427,6 +1433,7 @@ impl Dispatch<zwp_text_input_v3::ZwpTextInputV3, ()> for WaylandClientStatePtr {
 
                 if let Some(text) = state.ime_pre_edit.take() {
                     drop(state);
+                    println!("zwp_text_input_v3::Event::PreeditString {text:?}");
                     window.handle_ime(ImeInput::SetMarkedText(text));
                     if let Some(area) = window.get_ime_area() {
                         text_input.set_cursor_rectangle(
@@ -1593,6 +1600,7 @@ impl Dispatch<wl_pointer::WlPointer, ()> for WaylandClientStatePtr {
                             {
                                 compose.reset();
                                 drop(state);
+                                println!("wl_pointer::ButtonState::Pressed {}", text);
                                 window.handle_ime(ImeInput::InsertText(text));
                                 state = client.borrow_mut();
                             }

crates/gpui/src/platform/linux/x11/client.rs

@@ -569,6 +569,7 @@ impl X11Client {
                 let xim_connected = xim_handler.connected;
                 drop(state);
 
+                println!("XIM event: {:#?}", event);
                 let xim_filtered = match ximc.filter_event(&event, &mut xim_handler) {
                     Ok(handled) => handled,
                     Err(err) => {
@@ -841,6 +842,7 @@ impl X11Client {
                     )
                 };
                 state.xkb = xkb_state;
+                println!("X11 new keyboard notify");
             }
             Event::XkbStateNotify(event) => {
                 let mut state = self.0.borrow_mut();
@@ -860,6 +862,7 @@ impl X11Client {
                     locked_layout: event.locked_group.into(),
                 };
 
+                println!("X11 xkb state notify: {:?}", event);
                 if new_layout != old_layout {
                     if let Some(mut callback) = state.common.callbacks.keyboard_layout_change.take()
                     {
@@ -886,6 +889,7 @@ impl X11Client {
                 }
             }
             Event::KeyPress(event) => {
+                println!("KeyPress event: {:?}", event);
                 let window = self.get_window(event.event)?;
                 let mut state = self.0.borrow_mut();
 
@@ -895,6 +899,7 @@ impl X11Client {
                 let keystroke = {
                     let code = event.detail.into();
                     let xkb_state = state.previous_xkb_state.clone();
+                    state.xkb.update_key(code, xkbc::KeyDirection::Down);
                     state.xkb.update_mask(
                         event.state.bits() as ModMask,
                         0,
@@ -954,6 +959,7 @@ impl X11Client {
                 }));
             }
             Event::KeyRelease(event) => {
+                println!("KeyRelease event: {:?}", event);
                 let window = self.get_window(event.event)?;
                 let mut state = self.0.borrow_mut();
 
@@ -963,6 +969,7 @@ impl X11Client {
                 let keystroke = {
                     let code = event.detail.into();
                     let xkb_state = state.previous_xkb_state.clone();
+                    state.xkb.update_key(code, xkbc::KeyDirection::Up);
                     state.xkb.update_mask(
                         event.state.bits() as ModMask,
                         0,
@@ -1242,6 +1249,7 @@ impl X11Client {
         let mut xim_handler = state.xim_handler.take().unwrap();
         state.composing = !text.is_empty();
         drop(state);
+        println!("xim_handle_preedit: {}", text);
         window.handle_ime_preedit(text);
 
         if let Some(area) = window.get_ime_area() {