On X11, extract event handlers
Make code more clear wrt explicit returns during event handling, which may lead to skipped IME event handling.
This commit is contained in:
parent
dbe0f852da
commit
273984a385
6 changed files with 1400 additions and 1349 deletions
|
|
@ -940,10 +940,12 @@ impl EventLoopWindowTarget {
|
|||
}
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
fn set_exit_code(&self, code: i32) {
|
||||
x11_or_wayland!(match self; Self(evlp) => evlp.set_exit_code(code))
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
fn exit_code(&self) -> Option<i32> {
|
||||
x11_or_wayland!(match self; Self(evlp) => evlp.exit_code())
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ macro_rules! atom_manager {
|
|||
($($name:ident $(:$lit:literal)?),*) => {
|
||||
x11rb::atom_manager! {
|
||||
/// The atoms used by `winit`
|
||||
pub(crate) Atoms: AtomsCookie {
|
||||
pub Atoms: AtomsCookie {
|
||||
$($name $(:$lit)?,)*
|
||||
}
|
||||
}
|
||||
|
|
@ -14,7 +14,7 @@ macro_rules! atom_manager {
|
|||
/// Indices into the `Atoms` struct.
|
||||
#[derive(Copy, Clone, Debug)]
|
||||
#[allow(non_camel_case_types)]
|
||||
pub(crate) enum AtomName {
|
||||
pub enum AtomName {
|
||||
$($name,)*
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ impl From<io::Error> for DndDataParseError {
|
|||
}
|
||||
}
|
||||
|
||||
pub(crate) struct Dnd {
|
||||
pub struct Dnd {
|
||||
xconn: Arc<XConnection>,
|
||||
// Populated by XdndEnter event handler
|
||||
pub version: Option<c_long>,
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1025,7 +1025,7 @@ fn mkdid(w: xinput::DeviceId) -> crate::event::DeviceId {
|
|||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
struct Device {
|
||||
pub struct Device {
|
||||
_name: String,
|
||||
scroll_axes: Vec<(i32, ScrollAxis)>,
|
||||
// For master devices, this is the paired device (pointer <-> keyboard).
|
||||
|
|
|
|||
|
|
@ -324,7 +324,7 @@ impl XConnection {
|
|||
}
|
||||
}
|
||||
|
||||
pub(crate) struct ScreenResources {
|
||||
pub struct ScreenResources {
|
||||
/// List of attached modes.
|
||||
modes: Vec<randr::ModeInfo>,
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue