9602716ed2
* Rename EventsLoop and associated types to EventLoop * Rename WindowEvent::Refresh to WindowEvent::Redraw * Remove second thread from win32 backend * Update run_forever to hijack thread * Replace windows Mutex with parking_lot Mutex * Implement new ControlFlow and associated events * Add StartCause::Init support, timer example * Add ability to send custom user events * Fully invert windows control flow so win32 calls into winit's callback * Add request_redraw * Rename platform to platform_impl * Rename os to platform, add Ext trait postfixes * Add platform::desktop module with EventLoopExt::run_return * Re-organize into module structure * Improve documentation * Small changes to examples * Improve docs for run and run_return * Change instances of "events_loop" to "event_loop" * Rename MonitorId to MonitorHandle * Add CHANGELOG entry * Improve WaitUntil timer precision * When SendEvent is called during event closure, buffer events * Fix resize lag when waiting in some situations * Update send test and errors that broke some examples/APIs * Improve clarity/fix typos in docs * Fix unreachable panic after setting ControlFlow to Poll during some RedrawRequested events. * Fix crash when running in release mode * Remove crossbeam dependency and make drop events work again * Remove serde implementations from ControlFlow * Fix 1.24.1 build * Fix freeze when setting decorations * Replace &EventLoop in callback with &EventLoopWindowTarget * Document and implement Debug for EventLoopWindowTarget * Fix some deadlocks that could occur when changing window state * Fix thread executor not executing closure when called from non-loop thread * Fix buffered events not getting dispatched * Fix crash with runner refcell not getting dropped * Address review feedback * Fix CHANGELOG typo * Catch panics in user callback
75 lines
2.1 KiB
Rust
75 lines
2.1 KiB
Rust
use std::mem;
|
|
use std::ptr;
|
|
use std::sync::Arc;
|
|
use std::collections::HashMap;
|
|
|
|
use super::{ffi, XConnection, XError};
|
|
|
|
use super::input_method::PotentialInputMethods;
|
|
use super::context::ImeContext;
|
|
|
|
pub unsafe fn close_im(xconn: &Arc<XConnection>, im: ffi::XIM) -> Result<(), XError> {
|
|
(xconn.xlib.XCloseIM)(im);
|
|
xconn.check_errors()
|
|
}
|
|
|
|
pub unsafe fn destroy_ic(xconn: &Arc<XConnection>, ic: ffi::XIC) -> Result<(), XError> {
|
|
(xconn.xlib.XDestroyIC)(ic);
|
|
xconn.check_errors()
|
|
}
|
|
|
|
pub struct ImeInner {
|
|
pub xconn: Arc<XConnection>,
|
|
// WARNING: this is initially null!
|
|
pub im: ffi::XIM,
|
|
pub potential_input_methods: PotentialInputMethods,
|
|
pub contexts: HashMap<ffi::Window, Option<ImeContext>>,
|
|
// WARNING: this is initially zeroed!
|
|
pub destroy_callback: ffi::XIMCallback,
|
|
// Indicates whether or not the the input method was destroyed on the server end
|
|
// (i.e. if ibus/fcitx/etc. was terminated/restarted)
|
|
pub is_destroyed: bool,
|
|
pub is_fallback: bool,
|
|
}
|
|
|
|
impl ImeInner {
|
|
pub fn new(
|
|
xconn: Arc<XConnection>,
|
|
potential_input_methods: PotentialInputMethods,
|
|
) -> Self {
|
|
ImeInner {
|
|
xconn,
|
|
im: ptr::null_mut(),
|
|
potential_input_methods,
|
|
contexts: HashMap::new(),
|
|
destroy_callback: unsafe { mem::zeroed() },
|
|
is_destroyed: false,
|
|
is_fallback: false,
|
|
}
|
|
}
|
|
|
|
pub unsafe fn close_im_if_necessary(&self) -> Result<bool, XError> {
|
|
if !self.is_destroyed {
|
|
close_im(&self.xconn, self.im).map(|_| true)
|
|
} else {
|
|
Ok(false)
|
|
}
|
|
}
|
|
|
|
pub unsafe fn destroy_ic_if_necessary(&self, ic: ffi::XIC) -> Result<bool, XError> {
|
|
if !self.is_destroyed {
|
|
destroy_ic(&self.xconn, ic).map(|_| true)
|
|
} else {
|
|
Ok(false)
|
|
}
|
|
}
|
|
|
|
pub unsafe fn destroy_all_contexts_if_necessary(&self) -> Result<bool, XError> {
|
|
for context in self.contexts.values() {
|
|
if let &Some(ref context) = context {
|
|
self.destroy_ic_if_necessary(context.ic)?;
|
|
}
|
|
}
|
|
Ok(!self.is_destroyed)
|
|
}
|
|
}
|