mirror of
https://github.com/rust-windowing/winit.git
synced 2026-08-31 22:00:04 -04:00
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:
@@ -938,10 +938,12 @@ impl<T> EventLoopWindowTarget<T> {
|
|||||||
x11_or_wayland!(match self; Self(evlp) => evlp.exiting())
|
x11_or_wayland!(match self; Self(evlp) => evlp.exiting())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[allow(dead_code)]
|
||||||
fn set_exit_code(&self, code: i32) {
|
fn set_exit_code(&self, code: i32) {
|
||||||
x11_or_wayland!(match self; Self(evlp) => evlp.set_exit_code(code))
|
x11_or_wayland!(match self; Self(evlp) => evlp.set_exit_code(code))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[allow(dead_code)]
|
||||||
fn exit_code(&self) -> Option<i32> {
|
fn exit_code(&self) -> Option<i32> {
|
||||||
x11_or_wayland!(match self; Self(evlp) => evlp.exit_code())
|
x11_or_wayland!(match self; Self(evlp) => evlp.exit_code())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ macro_rules! atom_manager {
|
|||||||
($($name:ident $(:$lit:literal)?),*) => {
|
($($name:ident $(:$lit:literal)?),*) => {
|
||||||
x11rb::atom_manager! {
|
x11rb::atom_manager! {
|
||||||
/// The atoms used by `winit`
|
/// The atoms used by `winit`
|
||||||
pub(crate) Atoms: AtomsCookie {
|
pub Atoms: AtomsCookie {
|
||||||
$($name $(:$lit)?,)*
|
$($name $(:$lit)?,)*
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -14,7 +14,7 @@ macro_rules! atom_manager {
|
|||||||
/// Indices into the `Atoms` struct.
|
/// Indices into the `Atoms` struct.
|
||||||
#[derive(Copy, Clone, Debug)]
|
#[derive(Copy, Clone, Debug)]
|
||||||
#[allow(non_camel_case_types)]
|
#[allow(non_camel_case_types)]
|
||||||
pub(crate) enum AtomName {
|
pub enum AtomName {
|
||||||
$($name,)*
|
$($name,)*
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ impl From<io::Error> for DndDataParseError {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) struct Dnd {
|
pub struct Dnd {
|
||||||
xconn: Arc<XConnection>,
|
xconn: Arc<XConnection>,
|
||||||
// Populated by XdndEnter event handler
|
// Populated by XdndEnter event handler
|
||||||
pub version: Option<c_long>,
|
pub version: Option<c_long>,
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1035,7 +1035,7 @@ fn mkdid(w: xinput::DeviceId) -> crate::event::DeviceId {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
struct Device {
|
pub struct Device {
|
||||||
_name: String,
|
_name: String,
|
||||||
scroll_axes: Vec<(i32, ScrollAxis)>,
|
scroll_axes: Vec<(i32, ScrollAxis)>,
|
||||||
// For master devices, this is the paired device (pointer <-> keyboard).
|
// 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.
|
/// List of attached modes.
|
||||||
modes: Vec<randr::ModeInfo>,
|
modes: Vec<randr::ModeInfo>,
|
||||||
|
|
||||||
|
|||||||
@@ -83,14 +83,6 @@ impl FrameExtents {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
pub struct LogicalFrameExtents {
|
|
||||||
pub left: f64,
|
|
||||||
pub right: f64,
|
|
||||||
pub top: f64,
|
|
||||||
pub bottom: f64,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
pub enum FrameExtentsHeuristicPath {
|
pub enum FrameExtentsHeuristicPath {
|
||||||
Supported,
|
Supported,
|
||||||
|
|||||||
Reference in New Issue
Block a user