leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

On X11, fix ModifiersChanged from xdotool

Browse source 
xdotool will update modifiers before Xkb will actually send event
updating them, thus the modifiers will be updating even before the
actual update, which is unfortunate.

Links: https://github.com/alacritty/alacritty/issues/7502
This commit is contained in:
Kirill Chibisov 2023-12-30 09:05:03 +04:00 • committed by GitHub
parent 5a1d3e4656
commit 5e106b4dbb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 32 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

67
src/platform_impl/linux/x11/event_processor.rs
View file

@ -1,5 +1,5 @@
use std::{
cell::RefCell,
cell::{Cell, RefCell},
collections::HashMap,
os::raw::{c_char, c_int, c_long, c_ulong},
rc::Rc,
@ -56,6 +56,8 @@ pub(super) struct EventProcessor<T: 'static> {
pub(super) first_touch: Option<u64>,
// Currently focused window belonging to this process
pub(super) active_window: Option<xproto::Window>,
/// Latest modifiers we've sent for the user to trigger change in event.
pub(super) modifiers: Cell<ModifiersState>,
pub(super) is_composing: bool,
}
@ -994,12 +996,7 @@ impl<T: 'static> EventProcessor<T> {
let modifiers: crate::keyboard::ModifiersState =
self.kb_state.mods_state().into();
if !modifiers.is_empty() {
callback(Event::WindowEvent {
window_id,
event: WindowEvent::ModifiersChanged(modifiers.into()),
});
}
self.send_modifiers(modifiers, &mut callback);
// The deviceid for this event is for a keyboard instead of a pointer,
// so we have to do a little extra work.
@ -1061,12 +1058,7 @@ impl<T: 'static> EventProcessor<T> {
// window regains focus.
self.held_key_press = None;
callback(Event::WindowEvent {
window_id,
event: WindowEvent::ModifiersChanged(
ModifiersState::empty().into(),
),
});
self.send_modifiers(ModifiersState::empty(), &mut callback);
if let Some(window) = self.with_window(window, Arc::clone) {
window.shared_state_lock().has_focus = false;
@ -1280,22 +1272,13 @@ impl<T: 'static> EventProcessor<T> {
&& (keycodes_changed || geometry_changed)
{
unsafe { self.kb_state.init_with_x11_keymap() };
let modifiers = self.kb_state.mods_state();
self.send_modifiers(modifiers.into(), &mut callback);
}
}
ffi::XkbMapNotify => {
let prev_mods = self.kb_state.mods_state();
unsafe { self.kb_state.init_with_x11_keymap() };
let new_mods = self.kb_state.mods_state();
if prev_mods != new_mods {
if let Some(window) = self.active_window {
callback(Event::WindowEvent {
window_id: mkwid(window),
event: WindowEvent::ModifiersChanged(
Into::<ModifiersState>::into(new_mods).into(),
),
});
}
}
self.send_modifiers(self.kb_state.mods_state().into(), &mut callback);
}
ffi::XkbStateNotify => {
let xev =
@ -1304,7 +1287,9 @@ impl<T: 'static> EventProcessor<T> {
// Set the timestamp.
wt.xconn.set_timestamp(xev.time as xproto::Timestamp);
let prev_mods = self.kb_state.mods_state();
// NOTE: Modifiers could update without a prior event updating them,
// thus diffing the state before and after is not reliable.
self.kb_state.update_modifiers(
xev.base_mods,
xev.latched_mods,
@ -1313,17 +1298,8 @@ impl<T: 'static> EventProcessor<T> {
xev.latched_group as u32,
xev.locked_group as u32,
);
let new_mods = self.kb_state.mods_state();
if prev_mods != new_mods {
if let Some(window) = self.active_window {
callback(Event::WindowEvent {
window_id: mkwid(window),
event: WindowEvent::ModifiersChanged(
Into::<ModifiersState>::into(new_mods).into(),
),
});
}
}
self.send_modifiers(self.kb_state.mods_state().into(), &mut callback);
}
_ => {}
}
@ -1392,6 +1368,23 @@ impl<T: 'static> EventProcessor<T> {
}
}
/// Send modifiers for the active window.
///
/// The event won't be send when the `modifiers` match the previosly `sent` modifiers value.
fn send_modifiers<F: FnMut(Event<T>)>(&self, modifiers: ModifiersState, callback: &mut F) {
let window_id = match self.active_window {
Some(window) => mkwid(window),
None => return,
};
if self.modifiers.replace(modifiers) != modifiers {
callback(Event::WindowEvent {
window_id,
event: WindowEvent::ModifiersChanged(self.modifiers.get().into()),
});
}
}
fn handle_pressed_keys<F>(
wt: &super::EventLoopWindowTarget<T>,
window_id: crate::window::WindowId,

1
src/platform_impl/linux/x11/mod.rs
View file

@ -347,6 +347,7 @@ impl<T: 'static> EventLoop<T> {
held_key_press: None,
first_touch: None,
active_window: None,
modifiers: Default::default(),
is_composing: false,
};