2018-07-17 00:25:27 +10:00
|
|
|
#![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))]
|
2015-04-24 17:51:23 +10:00
|
|
|
|
2017-01-28 23:03:17 +11:00
|
|
|
use std::collections::VecDeque;
|
2019-05-30 11:29:54 +10:00
|
|
|
use std::{env, mem, fmt};
|
X11: General cleanup (#491)
* X11: General cleanup
This is almost entirely internal changes, and as usual, doesn't actually
fix any problems people have complained about.
- `XSetInputFocus` can't be called before the window is visible. This
was previously handled by looping (with a sleep) and querying for the
window's state until it was visible. Now we use `XIfEvent`, which blocks
until we receive `VisibilityNotify`. Note that this can't be replaced
with an `XSync` (I tried).
- We now call `XSync` at the end of window creation and check for
errors, assuring that broken windows are never returned. When creating
invisible windows, this is the only time the output buffer is flushed
during the entire window creation process (AFAIK). For visible windows,
`XIfEvent` will generally flush, but window creation has overall been
reduced to the minimum number of flushes.
- `check_errors().expect()` has been a common pattern throughout the
backend, but it seems that people (myself included) didn't make a
distinction between using it after synchronous requests and asynchronous
requests. Now we only use it after async requests if we flush first,
though this still isn't correct (since the request likely hasn't been
processed yet). The only real solution (besides forcing a sync *every
time*) is to handle asynchronous errors *asynchronously*. For future
work, I plan on adding logging, though I don't plan on actually
*handling* those errors; that's more of something to hope for in the
hypothetical async/await XCB paradise.
- We now flush whenever it makes sense to. `util::Flusher` was added to
force contributors to be aware of the output buffer.
- `Window::get_position`, `Window::get_inner_position`,
`Window::get_inner_size`, and `Window::get_outer_size` previously all
required *several* round-trips. On my machine, it took an average of
around 80µs. They've now been reduced to one round-trip each, which
reduces my measurement to 16µs. This was accomplished simply by caching
the frame extents, which are expensive to calculate (due to various
queries and heuristics), but change infrequently and predictably. I
still recommend that application developers use these methods sparingly
and generally prefer storing the values from `Resized`/`Moved`, as
that's zero overhead.
- The above change enabled me to change the `Moved` event to supply
window positions, rather than client area positions. Additionally, we no
longer generate `Moved` for real (as in, not synthetic)
`ConfigureNotify` events. Real `ConfigureNotify` events contain
positions relative to the parent window, which are typically constant
and useless. Since that position would be completely different from the
root-relative positions supplied by synthetic `ConfigureNotify` events
(which are the vast majority of them), that meant real `ConfigureNotify`
events would *always* be detected as the position having changed, so the
resultant `Moved` was multiple levels of misleading. In practice, this
meant a garbage `Moved` would be sent every time the window was resized;
now a resize has to actually change the window's position to be
accompanied by `Moved`.
- Every time we processed an `XI_Enter` event, we would leak 4 bytes via
`util::query_pointer` (`XIQueryPointer`). `XIButtonState` contains a
dynamically-allocated mask field which we weren't freeing. As this event
occurs with fairly high frequency, long-running applications could
easily accumulate substantial leaks. `util::PointerState::drop` now
takes care of this.
- The `util` module has been split up into several sub-modules, as it
was getting rather lengthy. This accounts for a significant part of this
diff, unfortunately.
- Atoms are now cached. Xlib caches them too, so `XInternAtom` wouldn't
typically be a round-trip anyway, but the added complexity is
negligible.
- Switched from `std::sync::Mutex` to `parking_lot::Mutex` (within this
backend). There appears to be no downside to this, but if anyone finds
one, this would be easy to revert.
- The WM name and supported hints are now global to the application, and
are updated upon `ReparentNotify`, which should detect when the WM was
replaced (assuming a reparenting WM was involved, that is). Previously,
these values were per-window and would never update, meaning replacing
the WM could potentially lead to (admittedly very minor) problems.
- The result of `Window2::create_empty_cursor` will now only be used if
it actually succeeds.
- `Window2::load_cursor` no longer re-allocates the cursor name.
- `util::lookup_utf8` previously allocated a 16-byte buffer on the heap.
Now it allocates a 1024-byte buffer on the stack, and falls back to
dynamic allocation if the buffer is too small. This base buffer size is
admittedly gratuitous, but less so if you're using IME.
- `with_c_str` was finally removed.
- Added `util::Format` enum to help prevent goofs when dealing with
format arguments.
- `util::get_property`, something I added way back in my first winit PR,
only calculated offsets correctly for `util::Format::Char`. This was
concealed by the accomodating buffer size, as it would be very rare for
the offset to be needed; however, testing with a buffer size of 1,
`util::Format::Long` would read from the same offset multiple times, and
`util::Format::Short` would miss data. This function now works correctly
for all formats, relying on the simple fact that the offset increases by
the buffer size on each iteration. We also account for the extra byte
that `XGetWindowProperty` allocates at the end of the buffer, and copy
data from the buffer instead of moving it and taking ownership of the
pointer.
- Drag and drop now reliably works in release mode. This is presumably
related to the `util::get_property` changes.
- `util::change_property` now exists, which should make it easier to add
features in the future.
- The `EventsLoop` device map is no longer in a mutex.
- `XConnection` now implements `Debug`.
- Valgrind no longer complains about anything related to winit (with
either the system allocator or jemalloc, though "not having valgrind
complain about jemalloc" isn't something to strive for).
* X11: Add better diagnostics when initialization fails
* X11: Handle XIQueryDevice failure
* X11: Use correct types in error handler
2018-05-03 23:15:49 +10:00
|
|
|
use std::ffi::CStr;
|
|
|
|
use std::os::raw::*;
|
2017-01-28 23:03:17 +11:00
|
|
|
use std::sync::Arc;
|
2015-05-04 15:32:02 +10:00
|
|
|
|
2018-06-18 10:44:38 +10:00
|
|
|
use parking_lot::Mutex;
|
2018-05-12 21:58:11 +10:00
|
|
|
use sctk::reexports::client::ConnectError;
|
|
|
|
|
2018-06-19 02:32:18 +10:00
|
|
|
use dpi::{LogicalPosition, LogicalSize, PhysicalPosition, PhysicalSize};
|
2019-02-21 20:51:43 +11:00
|
|
|
use icon::Icon;
|
2019-05-30 11:29:54 +10:00
|
|
|
use error::{ExternalError, NotSupportedError, OsError as RootOsError};
|
2019-04-28 02:06:51 +10:00
|
|
|
use event::Event;
|
2019-02-21 20:51:43 +11:00
|
|
|
use event_loop::{EventLoopClosed, ControlFlow, EventLoopWindowTarget as RootELW};
|
2019-06-13 04:07:25 +10:00
|
|
|
use monitor::{MonitorHandle as RootMonitorHandle, VideoMode};
|
2019-05-30 11:29:54 +10:00
|
|
|
use window::{WindowAttributes, CursorIcon};
|
2019-04-28 02:06:51 +10:00
|
|
|
use self::x11::{XConnection, XError};
|
|
|
|
use self::x11::ffi::XVisualInfo;
|
|
|
|
pub use self::x11::XNotSupported;
|
2017-09-01 19:04:57 +10:00
|
|
|
|
2017-03-04 06:56:27 +11:00
|
|
|
mod dlopen;
|
|
|
|
pub mod wayland;
|
2019-04-28 02:06:51 +10:00
|
|
|
pub mod x11;
|
2017-03-04 06:56:27 +11:00
|
|
|
|
2017-06-22 05:10:23 +10:00
|
|
|
/// Environment variable specifying which backend should be used on unix platform.
|
|
|
|
///
|
|
|
|
/// Legal values are x11 and wayland. If this variable is set only the named backend
|
|
|
|
/// will be tried by winit. If it is not set, winit will try to connect to a wayland connection,
|
|
|
|
/// and if it fails will fallback on x11.
|
|
|
|
///
|
|
|
|
/// If this variable is set with any other value, winit will panic.
|
2017-06-22 04:54:21 +10:00
|
|
|
const BACKEND_PREFERENCE_ENV_VAR: &str = "WINIT_UNIX_BACKEND";
|
2017-06-22 03:34:16 +10:00
|
|
|
|
2017-01-28 23:03:17 +11:00
|
|
|
#[derive(Clone, Default)]
|
|
|
|
pub struct PlatformSpecificWindowBuilderAttributes {
|
2019-04-28 02:06:51 +10:00
|
|
|
pub visual_infos: Option<XVisualInfo>,
|
2017-01-28 23:03:17 +11:00
|
|
|
pub screen_id: Option<i32>,
|
2018-05-17 00:16:36 +10:00
|
|
|
pub resize_increments: Option<(u32, u32)>,
|
|
|
|
pub base_size: Option<(u32, u32)>,
|
2018-05-21 00:47:22 +10:00
|
|
|
pub class: Option<(String, String)>,
|
|
|
|
pub override_redirect: bool,
|
2019-04-28 02:06:51 +10:00
|
|
|
pub x11_window_type: x11::util::WindowType,
|
2018-09-21 07:00:04 +10:00
|
|
|
pub gtk_theme_variant: Option<String>,
|
2018-11-16 08:59:56 +11:00
|
|
|
pub app_id: Option<String>
|
2017-01-28 23:03:17 +11:00
|
|
|
}
|
|
|
|
|
2019-04-28 02:06:51 +10:00
|
|
|
lazy_static!(
|
|
|
|
pub static ref X11_BACKEND: Mutex<Result<Arc<XConnection>, XNotSupported>> = {
|
|
|
|
Mutex::new(XConnection::new(Some(x_error_callback)).map(Arc::new))
|
|
|
|
};
|
|
|
|
);
|
2017-01-28 23:03:17 +11:00
|
|
|
|
2019-05-30 11:29:54 +10:00
|
|
|
#[derive(Debug, Clone)]
|
|
|
|
pub enum OsError {
|
|
|
|
XError(XError),
|
|
|
|
XMisc(&'static str),
|
|
|
|
}
|
|
|
|
|
|
|
|
impl fmt::Display for OsError {
|
|
|
|
fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
|
|
|
|
match self {
|
|
|
|
OsError::XError(e) => formatter.pad(&e.description),
|
|
|
|
OsError::XMisc(e) => formatter.pad(e),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-09-07 01:32:24 +10:00
|
|
|
pub enum Window {
|
2019-04-28 02:06:51 +10:00
|
|
|
X(x11::Window),
|
2018-06-15 09:42:18 +10:00
|
|
|
Wayland(wayland::Window),
|
2017-01-28 23:03:17 +11:00
|
|
|
}
|
|
|
|
|
2017-03-04 07:41:51 +11:00
|
|
|
#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
|
|
|
|
pub enum WindowId {
|
2019-04-28 02:06:51 +10:00
|
|
|
X(x11::WindowId),
|
2018-06-15 09:42:18 +10:00
|
|
|
Wayland(wayland::WindowId),
|
2017-01-28 23:03:17 +11:00
|
|
|
}
|
|
|
|
|
2018-12-22 03:51:48 +11:00
|
|
|
impl WindowId {
|
|
|
|
pub unsafe fn dummy() -> Self {
|
2019-02-21 20:51:43 +11:00
|
|
|
WindowId::Wayland(wayland::WindowId::dummy())
|
2018-12-22 03:51:48 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-04-23 06:52:35 +10:00
|
|
|
#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
|
|
|
|
pub enum DeviceId {
|
2019-04-28 02:06:51 +10:00
|
|
|
X(x11::DeviceId),
|
2018-06-15 09:42:18 +10:00
|
|
|
Wayland(wayland::DeviceId),
|
2017-04-23 06:52:35 +10:00
|
|
|
}
|
|
|
|
|
2018-12-22 03:51:48 +11:00
|
|
|
impl DeviceId {
|
|
|
|
pub unsafe fn dummy() -> Self {
|
2019-02-21 20:51:43 +11:00
|
|
|
DeviceId::Wayland(wayland::DeviceId::dummy())
|
2018-12-22 03:51:48 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-05-14 22:14:57 +10:00
|
|
|
#[derive(Debug, Clone)]
|
2019-02-06 02:30:33 +11:00
|
|
|
pub enum MonitorHandle {
|
2019-04-28 02:06:51 +10:00
|
|
|
X(x11::MonitorHandle),
|
2019-02-06 02:30:33 +11:00
|
|
|
Wayland(wayland::MonitorHandle),
|
2017-01-28 23:03:17 +11:00
|
|
|
}
|
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
impl MonitorHandle {
|
2017-01-28 23:03:17 +11:00
|
|
|
#[inline]
|
2019-05-30 11:29:54 +10:00
|
|
|
pub fn name(&self) -> Option<String> {
|
2017-01-28 23:03:17 +11:00
|
|
|
match self {
|
2019-05-30 11:29:54 +10:00
|
|
|
&MonitorHandle::X(ref m) => m.name(),
|
|
|
|
&MonitorHandle::Wayland(ref m) => m.name(),
|
2017-01-28 23:03:17 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
2019-05-30 11:29:54 +10:00
|
|
|
pub fn native_identifier(&self) -> u32 {
|
2017-01-28 23:03:17 +11:00
|
|
|
match self {
|
2019-05-30 11:29:54 +10:00
|
|
|
&MonitorHandle::X(ref m) => m.native_identifier(),
|
|
|
|
&MonitorHandle::Wayland(ref m) => m.native_identifier(),
|
2017-01-28 23:03:17 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
2019-05-30 11:29:54 +10:00
|
|
|
pub fn dimensions(&self) -> PhysicalSize {
|
2017-01-28 23:03:17 +11:00
|
|
|
match self {
|
2019-05-30 11:29:54 +10:00
|
|
|
&MonitorHandle::X(ref m) => m.dimensions(),
|
|
|
|
&MonitorHandle::Wayland(ref m) => m.dimensions(),
|
2017-01-28 23:03:17 +11:00
|
|
|
}
|
|
|
|
}
|
2017-09-07 18:33:46 +10:00
|
|
|
|
|
|
|
#[inline]
|
2019-05-30 11:29:54 +10:00
|
|
|
pub fn position(&self) -> PhysicalPosition {
|
2017-09-07 18:33:46 +10:00
|
|
|
match self {
|
2019-05-30 11:29:54 +10:00
|
|
|
&MonitorHandle::X(ref m) => m.position(),
|
|
|
|
&MonitorHandle::Wayland(ref m) => m.position(),
|
2017-09-07 18:33:46 +10:00
|
|
|
}
|
|
|
|
}
|
2017-10-17 22:56:38 +11:00
|
|
|
|
|
|
|
#[inline]
|
2019-05-30 11:29:54 +10:00
|
|
|
pub fn hidpi_factor(&self) -> f64 {
|
2017-10-20 04:08:05 +11:00
|
|
|
match self {
|
2019-05-30 11:29:54 +10:00
|
|
|
&MonitorHandle::X(ref m) => m.hidpi_factor(),
|
|
|
|
&MonitorHandle::Wayland(ref m) => m.hidpi_factor() as f64,
|
2017-10-20 04:08:05 +11:00
|
|
|
}
|
2017-10-17 22:56:38 +11:00
|
|
|
}
|
2019-06-13 04:07:25 +10:00
|
|
|
|
|
|
|
#[inline]
|
|
|
|
pub fn video_modes(&self) -> Box<dyn Iterator<Item = VideoMode>> {
|
|
|
|
match self {
|
|
|
|
MonitorHandle::X(m) => Box::new(m.video_modes()),
|
|
|
|
MonitorHandle::Wayland(m) => Box::new(m.video_modes()),
|
|
|
|
}
|
|
|
|
}
|
2017-01-28 23:03:17 +11:00
|
|
|
}
|
|
|
|
|
2017-09-07 01:32:24 +10:00
|
|
|
impl Window {
|
2017-01-28 23:03:17 +11:00
|
|
|
#[inline]
|
2019-02-21 20:51:43 +11:00
|
|
|
pub fn new<T>(
|
|
|
|
window_target: &EventLoopWindowTarget<T>,
|
2018-05-08 07:36:21 +10:00
|
|
|
attribs: WindowAttributes,
|
|
|
|
pl_attribs: PlatformSpecificWindowBuilderAttributes,
|
2019-05-30 11:29:54 +10:00
|
|
|
) -> Result<Self, RootOsError> {
|
2019-02-21 20:51:43 +11:00
|
|
|
match *window_target {
|
|
|
|
EventLoopWindowTarget::Wayland(ref window_target) => {
|
|
|
|
wayland::Window::new(window_target, attribs, pl_attribs).map(Window::Wayland)
|
2017-01-28 23:03:17 +11:00
|
|
|
},
|
2019-04-28 02:06:51 +10:00
|
|
|
EventLoopWindowTarget::X(ref window_target) => {
|
|
|
|
x11::Window::new(window_target, attribs, pl_attribs).map(Window::X)
|
|
|
|
},
|
2017-01-28 23:03:17 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-03-04 07:41:51 +11:00
|
|
|
#[inline]
|
|
|
|
pub fn id(&self) -> WindowId {
|
2017-03-04 20:48:44 +11:00
|
|
|
match self {
|
2019-04-28 02:06:51 +10:00
|
|
|
&Window::X(ref w) => WindowId::X(w.id()),
|
2018-06-15 09:42:18 +10:00
|
|
|
&Window::Wayland(ref w) => WindowId::Wayland(w.id()),
|
2017-03-04 20:48:44 +11:00
|
|
|
}
|
2017-03-04 07:41:51 +11:00
|
|
|
}
|
|
|
|
|
2017-01-28 23:03:17 +11:00
|
|
|
#[inline]
|
|
|
|
pub fn set_title(&self, title: &str) {
|
|
|
|
match self {
|
2019-04-28 02:06:51 +10:00
|
|
|
&Window::X(ref w) => w.set_title(title),
|
2018-06-15 09:42:18 +10:00
|
|
|
&Window::Wayland(ref w) => w.set_title(title),
|
2017-01-28 23:03:17 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
2019-05-30 11:29:54 +10:00
|
|
|
pub fn set_visible(&self, visible: bool) {
|
2017-01-28 23:03:17 +11:00
|
|
|
match self {
|
2019-05-30 11:29:54 +10:00
|
|
|
&Window::X(ref w) => w.set_visible(visible),
|
|
|
|
&Window::Wayland(ref w) => w.set_visible(visible),
|
2017-01-28 23:03:17 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
2019-05-30 11:29:54 +10:00
|
|
|
pub fn outer_position(&self) -> Result<LogicalPosition, NotSupportedError> {
|
2017-01-28 23:03:17 +11:00
|
|
|
match self {
|
2019-05-30 11:29:54 +10:00
|
|
|
&Window::X(ref w) => w.outer_position(),
|
|
|
|
&Window::Wayland(ref w) => w.outer_position(),
|
2017-01-28 23:03:17 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
2019-05-30 11:29:54 +10:00
|
|
|
pub fn inner_position(&self) -> Result<LogicalPosition, NotSupportedError> {
|
2017-01-28 23:03:17 +11:00
|
|
|
match self {
|
2019-05-30 11:29:54 +10:00
|
|
|
&Window::X(ref m) => m.inner_position(),
|
|
|
|
&Window::Wayland(ref m) => m.inner_position(),
|
2017-01-28 23:03:17 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-04-17 11:40:30 +10:00
|
|
|
#[inline]
|
2019-05-30 11:29:54 +10:00
|
|
|
pub fn set_outer_position(&self, position: LogicalPosition) {
|
2018-04-17 11:40:30 +10:00
|
|
|
match self {
|
2019-05-30 11:29:54 +10:00
|
|
|
&Window::X(ref w) => w.set_outer_position(position),
|
|
|
|
&Window::Wayland(ref w) => w.set_outer_position(position),
|
2018-04-17 11:40:30 +10:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-01-28 23:03:17 +11:00
|
|
|
#[inline]
|
2019-05-30 11:29:54 +10:00
|
|
|
pub fn inner_size(&self) -> LogicalSize {
|
2017-01-28 23:03:17 +11:00
|
|
|
match self {
|
2019-05-30 11:29:54 +10:00
|
|
|
&Window::X(ref w) => w.inner_size(),
|
|
|
|
&Window::Wayland(ref w) => w.inner_size(),
|
2017-01-28 23:03:17 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
2019-05-30 11:29:54 +10:00
|
|
|
pub fn outer_size(&self) -> LogicalSize {
|
2017-01-28 23:03:17 +11:00
|
|
|
match self {
|
2019-05-30 11:29:54 +10:00
|
|
|
&Window::X(ref w) => w.outer_size(),
|
|
|
|
&Window::Wayland(ref w) => w.outer_size(),
|
2017-01-28 23:03:17 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
2018-06-15 09:42:18 +10:00
|
|
|
pub fn set_inner_size(&self, size: LogicalSize) {
|
2017-01-28 23:03:17 +11:00
|
|
|
match self {
|
2019-04-28 02:06:51 +10:00
|
|
|
&Window::X(ref w) => w.set_inner_size(size),
|
2018-06-15 09:42:18 +10:00
|
|
|
&Window::Wayland(ref w) => w.set_inner_size(size),
|
2017-01-28 23:03:17 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-03-23 20:35:35 +11:00
|
|
|
#[inline]
|
2019-05-30 11:29:54 +10:00
|
|
|
pub fn set_min_inner_size(&self, dimensions: Option<LogicalSize>) {
|
2018-03-23 20:35:35 +11:00
|
|
|
match self {
|
2019-05-30 11:29:54 +10:00
|
|
|
&Window::X(ref w) => w.set_min_inner_size(dimensions),
|
|
|
|
&Window::Wayland(ref w) => w.set_min_inner_size(dimensions),
|
2018-03-23 20:35:35 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
2019-05-30 11:29:54 +10:00
|
|
|
pub fn set_max_inner_size(&self, dimensions: Option<LogicalSize>) {
|
2018-03-23 20:35:35 +11:00
|
|
|
match self {
|
2019-05-30 11:29:54 +10:00
|
|
|
&Window::X(ref w) => w.set_max_inner_size(dimensions),
|
|
|
|
&Window::Wayland(ref w) => w.set_max_inner_size(dimensions),
|
2018-03-23 20:35:35 +11:00
|
|
|
}
|
|
|
|
}
|
2018-06-15 09:42:18 +10:00
|
|
|
|
2018-06-12 08:47:50 +10:00
|
|
|
#[inline]
|
|
|
|
pub fn set_resizable(&self, resizable: bool) {
|
|
|
|
match self {
|
2019-04-28 02:06:51 +10:00
|
|
|
&Window::X(ref w) => w.set_resizable(resizable),
|
2018-06-14 01:18:44 +10:00
|
|
|
&Window::Wayland(ref w) => w.set_resizable(resizable),
|
2018-06-12 08:47:50 +10:00
|
|
|
}
|
|
|
|
}
|
2018-03-23 20:35:35 +11:00
|
|
|
|
2017-01-28 23:03:17 +11:00
|
|
|
#[inline]
|
2019-05-30 11:29:54 +10:00
|
|
|
pub fn set_cursor_icon(&self, cursor: CursorIcon) {
|
2017-01-28 23:03:17 +11:00
|
|
|
match self {
|
2019-05-30 11:29:54 +10:00
|
|
|
&Window::X(ref w) => w.set_cursor_icon(cursor),
|
|
|
|
&Window::Wayland(ref w) => w.set_cursor_icon(cursor)
|
2017-01-28 23:03:17 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
2019-05-30 11:29:54 +10:00
|
|
|
pub fn set_cursor_grab(&self, grab: bool) -> Result<(), ExternalError> {
|
2017-01-28 23:03:17 +11:00
|
|
|
match self {
|
2019-05-30 11:29:54 +10:00
|
|
|
&Window::X(ref window) => window.set_cursor_grab(grab),
|
|
|
|
&Window::Wayland(ref window) => window.set_cursor_grab(grab),
|
2018-06-19 02:32:18 +10:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
2019-05-30 11:29:54 +10:00
|
|
|
pub fn set_cursor_visible(&self, visible: bool) {
|
2018-06-19 02:32:18 +10:00
|
|
|
match self {
|
2019-05-30 11:29:54 +10:00
|
|
|
&Window::X(ref window) => window.set_cursor_visible(visible),
|
|
|
|
&Window::Wayland(ref window) => window.set_cursor_visible(visible),
|
2017-01-28 23:03:17 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
2019-05-30 11:29:54 +10:00
|
|
|
pub fn hidpi_factor(&self) -> f64 {
|
2017-01-28 23:03:17 +11:00
|
|
|
match self {
|
2019-05-30 11:29:54 +10:00
|
|
|
&Window::X(ref w) => w.hidpi_factor(),
|
2018-06-15 09:42:18 +10:00
|
|
|
&Window::Wayland(ref w) => w.hidpi_factor() as f64,
|
2017-01-28 23:03:17 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
2019-05-30 11:29:54 +10:00
|
|
|
pub fn set_cursor_position(&self, position: LogicalPosition) -> Result<(), ExternalError> {
|
2017-01-28 23:03:17 +11:00
|
|
|
match self {
|
2019-04-28 02:06:51 +10:00
|
|
|
&Window::X(ref w) => w.set_cursor_position(position),
|
2018-06-15 09:42:18 +10:00
|
|
|
&Window::Wayland(ref w) => w.set_cursor_position(position),
|
2017-01-28 23:03:17 +11:00
|
|
|
}
|
|
|
|
}
|
2017-08-28 09:19:26 +10:00
|
|
|
|
|
|
|
#[inline]
|
|
|
|
pub fn set_maximized(&self, maximized: bool) {
|
|
|
|
match self {
|
2019-04-28 02:06:51 +10:00
|
|
|
&Window::X(ref w) => w.set_maximized(maximized),
|
2018-01-13 16:38:12 +11:00
|
|
|
&Window::Wayland(ref w) => w.set_maximized(maximized),
|
2017-08-28 09:19:26 +10:00
|
|
|
}
|
|
|
|
}
|
2017-08-28 09:22:26 +10:00
|
|
|
|
2019-04-26 03:09:32 +10:00
|
|
|
#[inline]
|
2019-05-30 11:29:54 +10:00
|
|
|
pub fn fullscreen(&self) -> Option<RootMonitorHandle> {
|
2019-04-26 03:09:32 +10:00
|
|
|
match self {
|
2019-05-30 11:29:54 +10:00
|
|
|
&Window::X(ref w) => w.fullscreen(),
|
|
|
|
&Window::Wayland(ref w) => w.fullscreen()
|
2019-04-26 03:09:32 +10:00
|
|
|
.map(|monitor_id| RootMonitorHandle { inner: MonitorHandle::Wayland(monitor_id) })
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-28 09:22:26 +10:00
|
|
|
#[inline]
|
2019-02-06 02:30:33 +11:00
|
|
|
pub fn set_fullscreen(&self, monitor: Option<RootMonitorHandle>) {
|
2017-08-28 09:22:26 +10:00
|
|
|
match self {
|
2019-04-28 02:06:51 +10:00
|
|
|
&Window::X(ref w) => w.set_fullscreen(monitor),
|
2018-01-13 16:38:12 +11:00
|
|
|
&Window::Wayland(ref w) => w.set_fullscreen(monitor)
|
2017-12-22 23:50:46 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
|
|
|
pub fn set_decorations(&self, decorations: bool) {
|
|
|
|
match self {
|
2019-04-28 02:06:51 +10:00
|
|
|
&Window::X(ref w) => w.set_decorations(decorations),
|
2018-01-13 16:38:12 +11:00
|
|
|
&Window::Wayland(ref w) => w.set_decorations(decorations)
|
2017-08-28 09:22:26 +10:00
|
|
|
}
|
|
|
|
}
|
2017-09-07 18:33:46 +10:00
|
|
|
|
2018-05-21 00:24:05 +10:00
|
|
|
#[inline]
|
|
|
|
pub fn set_always_on_top(&self, always_on_top: bool) {
|
|
|
|
match self {
|
2019-04-28 02:06:51 +10:00
|
|
|
&Window::X(ref w) => w.set_always_on_top(always_on_top),
|
2018-05-21 00:24:05 +10:00
|
|
|
&Window::Wayland(_) => (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-05-08 07:36:21 +10:00
|
|
|
#[inline]
|
|
|
|
pub fn set_window_icon(&self, window_icon: Option<Icon>) {
|
|
|
|
match self {
|
2019-04-28 02:06:51 +10:00
|
|
|
&Window::X(ref w) => w.set_window_icon(window_icon),
|
2018-05-08 07:36:21 +10:00
|
|
|
&Window::Wayland(_) => (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-05-18 11:28:30 +10:00
|
|
|
#[inline]
|
2019-05-30 11:29:54 +10:00
|
|
|
pub fn set_ime_position(&self, position: LogicalPosition) {
|
2018-05-18 11:28:30 +10:00
|
|
|
match self {
|
2019-05-30 11:29:54 +10:00
|
|
|
&Window::X(ref w) => w.set_ime_position(position),
|
2018-05-18 11:28:30 +10:00
|
|
|
&Window::Wayland(_) => (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-02-21 20:51:43 +11:00
|
|
|
#[inline]
|
|
|
|
pub fn request_redraw(&self) {
|
|
|
|
match self {
|
2019-04-28 02:06:51 +10:00
|
|
|
&Window::X(ref w) => w.request_redraw(),
|
2019-02-21 20:51:43 +11:00
|
|
|
&Window::Wayland(ref w) => w.request_redraw(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-09-07 18:33:46 +10:00
|
|
|
#[inline]
|
2019-05-30 11:29:54 +10:00
|
|
|
pub fn current_monitor(&self) -> RootMonitorHandle {
|
2017-09-07 18:33:46 +10:00
|
|
|
match self {
|
2019-05-30 11:29:54 +10:00
|
|
|
&Window::X(ref window) => RootMonitorHandle { inner: MonitorHandle::X(window.current_monitor()) },
|
|
|
|
&Window::Wayland(ref window) => RootMonitorHandle { inner: MonitorHandle::Wayland(window.current_monitor()) },
|
2018-06-17 00:14:12 +10:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
2019-05-30 11:29:54 +10:00
|
|
|
pub fn available_monitors(&self) -> VecDeque<MonitorHandle> {
|
2018-06-17 00:14:12 +10:00
|
|
|
match self {
|
2019-05-30 11:29:54 +10:00
|
|
|
&Window::X(ref window) => window.available_monitors()
|
2019-04-28 02:06:51 +10:00
|
|
|
.into_iter()
|
|
|
|
.map(MonitorHandle::X)
|
|
|
|
.collect(),
|
2019-05-30 11:29:54 +10:00
|
|
|
&Window::Wayland(ref window) => window.available_monitors()
|
2018-06-17 00:14:12 +10:00
|
|
|
.into_iter()
|
2019-02-06 02:30:33 +11:00
|
|
|
.map(MonitorHandle::Wayland)
|
2018-06-17 00:14:12 +10:00
|
|
|
.collect(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
2019-05-30 11:29:54 +10:00
|
|
|
pub fn primary_monitor(&self) -> MonitorHandle {
|
2018-06-17 00:14:12 +10:00
|
|
|
match self {
|
2019-05-30 11:29:54 +10:00
|
|
|
&Window::X(ref window) => MonitorHandle::X(window.primary_monitor()),
|
|
|
|
&Window::Wayland(ref window) => MonitorHandle::Wayland(window.primary_monitor()),
|
2017-09-07 18:33:46 +10:00
|
|
|
}
|
|
|
|
}
|
2017-01-28 23:03:17 +11:00
|
|
|
}
|
|
|
|
|
2019-04-28 02:06:51 +10:00
|
|
|
|
X11: General cleanup (#491)
* X11: General cleanup
This is almost entirely internal changes, and as usual, doesn't actually
fix any problems people have complained about.
- `XSetInputFocus` can't be called before the window is visible. This
was previously handled by looping (with a sleep) and querying for the
window's state until it was visible. Now we use `XIfEvent`, which blocks
until we receive `VisibilityNotify`. Note that this can't be replaced
with an `XSync` (I tried).
- We now call `XSync` at the end of window creation and check for
errors, assuring that broken windows are never returned. When creating
invisible windows, this is the only time the output buffer is flushed
during the entire window creation process (AFAIK). For visible windows,
`XIfEvent` will generally flush, but window creation has overall been
reduced to the minimum number of flushes.
- `check_errors().expect()` has been a common pattern throughout the
backend, but it seems that people (myself included) didn't make a
distinction between using it after synchronous requests and asynchronous
requests. Now we only use it after async requests if we flush first,
though this still isn't correct (since the request likely hasn't been
processed yet). The only real solution (besides forcing a sync *every
time*) is to handle asynchronous errors *asynchronously*. For future
work, I plan on adding logging, though I don't plan on actually
*handling* those errors; that's more of something to hope for in the
hypothetical async/await XCB paradise.
- We now flush whenever it makes sense to. `util::Flusher` was added to
force contributors to be aware of the output buffer.
- `Window::get_position`, `Window::get_inner_position`,
`Window::get_inner_size`, and `Window::get_outer_size` previously all
required *several* round-trips. On my machine, it took an average of
around 80µs. They've now been reduced to one round-trip each, which
reduces my measurement to 16µs. This was accomplished simply by caching
the frame extents, which are expensive to calculate (due to various
queries and heuristics), but change infrequently and predictably. I
still recommend that application developers use these methods sparingly
and generally prefer storing the values from `Resized`/`Moved`, as
that's zero overhead.
- The above change enabled me to change the `Moved` event to supply
window positions, rather than client area positions. Additionally, we no
longer generate `Moved` for real (as in, not synthetic)
`ConfigureNotify` events. Real `ConfigureNotify` events contain
positions relative to the parent window, which are typically constant
and useless. Since that position would be completely different from the
root-relative positions supplied by synthetic `ConfigureNotify` events
(which are the vast majority of them), that meant real `ConfigureNotify`
events would *always* be detected as the position having changed, so the
resultant `Moved` was multiple levels of misleading. In practice, this
meant a garbage `Moved` would be sent every time the window was resized;
now a resize has to actually change the window's position to be
accompanied by `Moved`.
- Every time we processed an `XI_Enter` event, we would leak 4 bytes via
`util::query_pointer` (`XIQueryPointer`). `XIButtonState` contains a
dynamically-allocated mask field which we weren't freeing. As this event
occurs with fairly high frequency, long-running applications could
easily accumulate substantial leaks. `util::PointerState::drop` now
takes care of this.
- The `util` module has been split up into several sub-modules, as it
was getting rather lengthy. This accounts for a significant part of this
diff, unfortunately.
- Atoms are now cached. Xlib caches them too, so `XInternAtom` wouldn't
typically be a round-trip anyway, but the added complexity is
negligible.
- Switched from `std::sync::Mutex` to `parking_lot::Mutex` (within this
backend). There appears to be no downside to this, but if anyone finds
one, this would be easy to revert.
- The WM name and supported hints are now global to the application, and
are updated upon `ReparentNotify`, which should detect when the WM was
replaced (assuming a reparenting WM was involved, that is). Previously,
these values were per-window and would never update, meaning replacing
the WM could potentially lead to (admittedly very minor) problems.
- The result of `Window2::create_empty_cursor` will now only be used if
it actually succeeds.
- `Window2::load_cursor` no longer re-allocates the cursor name.
- `util::lookup_utf8` previously allocated a 16-byte buffer on the heap.
Now it allocates a 1024-byte buffer on the stack, and falls back to
dynamic allocation if the buffer is too small. This base buffer size is
admittedly gratuitous, but less so if you're using IME.
- `with_c_str` was finally removed.
- Added `util::Format` enum to help prevent goofs when dealing with
format arguments.
- `util::get_property`, something I added way back in my first winit PR,
only calculated offsets correctly for `util::Format::Char`. This was
concealed by the accomodating buffer size, as it would be very rare for
the offset to be needed; however, testing with a buffer size of 1,
`util::Format::Long` would read from the same offset multiple times, and
`util::Format::Short` would miss data. This function now works correctly
for all formats, relying on the simple fact that the offset increases by
the buffer size on each iteration. We also account for the extra byte
that `XGetWindowProperty` allocates at the end of the buffer, and copy
data from the buffer instead of moving it and taking ownership of the
pointer.
- Drag and drop now reliably works in release mode. This is presumably
related to the `util::get_property` changes.
- `util::change_property` now exists, which should make it easier to add
features in the future.
- The `EventsLoop` device map is no longer in a mutex.
- `XConnection` now implements `Debug`.
- Valgrind no longer complains about anything related to winit (with
either the system allocator or jemalloc, though "not having valgrind
complain about jemalloc" isn't something to strive for).
* X11: Add better diagnostics when initialization fails
* X11: Handle XIQueryDevice failure
* X11: Use correct types in error handler
2018-05-03 23:15:49 +10:00
|
|
|
unsafe extern "C" fn x_error_callback(
|
|
|
|
display: *mut x11::ffi::Display,
|
|
|
|
event: *mut x11::ffi::XErrorEvent,
|
|
|
|
) -> c_int {
|
2018-06-18 10:44:38 +10:00
|
|
|
let xconn_lock = X11_BACKEND.lock();
|
|
|
|
if let Ok(ref xconn) = *xconn_lock {
|
|
|
|
let mut buf: [c_char; 1024] = mem::uninitialized();
|
|
|
|
(xconn.xlib.XGetErrorText)(
|
|
|
|
display,
|
|
|
|
(*event).error_code as c_int,
|
|
|
|
buf.as_mut_ptr(),
|
|
|
|
buf.len() as c_int,
|
|
|
|
);
|
|
|
|
let description = CStr::from_ptr(buf.as_ptr()).to_string_lossy();
|
|
|
|
|
|
|
|
let error = XError {
|
|
|
|
description: description.into_owned(),
|
|
|
|
error_code: (*event).error_code,
|
|
|
|
request_code: (*event).request_code,
|
|
|
|
minor_code: (*event).minor_code,
|
|
|
|
};
|
|
|
|
|
2018-11-18 07:51:39 +11:00
|
|
|
error!("X11 error: {:#?}", error);
|
2018-06-18 10:44:38 +10:00
|
|
|
|
|
|
|
*xconn.latest_error.lock() = Some(error);
|
|
|
|
}
|
X11: General cleanup (#491)
* X11: General cleanup
This is almost entirely internal changes, and as usual, doesn't actually
fix any problems people have complained about.
- `XSetInputFocus` can't be called before the window is visible. This
was previously handled by looping (with a sleep) and querying for the
window's state until it was visible. Now we use `XIfEvent`, which blocks
until we receive `VisibilityNotify`. Note that this can't be replaced
with an `XSync` (I tried).
- We now call `XSync` at the end of window creation and check for
errors, assuring that broken windows are never returned. When creating
invisible windows, this is the only time the output buffer is flushed
during the entire window creation process (AFAIK). For visible windows,
`XIfEvent` will generally flush, but window creation has overall been
reduced to the minimum number of flushes.
- `check_errors().expect()` has been a common pattern throughout the
backend, but it seems that people (myself included) didn't make a
distinction between using it after synchronous requests and asynchronous
requests. Now we only use it after async requests if we flush first,
though this still isn't correct (since the request likely hasn't been
processed yet). The only real solution (besides forcing a sync *every
time*) is to handle asynchronous errors *asynchronously*. For future
work, I plan on adding logging, though I don't plan on actually
*handling* those errors; that's more of something to hope for in the
hypothetical async/await XCB paradise.
- We now flush whenever it makes sense to. `util::Flusher` was added to
force contributors to be aware of the output buffer.
- `Window::get_position`, `Window::get_inner_position`,
`Window::get_inner_size`, and `Window::get_outer_size` previously all
required *several* round-trips. On my machine, it took an average of
around 80µs. They've now been reduced to one round-trip each, which
reduces my measurement to 16µs. This was accomplished simply by caching
the frame extents, which are expensive to calculate (due to various
queries and heuristics), but change infrequently and predictably. I
still recommend that application developers use these methods sparingly
and generally prefer storing the values from `Resized`/`Moved`, as
that's zero overhead.
- The above change enabled me to change the `Moved` event to supply
window positions, rather than client area positions. Additionally, we no
longer generate `Moved` for real (as in, not synthetic)
`ConfigureNotify` events. Real `ConfigureNotify` events contain
positions relative to the parent window, which are typically constant
and useless. Since that position would be completely different from the
root-relative positions supplied by synthetic `ConfigureNotify` events
(which are the vast majority of them), that meant real `ConfigureNotify`
events would *always* be detected as the position having changed, so the
resultant `Moved` was multiple levels of misleading. In practice, this
meant a garbage `Moved` would be sent every time the window was resized;
now a resize has to actually change the window's position to be
accompanied by `Moved`.
- Every time we processed an `XI_Enter` event, we would leak 4 bytes via
`util::query_pointer` (`XIQueryPointer`). `XIButtonState` contains a
dynamically-allocated mask field which we weren't freeing. As this event
occurs with fairly high frequency, long-running applications could
easily accumulate substantial leaks. `util::PointerState::drop` now
takes care of this.
- The `util` module has been split up into several sub-modules, as it
was getting rather lengthy. This accounts for a significant part of this
diff, unfortunately.
- Atoms are now cached. Xlib caches them too, so `XInternAtom` wouldn't
typically be a round-trip anyway, but the added complexity is
negligible.
- Switched from `std::sync::Mutex` to `parking_lot::Mutex` (within this
backend). There appears to be no downside to this, but if anyone finds
one, this would be easy to revert.
- The WM name and supported hints are now global to the application, and
are updated upon `ReparentNotify`, which should detect when the WM was
replaced (assuming a reparenting WM was involved, that is). Previously,
these values were per-window and would never update, meaning replacing
the WM could potentially lead to (admittedly very minor) problems.
- The result of `Window2::create_empty_cursor` will now only be used if
it actually succeeds.
- `Window2::load_cursor` no longer re-allocates the cursor name.
- `util::lookup_utf8` previously allocated a 16-byte buffer on the heap.
Now it allocates a 1024-byte buffer on the stack, and falls back to
dynamic allocation if the buffer is too small. This base buffer size is
admittedly gratuitous, but less so if you're using IME.
- `with_c_str` was finally removed.
- Added `util::Format` enum to help prevent goofs when dealing with
format arguments.
- `util::get_property`, something I added way back in my first winit PR,
only calculated offsets correctly for `util::Format::Char`. This was
concealed by the accomodating buffer size, as it would be very rare for
the offset to be needed; however, testing with a buffer size of 1,
`util::Format::Long` would read from the same offset multiple times, and
`util::Format::Short` would miss data. This function now works correctly
for all formats, relying on the simple fact that the offset increases by
the buffer size on each iteration. We also account for the extra byte
that `XGetWindowProperty` allocates at the end of the buffer, and copy
data from the buffer instead of moving it and taking ownership of the
pointer.
- Drag and drop now reliably works in release mode. This is presumably
related to the `util::get_property` changes.
- `util::change_property` now exists, which should make it easier to add
features in the future.
- The `EventsLoop` device map is no longer in a mutex.
- `XConnection` now implements `Debug`.
- Valgrind no longer complains about anything related to winit (with
either the system allocator or jemalloc, though "not having valgrind
complain about jemalloc" isn't something to strive for).
* X11: Add better diagnostics when initialization fails
* X11: Handle XIQueryDevice failure
* X11: Use correct types in error handler
2018-05-03 23:15:49 +10:00
|
|
|
// Fun fact: this return value is completely ignored.
|
2017-01-28 23:03:17 +11:00
|
|
|
0
|
|
|
|
}
|
2019-04-28 02:06:51 +10:00
|
|
|
|
2017-03-04 07:41:51 +11:00
|
|
|
|
2019-02-21 20:51:43 +11:00
|
|
|
pub enum EventLoop<T: 'static> {
|
|
|
|
Wayland(wayland::EventLoop<T>),
|
2019-04-28 02:06:51 +10:00
|
|
|
X(x11::EventLoop<T>)
|
2017-03-04 07:41:51 +11:00
|
|
|
}
|
|
|
|
|
2017-10-26 05:03:57 +11:00
|
|
|
#[derive(Clone)]
|
2019-02-21 20:51:43 +11:00
|
|
|
pub enum EventLoopProxy<T: 'static> {
|
2019-04-28 02:06:51 +10:00
|
|
|
X(x11::EventLoopProxy<T>),
|
2019-02-21 20:51:43 +11:00
|
|
|
Wayland(wayland::EventLoopProxy<T>),
|
2017-05-25 23:19:13 +10:00
|
|
|
}
|
|
|
|
|
2019-02-21 20:51:43 +11:00
|
|
|
impl<T:'static> EventLoop<T> {
|
|
|
|
pub fn new() -> EventLoop<T> {
|
2017-09-01 19:04:57 +10:00
|
|
|
if let Ok(env_var) = env::var(BACKEND_PREFERENCE_ENV_VAR) {
|
|
|
|
match env_var.as_str() {
|
|
|
|
"x11" => {
|
X11: General cleanup (#491)
* X11: General cleanup
This is almost entirely internal changes, and as usual, doesn't actually
fix any problems people have complained about.
- `XSetInputFocus` can't be called before the window is visible. This
was previously handled by looping (with a sleep) and querying for the
window's state until it was visible. Now we use `XIfEvent`, which blocks
until we receive `VisibilityNotify`. Note that this can't be replaced
with an `XSync` (I tried).
- We now call `XSync` at the end of window creation and check for
errors, assuring that broken windows are never returned. When creating
invisible windows, this is the only time the output buffer is flushed
during the entire window creation process (AFAIK). For visible windows,
`XIfEvent` will generally flush, but window creation has overall been
reduced to the minimum number of flushes.
- `check_errors().expect()` has been a common pattern throughout the
backend, but it seems that people (myself included) didn't make a
distinction between using it after synchronous requests and asynchronous
requests. Now we only use it after async requests if we flush first,
though this still isn't correct (since the request likely hasn't been
processed yet). The only real solution (besides forcing a sync *every
time*) is to handle asynchronous errors *asynchronously*. For future
work, I plan on adding logging, though I don't plan on actually
*handling* those errors; that's more of something to hope for in the
hypothetical async/await XCB paradise.
- We now flush whenever it makes sense to. `util::Flusher` was added to
force contributors to be aware of the output buffer.
- `Window::get_position`, `Window::get_inner_position`,
`Window::get_inner_size`, and `Window::get_outer_size` previously all
required *several* round-trips. On my machine, it took an average of
around 80µs. They've now been reduced to one round-trip each, which
reduces my measurement to 16µs. This was accomplished simply by caching
the frame extents, which are expensive to calculate (due to various
queries and heuristics), but change infrequently and predictably. I
still recommend that application developers use these methods sparingly
and generally prefer storing the values from `Resized`/`Moved`, as
that's zero overhead.
- The above change enabled me to change the `Moved` event to supply
window positions, rather than client area positions. Additionally, we no
longer generate `Moved` for real (as in, not synthetic)
`ConfigureNotify` events. Real `ConfigureNotify` events contain
positions relative to the parent window, which are typically constant
and useless. Since that position would be completely different from the
root-relative positions supplied by synthetic `ConfigureNotify` events
(which are the vast majority of them), that meant real `ConfigureNotify`
events would *always* be detected as the position having changed, so the
resultant `Moved` was multiple levels of misleading. In practice, this
meant a garbage `Moved` would be sent every time the window was resized;
now a resize has to actually change the window's position to be
accompanied by `Moved`.
- Every time we processed an `XI_Enter` event, we would leak 4 bytes via
`util::query_pointer` (`XIQueryPointer`). `XIButtonState` contains a
dynamically-allocated mask field which we weren't freeing. As this event
occurs with fairly high frequency, long-running applications could
easily accumulate substantial leaks. `util::PointerState::drop` now
takes care of this.
- The `util` module has been split up into several sub-modules, as it
was getting rather lengthy. This accounts for a significant part of this
diff, unfortunately.
- Atoms are now cached. Xlib caches them too, so `XInternAtom` wouldn't
typically be a round-trip anyway, but the added complexity is
negligible.
- Switched from `std::sync::Mutex` to `parking_lot::Mutex` (within this
backend). There appears to be no downside to this, but if anyone finds
one, this would be easy to revert.
- The WM name and supported hints are now global to the application, and
are updated upon `ReparentNotify`, which should detect when the WM was
replaced (assuming a reparenting WM was involved, that is). Previously,
these values were per-window and would never update, meaning replacing
the WM could potentially lead to (admittedly very minor) problems.
- The result of `Window2::create_empty_cursor` will now only be used if
it actually succeeds.
- `Window2::load_cursor` no longer re-allocates the cursor name.
- `util::lookup_utf8` previously allocated a 16-byte buffer on the heap.
Now it allocates a 1024-byte buffer on the stack, and falls back to
dynamic allocation if the buffer is too small. This base buffer size is
admittedly gratuitous, but less so if you're using IME.
- `with_c_str` was finally removed.
- Added `util::Format` enum to help prevent goofs when dealing with
format arguments.
- `util::get_property`, something I added way back in my first winit PR,
only calculated offsets correctly for `util::Format::Char`. This was
concealed by the accomodating buffer size, as it would be very rare for
the offset to be needed; however, testing with a buffer size of 1,
`util::Format::Long` would read from the same offset multiple times, and
`util::Format::Short` would miss data. This function now works correctly
for all formats, relying on the simple fact that the offset increases by
the buffer size on each iteration. We also account for the extra byte
that `XGetWindowProperty` allocates at the end of the buffer, and copy
data from the buffer instead of moving it and taking ownership of the
pointer.
- Drag and drop now reliably works in release mode. This is presumably
related to the `util::get_property` changes.
- `util::change_property` now exists, which should make it easier to add
features in the future.
- The `EventsLoop` device map is no longer in a mutex.
- `XConnection` now implements `Debug`.
- Valgrind no longer complains about anything related to winit (with
either the system allocator or jemalloc, though "not having valgrind
complain about jemalloc" isn't something to strive for).
* X11: Add better diagnostics when initialization fails
* X11: Handle XIQueryDevice failure
* X11: Use correct types in error handler
2018-05-03 23:15:49 +10:00
|
|
|
// TODO: propagate
|
2019-02-06 02:30:33 +11:00
|
|
|
return EventLoop::new_x11().expect("Failed to initialize X11 backend");
|
2017-09-01 19:04:57 +10:00
|
|
|
},
|
|
|
|
"wayland" => {
|
2019-02-06 02:30:33 +11:00
|
|
|
return EventLoop::new_wayland()
|
X11: General cleanup (#491)
* X11: General cleanup
This is almost entirely internal changes, and as usual, doesn't actually
fix any problems people have complained about.
- `XSetInputFocus` can't be called before the window is visible. This
was previously handled by looping (with a sleep) and querying for the
window's state until it was visible. Now we use `XIfEvent`, which blocks
until we receive `VisibilityNotify`. Note that this can't be replaced
with an `XSync` (I tried).
- We now call `XSync` at the end of window creation and check for
errors, assuring that broken windows are never returned. When creating
invisible windows, this is the only time the output buffer is flushed
during the entire window creation process (AFAIK). For visible windows,
`XIfEvent` will generally flush, but window creation has overall been
reduced to the minimum number of flushes.
- `check_errors().expect()` has been a common pattern throughout the
backend, but it seems that people (myself included) didn't make a
distinction between using it after synchronous requests and asynchronous
requests. Now we only use it after async requests if we flush first,
though this still isn't correct (since the request likely hasn't been
processed yet). The only real solution (besides forcing a sync *every
time*) is to handle asynchronous errors *asynchronously*. For future
work, I plan on adding logging, though I don't plan on actually
*handling* those errors; that's more of something to hope for in the
hypothetical async/await XCB paradise.
- We now flush whenever it makes sense to. `util::Flusher` was added to
force contributors to be aware of the output buffer.
- `Window::get_position`, `Window::get_inner_position`,
`Window::get_inner_size`, and `Window::get_outer_size` previously all
required *several* round-trips. On my machine, it took an average of
around 80µs. They've now been reduced to one round-trip each, which
reduces my measurement to 16µs. This was accomplished simply by caching
the frame extents, which are expensive to calculate (due to various
queries and heuristics), but change infrequently and predictably. I
still recommend that application developers use these methods sparingly
and generally prefer storing the values from `Resized`/`Moved`, as
that's zero overhead.
- The above change enabled me to change the `Moved` event to supply
window positions, rather than client area positions. Additionally, we no
longer generate `Moved` for real (as in, not synthetic)
`ConfigureNotify` events. Real `ConfigureNotify` events contain
positions relative to the parent window, which are typically constant
and useless. Since that position would be completely different from the
root-relative positions supplied by synthetic `ConfigureNotify` events
(which are the vast majority of them), that meant real `ConfigureNotify`
events would *always* be detected as the position having changed, so the
resultant `Moved` was multiple levels of misleading. In practice, this
meant a garbage `Moved` would be sent every time the window was resized;
now a resize has to actually change the window's position to be
accompanied by `Moved`.
- Every time we processed an `XI_Enter` event, we would leak 4 bytes via
`util::query_pointer` (`XIQueryPointer`). `XIButtonState` contains a
dynamically-allocated mask field which we weren't freeing. As this event
occurs with fairly high frequency, long-running applications could
easily accumulate substantial leaks. `util::PointerState::drop` now
takes care of this.
- The `util` module has been split up into several sub-modules, as it
was getting rather lengthy. This accounts for a significant part of this
diff, unfortunately.
- Atoms are now cached. Xlib caches them too, so `XInternAtom` wouldn't
typically be a round-trip anyway, but the added complexity is
negligible.
- Switched from `std::sync::Mutex` to `parking_lot::Mutex` (within this
backend). There appears to be no downside to this, but if anyone finds
one, this would be easy to revert.
- The WM name and supported hints are now global to the application, and
are updated upon `ReparentNotify`, which should detect when the WM was
replaced (assuming a reparenting WM was involved, that is). Previously,
these values were per-window and would never update, meaning replacing
the WM could potentially lead to (admittedly very minor) problems.
- The result of `Window2::create_empty_cursor` will now only be used if
it actually succeeds.
- `Window2::load_cursor` no longer re-allocates the cursor name.
- `util::lookup_utf8` previously allocated a 16-byte buffer on the heap.
Now it allocates a 1024-byte buffer on the stack, and falls back to
dynamic allocation if the buffer is too small. This base buffer size is
admittedly gratuitous, but less so if you're using IME.
- `with_c_str` was finally removed.
- Added `util::Format` enum to help prevent goofs when dealing with
format arguments.
- `util::get_property`, something I added way back in my first winit PR,
only calculated offsets correctly for `util::Format::Char`. This was
concealed by the accomodating buffer size, as it would be very rare for
the offset to be needed; however, testing with a buffer size of 1,
`util::Format::Long` would read from the same offset multiple times, and
`util::Format::Short` would miss data. This function now works correctly
for all formats, relying on the simple fact that the offset increases by
the buffer size on each iteration. We also account for the extra byte
that `XGetWindowProperty` allocates at the end of the buffer, and copy
data from the buffer instead of moving it and taking ownership of the
pointer.
- Drag and drop now reliably works in release mode. This is presumably
related to the `util::get_property` changes.
- `util::change_property` now exists, which should make it easier to add
features in the future.
- The `EventsLoop` device map is no longer in a mutex.
- `XConnection` now implements `Debug`.
- Valgrind no longer complains about anything related to winit (with
either the system allocator or jemalloc, though "not having valgrind
complain about jemalloc" isn't something to strive for).
* X11: Add better diagnostics when initialization fails
* X11: Handle XIQueryDevice failure
* X11: Use correct types in error handler
2018-05-03 23:15:49 +10:00
|
|
|
.expect("Failed to initialize Wayland backend");
|
2017-09-01 19:04:57 +10:00
|
|
|
},
|
X11: General cleanup (#491)
* X11: General cleanup
This is almost entirely internal changes, and as usual, doesn't actually
fix any problems people have complained about.
- `XSetInputFocus` can't be called before the window is visible. This
was previously handled by looping (with a sleep) and querying for the
window's state until it was visible. Now we use `XIfEvent`, which blocks
until we receive `VisibilityNotify`. Note that this can't be replaced
with an `XSync` (I tried).
- We now call `XSync` at the end of window creation and check for
errors, assuring that broken windows are never returned. When creating
invisible windows, this is the only time the output buffer is flushed
during the entire window creation process (AFAIK). For visible windows,
`XIfEvent` will generally flush, but window creation has overall been
reduced to the minimum number of flushes.
- `check_errors().expect()` has been a common pattern throughout the
backend, but it seems that people (myself included) didn't make a
distinction between using it after synchronous requests and asynchronous
requests. Now we only use it after async requests if we flush first,
though this still isn't correct (since the request likely hasn't been
processed yet). The only real solution (besides forcing a sync *every
time*) is to handle asynchronous errors *asynchronously*. For future
work, I plan on adding logging, though I don't plan on actually
*handling* those errors; that's more of something to hope for in the
hypothetical async/await XCB paradise.
- We now flush whenever it makes sense to. `util::Flusher` was added to
force contributors to be aware of the output buffer.
- `Window::get_position`, `Window::get_inner_position`,
`Window::get_inner_size`, and `Window::get_outer_size` previously all
required *several* round-trips. On my machine, it took an average of
around 80µs. They've now been reduced to one round-trip each, which
reduces my measurement to 16µs. This was accomplished simply by caching
the frame extents, which are expensive to calculate (due to various
queries and heuristics), but change infrequently and predictably. I
still recommend that application developers use these methods sparingly
and generally prefer storing the values from `Resized`/`Moved`, as
that's zero overhead.
- The above change enabled me to change the `Moved` event to supply
window positions, rather than client area positions. Additionally, we no
longer generate `Moved` for real (as in, not synthetic)
`ConfigureNotify` events. Real `ConfigureNotify` events contain
positions relative to the parent window, which are typically constant
and useless. Since that position would be completely different from the
root-relative positions supplied by synthetic `ConfigureNotify` events
(which are the vast majority of them), that meant real `ConfigureNotify`
events would *always* be detected as the position having changed, so the
resultant `Moved` was multiple levels of misleading. In practice, this
meant a garbage `Moved` would be sent every time the window was resized;
now a resize has to actually change the window's position to be
accompanied by `Moved`.
- Every time we processed an `XI_Enter` event, we would leak 4 bytes via
`util::query_pointer` (`XIQueryPointer`). `XIButtonState` contains a
dynamically-allocated mask field which we weren't freeing. As this event
occurs with fairly high frequency, long-running applications could
easily accumulate substantial leaks. `util::PointerState::drop` now
takes care of this.
- The `util` module has been split up into several sub-modules, as it
was getting rather lengthy. This accounts for a significant part of this
diff, unfortunately.
- Atoms are now cached. Xlib caches them too, so `XInternAtom` wouldn't
typically be a round-trip anyway, but the added complexity is
negligible.
- Switched from `std::sync::Mutex` to `parking_lot::Mutex` (within this
backend). There appears to be no downside to this, but if anyone finds
one, this would be easy to revert.
- The WM name and supported hints are now global to the application, and
are updated upon `ReparentNotify`, which should detect when the WM was
replaced (assuming a reparenting WM was involved, that is). Previously,
these values were per-window and would never update, meaning replacing
the WM could potentially lead to (admittedly very minor) problems.
- The result of `Window2::create_empty_cursor` will now only be used if
it actually succeeds.
- `Window2::load_cursor` no longer re-allocates the cursor name.
- `util::lookup_utf8` previously allocated a 16-byte buffer on the heap.
Now it allocates a 1024-byte buffer on the stack, and falls back to
dynamic allocation if the buffer is too small. This base buffer size is
admittedly gratuitous, but less so if you're using IME.
- `with_c_str` was finally removed.
- Added `util::Format` enum to help prevent goofs when dealing with
format arguments.
- `util::get_property`, something I added way back in my first winit PR,
only calculated offsets correctly for `util::Format::Char`. This was
concealed by the accomodating buffer size, as it would be very rare for
the offset to be needed; however, testing with a buffer size of 1,
`util::Format::Long` would read from the same offset multiple times, and
`util::Format::Short` would miss data. This function now works correctly
for all formats, relying on the simple fact that the offset increases by
the buffer size on each iteration. We also account for the extra byte
that `XGetWindowProperty` allocates at the end of the buffer, and copy
data from the buffer instead of moving it and taking ownership of the
pointer.
- Drag and drop now reliably works in release mode. This is presumably
related to the `util::get_property` changes.
- `util::change_property` now exists, which should make it easier to add
features in the future.
- The `EventsLoop` device map is no longer in a mutex.
- `XConnection` now implements `Debug`.
- Valgrind no longer complains about anything related to winit (with
either the system allocator or jemalloc, though "not having valgrind
complain about jemalloc" isn't something to strive for).
* X11: Add better diagnostics when initialization fails
* X11: Handle XIQueryDevice failure
* X11: Use correct types in error handler
2018-05-03 23:15:49 +10:00
|
|
|
_ => panic!(
|
|
|
|
"Unknown environment variable value for {}, try one of `x11`,`wayland`",
|
|
|
|
BACKEND_PREFERENCE_ENV_VAR,
|
|
|
|
),
|
2017-09-01 19:04:57 +10:00
|
|
|
}
|
|
|
|
}
|
2017-03-04 07:41:51 +11:00
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
let wayland_err = match EventLoop::new_wayland() {
|
X11: General cleanup (#491)
* X11: General cleanup
This is almost entirely internal changes, and as usual, doesn't actually
fix any problems people have complained about.
- `XSetInputFocus` can't be called before the window is visible. This
was previously handled by looping (with a sleep) and querying for the
window's state until it was visible. Now we use `XIfEvent`, which blocks
until we receive `VisibilityNotify`. Note that this can't be replaced
with an `XSync` (I tried).
- We now call `XSync` at the end of window creation and check for
errors, assuring that broken windows are never returned. When creating
invisible windows, this is the only time the output buffer is flushed
during the entire window creation process (AFAIK). For visible windows,
`XIfEvent` will generally flush, but window creation has overall been
reduced to the minimum number of flushes.
- `check_errors().expect()` has been a common pattern throughout the
backend, but it seems that people (myself included) didn't make a
distinction between using it after synchronous requests and asynchronous
requests. Now we only use it after async requests if we flush first,
though this still isn't correct (since the request likely hasn't been
processed yet). The only real solution (besides forcing a sync *every
time*) is to handle asynchronous errors *asynchronously*. For future
work, I plan on adding logging, though I don't plan on actually
*handling* those errors; that's more of something to hope for in the
hypothetical async/await XCB paradise.
- We now flush whenever it makes sense to. `util::Flusher` was added to
force contributors to be aware of the output buffer.
- `Window::get_position`, `Window::get_inner_position`,
`Window::get_inner_size`, and `Window::get_outer_size` previously all
required *several* round-trips. On my machine, it took an average of
around 80µs. They've now been reduced to one round-trip each, which
reduces my measurement to 16µs. This was accomplished simply by caching
the frame extents, which are expensive to calculate (due to various
queries and heuristics), but change infrequently and predictably. I
still recommend that application developers use these methods sparingly
and generally prefer storing the values from `Resized`/`Moved`, as
that's zero overhead.
- The above change enabled me to change the `Moved` event to supply
window positions, rather than client area positions. Additionally, we no
longer generate `Moved` for real (as in, not synthetic)
`ConfigureNotify` events. Real `ConfigureNotify` events contain
positions relative to the parent window, which are typically constant
and useless. Since that position would be completely different from the
root-relative positions supplied by synthetic `ConfigureNotify` events
(which are the vast majority of them), that meant real `ConfigureNotify`
events would *always* be detected as the position having changed, so the
resultant `Moved` was multiple levels of misleading. In practice, this
meant a garbage `Moved` would be sent every time the window was resized;
now a resize has to actually change the window's position to be
accompanied by `Moved`.
- Every time we processed an `XI_Enter` event, we would leak 4 bytes via
`util::query_pointer` (`XIQueryPointer`). `XIButtonState` contains a
dynamically-allocated mask field which we weren't freeing. As this event
occurs with fairly high frequency, long-running applications could
easily accumulate substantial leaks. `util::PointerState::drop` now
takes care of this.
- The `util` module has been split up into several sub-modules, as it
was getting rather lengthy. This accounts for a significant part of this
diff, unfortunately.
- Atoms are now cached. Xlib caches them too, so `XInternAtom` wouldn't
typically be a round-trip anyway, but the added complexity is
negligible.
- Switched from `std::sync::Mutex` to `parking_lot::Mutex` (within this
backend). There appears to be no downside to this, but if anyone finds
one, this would be easy to revert.
- The WM name and supported hints are now global to the application, and
are updated upon `ReparentNotify`, which should detect when the WM was
replaced (assuming a reparenting WM was involved, that is). Previously,
these values were per-window and would never update, meaning replacing
the WM could potentially lead to (admittedly very minor) problems.
- The result of `Window2::create_empty_cursor` will now only be used if
it actually succeeds.
- `Window2::load_cursor` no longer re-allocates the cursor name.
- `util::lookup_utf8` previously allocated a 16-byte buffer on the heap.
Now it allocates a 1024-byte buffer on the stack, and falls back to
dynamic allocation if the buffer is too small. This base buffer size is
admittedly gratuitous, but less so if you're using IME.
- `with_c_str` was finally removed.
- Added `util::Format` enum to help prevent goofs when dealing with
format arguments.
- `util::get_property`, something I added way back in my first winit PR,
only calculated offsets correctly for `util::Format::Char`. This was
concealed by the accomodating buffer size, as it would be very rare for
the offset to be needed; however, testing with a buffer size of 1,
`util::Format::Long` would read from the same offset multiple times, and
`util::Format::Short` would miss data. This function now works correctly
for all formats, relying on the simple fact that the offset increases by
the buffer size on each iteration. We also account for the extra byte
that `XGetWindowProperty` allocates at the end of the buffer, and copy
data from the buffer instead of moving it and taking ownership of the
pointer.
- Drag and drop now reliably works in release mode. This is presumably
related to the `util::get_property` changes.
- `util::change_property` now exists, which should make it easier to add
features in the future.
- The `EventsLoop` device map is no longer in a mutex.
- `XConnection` now implements `Debug`.
- Valgrind no longer complains about anything related to winit (with
either the system allocator or jemalloc, though "not having valgrind
complain about jemalloc" isn't something to strive for).
* X11: Add better diagnostics when initialization fails
* X11: Handle XIQueryDevice failure
* X11: Use correct types in error handler
2018-05-03 23:15:49 +10:00
|
|
|
Ok(event_loop) => return event_loop,
|
|
|
|
Err(err) => err,
|
|
|
|
};
|
2017-03-04 07:41:51 +11:00
|
|
|
|
2019-02-06 02:30:33 +11:00
|
|
|
let x11_err = match EventLoop::new_x11() {
|
X11: General cleanup (#491)
* X11: General cleanup
This is almost entirely internal changes, and as usual, doesn't actually
fix any problems people have complained about.
- `XSetInputFocus` can't be called before the window is visible. This
was previously handled by looping (with a sleep) and querying for the
window's state until it was visible. Now we use `XIfEvent`, which blocks
until we receive `VisibilityNotify`. Note that this can't be replaced
with an `XSync` (I tried).
- We now call `XSync` at the end of window creation and check for
errors, assuring that broken windows are never returned. When creating
invisible windows, this is the only time the output buffer is flushed
during the entire window creation process (AFAIK). For visible windows,
`XIfEvent` will generally flush, but window creation has overall been
reduced to the minimum number of flushes.
- `check_errors().expect()` has been a common pattern throughout the
backend, but it seems that people (myself included) didn't make a
distinction between using it after synchronous requests and asynchronous
requests. Now we only use it after async requests if we flush first,
though this still isn't correct (since the request likely hasn't been
processed yet). The only real solution (besides forcing a sync *every
time*) is to handle asynchronous errors *asynchronously*. For future
work, I plan on adding logging, though I don't plan on actually
*handling* those errors; that's more of something to hope for in the
hypothetical async/await XCB paradise.
- We now flush whenever it makes sense to. `util::Flusher` was added to
force contributors to be aware of the output buffer.
- `Window::get_position`, `Window::get_inner_position`,
`Window::get_inner_size`, and `Window::get_outer_size` previously all
required *several* round-trips. On my machine, it took an average of
around 80µs. They've now been reduced to one round-trip each, which
reduces my measurement to 16µs. This was accomplished simply by caching
the frame extents, which are expensive to calculate (due to various
queries and heuristics), but change infrequently and predictably. I
still recommend that application developers use these methods sparingly
and generally prefer storing the values from `Resized`/`Moved`, as
that's zero overhead.
- The above change enabled me to change the `Moved` event to supply
window positions, rather than client area positions. Additionally, we no
longer generate `Moved` for real (as in, not synthetic)
`ConfigureNotify` events. Real `ConfigureNotify` events contain
positions relative to the parent window, which are typically constant
and useless. Since that position would be completely different from the
root-relative positions supplied by synthetic `ConfigureNotify` events
(which are the vast majority of them), that meant real `ConfigureNotify`
events would *always* be detected as the position having changed, so the
resultant `Moved` was multiple levels of misleading. In practice, this
meant a garbage `Moved` would be sent every time the window was resized;
now a resize has to actually change the window's position to be
accompanied by `Moved`.
- Every time we processed an `XI_Enter` event, we would leak 4 bytes via
`util::query_pointer` (`XIQueryPointer`). `XIButtonState` contains a
dynamically-allocated mask field which we weren't freeing. As this event
occurs with fairly high frequency, long-running applications could
easily accumulate substantial leaks. `util::PointerState::drop` now
takes care of this.
- The `util` module has been split up into several sub-modules, as it
was getting rather lengthy. This accounts for a significant part of this
diff, unfortunately.
- Atoms are now cached. Xlib caches them too, so `XInternAtom` wouldn't
typically be a round-trip anyway, but the added complexity is
negligible.
- Switched from `std::sync::Mutex` to `parking_lot::Mutex` (within this
backend). There appears to be no downside to this, but if anyone finds
one, this would be easy to revert.
- The WM name and supported hints are now global to the application, and
are updated upon `ReparentNotify`, which should detect when the WM was
replaced (assuming a reparenting WM was involved, that is). Previously,
these values were per-window and would never update, meaning replacing
the WM could potentially lead to (admittedly very minor) problems.
- The result of `Window2::create_empty_cursor` will now only be used if
it actually succeeds.
- `Window2::load_cursor` no longer re-allocates the cursor name.
- `util::lookup_utf8` previously allocated a 16-byte buffer on the heap.
Now it allocates a 1024-byte buffer on the stack, and falls back to
dynamic allocation if the buffer is too small. This base buffer size is
admittedly gratuitous, but less so if you're using IME.
- `with_c_str` was finally removed.
- Added `util::Format` enum to help prevent goofs when dealing with
format arguments.
- `util::get_property`, something I added way back in my first winit PR,
only calculated offsets correctly for `util::Format::Char`. This was
concealed by the accomodating buffer size, as it would be very rare for
the offset to be needed; however, testing with a buffer size of 1,
`util::Format::Long` would read from the same offset multiple times, and
`util::Format::Short` would miss data. This function now works correctly
for all formats, relying on the simple fact that the offset increases by
the buffer size on each iteration. We also account for the extra byte
that `XGetWindowProperty` allocates at the end of the buffer, and copy
data from the buffer instead of moving it and taking ownership of the
pointer.
- Drag and drop now reliably works in release mode. This is presumably
related to the `util::get_property` changes.
- `util::change_property` now exists, which should make it easier to add
features in the future.
- The `EventsLoop` device map is no longer in a mutex.
- `XConnection` now implements `Debug`.
- Valgrind no longer complains about anything related to winit (with
either the system allocator or jemalloc, though "not having valgrind
complain about jemalloc" isn't something to strive for).
* X11: Add better diagnostics when initialization fails
* X11: Handle XIQueryDevice failure
* X11: Use correct types in error handler
2018-05-03 23:15:49 +10:00
|
|
|
Ok(event_loop) => return event_loop,
|
|
|
|
Err(err) => err,
|
|
|
|
};
|
2017-09-01 19:04:57 +10:00
|
|
|
|
X11: General cleanup (#491)
* X11: General cleanup
This is almost entirely internal changes, and as usual, doesn't actually
fix any problems people have complained about.
- `XSetInputFocus` can't be called before the window is visible. This
was previously handled by looping (with a sleep) and querying for the
window's state until it was visible. Now we use `XIfEvent`, which blocks
until we receive `VisibilityNotify`. Note that this can't be replaced
with an `XSync` (I tried).
- We now call `XSync` at the end of window creation and check for
errors, assuring that broken windows are never returned. When creating
invisible windows, this is the only time the output buffer is flushed
during the entire window creation process (AFAIK). For visible windows,
`XIfEvent` will generally flush, but window creation has overall been
reduced to the minimum number of flushes.
- `check_errors().expect()` has been a common pattern throughout the
backend, but it seems that people (myself included) didn't make a
distinction between using it after synchronous requests and asynchronous
requests. Now we only use it after async requests if we flush first,
though this still isn't correct (since the request likely hasn't been
processed yet). The only real solution (besides forcing a sync *every
time*) is to handle asynchronous errors *asynchronously*. For future
work, I plan on adding logging, though I don't plan on actually
*handling* those errors; that's more of something to hope for in the
hypothetical async/await XCB paradise.
- We now flush whenever it makes sense to. `util::Flusher` was added to
force contributors to be aware of the output buffer.
- `Window::get_position`, `Window::get_inner_position`,
`Window::get_inner_size`, and `Window::get_outer_size` previously all
required *several* round-trips. On my machine, it took an average of
around 80µs. They've now been reduced to one round-trip each, which
reduces my measurement to 16µs. This was accomplished simply by caching
the frame extents, which are expensive to calculate (due to various
queries and heuristics), but change infrequently and predictably. I
still recommend that application developers use these methods sparingly
and generally prefer storing the values from `Resized`/`Moved`, as
that's zero overhead.
- The above change enabled me to change the `Moved` event to supply
window positions, rather than client area positions. Additionally, we no
longer generate `Moved` for real (as in, not synthetic)
`ConfigureNotify` events. Real `ConfigureNotify` events contain
positions relative to the parent window, which are typically constant
and useless. Since that position would be completely different from the
root-relative positions supplied by synthetic `ConfigureNotify` events
(which are the vast majority of them), that meant real `ConfigureNotify`
events would *always* be detected as the position having changed, so the
resultant `Moved` was multiple levels of misleading. In practice, this
meant a garbage `Moved` would be sent every time the window was resized;
now a resize has to actually change the window's position to be
accompanied by `Moved`.
- Every time we processed an `XI_Enter` event, we would leak 4 bytes via
`util::query_pointer` (`XIQueryPointer`). `XIButtonState` contains a
dynamically-allocated mask field which we weren't freeing. As this event
occurs with fairly high frequency, long-running applications could
easily accumulate substantial leaks. `util::PointerState::drop` now
takes care of this.
- The `util` module has been split up into several sub-modules, as it
was getting rather lengthy. This accounts for a significant part of this
diff, unfortunately.
- Atoms are now cached. Xlib caches them too, so `XInternAtom` wouldn't
typically be a round-trip anyway, but the added complexity is
negligible.
- Switched from `std::sync::Mutex` to `parking_lot::Mutex` (within this
backend). There appears to be no downside to this, but if anyone finds
one, this would be easy to revert.
- The WM name and supported hints are now global to the application, and
are updated upon `ReparentNotify`, which should detect when the WM was
replaced (assuming a reparenting WM was involved, that is). Previously,
these values were per-window and would never update, meaning replacing
the WM could potentially lead to (admittedly very minor) problems.
- The result of `Window2::create_empty_cursor` will now only be used if
it actually succeeds.
- `Window2::load_cursor` no longer re-allocates the cursor name.
- `util::lookup_utf8` previously allocated a 16-byte buffer on the heap.
Now it allocates a 1024-byte buffer on the stack, and falls back to
dynamic allocation if the buffer is too small. This base buffer size is
admittedly gratuitous, but less so if you're using IME.
- `with_c_str` was finally removed.
- Added `util::Format` enum to help prevent goofs when dealing with
format arguments.
- `util::get_property`, something I added way back in my first winit PR,
only calculated offsets correctly for `util::Format::Char`. This was
concealed by the accomodating buffer size, as it would be very rare for
the offset to be needed; however, testing with a buffer size of 1,
`util::Format::Long` would read from the same offset multiple times, and
`util::Format::Short` would miss data. This function now works correctly
for all formats, relying on the simple fact that the offset increases by
the buffer size on each iteration. We also account for the extra byte
that `XGetWindowProperty` allocates at the end of the buffer, and copy
data from the buffer instead of moving it and taking ownership of the
pointer.
- Drag and drop now reliably works in release mode. This is presumably
related to the `util::get_property` changes.
- `util::change_property` now exists, which should make it easier to add
features in the future.
- The `EventsLoop` device map is no longer in a mutex.
- `XConnection` now implements `Debug`.
- Valgrind no longer complains about anything related to winit (with
either the system allocator or jemalloc, though "not having valgrind
complain about jemalloc" isn't something to strive for).
* X11: Add better diagnostics when initialization fails
* X11: Handle XIQueryDevice failure
* X11: Use correct types in error handler
2018-05-03 23:15:49 +10:00
|
|
|
let err_string = format!(
|
2018-10-22 09:12:51 +11:00
|
|
|
"Failed to initialize any backend! Wayland status: {:?} X11 status: {:?}",
|
X11: General cleanup (#491)
* X11: General cleanup
This is almost entirely internal changes, and as usual, doesn't actually
fix any problems people have complained about.
- `XSetInputFocus` can't be called before the window is visible. This
was previously handled by looping (with a sleep) and querying for the
window's state until it was visible. Now we use `XIfEvent`, which blocks
until we receive `VisibilityNotify`. Note that this can't be replaced
with an `XSync` (I tried).
- We now call `XSync` at the end of window creation and check for
errors, assuring that broken windows are never returned. When creating
invisible windows, this is the only time the output buffer is flushed
during the entire window creation process (AFAIK). For visible windows,
`XIfEvent` will generally flush, but window creation has overall been
reduced to the minimum number of flushes.
- `check_errors().expect()` has been a common pattern throughout the
backend, but it seems that people (myself included) didn't make a
distinction between using it after synchronous requests and asynchronous
requests. Now we only use it after async requests if we flush first,
though this still isn't correct (since the request likely hasn't been
processed yet). The only real solution (besides forcing a sync *every
time*) is to handle asynchronous errors *asynchronously*. For future
work, I plan on adding logging, though I don't plan on actually
*handling* those errors; that's more of something to hope for in the
hypothetical async/await XCB paradise.
- We now flush whenever it makes sense to. `util::Flusher` was added to
force contributors to be aware of the output buffer.
- `Window::get_position`, `Window::get_inner_position`,
`Window::get_inner_size`, and `Window::get_outer_size` previously all
required *several* round-trips. On my machine, it took an average of
around 80µs. They've now been reduced to one round-trip each, which
reduces my measurement to 16µs. This was accomplished simply by caching
the frame extents, which are expensive to calculate (due to various
queries and heuristics), but change infrequently and predictably. I
still recommend that application developers use these methods sparingly
and generally prefer storing the values from `Resized`/`Moved`, as
that's zero overhead.
- The above change enabled me to change the `Moved` event to supply
window positions, rather than client area positions. Additionally, we no
longer generate `Moved` for real (as in, not synthetic)
`ConfigureNotify` events. Real `ConfigureNotify` events contain
positions relative to the parent window, which are typically constant
and useless. Since that position would be completely different from the
root-relative positions supplied by synthetic `ConfigureNotify` events
(which are the vast majority of them), that meant real `ConfigureNotify`
events would *always* be detected as the position having changed, so the
resultant `Moved` was multiple levels of misleading. In practice, this
meant a garbage `Moved` would be sent every time the window was resized;
now a resize has to actually change the window's position to be
accompanied by `Moved`.
- Every time we processed an `XI_Enter` event, we would leak 4 bytes via
`util::query_pointer` (`XIQueryPointer`). `XIButtonState` contains a
dynamically-allocated mask field which we weren't freeing. As this event
occurs with fairly high frequency, long-running applications could
easily accumulate substantial leaks. `util::PointerState::drop` now
takes care of this.
- The `util` module has been split up into several sub-modules, as it
was getting rather lengthy. This accounts for a significant part of this
diff, unfortunately.
- Atoms are now cached. Xlib caches them too, so `XInternAtom` wouldn't
typically be a round-trip anyway, but the added complexity is
negligible.
- Switched from `std::sync::Mutex` to `parking_lot::Mutex` (within this
backend). There appears to be no downside to this, but if anyone finds
one, this would be easy to revert.
- The WM name and supported hints are now global to the application, and
are updated upon `ReparentNotify`, which should detect when the WM was
replaced (assuming a reparenting WM was involved, that is). Previously,
these values were per-window and would never update, meaning replacing
the WM could potentially lead to (admittedly very minor) problems.
- The result of `Window2::create_empty_cursor` will now only be used if
it actually succeeds.
- `Window2::load_cursor` no longer re-allocates the cursor name.
- `util::lookup_utf8` previously allocated a 16-byte buffer on the heap.
Now it allocates a 1024-byte buffer on the stack, and falls back to
dynamic allocation if the buffer is too small. This base buffer size is
admittedly gratuitous, but less so if you're using IME.
- `with_c_str` was finally removed.
- Added `util::Format` enum to help prevent goofs when dealing with
format arguments.
- `util::get_property`, something I added way back in my first winit PR,
only calculated offsets correctly for `util::Format::Char`. This was
concealed by the accomodating buffer size, as it would be very rare for
the offset to be needed; however, testing with a buffer size of 1,
`util::Format::Long` would read from the same offset multiple times, and
`util::Format::Short` would miss data. This function now works correctly
for all formats, relying on the simple fact that the offset increases by
the buffer size on each iteration. We also account for the extra byte
that `XGetWindowProperty` allocates at the end of the buffer, and copy
data from the buffer instead of moving it and taking ownership of the
pointer.
- Drag and drop now reliably works in release mode. This is presumably
related to the `util::get_property` changes.
- `util::change_property` now exists, which should make it easier to add
features in the future.
- The `EventsLoop` device map is no longer in a mutex.
- `XConnection` now implements `Debug`.
- Valgrind no longer complains about anything related to winit (with
either the system allocator or jemalloc, though "not having valgrind
complain about jemalloc" isn't something to strive for).
* X11: Add better diagnostics when initialization fails
* X11: Handle XIQueryDevice failure
* X11: Use correct types in error handler
2018-05-03 23:15:49 +10:00
|
|
|
wayland_err,
|
|
|
|
x11_err,
|
|
|
|
);
|
|
|
|
panic!(err_string);
|
2017-09-01 19:04:57 +10:00
|
|
|
}
|
|
|
|
|
2019-02-21 20:51:43 +11:00
|
|
|
pub fn new_wayland() -> Result<EventLoop<T>, ConnectError> {
|
2019-02-06 02:30:33 +11:00
|
|
|
wayland::EventLoop::new()
|
|
|
|
.map(EventLoop::Wayland)
|
2017-09-01 19:04:57 +10:00
|
|
|
}
|
|
|
|
|
2019-04-28 02:06:51 +10:00
|
|
|
pub fn new_x11() -> Result<EventLoop<T>, XNotSupported> {
|
|
|
|
X11_BACKEND
|
|
|
|
.lock()
|
|
|
|
.as_ref()
|
|
|
|
.map(Arc::clone)
|
|
|
|
.map(x11::EventLoop::new)
|
|
|
|
.map(EventLoop::X)
|
|
|
|
.map_err(|err| err.clone())
|
2017-09-01 19:04:57 +10:00
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
2019-05-30 11:29:54 +10:00
|
|
|
pub fn available_monitors(&self) -> VecDeque<MonitorHandle> {
|
2017-09-01 19:04:57 +10:00
|
|
|
match *self {
|
2019-02-06 02:30:33 +11:00
|
|
|
EventLoop::Wayland(ref evlp) => evlp
|
2019-05-30 11:29:54 +10:00
|
|
|
.available_monitors()
|
2018-06-15 09:42:18 +10:00
|
|
|
.into_iter()
|
2019-02-06 02:30:33 +11:00
|
|
|
.map(MonitorHandle::Wayland)
|
2018-06-15 09:42:18 +10:00
|
|
|
.collect(),
|
2019-04-28 02:06:51 +10:00
|
|
|
EventLoop::X(ref evlp) => evlp
|
|
|
|
.x_connection()
|
2019-05-30 11:29:54 +10:00
|
|
|
.available_monitors()
|
2019-04-28 02:06:51 +10:00
|
|
|
.into_iter()
|
|
|
|
.map(MonitorHandle::X)
|
|
|
|
.collect(),
|
2017-09-01 19:04:57 +10:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
2019-05-30 11:29:54 +10:00
|
|
|
pub fn primary_monitor(&self) -> MonitorHandle {
|
2017-09-01 19:04:57 +10:00
|
|
|
match *self {
|
2019-05-30 11:29:54 +10:00
|
|
|
EventLoop::Wayland(ref evlp) => MonitorHandle::Wayland(evlp.primary_monitor()),
|
|
|
|
EventLoop::X(ref evlp) => MonitorHandle::X(evlp.x_connection().primary_monitor()),
|
2017-03-04 07:41:51 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-02-21 20:51:43 +11:00
|
|
|
pub fn create_proxy(&self) -> EventLoopProxy<T> {
|
2017-05-25 23:19:13 +10:00
|
|
|
match *self {
|
2019-02-06 02:30:33 +11:00
|
|
|
EventLoop::Wayland(ref evlp) => EventLoopProxy::Wayland(evlp.create_proxy()),
|
2019-04-28 02:06:51 +10:00
|
|
|
EventLoop::X(ref evlp) => EventLoopProxy::X(evlp.create_proxy()),
|
2017-05-25 23:19:13 +10:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-02-21 20:51:43 +11:00
|
|
|
pub fn run_return<F>(&mut self, callback: F)
|
|
|
|
where F: FnMut(::event::Event<T>, &RootELW<T>, &mut ControlFlow)
|
2017-03-04 07:41:51 +11:00
|
|
|
{
|
|
|
|
match *self {
|
2019-02-21 20:51:43 +11:00
|
|
|
EventLoop::Wayland(ref mut evlp) => evlp.run_return(callback),
|
2019-04-28 02:06:51 +10:00
|
|
|
EventLoop::X(ref mut evlp) => evlp.run_return(callback)
|
2017-03-04 07:41:51 +11:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-02-21 20:51:43 +11:00
|
|
|
pub fn run<F>(self, callback: F) -> !
|
|
|
|
where F: 'static + FnMut(::event::Event<T>, &RootELW<T>, &mut ControlFlow)
|
2017-03-04 07:41:51 +11:00
|
|
|
{
|
2019-02-21 20:51:43 +11:00
|
|
|
match self {
|
|
|
|
EventLoop::Wayland(evlp) => evlp.run(callback),
|
2019-04-28 02:06:51 +10:00
|
|
|
EventLoop::X(evlp) => evlp.run(callback)
|
2017-03-04 07:41:51 +11:00
|
|
|
}
|
|
|
|
}
|
2017-09-23 17:36:30 +10:00
|
|
|
|
|
|
|
#[inline]
|
|
|
|
pub fn is_wayland(&self) -> bool {
|
|
|
|
match *self {
|
2019-02-06 02:30:33 +11:00
|
|
|
EventLoop::Wayland(_) => true,
|
2019-04-28 02:06:51 +10:00
|
|
|
EventLoop::X(_) => false,
|
2017-09-23 17:36:30 +10:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-02-21 20:51:43 +11:00
|
|
|
pub fn window_target(&self) -> &::event_loop::EventLoopWindowTarget<T> {
|
2017-09-23 17:36:30 +10:00
|
|
|
match *self {
|
2019-02-21 20:51:43 +11:00
|
|
|
EventLoop::Wayland(ref evl) => evl.window_target(),
|
2019-04-28 02:06:51 +10:00
|
|
|
EventLoop::X(ref evl) => evl.window_target()
|
2017-09-23 17:36:30 +10:00
|
|
|
}
|
|
|
|
}
|
2017-03-04 07:41:51 +11:00
|
|
|
}
|
2017-05-25 23:19:13 +10:00
|
|
|
|
2019-02-21 20:51:43 +11:00
|
|
|
impl<T: 'static> EventLoopProxy<T> {
|
|
|
|
pub fn send_event(&self, event: T) -> Result<(), EventLoopClosed> {
|
2017-05-25 23:19:13 +10:00
|
|
|
match *self {
|
2019-02-21 20:51:43 +11:00
|
|
|
EventLoopProxy::Wayland(ref proxy) => proxy.send_event(event),
|
2019-04-28 02:06:51 +10:00
|
|
|
EventLoopProxy::X(ref proxy) => proxy.send_event(event),
|
2017-05-25 23:19:13 +10:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2019-02-21 20:51:43 +11:00
|
|
|
|
|
|
|
pub enum EventLoopWindowTarget<T> {
|
|
|
|
Wayland(wayland::EventLoopWindowTarget<T>),
|
2019-04-28 02:06:51 +10:00
|
|
|
X(x11::EventLoopWindowTarget<T>)
|
2019-02-21 20:51:43 +11:00
|
|
|
}
|
2019-04-28 02:06:51 +10:00
|
|
|
|
|
|
|
fn sticky_exit_callback<T, F>(
|
|
|
|
evt: Event<T>, target: &RootELW<T>, control_flow: &mut ControlFlow, callback: &mut F
|
|
|
|
) where F: FnMut(Event<T>, &RootELW<T>, &mut ControlFlow)
|
|
|
|
{
|
|
|
|
// make ControlFlow::Exit sticky by providing a dummy
|
|
|
|
// control flow reference if it is already Exit.
|
|
|
|
let mut dummy = ControlFlow::Exit;
|
|
|
|
let cf = if *control_flow == ControlFlow::Exit {
|
|
|
|
&mut dummy
|
|
|
|
} else {
|
|
|
|
control_flow
|
|
|
|
};
|
|
|
|
// user callback
|
|
|
|
callback(evt, target, cf)
|
2019-05-30 11:29:54 +10:00
|
|
|
}
|