Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

x11: Fix capitalization with neo 2 (#14466)

Browse source 
Fixed #14282

Release Notes:

- N/A
This commit is contained in:
Fernando Tagawa 2024-07-14 22:19:20 -03:00 • committed by GitHub
parent 59ce3535d3
commit 4a3097d4dd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 33 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

38
crates/gpui/src/platform/linux/x11/client.rs
View file

@ -24,7 +24,7 @@ use x11rb::xcb_ffi::XCBConnection;
use xim::{x11rb::X11rbClient, Client}; use xim::{x11rb::X11rbClient, Client};
use xim::{AttributeName, InputStyle}; use xim::{AttributeName, InputStyle};
use xkbc::x11::ffi::{XKB_X11_MIN_MAJOR_XKB_VERSION, XKB_X11_MIN_MINOR_XKB_VERSION}; use xkbc::x11::ffi::{XKB_X11_MIN_MAJOR_XKB_VERSION, XKB_X11_MIN_MINOR_XKB_VERSION};
use xkbcommon::xkb as xkbc; use xkbcommon::xkb::{self as xkbc, LayoutIndex, ModMask};
use crate::platform::linux::LinuxClient; use crate::platform::linux::LinuxClient;
use crate::platform::{LinuxCommon, PlatformWindow}; use crate::platform::{LinuxCommon, PlatformWindow};
@ -94,6 +94,13 @@ impl From<xim::ClientError> for EventHandlerError {
} }
} }
#[derive(Debug, Default, Clone)]
struct XKBStateNotiy {
depressed_layout: LayoutIndex,
latched_layout: LayoutIndex,
locked_layout: LayoutIndex,
}
pub struct X11ClientState { pub struct X11ClientState {
pub(crate) loop_handle: LoopHandle<'static, X11Client>, pub(crate) loop_handle: LoopHandle<'static, X11Client>,
pub(crate) event_loop: Option<calloop::EventLoop<'static, X11Client>>, pub(crate) event_loop: Option<calloop::EventLoop<'static, X11Client>>,
@ -113,6 +120,7 @@ pub struct X11ClientState {
pub(crate) mouse_focused_window: Option<xproto::Window>, pub(crate) mouse_focused_window: Option<xproto::Window>,
pub(crate) keyboard_focused_window: Option<xproto::Window>, pub(crate) keyboard_focused_window: Option<xproto::Window>,
pub(crate) xkb: xkbc::State, pub(crate) xkb: xkbc::State,
previous_xkb_state: XKBStateNotiy,
pub(crate) ximc: Option<X11rbClient<Rc<XCBConnection>>>, pub(crate) ximc: Option<X11rbClient<Rc<XCBConnection>>>,
pub(crate) xim_handler: Option<XimHandler>, pub(crate) xim_handler: Option<XimHandler>,
pub modifiers: Modifiers, pub modifiers: Modifiers,
@ -350,6 +358,7 @@ impl X11Client {
mouse_focused_window: None, mouse_focused_window: None,
keyboard_focused_window: None, keyboard_focused_window: None,
xkb: xkb_state, xkb: xkb_state,
previous_xkb_state: XKBStateNotiy::default(),
ximc, ximc,
xim_handler, xim_handler,
@ -622,7 +631,11 @@ impl X11Client {
event.latched_group as u32, event.latched_group as u32,
event.locked_group.into(), event.locked_group.into(),
); );
state.previous_xkb_state = XKBStateNotiy {
depressed_layout: event.base_group as u32,
latched_layout: event.latched_group as u32,
locked_layout: event.locked_group.into(),
};
let modifiers = Modifiers::from_xkb(&state.xkb); let modifiers = Modifiers::from_xkb(&state.xkb);
if state.modifiers == modifiers { if state.modifiers == modifiers {
drop(state); drop(state);
@ -644,11 +657,18 @@ impl X11Client {
let modifiers = modifiers_from_state(event.state); let modifiers = modifiers_from_state(event.state);
state.modifiers = modifiers; state.modifiers = modifiers;
state.pre_ime_key_down.take(); state.pre_ime_key_down.take();
let keystroke = { let keystroke = {
let code = event.detail.into(); let code = event.detail.into();
let xkb_state = state.previous_xkb_state.clone();
state.xkb.update_mask(
event.state.bits() as ModMask,
0,
0,
xkb_state.depressed_layout,
xkb_state.latched_layout,
xkb_state.locked_layout,
);
let mut keystroke = crate::Keystroke::from_xkb(&state.xkb, modifiers, code); let mut keystroke = crate::Keystroke::from_xkb(&state.xkb, modifiers, code);
state.xkb.update_key(code, xkbc::KeyDirection::Down);
let keysym = state.xkb.key_get_one_sym(code); let keysym = state.xkb.key_get_one_sym(code);
if keysym.is_modifier_key() { if keysym.is_modifier_key() {
return Some(()); return Some(());
@ -707,8 +727,16 @@ impl X11Client {
let keystroke = { let keystroke = {
let code = event.detail.into(); let code = event.detail.into();
let xkb_state = state.previous_xkb_state.clone();
state.xkb.update_mask(
event.state.bits() as ModMask,
0,
0,
xkb_state.depressed_layout,
xkb_state.latched_layout,
xkb_state.locked_layout,
);
let keystroke = crate::Keystroke::from_xkb(&state.xkb, modifiers, code); let keystroke = crate::Keystroke::from_xkb(&state.xkb, modifiers, code);
state.xkb.update_key(code, xkbc::KeyDirection::Up);
let keysym = state.xkb.key_get_one_sym(code); let keysym = state.xkb.key_get_one_sym(code);
if keysym.is_modifier_key() { if keysym.is_modifier_key() {
return Some(()); return Some(());