Event Loop 2.0 API and Windows implementation (#638)

* 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

src/platform_impl/linux/dlopen.rs

@@ -0,0 +1,15 @@
+#![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))]
+#![allow(dead_code)]
+
+use std::os::raw::{c_void, c_char, c_int};
+
+pub const RTLD_LAZY: c_int = 0x001;
+pub const RTLD_NOW: c_int = 0x002;
+
+#[link="dl"]
+extern {
+    pub fn dlopen(filename: *const c_char, flag: c_int) -> *mut c_void;
+    pub fn dlerror() -> *mut c_char;
+    pub fn dlsym(handle: *mut c_void, symbol: *const c_char) -> *mut c_void;
+    pub fn dlclose(handle: *mut c_void) -> c_int;
+}

src/platform_impl/linux/mod.rs

@@ -0,0 +1,542 @@
+#![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))]
+
+use std::collections::VecDeque;
+use std::{env, mem};
+use std::ffi::CStr;
+use std::os::raw::*;
+use std::sync::Arc;
+
+use parking_lot::Mutex;
+use sctk::reexports::client::ConnectError;
+
+use {
+    CreationError,
+    EventLoopClosed,
+    Icon,
+    MouseCursor,
+    ControlFlow,
+    WindowAttributes,
+};
+use dpi::{LogicalPosition, LogicalSize, PhysicalPosition, PhysicalSize};
+use window::MonitorHandle as RootMonitorHandle;
+use self::x11::{XConnection, XError};
+use self::x11::ffi::XVisualInfo;
+pub use self::x11::XNotSupported;
+
+mod dlopen;
+pub mod wayland;
+pub mod x11;
+
+/// 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.
+const BACKEND_PREFERENCE_ENV_VAR: &str = "WINIT_UNIX_BACKEND";
+
+#[derive(Clone, Default)]
+pub struct PlatformSpecificWindowBuilderAttributes {
+    pub visual_infos: Option<XVisualInfo>,
+    pub screen_id: Option<i32>,
+    pub resize_increments: Option<(u32, u32)>,
+    pub base_size: Option<(u32, u32)>,
+    pub class: Option<(String, String)>,
+    pub override_redirect: bool,
+    pub x11_window_type: x11::util::WindowType,
+    pub gtk_theme_variant: Option<String>,
+    pub app_id: Option<String>
+}
+
+lazy_static!(
+    pub static ref X11_BACKEND: Mutex<Result<Arc<XConnection>, XNotSupported>> = {
+        Mutex::new(XConnection::new(Some(x_error_callback)).map(Arc::new))
+    };
+);
+
+pub enum Window {
+    X(x11::Window),
+    Wayland(wayland::Window),
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub enum WindowId {
+    X(x11::WindowId),
+    Wayland(wayland::WindowId),
+}
+
+impl WindowId {
+    pub unsafe fn dummy() -> Self {
+        WindowId::X(x11::WindowId::dummy())
+    }
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub enum DeviceId {
+    X(x11::DeviceId),
+    Wayland(wayland::DeviceId),
+}
+
+impl DeviceId {
+    pub unsafe fn dummy() -> Self {
+        DeviceId::X(x11::DeviceId::dummy())
+    }
+}
+
+#[derive(Debug, Clone)]
+pub enum MonitorHandle {
+    X(x11::MonitorHandle),
+    Wayland(wayland::MonitorHandle),
+}
+
+impl MonitorHandle {
+    #[inline]
+    pub fn get_name(&self) -> Option<String> {
+        match self {
+            &MonitorHandle::X(ref m) => m.get_name(),
+            &MonitorHandle::Wayland(ref m) => m.get_name(),
+        }
+    }
+
+    #[inline]
+    pub fn get_native_identifier(&self) -> u32 {
+        match self {
+            &MonitorHandle::X(ref m) => m.get_native_identifier(),
+            &MonitorHandle::Wayland(ref m) => m.get_native_identifier(),
+        }
+    }
+
+    #[inline]
+    pub fn get_dimensions(&self) -> PhysicalSize {
+        match self {
+            &MonitorHandle::X(ref m) => m.get_dimensions(),
+            &MonitorHandle::Wayland(ref m) => m.get_dimensions(),
+        }
+    }
+
+    #[inline]
+    pub fn get_position(&self) -> PhysicalPosition {
+        match self {
+            &MonitorHandle::X(ref m) => m.get_position(),
+            &MonitorHandle::Wayland(ref m) => m.get_position(),
+        }
+    }
+
+    #[inline]
+    pub fn get_hidpi_factor(&self) -> f64 {
+        match self {
+            &MonitorHandle::X(ref m) => m.get_hidpi_factor(),
+            &MonitorHandle::Wayland(ref m) => m.get_hidpi_factor() as f64,
+        }
+    }
+}
+
+impl Window {
+    #[inline]
+    pub fn new(
+        event_loop: &EventLoop,
+        attribs: WindowAttributes,
+        pl_attribs: PlatformSpecificWindowBuilderAttributes,
+    ) -> Result<Self, CreationError> {
+        match *event_loop {
+            EventsLoop::Wayland(ref event_loop) => {
+                wayland::Window::new(event_loop, attribs, pl_attribs).map(Window::Wayland)
+            },
+            EventLoop::X(ref event_loop) => {
+                x11::Window::new(event_loop, attribs, pl_attribs).map(Window::X)
+            },
+        }
+    }
+
+    #[inline]
+    pub fn id(&self) -> WindowId {
+        match self {
+            &Window::X(ref w) => WindowId::X(w.id()),
+            &Window::Wayland(ref w) => WindowId::Wayland(w.id()),
+        }
+    }
+
+    #[inline]
+    pub fn set_title(&self, title: &str) {
+        match self {
+            &Window::X(ref w) => w.set_title(title),
+            &Window::Wayland(ref w) => w.set_title(title),
+        }
+    }
+
+    #[inline]
+    pub fn show(&self) {
+        match self {
+            &Window::X(ref w) => w.show(),
+            &Window::Wayland(ref w) => w.show(),
+        }
+    }
+
+    #[inline]
+    pub fn hide(&self) {
+        match self {
+            &Window::X(ref w) => w.hide(),
+            &Window::Wayland(ref w) => w.hide(),
+        }
+    }
+
+    #[inline]
+    pub fn get_position(&self) -> Option<LogicalPosition> {
+        match self {
+            &Window::X(ref w) => w.get_position(),
+            &Window::Wayland(ref w) => w.get_position(),
+        }
+    }
+
+    #[inline]
+    pub fn get_inner_position(&self) -> Option<LogicalPosition> {
+        match self {
+            &Window::X(ref m) => m.get_inner_position(),
+            &Window::Wayland(ref m) => m.get_inner_position(),
+        }
+    }
+
+    #[inline]
+    pub fn set_position(&self, position: LogicalPosition) {
+        match self {
+            &Window::X(ref w) => w.set_position(position),
+            &Window::Wayland(ref w) => w.set_position(position),
+        }
+    }
+
+    #[inline]
+    pub fn get_inner_size(&self) -> Option<LogicalSize> {
+        match self {
+            &Window::X(ref w) => w.get_inner_size(),
+            &Window::Wayland(ref w) => w.get_inner_size(),
+        }
+    }
+
+    #[inline]
+    pub fn get_outer_size(&self) -> Option<LogicalSize> {
+        match self {
+            &Window::X(ref w) => w.get_outer_size(),
+            &Window::Wayland(ref w) => w.get_outer_size(),
+        }
+    }
+
+    #[inline]
+    pub fn set_inner_size(&self, size: LogicalSize) {
+        match self {
+            &Window::X(ref w) => w.set_inner_size(size),
+            &Window::Wayland(ref w) => w.set_inner_size(size),
+        }
+    }
+
+    #[inline]
+    pub fn set_min_dimensions(&self, dimensions: Option<LogicalSize>) {
+        match self {
+            &Window::X(ref w) => w.set_min_dimensions(dimensions),
+            &Window::Wayland(ref w) => w.set_min_dimensions(dimensions),
+        }
+    }
+
+    #[inline]
+    pub fn set_max_dimensions(&self, dimensions: Option<LogicalSize>) {
+        match self {
+            &Window::X(ref w) => w.set_max_dimensions(dimensions),
+            &Window::Wayland(ref w) => w.set_max_dimensions(dimensions),
+        }
+    }
+
+    #[inline]
+    pub fn set_resizable(&self, resizable: bool) {
+        match self {
+            &Window::X(ref w) => w.set_resizable(resizable),
+            &Window::Wayland(ref w) => w.set_resizable(resizable),
+        }
+    }
+
+    #[inline]
+    pub fn set_cursor(&self, cursor: MouseCursor) {
+        match self {
+            &Window::X(ref w) => w.set_cursor(cursor),
+            &Window::Wayland(ref w) => w.set_cursor(cursor)
+        }
+    }
+
+    #[inline]
+    pub fn grab_cursor(&self, grab: bool) -> Result<(), String> {
+        match self {
+            &Window::X(ref window) => window.grab_cursor(grab),
+            &Window::Wayland(ref window) => window.grab_cursor(grab),
+        }
+    }
+
+    #[inline]
+    pub fn hide_cursor(&self, hide: bool) {
+        match self {
+            &Window::X(ref window) => window.hide_cursor(hide),
+            &Window::Wayland(ref window) => window.hide_cursor(hide),
+        }
+    }
+
+    #[inline]
+    pub fn get_hidpi_factor(&self) -> f64 {
+       match self {
+            &Window::X(ref w) => w.get_hidpi_factor(),
+            &Window::Wayland(ref w) => w.hidpi_factor() as f64,
+        }
+    }
+
+    #[inline]
+    pub fn set_cursor_position(&self, position: LogicalPosition) -> Result<(), String> {
+        match self {
+            &Window::X(ref w) => w.set_cursor_position(position),
+            &Window::Wayland(ref w) => w.set_cursor_position(position),
+        }
+    }
+
+    #[inline]
+    pub fn set_maximized(&self, maximized: bool) {
+        match self {
+            &Window::X(ref w) => w.set_maximized(maximized),
+            &Window::Wayland(ref w) => w.set_maximized(maximized),
+        }
+    }
+
+    #[inline]
+    pub fn set_fullscreen(&self, monitor: Option<RootMonitorHandle>) {
+        match self {
+            &Window::X(ref w) => w.set_fullscreen(monitor),
+            &Window::Wayland(ref w) => w.set_fullscreen(monitor)
+        }
+    }
+
+    #[inline]
+    pub fn set_decorations(&self, decorations: bool) {
+        match self {
+            &Window::X(ref w) => w.set_decorations(decorations),
+            &Window::Wayland(ref w) => w.set_decorations(decorations)
+        }
+    }
+
+    #[inline]
+    pub fn set_always_on_top(&self, always_on_top: bool) {
+        match self {
+            &Window::X(ref w) => w.set_always_on_top(always_on_top),
+            &Window::Wayland(_) => (),
+        }
+    }
+
+    #[inline]
+    pub fn set_window_icon(&self, window_icon: Option<Icon>) {
+        match self {
+            &Window::X(ref w) => w.set_window_icon(window_icon),
+            &Window::Wayland(_) => (),
+        }
+    }
+
+    #[inline]
+    pub fn set_ime_spot(&self, position: LogicalPosition) {
+        match self {
+            &Window::X(ref w) => w.set_ime_spot(position),
+            &Window::Wayland(_) => (),
+        }
+    }
+
+    #[inline]
+    pub fn get_current_monitor(&self) -> RootMonitorHandle {
+        match self {
+            &Window::X(ref window) => RootMonitorHandle { inner: MonitorHandle::X(window.get_current_monitor()) },
+            &Window::Wayland(ref window) => RootMonitorHandle { inner: MonitorHandle::Wayland(window.get_current_monitor()) },
+        }
+    }
+
+    #[inline]
+    pub fn get_available_monitors(&self) -> VecDeque<MonitorHandle> {
+        match self {
+            &Window::X(ref window) => window.get_available_monitors()
+                .into_iter()
+                .map(MonitorHandle::X)
+                .collect(),
+            &Window::Wayland(ref window) => window.get_available_monitors()
+                .into_iter()
+                .map(MonitorHandle::Wayland)
+                .collect(),
+        }
+    }
+
+    #[inline]
+    pub fn get_primary_monitor(&self) -> MonitorHandle {
+        match self {
+            &Window::X(ref window) => MonitorHandle::X(window.get_primary_monitor()),
+            &Window::Wayland(ref window) => MonitorHandle::Wayland(window.get_primary_monitor()),
+        }
+    }
+}
+
+unsafe extern "C" fn x_error_callback(
+    display: *mut x11::ffi::Display,
+    event: *mut x11::ffi::XErrorEvent,
+) -> c_int {
+    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,
+        };
+
+        error!("X11 error: {:#?}", error);
+
+        *xconn.latest_error.lock() = Some(error);
+    }
+    // Fun fact: this return value is completely ignored.
+    0
+}
+
+pub enum EventLoop {
+    Wayland(wayland::EventLoop),
+    X(x11::EventLoop)
+}
+
+#[derive(Clone)]
+pub enum EventLoopProxy {
+    X(x11::EventLoopProxy),
+    Wayland(wayland::EventLoopProxy),
+}
+
+impl EventLoop {
+    pub fn new() -> EventLoop {
+        if let Ok(env_var) = env::var(BACKEND_PREFERENCE_ENV_VAR) {
+            match env_var.as_str() {
+                "x11" => {
+                    // TODO: propagate
+                    return EventLoop::new_x11().expect("Failed to initialize X11 backend");
+                },
+                "wayland" => {
+                    return EventLoop::new_wayland()
+                        .expect("Failed to initialize Wayland backend");
+                },
+                _ => panic!(
+                    "Unknown environment variable value for {}, try one of `x11`,`wayland`",
+                    BACKEND_PREFERENCE_ENV_VAR,
+                ),
+            }
+        }
+
+        let wayland_err = match EventLoop::new_wayland() {
+            Ok(event_loop) => return event_loop,
+            Err(err) => err,
+        };
+
+        let x11_err = match EventLoop::new_x11() {
+            Ok(event_loop) => return event_loop,
+            Err(err) => err,
+        };
+
+        let err_string = format!(
+            "Failed to initialize any backend! Wayland status: {:?} X11 status: {:?}",
+            wayland_err,
+            x11_err,
+        );
+        panic!(err_string);
+    }
+
+    pub fn new_wayland() -> Result<EventLoop, ConnectError> {
+        wayland::EventLoop::new()
+            .map(EventLoop::Wayland)
+    }
+
+    pub fn new_x11() -> Result<EventLoop, XNotSupported> {
+        X11_BACKEND
+            .lock()
+            .as_ref()
+            .map(Arc::clone)
+            .map(x11::EventLoop::new)
+            .map(EventLoop::X)
+            .map_err(|err| err.clone())
+    }
+
+    #[inline]
+    pub fn get_available_monitors(&self) -> VecDeque<MonitorHandle> {
+        match *self {
+            EventLoop::Wayland(ref evlp) => evlp
+                .get_available_monitors()
+                .into_iter()
+                .map(MonitorHandle::Wayland)
+                .collect(),
+            EventLoop::X(ref evlp) => evlp
+                .x_connection()
+                .get_available_monitors()
+                .into_iter()
+                .map(MonitorHandle::X)
+                .collect(),
+        }
+    }
+
+    #[inline]
+    pub fn get_primary_monitor(&self) -> MonitorHandle {
+        match *self {
+            EventLoop::Wayland(ref evlp) => MonitorHandle::Wayland(evlp.get_primary_monitor()),
+            EventLoop::X(ref evlp) => MonitorHandle::X(evlp.x_connection().get_primary_monitor()),
+        }
+    }
+
+    pub fn create_proxy(&self) -> EventLoopProxy {
+        match *self {
+            EventLoop::Wayland(ref evlp) => EventLoopProxy::Wayland(evlp.create_proxy()),
+            EventLoop::X(ref evlp) => EventLoopProxy::X(evlp.create_proxy()),
+        }
+    }
+
+    pub fn poll_events<F>(&mut self, callback: F)
+        where F: FnMut(::Event)
+    {
+        match *self {
+            EventLoop::Wayland(ref mut evlp) => evlp.poll_events(callback),
+            EventLoop::X(ref mut evlp) => evlp.poll_events(callback)
+        }
+    }
+
+    pub fn run_forever<F>(&mut self, callback: F)
+        where F: FnMut(::Event) -> ControlFlow
+    {
+        match *self {
+            EventLoop::Wayland(ref mut evlp) => evlp.run_forever(callback),
+            EventLoop::X(ref mut evlp) => evlp.run_forever(callback)
+        }
+    }
+
+    #[inline]
+    pub fn is_wayland(&self) -> bool {
+        match *self {
+            EventLoop::Wayland(_) => true,
+            EventLoop::X(_) => false,
+        }
+    }
+
+    #[inline]
+    pub fn x_connection(&self) -> Option<&Arc<XConnection>> {
+        match *self {
+            EventLoop::Wayland(_) => None,
+            EventLoop::X(ref ev) => Some(ev.x_connection()),
+        }
+    }
+}
+
+impl EventLoopProxy {
+    pub fn wakeup(&self) -> Result<(), EventLoopClosed> {
+        match *self {
+            EventLoopProxy::Wayland(ref proxy) => proxy.wakeup(),
+            EventLoopProxy::X(ref proxy) => proxy.wakeup(),
+        }
+    }
+}

src/platform_impl/linux/wayland/event_loop.rs

@@ -0,0 +1,594 @@
+use std::cell::RefCell;
+use std::collections::VecDeque;
+use std::fmt;
+use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::{Arc, Mutex, Weak};
+
+use {ControlFlow, EventLoopClosed, PhysicalPosition, PhysicalSize};
+
+use super::window::WindowStore;
+use super::WindowId;
+
+use sctk::output::OutputMgr;
+use sctk::reexports::client::protocol::{
+    wl_keyboard, wl_output, wl_pointer, wl_registry, wl_seat, wl_touch,
+};
+use sctk::reexports::client::{ConnectError, Display, EventQueue, GlobalEvent, Proxy};
+use sctk::Environment;
+
+use sctk::reexports::client::protocol::wl_display::RequestsTrait as DisplayRequests;
+use sctk::reexports::client::protocol::wl_surface::RequestsTrait;
+
+use ModifiersState;
+
+pub struct EventLoopSink {
+    buffer: VecDeque<::Event>,
+}
+
+impl EventLoopSink {
+    pub fn new() -> EventLoopSink {
+        EventLoopSink {
+            buffer: VecDeque::new(),
+        }
+    }
+
+    pub fn send_event(&mut self, evt: ::WindowEvent, wid: WindowId) {
+        let evt = ::Event::WindowEvent {
+            event: evt,
+            window_id: ::WindowId(::platform::WindowId::Wayland(wid)),
+        };
+        self.buffer.push_back(evt);
+    }
+
+    pub fn send_raw_event(&mut self, evt: ::Event) {
+        self.buffer.push_back(evt);
+    }
+
+    fn empty_with<F>(&mut self, callback: &mut F)
+    where
+        F: FnMut(::Event),
+    {
+        for evt in self.buffer.drain(..) {
+            callback(evt)
+        }
+    }
+}
+
+pub struct EventLoop {
+    // The Event Queue
+    pub evq: RefCell<EventQueue>,
+    // our sink, shared with some handlers, buffering the events
+    sink: Arc<Mutex<EventLoopSink>>,
+    // Whether or not there is a pending `Awakened` event to be emitted.
+    pending_wakeup: Arc<AtomicBool>,
+    // The window store
+    pub store: Arc<Mutex<WindowStore>>,
+    // the env
+    pub env: Environment,
+    // a cleanup switch to prune dead windows
+    pub cleanup_needed: Arc<Mutex<bool>>,
+    // The wayland display
+    pub display: Arc<Display>,
+    // The list of seats
+    pub seats: Arc<Mutex<Vec<(u32, Proxy<wl_seat::WlSeat>)>>>,
+}
+
+// A handle that can be sent across threads and used to wake up the `EventLoop`.
+//
+// We should only try and wake up the `EventLoop` if it still exists, so we hold Weak ptrs.
+#[derive(Clone)]
+pub struct EventLoopProxy {
+    display: Weak<Display>,
+    pending_wakeup: Weak<AtomicBool>,
+}
+
+impl EventLoopProxy {
+    // Causes the `EventLoop` to stop blocking on `run_forever` and emit an `Awakened` event.
+    //
+    // Returns `Err` if the associated `EventLoop` no longer exists.
+    pub fn wakeup(&self) -> Result<(), EventLoopClosed> {
+        let display = self.display.upgrade();
+        let wakeup = self.pending_wakeup.upgrade();
+        match (display, wakeup) {
+            (Some(display), Some(wakeup)) => {
+                // Update the `EventLoop`'s `pending_wakeup` flag.
+                wakeup.store(true, Ordering::Relaxed);
+                // Cause the `EventLoop` to break from `dispatch` if it is currently blocked.
+                let _ = display.sync(|callback| callback.implement(|_, _| {}, ()));
+                display.flush().map_err(|_| EventLoopClosed)?;
+                Ok(())
+            }
+            _ => Err(EventLoopClosed),
+        }
+    }
+}
+
+impl EventLoop {
+    pub fn new() -> Result<EventLoop, ConnectError> {
+        let (display, mut event_queue) = Display::connect_to_env()?;
+
+        let display = Arc::new(display);
+        let pending_wakeup = Arc::new(AtomicBool::new(false));
+        let sink = Arc::new(Mutex::new(EventLoopSink::new()));
+        let store = Arc::new(Mutex::new(WindowStore::new()));
+        let seats = Arc::new(Mutex::new(Vec::new()));
+
+        let mut seat_manager = SeatManager {
+            sink: sink.clone(),
+            store: store.clone(),
+            seats: seats.clone(),
+            events_loop_proxy: EventsLoopProxy {
+                display: Arc::downgrade(&display),
+                pending_wakeup: Arc::downgrade(&pending_wakeup),
+            },
+        };
+
+        let env = Environment::from_display_with_cb(
+            &display,
+            &mut event_queue,
+            move |event, registry| {
+                match event {
+                    GlobalEvent::New { id, ref interface, version } => {
+                        if interface == "wl_seat" {
+                            seat_manager.add_seat(id, version, registry)
+                        }
+                    },
+                    GlobalEvent::Removed { id, ref interface } => {
+                        if interface == "wl_seat" {
+                            seat_manager.remove_seat(id)
+                        }
+                    },
+                }
+            },
+        ).unwrap();
+
+        Ok(EventLoop {
+            display,
+            evq: RefCell::new(event_queue),
+            sink,
+            pending_wakeup,
+            store,
+            env,
+            cleanup_needed: Arc::new(Mutex::new(false)),
+            seats,
+        })
+    }
+
+    pub fn create_proxy(&self) -> EventLoopProxy {
+        EventLoopProxy {
+            display: Arc::downgrade(&self.display),
+            pending_wakeup: Arc::downgrade(&self.pending_wakeup),
+        }
+    }
+
+    pub fn poll_events<F>(&mut self, mut callback: F)
+    where
+        F: FnMut(::Event),
+    {
+        // send pending events to the server
+        self.display.flush().expect("Wayland connection lost.");
+
+        // dispatch any pre-buffered events
+        self.sink.lock().unwrap().empty_with(&mut callback);
+
+        // try to read pending events
+        if let Some(h) = self.evq.get_mut().prepare_read() {
+            h.read_events().expect("Wayland connection lost.");
+        }
+        // dispatch wayland events
+        self.evq
+            .get_mut()
+            .dispatch_pending()
+            .expect("Wayland connection lost.");
+        self.post_dispatch_triggers();
+
+        // dispatch buffered events to client
+        self.sink.lock().unwrap().empty_with(&mut callback);
+    }
+
+    pub fn run_forever<F>(&mut self, mut callback: F)
+    where
+        F: FnMut(::Event) -> ControlFlow,
+    {
+        // send pending events to the server
+        self.display.flush().expect("Wayland connection lost.");
+
+        // Check for control flow by wrapping the callback.
+        let control_flow = ::std::cell::Cell::new(ControlFlow::Continue);
+        let mut callback = |event| {
+            if let ControlFlow::Break = callback(event) {
+                control_flow.set(ControlFlow::Break);
+            }
+        };
+
+        // dispatch any pre-buffered events
+        self.post_dispatch_triggers();
+        self.sink.lock().unwrap().empty_with(&mut callback);
+
+        loop {
+            // dispatch events blocking if needed
+            self.evq
+                .get_mut()
+                .dispatch()
+                .expect("Wayland connection lost.");
+            self.post_dispatch_triggers();
+
+            // empty buffer of events
+            self.sink.lock().unwrap().empty_with(&mut callback);
+
+            if let ControlFlow::Break = control_flow.get() {
+                break;
+            }
+        }
+    }
+
+    pub fn get_primary_monitor(&self) -> MonitorHandle {
+        get_primary_monitor(&self.env.outputs)
+    }
+
+    pub fn get_available_monitors(&self) -> VecDeque<MonitorHandle> {
+        get_available_monitors(&self.env.outputs)
+    }
+}
+
+/*
+ * Private EventLoop Internals
+ */
+
+impl EventLoop {
+    fn post_dispatch_triggers(&mut self) {
+        let mut sink = self.sink.lock().unwrap();
+        // process a possible pending wakeup call
+        if self.pending_wakeup.load(Ordering::Relaxed) {
+            sink.send_raw_event(::Event::Awakened);
+            self.pending_wakeup.store(false, Ordering::Relaxed);
+        }
+        // prune possible dead windows
+        {
+            let mut cleanup_needed = self.cleanup_needed.lock().unwrap();
+            if *cleanup_needed {
+                let pruned = self.store.lock().unwrap().cleanup();
+                *cleanup_needed = false;
+                for wid in pruned {
+                    sink.send_event(::WindowEvent::Destroyed, wid);
+                }
+            }
+        }
+        // process pending resize/refresh
+        self.store.lock().unwrap().for_each(
+            |newsize, size, new_dpi, refresh, frame_refresh, closed, wid, frame| {
+                if let Some(frame) = frame {
+                    if let Some((w, h)) = newsize {
+                        frame.resize(w, h);
+                        frame.refresh();
+                        let logical_size = ::LogicalSize::new(w as f64, h as f64);
+                        sink.send_event(::WindowEvent::Resized(logical_size), wid);
+                        *size = (w, h);
+                    } else if frame_refresh {
+                        frame.refresh();
+                        if !refresh {
+                            frame.surface().commit()
+                        }
+                    }
+                }
+                if let Some(dpi) = new_dpi {
+                    sink.send_event(::WindowEvent::HiDpiFactorChanged(dpi as f64), wid);
+                }
+                if refresh {
+                    sink.send_event(::WindowEvent::Redraw, wid);
+                }
+                if closed {
+                    sink.send_event(::WindowEvent::CloseRequested, wid);
+                }
+            },
+        )
+    }
+}
+
+/*
+ * Wayland protocol implementations
+ */
+
+struct SeatManager {
+    sink: Arc<Mutex<EventLoopSink>>,
+    store: Arc<Mutex<WindowStore>>,
+    seats: Arc<Mutex<Vec<(u32, Proxy<wl_seat::WlSeat>)>>>,
+    event_loop_proxy: EventLoopProxy,
+}
+
+impl SeatManager {
+    fn add_seat(&mut self, id: u32, version: u32, registry: Proxy<wl_registry::WlRegistry>) {
+        use self::wl_registry::RequestsTrait as RegistryRequests;
+        use std::cmp::min;
+
+        let mut seat_data = SeatData {
+            sink: self.sink.clone(),
+            store: self.store.clone(),
+            pointer: None,
+            keyboard: None,
+            touch: None,
+            events_loop_proxy: self.events_loop_proxy.clone(),
+            modifiers_tracker: Arc::new(Mutex::new(ModifiersState::default())),
+        };
+        let seat = registry
+            .bind(min(version, 5), id, move |seat| {
+                seat.implement(move |event, seat| {
+                    seat_data.receive(event, seat)
+                }, ())
+            })
+            .unwrap();
+        self.store.lock().unwrap().new_seat(&seat);
+        self.seats.lock().unwrap().push((id, seat));
+    }
+
+    fn remove_seat(&mut self, id: u32) {
+        use self::wl_seat::RequestsTrait as SeatRequests;
+<<<<<<< HEAD:src/platform_impl/linux/wayland/event_loop.rs
+        match evt {
+            GlobalEvent::New {
+                id,
+                ref interface,
+                version,
+            } if interface == "wl_seat" =>
+            {
+                use std::cmp::min;
+
+                let mut seat_data = SeatData {
+                    sink: self.sink.clone(),
+                    store: self.store.clone(),
+                    pointer: None,
+                    keyboard: None,
+                    touch: None,
+                    events_loop_proxy: self.events_loop_proxy.clone(),
+                    modifiers_tracker: Arc::new(Mutex::new(ModifiersState::default())),
+                };
+                let seat = registry
+<<<<<<< HEAD
+                    .bind(min(version, 5), id, move |seat| {
+                        seat.implement(move |event, seat| {
+                            seat_data.receive(event, seat)
+                        }, ())
+                    })
+                    .unwrap();
+=======
+                    .bind::<wl_seat::WlSeat>(min(version, 5), id)
+                    .unwrap()
+                    .implement(SeatData {
+                        sink: self.sink.clone(),
+                        store: self.store.clone(),
+                        pointer: None,
+                        keyboard: None,
+                        touch: None,
+                        event_loop_proxy: self.event_loop_proxy.clone(),
+                    });
+>>>>>>> Change instances of "events_loop" to "event_loop"
+                self.store.lock().unwrap().new_seat(&seat);
+                self.seats.lock().unwrap().push((id, seat));
+            }
+            GlobalEvent::Removed { id, ref interface } if interface == "wl_seat" => {
+                let mut seats = self.seats.lock().unwrap();
+                if let Some(idx) = seats.iter().position(|&(i, _)| i == id) {
+                    let (_, seat) = seats.swap_remove(idx);
+                    if seat.version() >= 5 {
+                        seat.release();
+                    }
+                }
+=======
+        let mut seats = self.seats.lock().unwrap();
+        if let Some(idx) = seats.iter().position(|&(i, _)| i == id) {
+            let (_, seat) = seats.swap_remove(idx);
+            if seat.version() >= 5 {
+                seat.release();
+>>>>>>> master:src/platform/linux/wayland/event_loop.rs
+            }
+        }
+    }
+}
+
+struct SeatData {
+    sink: Arc<Mutex<EventLoopSink>>,
+    store: Arc<Mutex<WindowStore>>,
+    pointer: Option<Proxy<wl_pointer::WlPointer>>,
+    keyboard: Option<Proxy<wl_keyboard::WlKeyboard>>,
+    touch: Option<Proxy<wl_touch::WlTouch>>,
+<<<<<<< HEAD
+    events_loop_proxy: EventsLoopProxy,
+    modifiers_tracker: Arc<Mutex<ModifiersState>>,
+=======
+    event_loop_proxy: EventLoopProxy,
+>>>>>>> Change instances of "events_loop" to "event_loop"
+}
+
+impl SeatData {
+    fn receive(&mut self, evt: wl_seat::Event, seat: Proxy<wl_seat::WlSeat>) {
+        match evt {
+            wl_seat::Event::Name { .. } => (),
+            wl_seat::Event::Capabilities { capabilities } => {
+                // create pointer if applicable
+                if capabilities.contains(wl_seat::Capability::Pointer) && self.pointer.is_none() {
+                    self.pointer = Some(super::pointer::implement_pointer(
+                        &seat,
+                        self.sink.clone(),
+                        self.store.clone(),
+                        self.modifiers_tracker.clone(),
+                    ))
+                }
+                // destroy pointer if applicable
+                if !capabilities.contains(wl_seat::Capability::Pointer) {
+                    if let Some(pointer) = self.pointer.take() {
+                        if pointer.version() >= 3 {
+                            use self::wl_pointer::RequestsTrait;
+                            pointer.release();
+                        }
+                    }
+                }
+                // create keyboard if applicable
+                if capabilities.contains(wl_seat::Capability::Keyboard) && self.keyboard.is_none() {
+                    self.keyboard = Some(super::keyboard::init_keyboard(
+                        &seat,
+                        self.sink.clone(),
+<<<<<<< HEAD
+                        self.events_loop_proxy.clone(),
+                        self.modifiers_tracker.clone(),
+=======
+                        self.event_loop_proxy.clone(),
+>>>>>>> Change instances of "events_loop" to "event_loop"
+                    ))
+                }
+                // destroy keyboard if applicable
+                if !capabilities.contains(wl_seat::Capability::Keyboard) {
+                    if let Some(kbd) = self.keyboard.take() {
+                        if kbd.version() >= 3 {
+                            use self::wl_keyboard::RequestsTrait;
+                            kbd.release();
+                        }
+                    }
+                }
+                // create touch if applicable
+                if capabilities.contains(wl_seat::Capability::Touch) && self.touch.is_none() {
+                    self.touch = Some(super::touch::implement_touch(
+                        &seat,
+                        self.sink.clone(),
+                        self.store.clone(),
+                    ))
+                }
+                // destroy touch if applicable
+                if !capabilities.contains(wl_seat::Capability::Touch) {
+                    if let Some(touch) = self.touch.take() {
+                        if touch.version() >= 3 {
+                            use self::wl_touch::RequestsTrait;
+                            touch.release();
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+impl Drop for SeatData {
+    fn drop(&mut self) {
+        if let Some(pointer) = self.pointer.take() {
+            if pointer.version() >= 3 {
+                use self::wl_pointer::RequestsTrait;
+                pointer.release();
+            }
+        }
+        if let Some(kbd) = self.keyboard.take() {
+            if kbd.version() >= 3 {
+                use self::wl_keyboard::RequestsTrait;
+                kbd.release();
+            }
+        }
+        if let Some(touch) = self.touch.take() {
+            if touch.version() >= 3 {
+                use self::wl_touch::RequestsTrait;
+                touch.release();
+            }
+        }
+    }
+}
+
+/*
+ * Monitor stuff
+ */
+
+pub struct MonitorHandle {
+    pub(crate) proxy: Proxy<wl_output::WlOutput>,
+    pub(crate) mgr: OutputMgr,
+}
+
+impl Clone for MonitorHandle {
+    fn clone(&self) -> MonitorHandle {
+        MonitorHandle {
+            proxy: self.proxy.clone(),
+            mgr: self.mgr.clone(),
+        }
+    }
+}
+
+impl fmt::Debug for MonitorHandle {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        #[derive(Debug)]
+        struct MonitorHandle {
+            name: Option<String>,
+            native_identifier: u32,
+            dimensions: PhysicalSize,
+            position: PhysicalPosition,
+            hidpi_factor: i32,
+        }
+
+        let monitor_id_proxy = MonitorHandle {
+            name: self.get_name(),
+            native_identifier: self.get_native_identifier(),
+            dimensions: self.get_dimensions(),
+            position: self.get_position(),
+            hidpi_factor: self.get_hidpi_factor(),
+        };
+
+        monitor_id_proxy.fmt(f)
+    }
+}
+
+impl MonitorHandle {
+    pub fn get_name(&self) -> Option<String> {
+        self.mgr.with_info(&self.proxy, |_, info| {
+            format!("{} ({})", info.model, info.make)
+        })
+    }
+
+    #[inline]
+    pub fn get_native_identifier(&self) -> u32 {
+        self.mgr.with_info(&self.proxy, |id, _| id).unwrap_or(0)
+    }
+
+    pub fn get_dimensions(&self) -> PhysicalSize {
+        match self.mgr.with_info(&self.proxy, |_, info| {
+            info.modes
+                .iter()
+                .find(|m| m.is_current)
+                .map(|m| m.dimensions)
+        }) {
+            Some(Some((w, h))) => (w as u32, h as u32),
+            _ => (0, 0),
+        }.into()
+    }
+
+    pub fn get_position(&self) -> PhysicalPosition {
+        self.mgr
+            .with_info(&self.proxy, |_, info| info.location)
+            .unwrap_or((0, 0))
+            .into()
+    }
+
+    #[inline]
+    pub fn get_hidpi_factor(&self) -> i32 {
+        self.mgr
+            .with_info(&self.proxy, |_, info| info.scale_factor)
+            .unwrap_or(1)
+    }
+}
+
+pub fn get_primary_monitor(outputs: &OutputMgr) -> MonitorHandle {
+    outputs.with_all(|list| {
+        if let Some(&(_, ref proxy, _)) = list.first() {
+            MonitorHandle {
+                proxy: proxy.clone(),
+                mgr: outputs.clone(),
+            }
+        } else {
+            panic!("No monitor is available.")
+        }
+    })
+}
+
+pub fn get_available_monitors(outputs: &OutputMgr) -> VecDeque<MonitorHandle> {
+    outputs.with_all(|list| {
+        list.iter()
+            .map(|&(_, ref proxy, _)| MonitorHandle {
+                proxy: proxy.clone(),
+                mgr: outputs.clone(),
+            })
+            .collect()
+    })
+}

src/platform_impl/linux/wayland/keyboard.rs

@@ -0,0 +1,363 @@
+use std::sync::{Arc, Mutex};
+
+use super::{make_wid, DeviceId, EventLoopProxy, EventLoopSink};
+use sctk::keyboard::{
+    self, map_keyboard_auto_with_repeat, Event as KbEvent, KeyRepeatEvent, KeyRepeatKind,
+};
+use sctk::reexports::client::protocol::wl_keyboard;
+use sctk::reexports::client::Proxy;
+use sctk::reexports::client::protocol::wl_seat;
+use sctk::reexports::client::protocol::wl_seat::RequestsTrait as SeatRequests;
+
+use {ElementState, KeyboardInput, ModifiersState, VirtualKeyCode, WindowEvent};
+
+pub fn init_keyboard(
+    seat: &Proxy<wl_seat::WlSeat>,
+    sink: Arc<Mutex<EventLoopSink>>,
+    event_loop_proxy: EventLoopProxy,
+    modifiers_tracker: Arc<Mutex<ModifiersState>>,
+) -> Proxy<wl_keyboard::WlKeyboard> {
+    // { variables to be captured by the closures
+    let target = Arc::new(Mutex::new(None));
+    let my_sink = sink.clone();
+    let repeat_sink = sink.clone();
+    let repeat_target = target.clone();
+    let my_modifiers = modifiers_tracker.clone();
+    // }
+    let ret = map_keyboard_auto_with_repeat(
+        seat,
+        KeyRepeatKind::System,
+        move |evt: KbEvent, _| match evt {
+            KbEvent::Enter { surface, .. } => {
+                let wid = make_wid(&surface);
+                my_sink
+                    .lock()
+                    .unwrap()
+                    .send_event(WindowEvent::Focused(true), wid);
+                *target.lock().unwrap() = Some(wid);
+            }
+            KbEvent::Leave { surface, .. } => {
+                let wid = make_wid(&surface);
+                my_sink
+                    .lock()
+                    .unwrap()
+                    .send_event(WindowEvent::Focused(false), wid);
+                *target.lock().unwrap() = None;
+            }
+            KbEvent::Key {
+                rawkey,
+                keysym,
+                state,
+                utf8,
+                ..
+            } => {
+                if let Some(wid) = *target.lock().unwrap() {
+                    let state = match state {
+                        wl_keyboard::KeyState::Pressed => ElementState::Pressed,
+                        wl_keyboard::KeyState::Released => ElementState::Released,
+                    };
+                    let vkcode = key_to_vkey(rawkey, keysym);
+                    let mut guard = my_sink.lock().unwrap();
+                    guard.send_event(
+                        WindowEvent::KeyboardInput {
+                            device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                            input: KeyboardInput {
+                                state: state,
+                                scancode: rawkey,
+                                virtual_keycode: vkcode,
+                                modifiers: modifiers_tracker.lock().unwrap().clone(),
+                            },
+                        },
+                        wid,
+                    );
+                    // send char event only on key press, not release
+                    if let ElementState::Released = state {
+                        return;
+                    }
+                    if let Some(txt) = utf8 {
+                        for chr in txt.chars() {
+                            guard.send_event(WindowEvent::ReceivedCharacter(chr), wid);
+                        }
+                    }
+                }
+            }
+            KbEvent::RepeatInfo { .. } => { /* Handled by smithay client toolkit */ }
+            KbEvent::Modifiers { modifiers: event_modifiers } => {
+                *modifiers_tracker.lock().unwrap() = event_modifiers.into()
+            }
+        },
+        move |repeat_event: KeyRepeatEvent, _| {
+            if let Some(wid) = *repeat_target.lock().unwrap() {
+                let state = ElementState::Pressed;
+                let vkcode = key_to_vkey(repeat_event.rawkey, repeat_event.keysym);
+                let mut guard = repeat_sink.lock().unwrap();
+                guard.send_event(
+                    WindowEvent::KeyboardInput {
+                        device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                        input: KeyboardInput {
+                            state: state,
+                            scancode: repeat_event.rawkey,
+                            virtual_keycode: vkcode,
+                            modifiers: my_modifiers.lock().unwrap().clone(),
+                        },
+                    },
+                    wid,
+                );
+                if let Some(txt) = repeat_event.utf8 {
+                    for chr in txt.chars() {
+                        guard.send_event(WindowEvent::ReceivedCharacter(chr), wid);
+                    }
+                }
+                event_loop_proxy.wakeup().unwrap();
+            }
+        },
+    );
+
+    match ret {
+        Ok(keyboard) => keyboard,
+        Err(_) => {
+            // This is a fallback impl if libxkbcommon was not available
+            // This case should probably never happen, as most wayland
+            // compositors _need_ libxkbcommon anyway...
+            //
+            // In this case, we don't have the keymap information (it is
+            // supposed to be serialized by the compositor using libxkbcommon)
+
+            // { variables to be captured by the closure
+            let mut target = None;
+            let my_sink = sink;
+            // }
+            seat.get_keyboard(|keyboard| {
+                keyboard.implement(move |evt, _| match evt {
+                    wl_keyboard::Event::Enter { surface, .. } => {
+                        let wid = make_wid(&surface);
+                        my_sink
+                            .lock()
+                            .unwrap()
+                            .send_event(WindowEvent::Focused(true), wid);
+                        target = Some(wid);
+                    }
+                    wl_keyboard::Event::Leave { surface, .. } => {
+                        let wid = make_wid(&surface);
+                        my_sink
+                            .lock()
+                            .unwrap()
+                            .send_event(WindowEvent::Focused(false), wid);
+                        target = None;
+                    }
+                    wl_keyboard::Event::Key { key, state, .. } => {
+                        if let Some(wid) = target {
+                            let state = match state {
+                                wl_keyboard::KeyState::Pressed => ElementState::Pressed,
+                                wl_keyboard::KeyState::Released => ElementState::Released,
+                            };
+                            my_sink.lock().unwrap().send_event(
+                                WindowEvent::KeyboardInput {
+                                    device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                                    input: KeyboardInput {
+                                        state: state,
+                                        scancode: key,
+                                        virtual_keycode: None,
+                                        modifiers: ModifiersState::default(),
+                                    },
+                                },
+                                wid,
+                            );
+                        }
+                    }
+                    _ => (),
+                }, ())
+            }).unwrap()
+        }
+    }
+}
+
+fn key_to_vkey(rawkey: u32, keysym: u32) -> Option<VirtualKeyCode> {
+    match rawkey {
+        1 => Some(VirtualKeyCode::Escape),
+        2 => Some(VirtualKeyCode::Key1),
+        3 => Some(VirtualKeyCode::Key2),
+        4 => Some(VirtualKeyCode::Key3),
+        5 => Some(VirtualKeyCode::Key4),
+        6 => Some(VirtualKeyCode::Key5),
+        7 => Some(VirtualKeyCode::Key6),
+        8 => Some(VirtualKeyCode::Key7),
+        9 => Some(VirtualKeyCode::Key8),
+        10 => Some(VirtualKeyCode::Key9),
+        11 => Some(VirtualKeyCode::Key0),
+        _ => keysym_to_vkey(keysym),
+    }
+}
+
+fn keysym_to_vkey(keysym: u32) -> Option<VirtualKeyCode> {
+    use sctk::keyboard::keysyms;
+    match keysym {
+        // letters
+        keysyms::XKB_KEY_A | keysyms::XKB_KEY_a => Some(VirtualKeyCode::A),
+        keysyms::XKB_KEY_B | keysyms::XKB_KEY_b => Some(VirtualKeyCode::B),
+        keysyms::XKB_KEY_C | keysyms::XKB_KEY_c => Some(VirtualKeyCode::C),
+        keysyms::XKB_KEY_D | keysyms::XKB_KEY_d => Some(VirtualKeyCode::D),
+        keysyms::XKB_KEY_E | keysyms::XKB_KEY_e => Some(VirtualKeyCode::E),
+        keysyms::XKB_KEY_F | keysyms::XKB_KEY_f => Some(VirtualKeyCode::F),
+        keysyms::XKB_KEY_G | keysyms::XKB_KEY_g => Some(VirtualKeyCode::G),
+        keysyms::XKB_KEY_H | keysyms::XKB_KEY_h => Some(VirtualKeyCode::H),
+        keysyms::XKB_KEY_I | keysyms::XKB_KEY_i => Some(VirtualKeyCode::I),
+        keysyms::XKB_KEY_J | keysyms::XKB_KEY_j => Some(VirtualKeyCode::J),
+        keysyms::XKB_KEY_K | keysyms::XKB_KEY_k => Some(VirtualKeyCode::K),
+        keysyms::XKB_KEY_L | keysyms::XKB_KEY_l => Some(VirtualKeyCode::L),
+        keysyms::XKB_KEY_M | keysyms::XKB_KEY_m => Some(VirtualKeyCode::M),
+        keysyms::XKB_KEY_N | keysyms::XKB_KEY_n => Some(VirtualKeyCode::N),
+        keysyms::XKB_KEY_O | keysyms::XKB_KEY_o => Some(VirtualKeyCode::O),
+        keysyms::XKB_KEY_P | keysyms::XKB_KEY_p => Some(VirtualKeyCode::P),
+        keysyms::XKB_KEY_Q | keysyms::XKB_KEY_q => Some(VirtualKeyCode::Q),
+        keysyms::XKB_KEY_R | keysyms::XKB_KEY_r => Some(VirtualKeyCode::R),
+        keysyms::XKB_KEY_S | keysyms::XKB_KEY_s => Some(VirtualKeyCode::S),
+        keysyms::XKB_KEY_T | keysyms::XKB_KEY_t => Some(VirtualKeyCode::T),
+        keysyms::XKB_KEY_U | keysyms::XKB_KEY_u => Some(VirtualKeyCode::U),
+        keysyms::XKB_KEY_V | keysyms::XKB_KEY_v => Some(VirtualKeyCode::V),
+        keysyms::XKB_KEY_W | keysyms::XKB_KEY_w => Some(VirtualKeyCode::W),
+        keysyms::XKB_KEY_X | keysyms::XKB_KEY_x => Some(VirtualKeyCode::X),
+        keysyms::XKB_KEY_Y | keysyms::XKB_KEY_y => Some(VirtualKeyCode::Y),
+        keysyms::XKB_KEY_Z | keysyms::XKB_KEY_z => Some(VirtualKeyCode::Z),
+        // F--
+        keysyms::XKB_KEY_F1 => Some(VirtualKeyCode::F1),
+        keysyms::XKB_KEY_F2 => Some(VirtualKeyCode::F2),
+        keysyms::XKB_KEY_F3 => Some(VirtualKeyCode::F3),
+        keysyms::XKB_KEY_F4 => Some(VirtualKeyCode::F4),
+        keysyms::XKB_KEY_F5 => Some(VirtualKeyCode::F5),
+        keysyms::XKB_KEY_F6 => Some(VirtualKeyCode::F6),
+        keysyms::XKB_KEY_F7 => Some(VirtualKeyCode::F7),
+        keysyms::XKB_KEY_F8 => Some(VirtualKeyCode::F8),
+        keysyms::XKB_KEY_F9 => Some(VirtualKeyCode::F9),
+        keysyms::XKB_KEY_F10 => Some(VirtualKeyCode::F10),
+        keysyms::XKB_KEY_F11 => Some(VirtualKeyCode::F11),
+        keysyms::XKB_KEY_F12 => Some(VirtualKeyCode::F12),
+        keysyms::XKB_KEY_F13 => Some(VirtualKeyCode::F13),
+        keysyms::XKB_KEY_F14 => Some(VirtualKeyCode::F14),
+        keysyms::XKB_KEY_F15 => Some(VirtualKeyCode::F15),
+        keysyms::XKB_KEY_F16 => Some(VirtualKeyCode::F16),
+        keysyms::XKB_KEY_F17 => Some(VirtualKeyCode::F17),
+        keysyms::XKB_KEY_F18 => Some(VirtualKeyCode::F18),
+        keysyms::XKB_KEY_F19 => Some(VirtualKeyCode::F19),
+        keysyms::XKB_KEY_F20 => Some(VirtualKeyCode::F20),
+        keysyms::XKB_KEY_F21 => Some(VirtualKeyCode::F21),
+        keysyms::XKB_KEY_F22 => Some(VirtualKeyCode::F22),
+        keysyms::XKB_KEY_F23 => Some(VirtualKeyCode::F23),
+        keysyms::XKB_KEY_F24 => Some(VirtualKeyCode::F24),
+        // flow control
+        keysyms::XKB_KEY_Print => Some(VirtualKeyCode::Snapshot),
+        keysyms::XKB_KEY_Scroll_Lock => Some(VirtualKeyCode::Scroll),
+        keysyms::XKB_KEY_Pause => Some(VirtualKeyCode::Pause),
+        keysyms::XKB_KEY_Insert => Some(VirtualKeyCode::Insert),
+        keysyms::XKB_KEY_Home => Some(VirtualKeyCode::Home),
+        keysyms::XKB_KEY_Delete => Some(VirtualKeyCode::Delete),
+        keysyms::XKB_KEY_End => Some(VirtualKeyCode::End),
+        keysyms::XKB_KEY_Page_Down => Some(VirtualKeyCode::PageDown),
+        keysyms::XKB_KEY_Page_Up => Some(VirtualKeyCode::PageUp),
+        // arrows
+        keysyms::XKB_KEY_Left => Some(VirtualKeyCode::Left),
+        keysyms::XKB_KEY_Up => Some(VirtualKeyCode::Up),
+        keysyms::XKB_KEY_Right => Some(VirtualKeyCode::Right),
+        keysyms::XKB_KEY_Down => Some(VirtualKeyCode::Down),
+        //
+        keysyms::XKB_KEY_BackSpace => Some(VirtualKeyCode::Back),
+        keysyms::XKB_KEY_Return => Some(VirtualKeyCode::Return),
+        keysyms::XKB_KEY_space => Some(VirtualKeyCode::Space),
+        // keypad
+        keysyms::XKB_KEY_Num_Lock => Some(VirtualKeyCode::Numlock),
+        keysyms::XKB_KEY_KP_0 => Some(VirtualKeyCode::Numpad0),
+        keysyms::XKB_KEY_KP_1 => Some(VirtualKeyCode::Numpad1),
+        keysyms::XKB_KEY_KP_2 => Some(VirtualKeyCode::Numpad2),
+        keysyms::XKB_KEY_KP_3 => Some(VirtualKeyCode::Numpad3),
+        keysyms::XKB_KEY_KP_4 => Some(VirtualKeyCode::Numpad4),
+        keysyms::XKB_KEY_KP_5 => Some(VirtualKeyCode::Numpad5),
+        keysyms::XKB_KEY_KP_6 => Some(VirtualKeyCode::Numpad6),
+        keysyms::XKB_KEY_KP_7 => Some(VirtualKeyCode::Numpad7),
+        keysyms::XKB_KEY_KP_8 => Some(VirtualKeyCode::Numpad8),
+        keysyms::XKB_KEY_KP_9 => Some(VirtualKeyCode::Numpad9),
+        // misc
+        // => Some(VirtualKeyCode::AbntC1),
+        // => Some(VirtualKeyCode::AbntC2),
+        keysyms::XKB_KEY_plus => Some(VirtualKeyCode::Add),
+        keysyms::XKB_KEY_apostrophe => Some(VirtualKeyCode::Apostrophe),
+        // => Some(VirtualKeyCode::Apps),
+        // => Some(VirtualKeyCode::At),
+        // => Some(VirtualKeyCode::Ax),
+        keysyms::XKB_KEY_backslash => Some(VirtualKeyCode::Backslash),
+        // => Some(VirtualKeyCode::Calculator),
+        // => Some(VirtualKeyCode::Capital),
+        keysyms::XKB_KEY_colon => Some(VirtualKeyCode::Colon),
+        keysyms::XKB_KEY_comma => Some(VirtualKeyCode::Comma),
+        // => Some(VirtualKeyCode::Convert),
+        // => Some(VirtualKeyCode::Decimal),
+        // => Some(VirtualKeyCode::Divide),
+        keysyms::XKB_KEY_equal => Some(VirtualKeyCode::Equals),
+        // => Some(VirtualKeyCode::Grave),
+        // => Some(VirtualKeyCode::Kana),
+        // => Some(VirtualKeyCode::Kanji),
+        keysyms::XKB_KEY_Alt_L => Some(VirtualKeyCode::LAlt),
+        // => Some(VirtualKeyCode::LBracket),
+        keysyms::XKB_KEY_Control_L => Some(VirtualKeyCode::LControl),
+        keysyms::XKB_KEY_Shift_L => Some(VirtualKeyCode::LShift),
+        // => Some(VirtualKeyCode::LWin),
+        // => Some(VirtualKeyCode::Mail),
+        // => Some(VirtualKeyCode::MediaSelect),
+        // => Some(VirtualKeyCode::MediaStop),
+        keysyms::XKB_KEY_minus => Some(VirtualKeyCode::Minus),
+        keysyms::XKB_KEY_asterisk => Some(VirtualKeyCode::Multiply),
+        // => Some(VirtualKeyCode::Mute),
+        // => Some(VirtualKeyCode::MyComputer),
+        // => Some(VirtualKeyCode::NextTrack),
+        // => Some(VirtualKeyCode::NoConvert),
+        keysyms::XKB_KEY_KP_Separator => Some(VirtualKeyCode::NumpadComma),
+        keysyms::XKB_KEY_KP_Enter => Some(VirtualKeyCode::NumpadEnter),
+        keysyms::XKB_KEY_KP_Equal => Some(VirtualKeyCode::NumpadEquals),
+        // => Some(VirtualKeyCode::OEM102),
+        // => Some(VirtualKeyCode::Period),
+        // => Some(VirtualKeyCode::Playpause),
+        // => Some(VirtualKeyCode::Power),
+        // => Some(VirtualKeyCode::Prevtrack),
+        keysyms::XKB_KEY_Alt_R => Some(VirtualKeyCode::RAlt),
+        // => Some(VirtualKeyCode::RBracket),
+        keysyms::XKB_KEY_Control_R => Some(VirtualKeyCode::RControl),
+        keysyms::XKB_KEY_Shift_R => Some(VirtualKeyCode::RShift),
+        // => Some(VirtualKeyCode::RWin),
+        keysyms::XKB_KEY_semicolon => Some(VirtualKeyCode::Semicolon),
+        keysyms::XKB_KEY_slash => Some(VirtualKeyCode::Slash),
+        // => Some(VirtualKeyCode::Sleep),
+        // => Some(VirtualKeyCode::Stop),
+        // => Some(VirtualKeyCode::Subtract),
+        // => Some(VirtualKeyCode::Sysrq),
+        keysyms::XKB_KEY_Tab => Some(VirtualKeyCode::Tab),
+        keysyms::XKB_KEY_ISO_Left_Tab => Some(VirtualKeyCode::Tab),
+        // => Some(VirtualKeyCode::Underline),
+        // => Some(VirtualKeyCode::Unlabeled),
+        keysyms::XKB_KEY_XF86AudioLowerVolume => Some(VirtualKeyCode::VolumeDown),
+        keysyms::XKB_KEY_XF86AudioRaiseVolume => Some(VirtualKeyCode::VolumeUp),
+        // => Some(VirtualKeyCode::Wake),
+        // => Some(VirtualKeyCode::Webback),
+        // => Some(VirtualKeyCode::WebFavorites),
+        // => Some(VirtualKeyCode::WebForward),
+        // => Some(VirtualKeyCode::WebHome),
+        // => Some(VirtualKeyCode::WebRefresh),
+        // => Some(VirtualKeyCode::WebSearch),
+        // => Some(VirtualKeyCode::WebStop),
+        // => Some(VirtualKeyCode::Yen),
+        keysyms::XKB_KEY_XF86Copy => Some(VirtualKeyCode::Copy),
+        keysyms::XKB_KEY_XF86Paste => Some(VirtualKeyCode::Paste),
+        keysyms::XKB_KEY_XF86Cut => Some(VirtualKeyCode::Cut),
+        // fallback
+        _ => None,
+    }
+}
+
+impl From<keyboard::ModifiersState> for ModifiersState {
+    fn from(mods: keyboard::ModifiersState) -> ModifiersState {
+        ModifiersState {
+            shift: mods.shift,
+            ctrl: mods.ctrl,
+            alt: mods.alt,
+            logo: mods.logo,
+        }
+    }
+}

src/platform_impl/linux/wayland/mod.rs

@@ -0,0 +1,37 @@
+#![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd",
+           target_os = "netbsd", target_os = "openbsd"))]
+
+pub use self::window::Window;
+pub use self::event_loop::{EventLoop, EventLoopProxy, EventLoopSink, MonitorHandle};
+
+use sctk::reexports::client::protocol::wl_surface;
+use sctk::reexports::client::Proxy;
+
+mod event_loop;
+mod pointer;
+mod touch;
+mod keyboard;
+mod window;
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct DeviceId;
+
+impl DeviceId {
+    pub unsafe fn dummy() -> Self {
+        DeviceId
+    }
+}
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct WindowId(usize);
+
+impl WindowId {
+    pub unsafe fn dummy() -> Self {
+        WindowId(0)
+    }
+}
+
+#[inline]
+fn make_wid(s: &Proxy<wl_surface::WlSurface>) -> WindowId {
+    WindowId(s.c_ptr() as usize)
+}

src/platform_impl/linux/wayland/pointer.rs

@@ -0,0 +1,189 @@
+use std::sync::{Arc, Mutex};
+
+use {ElementState, MouseButton, MouseScrollDelta, TouchPhase, WindowEvent};
+use events::ModifiersState;
+
+use super::DeviceId;
+use super::event_loop::EventLoopSink;
+use super::window::WindowStore;
+
+use sctk::reexports::client::Proxy;
+use sctk::reexports::client::protocol::wl_pointer::{self, Event as PtrEvent, WlPointer};
+use sctk::reexports::client::protocol::wl_seat;
+use sctk::reexports::client::protocol::wl_seat::RequestsTrait as SeatRequests;
+
+pub fn implement_pointer(
+    seat: &Proxy<wl_seat::WlSeat>,
+    sink: Arc<Mutex<EventLoopSink>>,
+    store: Arc<Mutex<WindowStore>>,
+    modifiers_tracker: Arc<Mutex<ModifiersState>>,
+) -> Proxy<WlPointer> {
+    let mut mouse_focus = None;
+    let mut axis_buffer = None;
+    let mut axis_discrete_buffer = None;
+    let mut axis_state = TouchPhase::Ended;
+
+    seat.get_pointer(|pointer| {
+        pointer.implement(move |evt, pointer| {
+            let mut sink = sink.lock().unwrap();
+            let store = store.lock().unwrap();
+            match evt {
+                PtrEvent::Enter {
+                    surface,
+                    surface_x,
+                    surface_y,
+                    ..
+                } => {
+                    let wid = store.find_wid(&surface);
+                    if let Some(wid) = wid {
+                        mouse_focus = Some(wid);
+                        sink.send_event(
+                            WindowEvent::CursorEntered {
+                                device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                            },
+                            wid,
+                        );
+                        sink.send_event(
+                            WindowEvent::CursorMoved {
+                                device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                                position: (surface_x, surface_y).into(),
+                                modifiers: modifiers_tracker.lock().unwrap().clone(),
+                            },
+                            wid,
+                        );
+                    }
+                }
+                PtrEvent::Leave { surface, .. } => {
+                    mouse_focus = None;
+                    let wid = store.find_wid(&surface);
+                    if let Some(wid) = wid {
+                        sink.send_event(
+                            WindowEvent::CursorLeft {
+                                device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                            },
+                            wid,
+                        );
+                    }
+                }
+                PtrEvent::Motion {
+                    surface_x,
+                    surface_y,
+                    ..
+                } => {
+                    if let Some(wid) = mouse_focus {
+                        sink.send_event(
+                            WindowEvent::CursorMoved {
+                                device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                                position: (surface_x, surface_y).into(),
+                                modifiers: modifiers_tracker.lock().unwrap().clone(),
+                            },
+                            wid,
+                        );
+                    }
+                }
+                PtrEvent::Button { button, state, .. } => {
+                    if let Some(wid) = mouse_focus {
+                        let state = match state {
+                            wl_pointer::ButtonState::Pressed => ElementState::Pressed,
+                            wl_pointer::ButtonState::Released => ElementState::Released,
+                        };
+                        let button = match button {
+                            0x110 => MouseButton::Left,
+                            0x111 => MouseButton::Right,
+                            0x112 => MouseButton::Middle,
+                            // TODO figure out the translation ?
+                            _ => return,
+                        };
+                        sink.send_event(
+                            WindowEvent::MouseInput {
+                                device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                                state: state,
+                                button: button,
+                                modifiers: modifiers_tracker.lock().unwrap().clone(),
+                            },
+                            wid,
+                        );
+                    }
+                }
+                PtrEvent::Axis { axis, value, .. } => {
+                    if let Some(wid) = mouse_focus {
+                        if pointer.version() < 5 {
+                            let (mut x, mut y) = (0.0, 0.0);
+                            // old seat compatibility
+                            match axis {
+                                // wayland vertical sign convention is the inverse of winit
+                                wl_pointer::Axis::VerticalScroll => y -= value as f32,
+                                wl_pointer::Axis::HorizontalScroll => x += value as f32,
+                            }
+                            sink.send_event(
+                                WindowEvent::MouseWheel {
+                                    device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                                    delta: MouseScrollDelta::PixelDelta((x as f64, y as f64).into()),
+                                    phase: TouchPhase::Moved,
+                                    modifiers: modifiers_tracker.lock().unwrap().clone(),
+                                },
+                                wid,
+                            );
+                        } else {
+                            let (mut x, mut y) = axis_buffer.unwrap_or((0.0, 0.0));
+                            match axis {
+                                // wayland vertical sign convention is the inverse of winit
+                                wl_pointer::Axis::VerticalScroll => y -= value as f32,
+                                wl_pointer::Axis::HorizontalScroll => x += value as f32,
+                            }
+                            axis_buffer = Some((x, y));
+                            axis_state = match axis_state {
+                                TouchPhase::Started | TouchPhase::Moved => TouchPhase::Moved,
+                                _ => TouchPhase::Started,
+                            }
+                        }
+                    }
+                }
+                PtrEvent::Frame => {
+                    let axis_buffer = axis_buffer.take();
+                    let axis_discrete_buffer = axis_discrete_buffer.take();
+                    if let Some(wid) = mouse_focus {
+                        if let Some((x, y)) = axis_discrete_buffer {
+                            sink.send_event(
+                                WindowEvent::MouseWheel {
+                                    device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                                    delta: MouseScrollDelta::LineDelta(x as f32, y as f32),
+                                    phase: axis_state,
+                                    modifiers: modifiers_tracker.lock().unwrap().clone(),
+                                },
+                                wid,
+                            );
+                        } else if let Some((x, y)) = axis_buffer {
+                            sink.send_event(
+                                WindowEvent::MouseWheel {
+                                    device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                                    delta: MouseScrollDelta::PixelDelta((x as f64, y as f64).into()),
+                                    phase: axis_state,
+                                    modifiers: modifiers_tracker.lock().unwrap().clone(),
+                                },
+                                wid,
+                            );
+                        }
+                    }
+                }
+                PtrEvent::AxisSource { .. } => (),
+                PtrEvent::AxisStop { .. } => {
+                    axis_state = TouchPhase::Ended;
+                }
+                PtrEvent::AxisDiscrete { axis, discrete } => {
+                    let (mut x, mut y) = axis_discrete_buffer.unwrap_or((0, 0));
+                    match axis {
+                        // wayland vertical sign convention is the inverse of winit
+                        wl_pointer::Axis::VerticalScroll => y -= discrete,
+                        wl_pointer::Axis::HorizontalScroll => x += discrete,
+                    }
+                    axis_discrete_buffer = Some((x, y));
+                    axis_state = match axis_state {
+                        TouchPhase::Started | TouchPhase::Moved => TouchPhase::Moved,
+                        _ => TouchPhase::Started,
+                    }
+                }
+            }
+        }, ())
+    }).unwrap()
+}

src/platform_impl/linux/wayland/touch.rs

@@ -0,0 +1,97 @@
+use std::sync::{Arc, Mutex};
+
+use {TouchPhase, WindowEvent};
+
+use super::{DeviceId, WindowId};
+use super::event_loop::EventLoopSink;
+use super::window::WindowStore;
+
+use sctk::reexports::client::Proxy;
+use sctk::reexports::client::protocol::wl_touch::{Event as TouchEvent, WlTouch};
+use sctk::reexports::client::protocol::wl_seat;
+use sctk::reexports::client::protocol::wl_seat::RequestsTrait as SeatRequests;
+
+struct TouchPoint {
+    wid: WindowId,
+    location: (f64, f64),
+    id: i32,
+}
+
+pub(crate) fn implement_touch(
+    seat: &Proxy<wl_seat::WlSeat>,
+    sink: Arc<Mutex<EventLoopSink>>,
+    store: Arc<Mutex<WindowStore>>,
+) -> Proxy<WlTouch> {
+    let mut pending_ids = Vec::new();
+    seat.get_touch(|touch| {
+        touch.implement(move |evt, _| {
+            let mut sink = sink.lock().unwrap();
+            let store = store.lock().unwrap();
+            match evt {
+                TouchEvent::Down {
+                    surface, id, x, y, ..
+                } => {
+                    let wid = store.find_wid(&surface);
+                    if let Some(wid) = wid {
+                        sink.send_event(
+                            WindowEvent::Touch(::Touch {
+                                device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                                phase: TouchPhase::Started,
+                                location: (x, y).into(),
+                                id: id as u64,
+                            }),
+                            wid,
+                        );
+                        pending_ids.push(TouchPoint {
+                            wid: wid,
+                            location: (x, y),
+                            id: id,
+                        });
+                    }
+                }
+                TouchEvent::Up { id, .. } => {
+                    let idx = pending_ids.iter().position(|p| p.id == id);
+                    if let Some(idx) = idx {
+                        let pt = pending_ids.remove(idx);
+                        sink.send_event(
+                            WindowEvent::Touch(::Touch {
+                                device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                                phase: TouchPhase::Ended,
+                                location: pt.location.into(),
+                                id: id as u64,
+                            }),
+                            pt.wid,
+                        );
+                    }
+                }
+                TouchEvent::Motion { id, x, y, .. } => {
+                    let pt = pending_ids.iter_mut().find(|p| p.id == id);
+                    if let Some(pt) = pt {
+                        pt.location = (x, y);
+                        sink.send_event(
+                            WindowEvent::Touch(::Touch {
+                                device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                                phase: TouchPhase::Moved,
+                                location: (x, y).into(),
+                                id: id as u64,
+                            }),
+                            pt.wid,
+                        );
+                    }
+                }
+                TouchEvent::Frame => (),
+                TouchEvent::Cancel => for pt in pending_ids.drain(..) {
+                    sink.send_event(
+                        WindowEvent::Touch(::Touch {
+                            device_id: ::DeviceId(::platform::DeviceId::Wayland(DeviceId)),
+                            phase: TouchPhase::Cancelled,
+                            location: pt.location.into(),
+                            id: pt.id as u64,
+                        }),
+                        pt.wid,
+                    );
+                },
+            }
+        }, ())
+    }).unwrap()
+}

src/platform_impl/linux/wayland/window.rs

@@ -0,0 +1,451 @@
+use std::collections::VecDeque;
+use std::sync::{Arc, Mutex, Weak};
+
+use {CreationError, MouseCursor, WindowAttributes};
+use dpi::{LogicalPosition, LogicalSize};
+<<<<<<< HEAD:src/platform_impl/linux/wayland/window.rs
+use platform_impl::MonitorHandle as PlatformMonitorHandle;
+use window::MonitorHandle as RootMonitorHandle;
+=======
+use platform::{MonitorId as PlatformMonitorId, PlatformSpecificWindowBuilderAttributes as PlAttributes};
+use window::MonitorId as RootMonitorId;
+>>>>>>> master:src/platform/linux/wayland/window.rs
+
+use sctk::surface::{get_dpi_factor, get_outputs};
+use sctk::window::{ConceptFrame, Event as WEvent, Window as SWindow, Theme};
+use sctk::reexports::client::{Display, Proxy};
+use sctk::reexports::client::protocol::{wl_seat, wl_surface};
+use sctk::reexports::client::protocol::wl_surface::RequestsTrait as SurfaceRequests;
+use sctk::output::OutputMgr;
+
+use super::{make_wid, EventLoop, MonitorHandle, WindowId};
+use platform_impl::platform::wayland::event_loop::{get_available_monitors, get_primary_monitor};
+
+pub struct Window {
+    surface: Proxy<wl_surface::WlSurface>,
+    frame: Arc<Mutex<SWindow<ConceptFrame>>>,
+    outputs: OutputMgr, // Access to info for all monitors
+    size: Arc<Mutex<(u32, u32)>>,
+    kill_switch: (Arc<Mutex<bool>>, Arc<Mutex<bool>>),
+    display: Arc<Display>,
+    need_frame_refresh: Arc<Mutex<bool>>,
+}
+
+impl Window {
+    pub fn new(evlp: &EventLoop, attributes: WindowAttributes, pl_attribs: PlAttributes) -> Result<Window, CreationError> {
+        let (width, height) = attributes.dimensions.map(Into::into).unwrap_or((800, 600));
+        // Create the window
+        let size = Arc::new(Mutex::new((width, height)));
+
+        let window_store = evlp.store.clone();
+        let surface = evlp.env.create_surface(move |dpi, surface| {
+            window_store.lock().unwrap().dpi_change(&surface, dpi);
+            surface.set_buffer_scale(dpi);
+        });
+
+        let window_store = evlp.store.clone();
+        let my_surface = surface.clone();
+        let mut frame = SWindow::<ConceptFrame>::init_from_env(
+            &evlp.env,
+            surface.clone(),
+            (width, height),
+            move |event| match event {
+                WEvent::Configure { new_size, .. } => {
+                    let mut store = window_store.lock().unwrap();
+                    for window in &mut store.windows {
+                        if window.surface.equals(&my_surface) {
+                            window.newsize = new_size;
+                            window.need_refresh = true;
+                            *(window.need_frame_refresh.lock().unwrap()) = true;
+                            return;
+                        }
+                    }
+                }
+                WEvent::Refresh => {
+                    let store = window_store.lock().unwrap();
+                    for window in &store.windows {
+                        if window.surface.equals(&my_surface) {
+                            *(window.need_frame_refresh.lock().unwrap()) = true;
+                            return;
+                        }
+                    }
+                }
+                WEvent::Close => {
+                    let mut store = window_store.lock().unwrap();
+                    for window in &mut store.windows {
+                        if window.surface.equals(&my_surface) {
+                            window.closed = true;
+                            return;
+                        }
+                    }
+                }
+            },
+        ).unwrap();
+
+        if let Some(app_id) = pl_attribs.app_id {
+            frame.set_app_id(app_id);
+        }
+
+        for &(_, ref seat) in evlp.seats.lock().unwrap().iter() {
+            frame.new_seat(seat);
+        }
+
+        // Check for fullscreen requirements
+        if let Some(RootMonitorHandle {
+            inner: PlatformMonitorHandle::Wayland(ref monitor_id),
+        }) = attributes.fullscreen
+        {
+            frame.set_fullscreen(Some(&monitor_id.proxy));
+        } else if attributes.maximized {
+            frame.set_maximized();
+        }
+
+        frame.set_resizable(attributes.resizable);
+
+        // set decorations
+        frame.set_decorate(attributes.decorations);
+
+        // min-max dimensions
+        frame.set_min_size(attributes.min_dimensions.map(Into::into));
+        frame.set_max_size(attributes.max_dimensions.map(Into::into));
+
+        let kill_switch = Arc::new(Mutex::new(false));
+        let need_frame_refresh = Arc::new(Mutex::new(true));
+        let frame = Arc::new(Mutex::new(frame));
+
+        evlp.store.lock().unwrap().windows.push(InternalWindow {
+            closed: false,
+            newsize: None,
+            size: size.clone(),
+            need_refresh: false,
+            need_frame_refresh: need_frame_refresh.clone(),
+            surface: surface.clone(),
+            kill_switch: kill_switch.clone(),
+            frame: Arc::downgrade(&frame),
+            current_dpi: 1,
+            new_dpi: None,
+        });
+        evlp.evq.borrow_mut().sync_roundtrip().unwrap();
+
+        Ok(Window {
+            display: evlp.display.clone(),
+            surface: surface,
+            frame: frame,
+            outputs: evlp.env.outputs.clone(),
+            size: size,
+            kill_switch: (kill_switch, evlp.cleanup_needed.clone()),
+            need_frame_refresh: need_frame_refresh,
+        })
+    }
+
+    #[inline]
+    pub fn id(&self) -> WindowId {
+        make_wid(&self.surface)
+    }
+
+    pub fn set_title(&self, title: &str) {
+        self.frame.lock().unwrap().set_title(title.into());
+    }
+
+    #[inline]
+    pub fn show(&self) {
+        // TODO
+    }
+
+    #[inline]
+    pub fn hide(&self) {
+        // TODO
+    }
+
+    #[inline]
+    pub fn get_position(&self) -> Option<LogicalPosition> {
+        // Not possible with wayland
+        None
+    }
+
+    #[inline]
+    pub fn get_inner_position(&self) -> Option<LogicalPosition> {
+        // Not possible with wayland
+        None
+    }
+
+    #[inline]
+    pub fn set_position(&self, _pos: LogicalPosition) {
+        // Not possible with wayland
+    }
+
+    pub fn get_inner_size(&self) -> Option<LogicalSize> {
+        Some(self.size.lock().unwrap().clone().into())
+    }
+
+    #[inline]
+    pub fn get_outer_size(&self) -> Option<LogicalSize> {
+        let (w, h) = self.size.lock().unwrap().clone();
+        // let (w, h) = super::wayland_window::add_borders(w as i32, h as i32);
+        Some((w, h).into())
+    }
+
+    #[inline]
+    // NOTE: This will only resize the borders, the contents must be updated by the user
+    pub fn set_inner_size(&self, size: LogicalSize) {
+        let (w, h) = size.into();
+        self.frame.lock().unwrap().resize(w, h);
+        *(self.size.lock().unwrap()) = (w, h);
+    }
+
+    #[inline]
+    pub fn set_min_dimensions(&self, dimensions: Option<LogicalSize>) {
+        self.frame.lock().unwrap().set_min_size(dimensions.map(Into::into));
+    }
+
+    #[inline]
+    pub fn set_max_dimensions(&self, dimensions: Option<LogicalSize>) {
+        self.frame.lock().unwrap().set_max_size(dimensions.map(Into::into));
+    }
+
+    #[inline]
+    pub fn set_resizable(&self, resizable: bool) {
+        self.frame.lock().unwrap().set_resizable(resizable);
+    }
+
+    #[inline]
+    pub fn hidpi_factor(&self) -> i32 {
+        get_dpi_factor(&self.surface)
+    }
+
+    pub fn set_decorations(&self, decorate: bool) {
+        self.frame.lock().unwrap().set_decorate(decorate);
+        *(self.need_frame_refresh.lock().unwrap()) = true;
+    }
+
+    pub fn set_maximized(&self, maximized: bool) {
+        if maximized {
+            self.frame.lock().unwrap().set_maximized();
+        } else {
+            self.frame.lock().unwrap().unset_maximized();
+        }
+    }
+
+    pub fn set_fullscreen(&self, monitor: Option<RootMonitorHandle>) {
+        if let Some(RootMonitorHandle {
+            inner: PlatformMonitorHandle::Wayland(ref monitor_id),
+        }) = monitor
+        {
+            self.frame
+                .lock()
+                .unwrap()
+                .set_fullscreen(Some(&monitor_id.proxy));
+        } else {
+            self.frame.lock().unwrap().unset_fullscreen();
+        }
+    }
+
+
+    pub fn set_theme<T: Theme>(&self, theme: T) {
+        self.frame.lock().unwrap().set_theme(theme)
+    }
+
+    #[inline]
+    pub fn set_cursor(&self, _cursor: MouseCursor) {
+        // TODO
+    }
+
+    #[inline]
+    pub fn hide_cursor(&self, _hide: bool) {
+        // TODO: This isn't possible on Wayland yet
+    }
+
+    #[inline]
+    pub fn grab_cursor(&self, _grab: bool) -> Result<(), String> {
+        Err("Cursor grabbing is not yet possible on Wayland.".to_owned())
+    }
+
+    #[inline]
+    pub fn set_cursor_position(&self, _pos: LogicalPosition) -> Result<(), String> {
+        Err("Setting the cursor position is not yet possible on Wayland.".to_owned())
+    }
+
+    pub fn get_display(&self) -> &Display {
+        &*self.display
+    }
+
+    pub fn get_surface(&self) -> &Proxy<wl_surface::WlSurface> {
+        &self.surface
+    }
+
+<<<<<<< HEAD:src/platform_impl/linux/wayland/window.rs
+    pub fn get_current_monitor(&self) -> MonitorHandle {
+        // we don't know how much each monitor sees us so...
+        // just return the most recent one ?
+        let guard = self.monitors.lock().unwrap();
+        guard.monitors.last().unwrap().clone()
+=======
+    pub fn get_current_monitor(&self) -> MonitorId {
+        let output = get_outputs(&self.surface).last().unwrap().clone();
+        MonitorId {
+            proxy: output,
+            mgr: self.outputs.clone(),
+        }
+>>>>>>> master:src/platform/linux/wayland/window.rs
+    }
+
+    pub fn get_available_monitors(&self) -> VecDeque<MonitorHandle> {
+        get_available_monitors(&self.outputs)
+    }
+
+    pub fn get_primary_monitor(&self) -> MonitorHandle {
+        get_primary_monitor(&self.outputs)
+    }
+}
+
+impl Drop for Window {
+    fn drop(&mut self) {
+        *(self.kill_switch.0.lock().unwrap()) = true;
+        *(self.kill_switch.1.lock().unwrap()) = true;
+    }
+}
+
+/*
+ * Internal store for windows
+ */
+
+struct InternalWindow {
+    surface: Proxy<wl_surface::WlSurface>,
+    newsize: Option<(u32, u32)>,
+    size: Arc<Mutex<(u32, u32)>>,
+    need_refresh: bool,
+    need_frame_refresh: Arc<Mutex<bool>>,
+    closed: bool,
+    kill_switch: Arc<Mutex<bool>>,
+    frame: Weak<Mutex<SWindow<ConceptFrame>>>,
+    current_dpi: i32,
+    new_dpi: Option<i32>,
+}
+
+pub struct WindowStore {
+    windows: Vec<InternalWindow>,
+}
+
+impl WindowStore {
+    pub fn new() -> WindowStore {
+        WindowStore {
+            windows: Vec::new(),
+        }
+    }
+
+    pub fn find_wid(&self, surface: &Proxy<wl_surface::WlSurface>) -> Option<WindowId> {
+        for window in &self.windows {
+            if surface.equals(&window.surface) {
+                return Some(make_wid(surface));
+            }
+        }
+        None
+    }
+
+    pub fn cleanup(&mut self) -> Vec<WindowId> {
+        let mut pruned = Vec::new();
+        self.windows.retain(|w| {
+            if *w.kill_switch.lock().unwrap() {
+                // window is dead, cleanup
+                pruned.push(make_wid(&w.surface));
+                w.surface.destroy();
+                false
+            } else {
+                true
+            }
+        });
+        pruned
+    }
+
+    pub fn new_seat(&self, seat: &Proxy<wl_seat::WlSeat>) {
+        for window in &self.windows {
+            if let Some(w) = window.frame.upgrade() {
+                w.lock().unwrap().new_seat(seat);
+            }
+        }
+    }
+
+    fn dpi_change(&mut self, surface: &Proxy<wl_surface::WlSurface>, new: i32) {
+        for window in &mut self.windows {
+            if surface.equals(&window.surface) {
+                window.new_dpi = Some(new);
+            }
+        }
+    }
+
+    pub fn for_each<F>(&mut self, mut f: F)
+    where
+        F: FnMut(Option<(u32, u32)>, &mut (u32, u32), Option<i32>, bool, bool, bool, WindowId, Option<&mut SWindow<ConceptFrame>>),
+    {
+        for window in &mut self.windows {
+            let opt_arc = window.frame.upgrade();
+            let mut opt_mutex_lock = opt_arc.as_ref().map(|m| m.lock().unwrap());
+            f(
+                window.newsize.take(),
+                &mut *(window.size.lock().unwrap()),
+                window.new_dpi,
+                window.need_refresh,
+                ::std::mem::replace(&mut *window.need_frame_refresh.lock().unwrap(), false),
+                window.closed,
+                make_wid(&window.surface),
+                opt_mutex_lock.as_mut().map(|m| &mut **m),
+            );
+            if let Some(dpi) = window.new_dpi.take() {
+                window.current_dpi = dpi;
+            }
+            window.need_refresh = false;
+            // avoid re-spamming the event
+            window.closed = false;
+        }
+    }
+}
+<<<<<<< HEAD:src/platform_impl/linux/wayland/window.rs
+
+/*
+ * Monitor list with some covenience method to compute DPI
+ */
+
+struct MonitorList {
+    monitors: Vec<MonitorHandle>
+}
+
+impl MonitorList {
+    fn new() -> MonitorList {
+        MonitorList {
+            monitors: Vec::new()
+        }
+    }
+
+    fn compute_hidpi_factor(&self) -> i32 {
+        let mut factor = 1;
+        for monitor_id in &self.monitors {
+            let monitor_dpi = monitor_id.get_hidpi_factor();
+            if monitor_dpi > factor { factor = monitor_dpi; }
+        }
+        factor
+    }
+
+    fn add_output(&mut self, monitor: MonitorHandle) -> Option<i32> {
+        let old_dpi = self.compute_hidpi_factor();
+        let monitor_dpi = monitor.get_hidpi_factor();
+        self.monitors.push(monitor);
+        if monitor_dpi > old_dpi {
+            Some(monitor_dpi)
+        } else {
+            None
+        }
+    }
+
+    fn del_output(&mut self, output: &Proxy<wl_output::WlOutput>) -> Option<i32> {
+        let old_dpi = self.compute_hidpi_factor();
+        self.monitors.retain(|m| !m.proxy.equals(output));
+        let new_dpi = self.compute_hidpi_factor();
+        if new_dpi != old_dpi {
+            Some(new_dpi)
+        } else {
+            None
+        }
+    }
+}
+=======
+>>>>>>> master:src/platform/linux/wayland/window.rs

src/platform_impl/linux/x11/dnd.rs

@@ -0,0 +1,219 @@
+use std::io;
+use std::sync::Arc;
+use std::path::{Path, PathBuf};
+use std::str::Utf8Error;
+use std::os::raw::*;
+
+use percent_encoding::percent_decode;
+
+use super::{ffi, util, XConnection, XError};
+
+#[derive(Debug)]
+pub struct DndAtoms {
+    pub aware: ffi::Atom,
+    pub enter: ffi::Atom,
+    pub leave: ffi::Atom,
+    pub drop: ffi::Atom,
+    pub position: ffi::Atom,
+    pub status: ffi::Atom,
+    pub action_private: ffi::Atom,
+    pub selection: ffi::Atom,
+    pub finished: ffi::Atom,
+    pub type_list: ffi::Atom,
+    pub uri_list: ffi::Atom,
+    pub none: ffi::Atom,
+}
+
+impl DndAtoms {
+    pub fn new(xconn: &Arc<XConnection>) -> Result<Self, XError> {
+        let names = [
+            b"XdndAware\0".as_ptr() as *mut c_char,
+            b"XdndEnter\0".as_ptr() as *mut c_char,
+            b"XdndLeave\0".as_ptr() as *mut c_char,
+            b"XdndDrop\0".as_ptr() as *mut c_char,
+            b"XdndPosition\0".as_ptr() as *mut c_char,
+            b"XdndStatus\0".as_ptr() as *mut c_char,
+            b"XdndActionPrivate\0".as_ptr() as *mut c_char,
+            b"XdndSelection\0".as_ptr() as *mut c_char,
+            b"XdndFinished\0".as_ptr() as *mut c_char,
+            b"XdndTypeList\0".as_ptr() as *mut c_char,
+            b"text/uri-list\0".as_ptr() as *mut c_char,
+            b"None\0".as_ptr() as *mut c_char,
+        ];
+        let atoms = unsafe { xconn.get_atoms(&names) }?;
+        Ok(DndAtoms {
+            aware: atoms[0],
+            enter: atoms[1],
+            leave: atoms[2],
+            drop: atoms[3],
+            position: atoms[4],
+            status: atoms[5],
+            action_private: atoms[6],
+            selection: atoms[7],
+            finished: atoms[8],
+            type_list: atoms[9],
+            uri_list: atoms[10],
+            none: atoms[11],
+        })
+    }
+}
+
+#[derive(Debug, Clone, Copy)]
+pub enum DndState {
+    Accepted,
+    Rejected,
+}
+
+#[derive(Debug)]
+pub enum DndDataParseError {
+    EmptyData,
+    InvalidUtf8(Utf8Error),
+    HostnameSpecified(String),
+    UnexpectedProtocol(String),
+    UnresolvablePath(io::Error),
+}
+
+impl From<Utf8Error> for DndDataParseError {
+    fn from(e: Utf8Error) -> Self {
+        DndDataParseError::InvalidUtf8(e)
+    }
+}
+
+impl From<io::Error> for DndDataParseError {
+    fn from(e: io::Error) -> Self {
+        DndDataParseError::UnresolvablePath(e)
+    }
+}
+
+pub struct Dnd {
+    xconn: Arc<XConnection>,
+    pub atoms: DndAtoms,
+    // Populated by XdndEnter event handler
+    pub version: Option<c_long>,
+    pub type_list: Option<Vec<c_ulong>>,
+    // Populated by XdndPosition event handler
+    pub source_window: Option<c_ulong>,
+    // Populated by SelectionNotify event handler (triggered by XdndPosition event handler)
+    pub result: Option<Result<Vec<PathBuf>, DndDataParseError>>,
+}
+
+impl Dnd {
+    pub fn new(xconn: Arc<XConnection>) -> Result<Self, XError> {
+        let atoms = DndAtoms::new(&xconn)?;
+        Ok(Dnd {
+            xconn,
+            atoms,
+            version: None,
+            type_list: None,
+            source_window: None,
+            result: None,
+        })
+    }
+
+    pub fn reset(&mut self) {
+        self.version = None;
+        self.type_list = None;
+        self.source_window = None;
+        self.result = None;
+    }
+
+    pub unsafe fn send_status(
+        &self,
+        this_window: c_ulong,
+        target_window: c_ulong,
+        state: DndState,
+    ) -> Result<(), XError> {
+        let (accepted, action) = match state {
+            DndState::Accepted => (1, self.atoms.action_private as c_long),
+            DndState::Rejected => (0, self.atoms.none as c_long),
+        };
+        self.xconn.send_client_msg(
+            target_window,
+            target_window,
+            self.atoms.status,
+            None,
+            [this_window as c_long, accepted, 0, 0, action],
+        ).flush()
+    }
+
+    pub unsafe fn send_finished(
+        &self,
+        this_window: c_ulong,
+        target_window: c_ulong,
+        state: DndState,
+    ) -> Result<(), XError> {
+        let (accepted, action) = match state {
+            DndState::Accepted => (1, self.atoms.action_private as c_long),
+            DndState::Rejected => (0, self.atoms.none as c_long),
+        };
+        self.xconn.send_client_msg(
+            target_window,
+            target_window,
+            self.atoms.finished,
+            None,
+            [this_window as c_long, accepted, action, 0, 0],
+        ).flush()
+    }
+
+    pub unsafe fn get_type_list(
+        &self,
+        source_window: c_ulong,
+    ) -> Result<Vec<ffi::Atom>, util::GetPropertyError> {
+        self.xconn.get_property(
+            source_window,
+            self.atoms.type_list,
+            ffi::XA_ATOM,
+        )
+    }
+
+    pub unsafe fn convert_selection(&self, window: c_ulong, time: c_ulong) {
+        (self.xconn.xlib.XConvertSelection)(
+            self.xconn.display,
+            self.atoms.selection,
+            self.atoms.uri_list,
+            self.atoms.selection,
+            window,
+            time,
+        );
+    }
+
+    pub unsafe fn read_data(
+        &self,
+        window: c_ulong,
+    ) -> Result<Vec<c_uchar>, util::GetPropertyError> {
+        self.xconn.get_property(
+            window,
+            self.atoms.selection,
+            self.atoms.uri_list,
+        )
+    }
+
+    pub fn parse_data(&self, data: &mut Vec<c_uchar>) -> Result<Vec<PathBuf>, DndDataParseError> {
+        if !data.is_empty() {
+            let mut path_list = Vec::new();
+            let decoded = percent_decode(data).decode_utf8()?.into_owned();
+            for uri in decoded.split("\r\n").filter(|u| !u.is_empty()) {
+                // The format is specified as protocol://host/path
+                // However, it's typically simply protocol:///path
+                let path_str = if uri.starts_with("file://") {
+                    let path_str = uri.replace("file://", "");
+                    if !path_str.starts_with('/') {
+                        // A hostname is specified
+                        // Supporting this case is beyond the scope of my mental health
+                        return Err(DndDataParseError::HostnameSpecified(path_str));
+                    }
+                    path_str
+                } else {
+                    // Only the file protocol is supported
+                    return Err(DndDataParseError::UnexpectedProtocol(uri.to_owned()));
+                };
+
+                let path = Path::new(&path_str).canonicalize()?;
+                path_list.push(path);
+            }
+            Ok(path_list)
+        } else {
+            Err(DndDataParseError::EmptyData)
+        }
+    }
+}

src/platform_impl/linux/x11/ffi.rs

@@ -0,0 +1,8 @@
+pub use x11_dl::keysym::*;
+pub use x11_dl::xcursor::*;
+pub use x11_dl::xlib::*;
+pub use x11_dl::xinput::*;
+pub use x11_dl::xinput2::*;
+pub use x11_dl::xlib_xcb::*;
+pub use x11_dl::error::OpenError;
+pub use x11_dl::xrandr::*;

src/platform_impl/linux/x11/ime/callbacks.rs

@@ -0,0 +1,185 @@
+use std::ptr;
+use std::sync::Arc;
+use std::collections::HashMap;
+use std::os::raw::c_char;
+
+use super::{ffi, XConnection, XError};
+
+use super::inner::{close_im, ImeInner};
+use super::input_method::PotentialInputMethods;
+use super::context::{ImeContextCreationError, ImeContext};
+
+pub unsafe fn xim_set_callback(
+    xconn: &Arc<XConnection>,
+    xim: ffi::XIM,
+    field: *const c_char,
+    callback: *mut ffi::XIMCallback,
+) -> Result<(), XError> {
+    // It's advisable to wrap variadic FFI functions in our own functions, as we want to minimize
+    // access that isn't type-checked.
+    (xconn.xlib.XSetIMValues)(
+        xim,
+        field,
+        callback,
+        ptr::null_mut::<()>(),
+    );
+    xconn.check_errors()
+}
+
+// Set a callback for when an input method matching the current locale modifiers becomes
+// available. Note that this has nothing to do with what input methods are open or able to be
+// opened, and simply uses the modifiers that are set when the callback is set.
+// * This is called per locale modifier, not per input method opened with that locale modifier.
+// * Trying to set this for multiple locale modifiers causes problems, i.e. one of the rebuilt
+//   input contexts would always silently fail to use the input method.
+pub unsafe fn set_instantiate_callback(
+    xconn: &Arc<XConnection>,
+    client_data: ffi::XPointer,
+) -> Result<(), XError> {
+    (xconn.xlib.XRegisterIMInstantiateCallback)(
+        xconn.display,
+        ptr::null_mut(),
+        ptr::null_mut(),
+        ptr::null_mut(),
+        Some(xim_instantiate_callback),
+        client_data,
+    );
+    xconn.check_errors()
+}
+
+pub unsafe fn unset_instantiate_callback(
+    xconn: &Arc<XConnection>,
+    client_data: ffi::XPointer,
+) -> Result<(), XError> {
+    (xconn.xlib.XUnregisterIMInstantiateCallback)(
+        xconn.display,
+        ptr::null_mut(),
+        ptr::null_mut(),
+        ptr::null_mut(),
+        Some(xim_instantiate_callback),
+        client_data,
+    );
+    xconn.check_errors()
+}
+
+pub unsafe fn set_destroy_callback(
+    xconn: &Arc<XConnection>,
+    im: ffi::XIM,
+    inner: &ImeInner,
+) -> Result<(), XError> {
+    xim_set_callback(
+        &xconn,
+        im,
+        ffi::XNDestroyCallback_0.as_ptr() as *const _,
+        &inner.destroy_callback as *const _ as *mut _,
+    )
+}
+
+#[derive(Debug)]
+enum ReplaceImError {
+    MethodOpenFailed(PotentialInputMethods),
+    ContextCreationFailed(ImeContextCreationError),
+    SetDestroyCallbackFailed(XError),
+}
+
+// Attempt to replace current IM (which may or may not be presently valid) with a new one. This
+// includes replacing all existing input contexts and free'ing resources as necessary. This only
+// modifies existing state if all operations succeed.
+unsafe fn replace_im(inner: *mut ImeInner) -> Result<(), ReplaceImError> {
+    let xconn = &(*inner).xconn;
+
+    let (new_im, is_fallback) = {
+        let new_im = (*inner).potential_input_methods.open_im(xconn, None);
+        let is_fallback = new_im.is_fallback();
+        (
+            new_im.ok().ok_or_else(|| {
+                ReplaceImError::MethodOpenFailed((*inner).potential_input_methods.clone())
+            })?,
+            is_fallback,
+        )
+    };
+
+    // It's important to always set a destroy callback, since there's otherwise potential for us
+    // to try to use or free a resource that's already been destroyed on the server.
+    {
+        let result = set_destroy_callback(xconn, new_im.im, &*inner);
+        if result.is_err() {
+            let _ = close_im(xconn, new_im.im);
+        }
+        result
+    }.map_err(ReplaceImError::SetDestroyCallbackFailed)?;
+
+    let mut new_contexts = HashMap::new();
+    for (window, old_context) in (*inner).contexts.iter() {
+        let spot = old_context.as_ref().map(|old_context| old_context.ic_spot);
+        let new_context = {
+            let result = ImeContext::new(
+                xconn,
+                new_im.im,
+                *window,
+                spot,
+            );
+            if result.is_err() {
+                let _ = close_im(xconn, new_im.im);
+            }
+            result.map_err(ReplaceImError::ContextCreationFailed)?
+        };
+        new_contexts.insert(*window, Some(new_context));
+    }
+
+    // If we've made it this far, everything succeeded.
+    let _ = (*inner).destroy_all_contexts_if_necessary();
+    let _ = (*inner).close_im_if_necessary();
+    (*inner).im = new_im.im;
+    (*inner).contexts = new_contexts;
+    (*inner).is_destroyed = false;
+    (*inner).is_fallback = is_fallback;
+    Ok(())
+}
+
+pub unsafe extern fn xim_instantiate_callback(
+    _display: *mut ffi::Display,
+    client_data: ffi::XPointer,
+    // This field is unsupplied.
+    _call_data: ffi::XPointer,
+) {
+    let inner: *mut ImeInner = client_data as _;
+    if !inner.is_null() {
+        let xconn = &(*inner).xconn;
+        let result = replace_im(inner);
+        if result.is_ok() {
+            let _ = unset_instantiate_callback(xconn, client_data);
+            (*inner).is_fallback = false;
+        } else if result.is_err() && (*inner).is_destroyed {
+            // We have no usable input methods!
+            result.expect("Failed to reopen input method");
+        }
+    }
+}
+
+// This callback is triggered when the input method is closed on the server end. When this
+// happens, XCloseIM/XDestroyIC doesn't need to be called, as the resources have already been
+// free'd (attempting to do so causes our connection to freeze).
+pub unsafe extern fn xim_destroy_callback(
+    _xim: ffi::XIM,
+    client_data: ffi::XPointer,
+    // This field is unsupplied.
+    _call_data: ffi::XPointer,
+) {
+    let inner: *mut ImeInner = client_data as _;
+    if !inner.is_null() {
+        (*inner).is_destroyed = true;
+        let xconn = &(*inner).xconn;
+        if !(*inner).is_fallback {
+            let _ = set_instantiate_callback(xconn, client_data);
+            // Attempt to open fallback input method.
+            let result = replace_im(inner);
+            if result.is_ok() {
+                (*inner).is_fallback = true;
+            } else {
+                // We have no usable input methods!
+                result.expect("Failed to open fallback input method");
+            }
+        }
+    }
+}

src/platform_impl/linux/x11/ime/context.rs

@@ -0,0 +1,134 @@
+use std::ptr;
+use std::sync::Arc;
+use std::os::raw::{c_short, c_void};
+
+use super::{ffi, util, XConnection, XError};
+
+#[derive(Debug)]
+pub enum ImeContextCreationError {
+    XError(XError),
+    Null,
+}
+
+unsafe fn create_pre_edit_attr<'a>(
+    xconn: &'a Arc<XConnection>,
+    ic_spot: &'a ffi::XPoint,
+) -> util::XSmartPointer<'a, c_void> {
+    util::XSmartPointer::new(
+        xconn,
+        (xconn.xlib.XVaCreateNestedList)(
+            0,
+            ffi::XNSpotLocation_0.as_ptr() as *const _,
+            ic_spot,
+            ptr::null_mut::<()>(),
+        ),
+    ).expect("XVaCreateNestedList returned NULL")
+}
+
+// WARNING: this struct doesn't destroy its XIC resource when dropped.
+// This is intentional, as it doesn't have enough information to know whether or not the context
+// still exists on the server. Since `ImeInner` has that awareness, destruction must be handled
+// through `ImeInner`.
+#[derive(Debug)]
+pub struct ImeContext {
+    pub ic: ffi::XIC,
+    pub ic_spot: ffi::XPoint,
+}
+
+impl ImeContext {
+    pub unsafe fn new(
+        xconn: &Arc<XConnection>,
+        im: ffi::XIM,
+        window: ffi::Window,
+        ic_spot: Option<ffi::XPoint>,
+    ) -> Result<Self, ImeContextCreationError> {
+        let ic = if let Some(ic_spot) = ic_spot {
+            ImeContext::create_ic_with_spot(xconn, im, window, ic_spot)
+        } else {
+            ImeContext::create_ic(xconn, im, window)
+        };
+
+        let ic = ic.ok_or(ImeContextCreationError::Null)?;
+        xconn.check_errors().map_err(ImeContextCreationError::XError)?;
+
+        Ok(ImeContext {
+            ic,
+            ic_spot: ic_spot.unwrap_or_else(|| ffi::XPoint { x: 0, y: 0 }),
+        })
+    }
+
+    unsafe fn create_ic(
+        xconn: &Arc<XConnection>,
+        im: ffi::XIM,
+        window: ffi::Window,
+    ) -> Option<ffi::XIC> {
+        let ic = (xconn.xlib.XCreateIC)(
+            im,
+            ffi::XNInputStyle_0.as_ptr() as *const _,
+            ffi::XIMPreeditNothing | ffi::XIMStatusNothing,
+            ffi::XNClientWindow_0.as_ptr() as *const _,
+            window,
+            ptr::null_mut::<()>(),
+        );
+        if ic.is_null() {
+            None
+        } else {
+            Some(ic)
+        }
+    }
+
+    unsafe fn create_ic_with_spot(
+        xconn: &Arc<XConnection>,
+        im: ffi::XIM,
+        window: ffi::Window,
+        ic_spot: ffi::XPoint,
+    ) -> Option<ffi::XIC> {
+        let pre_edit_attr = create_pre_edit_attr(xconn, &ic_spot);
+        let ic = (xconn.xlib.XCreateIC)(
+            im,
+            ffi::XNInputStyle_0.as_ptr() as *const _,
+            ffi::XIMPreeditNothing | ffi::XIMStatusNothing,
+            ffi::XNClientWindow_0.as_ptr() as *const _,
+            window,
+            ffi::XNPreeditAttributes_0.as_ptr() as *const _,
+            pre_edit_attr.ptr,
+            ptr::null_mut::<()>(),
+        );
+        if ic.is_null() {
+            None
+        } else {
+            Some(ic)
+        }
+    }
+
+    pub fn focus(&self, xconn: &Arc<XConnection>) -> Result<(), XError> {
+        unsafe {
+            (xconn.xlib.XSetICFocus)(self.ic);
+        }
+        xconn.check_errors()
+    }
+
+    pub fn unfocus(&self, xconn: &Arc<XConnection>) -> Result<(), XError> {
+        unsafe {
+            (xconn.xlib.XUnsetICFocus)(self.ic);
+        }
+        xconn.check_errors()
+    }
+
+    pub fn set_spot(&mut self, xconn: &Arc<XConnection>, x: c_short, y: c_short) {
+        if self.ic_spot.x == x && self.ic_spot.y == y {
+            return;
+        }
+        self.ic_spot = ffi::XPoint { x, y };
+
+        unsafe {
+            let pre_edit_attr = create_pre_edit_attr(xconn, &self.ic_spot);
+            (xconn.xlib.XSetICValues)(
+                self.ic,
+                ffi::XNPreeditAttributes_0.as_ptr() as *const _,
+                pre_edit_attr.ptr,
+                ptr::null_mut::<()>(),
+            );
+        }
+    }
+}

src/platform_impl/linux/x11/ime/inner.rs

@@ -0,0 +1,75 @@
+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)
+    }
+}

src/platform_impl/linux/x11/ime/input_method.rs

@@ -0,0 +1,283 @@
+use std::env;
+use std::fmt;
+use std::ptr;
+use std::sync::Arc;
+use std::os::raw::c_char;
+use std::ffi::{CStr, CString, IntoStringError};
+
+use parking_lot::Mutex;
+
+use super::{ffi, util, XConnection, XError};
+
+lazy_static! {
+    static ref GLOBAL_LOCK: Mutex<()> = Default::default();
+}
+
+unsafe fn open_im(
+    xconn: &Arc<XConnection>,
+    locale_modifiers: &CStr,
+) -> Option<ffi::XIM> {
+    let _lock = GLOBAL_LOCK.lock();
+
+    // XSetLocaleModifiers returns...
+    // * The current locale modifiers if it's given a NULL pointer.
+    // * The new locale modifiers if we succeeded in setting them.
+    // * NULL if the locale modifiers string is malformed.
+    (xconn.xlib.XSetLocaleModifiers)(locale_modifiers.as_ptr());
+
+    let im = (xconn.xlib.XOpenIM)(
+        xconn.display,
+        ptr::null_mut(),
+        ptr::null_mut(),
+        ptr::null_mut(),
+    );
+
+    if im.is_null() {
+        None
+    } else {
+        Some(im)
+    }
+}
+
+#[derive(Debug)]
+pub struct InputMethod {
+    pub im: ffi::XIM,
+    name: String,
+}
+
+impl InputMethod {
+    fn new(im: ffi::XIM, name: String) -> Self {
+        InputMethod { im, name }
+    }
+}
+
+#[derive(Debug)]
+pub enum InputMethodResult {
+    /// Input method used locale modifier from `XMODIFIERS` environment variable.
+    XModifiers(InputMethod),
+    /// Input method used internal fallback locale modifier.
+    Fallback(InputMethod),
+    /// Input method could not be opened using any locale modifier tried.
+    Failure,
+}
+
+impl InputMethodResult {
+    pub fn is_fallback(&self) -> bool {
+        if let &InputMethodResult::Fallback(_) = self {
+            true
+        } else {
+            false
+        }
+    }
+
+    pub fn ok(self) -> Option<InputMethod> {
+        use self::InputMethodResult::*;
+        match self {
+            XModifiers(im) | Fallback(im) => Some(im),
+            Failure => None,
+        }
+    }
+}
+
+#[derive(Debug, Clone)]
+enum GetXimServersError {
+    XError(XError),
+    GetPropertyError(util::GetPropertyError),
+    InvalidUtf8(IntoStringError),
+}
+
+// The root window has a property named XIM_SERVERS, which contains a list of atoms represeting
+// the availabile XIM servers. For instance, if you're using ibus, it would contain an atom named
+// "@server=ibus". It's possible for this property to contain multiple atoms, though presumably
+// rare. Note that we replace "@server=" with "@im=" in order to match the format of locale
+// modifiers, since we don't want a user who's looking at logs to ask "am I supposed to set
+// XMODIFIERS to `@server=ibus`?!?"
+unsafe fn get_xim_servers(xconn: &Arc<XConnection>) -> Result<Vec<String>, GetXimServersError> {
+    let servers_atom = xconn.get_atom_unchecked(b"XIM_SERVERS\0");
+
+    let root = (xconn.xlib.XDefaultRootWindow)(xconn.display);
+
+    let mut atoms: Vec<ffi::Atom> = xconn.get_property(
+        root,
+        servers_atom,
+        ffi::XA_ATOM,
+    ).map_err(GetXimServersError::GetPropertyError)?;
+
+    let mut names: Vec<*const c_char> = Vec::with_capacity(atoms.len());
+    (xconn.xlib.XGetAtomNames)(
+        xconn.display,
+        atoms.as_mut_ptr(),
+        atoms.len() as _,
+        names.as_mut_ptr() as _,
+    );
+    names.set_len(atoms.len());
+
+    let mut formatted_names = Vec::with_capacity(names.len());
+    for name in names {
+        let string = CStr::from_ptr(name)
+            .to_owned()
+            .into_string()
+            .map_err(GetXimServersError::InvalidUtf8)?;
+        (xconn.xlib.XFree)(name as _);
+        formatted_names.push(string.replace("@server=", "@im="));
+    }
+    xconn.check_errors().map_err(GetXimServersError::XError)?;
+    Ok(formatted_names)
+}
+
+#[derive(Clone)]
+struct InputMethodName {
+    c_string: CString,
+    string: String,
+}
+
+impl InputMethodName {
+    pub fn from_string(string: String) -> Self {
+        let c_string = CString::new(string.clone())
+            .expect("String used to construct CString contained null byte");
+        InputMethodName {
+            c_string,
+            string,
+        }
+    }
+
+    pub fn from_str(string: &str) -> Self {
+        let c_string = CString::new(string)
+            .expect("String used to construct CString contained null byte");
+        InputMethodName {
+            c_string,
+            string: string.to_owned(),
+        }
+    }
+}
+
+impl fmt::Debug for InputMethodName {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        self.string.fmt(f)
+    }
+}
+
+#[derive(Debug, Clone)]
+struct PotentialInputMethod {
+    name: InputMethodName,
+    successful: Option<bool>,
+}
+
+impl PotentialInputMethod {
+    pub fn from_string(string: String) -> Self {
+        PotentialInputMethod {
+            name: InputMethodName::from_string(string),
+            successful: None,
+        }
+    }
+
+    pub fn from_str(string: &str) -> Self {
+        PotentialInputMethod {
+            name: InputMethodName::from_str(string),
+            successful: None,
+        }
+    }
+
+    pub fn reset(&mut self) {
+        self.successful = None;
+    }
+
+    pub fn open_im(&mut self, xconn: &Arc<XConnection>) -> Option<InputMethod> {
+        let im = unsafe { open_im(xconn, &self.name.c_string) };
+        self.successful = Some(im.is_some());
+        im.map(|im| InputMethod::new(im, self.name.string.clone()))
+    }
+}
+
+// By logging this struct, you get a sequential listing of every locale modifier tried, where it
+// came from, and if it succceeded.
+#[derive(Debug, Clone)]
+pub struct PotentialInputMethods {
+    // On correctly configured systems, the XMODIFIERS environemnt variable tells us everything we
+    // need to know.
+    xmodifiers: Option<PotentialInputMethod>,
+    // We have some standard options at our disposal that should ostensibly always work. For users
+    // who only need compose sequences, this ensures that the program launches without a hitch
+    // For users who need more sophisticated IME features, this is more or less a silent failure.
+    // Logging features should be added in the future to allow both audiences to be effectively
+    // served.
+    fallbacks: [PotentialInputMethod; 2],
+    // For diagnostic purposes, we include the list of XIM servers that the server reports as
+    // being available.
+    _xim_servers: Result<Vec<String>, GetXimServersError>,
+}
+
+impl PotentialInputMethods {
+    pub fn new(xconn: &Arc<XConnection>) -> Self {
+        let xmodifiers = env::var("XMODIFIERS")
+            .ok()
+            .map(PotentialInputMethod::from_string);
+        PotentialInputMethods {
+            // Since passing "" to XSetLocaleModifiers results in it defaulting to the value of
+            // XMODIFIERS, it's worth noting what happens if XMODIFIERS is also "". If simply
+            // running the program with `XMODIFIERS="" cargo run`, then assuming XMODIFIERS is
+            // defined in the profile (or parent environment) then that parent XMODIFIERS is used.
+            // If that XMODIFIERS value is also "" (i.e. if you ran `export XMODIFIERS=""`), then
+            // XSetLocaleModifiers uses the default local input method. Note that defining
+            // XMODIFIERS as "" is different from XMODIFIERS not being defined at all, since in
+            // that case, we get `None` and end up skipping ahead to the next method.
+            xmodifiers,
+            fallbacks: [
+                // This is a standard input method that supports compose equences, which should
+                // always be available. `@im=none` appears to mean the same thing.
+                PotentialInputMethod::from_str("@im=local"),
+                // This explicitly specifies to use the implementation-dependent default, though
+                // that seems to be equivalent to just using the local input method.
+                PotentialInputMethod::from_str("@im="),
+            ],
+            // The XIM_SERVERS property can have surprising values. For instance, when I exited
+            // ibus to run fcitx, it retained the value denoting ibus. Even more surprising is
+            // that the fcitx input method could only be successfully opened using "@im=ibus".
+            // Presumably due to this quirk, it's actually possible to alternate between ibus and
+            // fcitx in a running application.
+            _xim_servers: unsafe { get_xim_servers(xconn) },
+        }
+    }
+
+    // This resets the `successful` field of every potential input method, ensuring we have
+    // accurate information when this struct is re-used by the destruction/instantiation callbacks.
+    fn reset(&mut self) {
+        if let Some(ref mut input_method) = self.xmodifiers {
+            input_method.reset();
+        }
+
+        for input_method in &mut self.fallbacks {
+            input_method.reset();
+        }
+    }
+
+    pub fn open_im(
+        &mut self,
+        xconn: &Arc<XConnection>,
+        callback: Option<&Fn() -> ()>,
+    ) -> InputMethodResult {
+        use self::InputMethodResult::*;
+
+        self.reset();
+
+        if let Some(ref mut input_method) = self.xmodifiers {
+            let im = input_method.open_im(xconn);
+            if let Some(im) = im {
+                return XModifiers(im);
+            } else {
+                if let Some(ref callback) = callback {
+                    callback();
+                }
+            }
+        }
+
+        for input_method in &mut self.fallbacks {
+            let im = input_method.open_im(xconn);
+            if let Some(im) = im {
+                return Fallback(im);
+            }
+        }
+
+        Failure
+    }
+}

src/platform_impl/linux/x11/ime/mod.rs

@@ -0,0 +1,165 @@
+// Important: all XIM calls need to happen from the same thread!
+
+mod inner;
+mod input_method;
+mod context;
+mod callbacks;
+
+use std::sync::Arc;
+use std::sync::mpsc::{Receiver, Sender};
+
+use super::{ffi, util, XConnection, XError};
+
+use self::inner::{close_im, ImeInner};
+use self::input_method::PotentialInputMethods;
+use self::context::{ImeContextCreationError, ImeContext};
+use self::callbacks::*;
+
+pub type ImeReceiver = Receiver<(ffi::Window, i16, i16)>;
+pub type ImeSender = Sender<(ffi::Window, i16, i16)>;
+
+#[derive(Debug)]
+pub enum ImeCreationError {
+    OpenFailure(PotentialInputMethods),
+    SetDestroyCallbackFailed(XError),
+}
+
+pub struct Ime {
+    xconn: Arc<XConnection>,
+    // The actual meat of this struct is boxed away, since it needs to have a fixed location in
+    // memory so we can pass a pointer to it around.
+    inner: Box<ImeInner>,
+}
+
+impl Ime {
+    pub fn new(xconn: Arc<XConnection>) -> Result<Self, ImeCreationError> {
+        let potential_input_methods = PotentialInputMethods::new(&xconn);
+
+        let (mut inner, client_data) = {
+            let mut inner = Box::new(ImeInner::new(
+                xconn,
+                potential_input_methods,
+            ));
+            let inner_ptr = Box::into_raw(inner);
+            let client_data = inner_ptr as _;
+            let destroy_callback = ffi::XIMCallback {
+                client_data,
+                callback: Some(xim_destroy_callback),
+            };
+            inner = unsafe { Box::from_raw(inner_ptr) };
+            inner.destroy_callback = destroy_callback;
+            (inner, client_data)
+        };
+
+        let xconn = Arc::clone(&inner.xconn);
+
+        let input_method = inner.potential_input_methods.open_im(&xconn, Some(&|| {
+            let _ = unsafe { set_instantiate_callback(&xconn, client_data) };
+        }));
+
+        let is_fallback = input_method.is_fallback();
+        if let Some(input_method) = input_method.ok() {
+            inner.im = input_method.im;
+            inner.is_fallback = is_fallback;
+            unsafe {
+                let result = set_destroy_callback(&xconn, input_method.im, &*inner)
+                    .map_err(ImeCreationError::SetDestroyCallbackFailed);
+                if result.is_err() {
+                    let _ = close_im(&xconn, input_method.im);
+                }
+                result?;
+            }
+            Ok(Ime { xconn, inner })
+        } else {
+            Err(ImeCreationError::OpenFailure(inner.potential_input_methods))
+        }
+    }
+
+    pub fn is_destroyed(&self) -> bool {
+        self.inner.is_destroyed
+    }
+
+    // This pattern is used for various methods here:
+    // Ok(_) indicates that nothing went wrong internally
+    // Ok(true) indicates that the action was actually performed
+    // Ok(false) indicates that the action is not presently applicable
+    pub fn create_context(&mut self, window: ffi::Window)
+        -> Result<bool, ImeContextCreationError>
+    {
+        let context = if self.is_destroyed() {
+            // Create empty entry in map, so that when IME is rebuilt, this window has a context.
+            None
+        } else {
+            Some(unsafe { ImeContext::new(
+                &self.inner.xconn,
+                self.inner.im,
+                window,
+                None,
+            ) }?)
+        };
+        self.inner.contexts.insert(window, context);
+        Ok(!self.is_destroyed())
+    }
+
+    pub fn get_context(&self, window: ffi::Window) -> Option<ffi::XIC> {
+        if self.is_destroyed() {
+            return None;
+        }
+        if let Some(&Some(ref context)) = self.inner.contexts.get(&window) {
+            Some(context.ic)
+        } else {
+            None
+        }
+    }
+
+    pub fn remove_context(&mut self, window: ffi::Window) -> Result<bool, XError> {
+        if let Some(Some(context)) = self.inner.contexts.remove(&window) {
+            unsafe {
+                self.inner.destroy_ic_if_necessary(context.ic)?;
+            }
+            Ok(true)
+        } else {
+            Ok(false)
+        }
+    }
+
+    pub fn focus(&mut self, window: ffi::Window) -> Result<bool, XError> {
+        if self.is_destroyed() {
+            return Ok(false);
+        }
+        if let Some(&mut Some(ref mut context)) = self.inner.contexts.get_mut(&window) {
+            context.focus(&self.xconn).map(|_| true)
+        } else {
+            Ok(false)
+        }
+    }
+
+    pub fn unfocus(&mut self, window: ffi::Window) -> Result<bool, XError> {
+        if self.is_destroyed() {
+            return Ok(false);
+        }
+        if let Some(&mut Some(ref mut context)) = self.inner.contexts.get_mut(&window) {
+            context.unfocus(&self.xconn).map(|_| true)
+        } else {
+            Ok(false)
+        }
+    }
+
+    pub fn send_xim_spot(&mut self, window: ffi::Window, x: i16, y: i16) {
+        if self.is_destroyed() {
+            return;
+        }
+        if let Some(&mut Some(ref mut context)) = self.inner.contexts.get_mut(&window) {
+            context.set_spot(&self.xconn, x as _, y as _);
+        }
+    }
+}
+
+impl Drop for Ime {
+    fn drop(&mut self) {
+        unsafe {
+            let _ = self.inner.destroy_all_contexts_if_necessary();
+            let _ = self.inner.close_im_if_necessary();
+        }
+    }
+}

src/platform_impl/linux/x11/monitor.rs

@@ -0,0 +1,269 @@
+use std::os::raw::*;
+
+use parking_lot::Mutex;
+
+use {PhysicalPosition, PhysicalSize};
+use super::{util, XConnection, XError};
+use super::ffi::{
+    RRCrtcChangeNotifyMask,
+    RROutputPropertyNotifyMask,
+    RRScreenChangeNotifyMask,
+    True,
+    Window,
+    XRRScreenResources,
+};
+
+// Used to test XRandR < 1.5 code path. This should always be committed as false.
+const FORCE_RANDR_COMPAT: bool = false;
+// Also used for testing. This should always be committed as false.
+const DISABLE_MONITOR_LIST_CACHING: bool = false;
+
+lazy_static! {
+    static ref XRANDR_VERSION: Mutex<Option<(c_int, c_int)>> = Mutex::default();
+    static ref MONITORS: Mutex<Option<Vec<MonitorHandle>>> = Mutex::default();
+}
+
+fn version_is_at_least(major: c_int, minor: c_int) -> bool {
+    if let Some((avail_major, avail_minor)) = *XRANDR_VERSION.lock() {
+        if avail_major == major {
+            avail_minor >= minor
+        } else {
+            avail_major > major
+        }
+    } else {
+        unreachable!();
+    }
+}
+
+pub fn invalidate_cached_monitor_list() -> Option<Vec<MonitorHandle>> {
+    // We update this lazily.
+    (*MONITORS.lock()).take()
+}
+
+#[derive(Debug, Clone)]
+pub struct MonitorHandle {
+    /// The actual id
+    id: u32,
+    /// The name of the monitor
+    pub(crate) name: String,
+    /// The size of the monitor
+    dimensions: (u32, u32),
+    /// The position of the monitor in the X screen
+    position: (i32, i32),
+    /// If the monitor is the primary one
+    primary: bool,
+    /// The DPI scale factor
+    pub(crate) hidpi_factor: f64,
+    /// Used to determine which windows are on this monitor
+    pub(crate) rect: util::AaRect,
+}
+
+impl MonitorHandle {
+    fn from_repr(
+        xconn: &XConnection,
+        resources: *mut XRRScreenResources,
+        id: u32,
+        repr: util::MonitorRepr,
+        primary: bool,
+    ) -> Option<Self> {
+        let (name, hidpi_factor) = unsafe { xconn.get_output_info(resources, &repr)? };
+        let (dimensions, position) = unsafe { (repr.get_dimensions(), repr.get_position()) };
+        let rect = util::AaRect::new(position, dimensions);
+        Some(MonitorHandle {
+            id,
+            name,
+            hidpi_factor,
+            dimensions,
+            position,
+            primary,
+            rect,
+        })
+    }
+
+    pub fn get_name(&self) -> Option<String> {
+        Some(self.name.clone())
+    }
+
+    #[inline]
+    pub fn get_native_identifier(&self) -> u32 {
+        self.id as u32
+    }
+
+    pub fn get_dimensions(&self) -> PhysicalSize {
+        self.dimensions.into()
+    }
+
+    pub fn get_position(&self) -> PhysicalPosition {
+        self.position.into()
+    }
+
+    #[inline]
+    pub fn get_hidpi_factor(&self) -> f64 {
+        self.hidpi_factor
+    }
+}
+
+impl XConnection {
+    pub fn get_monitor_for_window(&self, window_rect: Option<util::AaRect>) -> MonitorHandle {
+        let monitors = self.get_available_monitors();
+        let default = monitors
+            .get(0)
+            .expect("[winit] Failed to find any monitors using XRandR.");
+
+        let window_rect = match window_rect {
+            Some(rect) => rect,
+            None => return default.to_owned(),
+        };
+
+        let mut largest_overlap = 0;
+        let mut matched_monitor = default;
+        for monitor in &monitors {
+            let overlapping_area = window_rect.get_overlapping_area(&monitor.rect);
+            if overlapping_area > largest_overlap {
+                largest_overlap = overlapping_area;
+                matched_monitor = &monitor;
+            }
+        }
+
+        matched_monitor.to_owned()
+    }
+
+    fn query_monitor_list(&self) -> Vec<MonitorHandle> {
+        unsafe {
+            let root = (self.xlib.XDefaultRootWindow)(self.display);
+            // WARNING: this function is supposedly very slow, on the order of hundreds of ms.
+            // Upon failure, `resources` will be null.
+            let resources = (self.xrandr.XRRGetScreenResources)(self.display, root);
+            if resources.is_null() {
+                panic!("[winit] `XRRGetScreenResources` returned NULL. That should only happen if the root window doesn't exist.");
+            }
+
+            let mut available;
+            let mut has_primary = false;
+
+            if self.xrandr_1_5.is_some() && version_is_at_least(1, 5) && !FORCE_RANDR_COMPAT {
+                // We're in XRandR >= 1.5, enumerate monitors. This supports things like MST and
+                // videowalls.
+                let xrandr_1_5 = self.xrandr_1_5.as_ref().unwrap();
+                let mut monitor_count = 0;
+                let monitors = (xrandr_1_5.XRRGetMonitors)(self.display, root, 1, &mut monitor_count);
+                assert!(monitor_count >= 0);
+                available = Vec::with_capacity(monitor_count as usize);
+                for monitor_index in 0..monitor_count {
+                    let monitor = monitors.offset(monitor_index as isize);
+                    let is_primary = (*monitor).primary != 0;
+                    has_primary |= is_primary;
+                    MonitorHandle::from_repr(
+                        self,
+                        resources,
+                        monitor_index as u32,
+                        monitor.into(),
+                        is_primary,
+                    ).map(|monitor_id| available.push(monitor_id));
+                }
+                (xrandr_1_5.XRRFreeMonitors)(monitors);
+            } else {
+                // We're in XRandR < 1.5, enumerate CRTCs. Everything will work except MST and
+                // videowall setups will also show monitors that aren't in the logical groups the user
+                // cares about.
+                let primary = (self.xrandr.XRRGetOutputPrimary)(self.display, root);
+                available = Vec::with_capacity((*resources).ncrtc as usize);
+                for crtc_index in 0..(*resources).ncrtc {
+                    let crtc_id = *((*resources).crtcs.offset(crtc_index as isize));
+                    let crtc = (self.xrandr.XRRGetCrtcInfo)(self.display, resources, crtc_id);
+                    let is_active = (*crtc).width > 0 && (*crtc).height > 0 && (*crtc).noutput > 0;
+                    if is_active {
+                        let crtc = util::MonitorRepr::from(crtc);
+                        let is_primary = crtc.get_output() == primary;
+                        has_primary |= is_primary;
+                        MonitorHandle::from_repr(
+                            self,
+                            resources,
+                            crtc_id as u32,
+                            crtc,
+                            is_primary,
+                        ).map(|monitor_id| available.push(monitor_id));
+                    }
+                    (self.xrandr.XRRFreeCrtcInfo)(crtc);
+                }
+            }
+
+            // If no monitors were detected as being primary, we just pick one ourselves!
+            if !has_primary {
+                if let Some(ref mut fallback) = available.first_mut() {
+                    // Setting this here will come in handy if we ever add an `is_primary` method.
+                    fallback.primary = true;
+                }
+            }
+
+            (self.xrandr.XRRFreeScreenResources)(resources);
+            available
+        }
+    }
+
+    pub fn get_available_monitors(&self) -> Vec<MonitorHandle> {
+        let mut monitors_lock = MONITORS.lock();
+        (*monitors_lock)
+            .as_ref()
+            .cloned()
+            .or_else(|| {
+                let monitors = Some(self.query_monitor_list());
+                if !DISABLE_MONITOR_LIST_CACHING {
+                    (*monitors_lock) = monitors.clone();
+                }
+                monitors
+            })
+            .unwrap()
+    }
+
+    #[inline]
+    pub fn get_primary_monitor(&self) -> MonitorHandle {
+        self.get_available_monitors()
+            .into_iter()
+            .find(|monitor| monitor.primary)
+            .expect("[winit] Failed to find any monitors using XRandR.")
+    }
+
+    pub fn select_xrandr_input(&self, root: Window) -> Result<c_int, XError> {
+        {
+            let mut version_lock = XRANDR_VERSION.lock();
+            if version_lock.is_none() {
+                let mut major = 0;
+                let mut minor = 0;
+                let has_extension = unsafe {
+                    (self.xrandr.XRRQueryVersion)(
+                        self.display,
+                        &mut major,
+                        &mut minor,
+                    )
+                };
+                if has_extension != True {
+                    panic!("[winit] XRandR extension not available.");
+                }
+                *version_lock = Some((major, minor));
+            }
+        }
+
+        let mut event_offset = 0;
+        let mut error_offset = 0;
+        let status = unsafe {
+            (self.xrandr.XRRQueryExtension)(
+                self.display,
+                &mut event_offset,
+                &mut error_offset,
+            )
+        };
+
+        if status != True {
+            self.check_errors()?;
+            unreachable!("[winit] `XRRQueryExtension` failed but no error was received.");
+        }
+
+        let mask = RRCrtcChangeNotifyMask
+            | RROutputPropertyNotifyMask
+            | RRScreenChangeNotifyMask;
+        unsafe { (self.xrandr.XRRSelectInput)(self.display, root, mask) };
+
+        Ok(event_offset)
+    }
+}

src/platform_impl/linux/x11/util/atom.rs

@@ -0,0 +1,72 @@
+use std::collections::HashMap;
+use std::ffi::{CStr, CString};
+use std::fmt::Debug;
+use std::os::raw::*;
+
+use parking_lot::Mutex;
+
+use super::*;
+
+type AtomCache = HashMap<CString, ffi::Atom>;
+
+lazy_static! {
+    static ref ATOM_CACHE: Mutex<AtomCache> = Mutex::new(HashMap::with_capacity(2048));
+}
+
+impl XConnection {
+    pub fn get_atom<T: AsRef<CStr> + Debug>(&self, name: T) -> ffi::Atom {
+        let name = name.as_ref();
+        let mut atom_cache_lock = ATOM_CACHE.lock();
+        let cached_atom = (*atom_cache_lock).get(name).cloned();
+        if let Some(atom) = cached_atom {
+            atom
+        } else {
+            let atom = unsafe { (self.xlib.XInternAtom)(
+                self.display,
+                name.as_ptr() as *const c_char,
+                ffi::False,
+            ) };
+            if atom == 0 {
+                let msg = format!(
+                    "`XInternAtom` failed, which really shouldn't happen. Atom: {:?}, Error: {:#?}",
+                    name,
+                    self.check_errors(),
+                );
+                panic!(msg);
+            }
+            /*println!(
+                "XInternAtom name:{:?} atom:{:?}",
+                name,
+                atom,
+            );*/
+            (*atom_cache_lock).insert(name.to_owned(), atom);
+            atom
+        }
+    }
+
+    pub unsafe fn get_atom_unchecked(&self, name: &[u8]) -> ffi::Atom {
+        debug_assert!(CStr::from_bytes_with_nul(name).is_ok());
+        let name = CStr::from_bytes_with_nul_unchecked(name);
+        self.get_atom(name)
+    }
+
+    // Note: this doesn't use caching, for the sake of simplicity.
+    // If you're dealing with this many atoms, you'll usually want to cache them locally anyway.
+    pub unsafe fn get_atoms(&self,  names: &[*mut c_char]) -> Result<Vec<ffi::Atom>, XError> {
+        let mut atoms = Vec::with_capacity(names.len());
+        (self.xlib.XInternAtoms)(
+            self.display,
+            names.as_ptr() as *mut _,
+            names.len() as c_int,
+            ffi::False,
+            atoms.as_mut_ptr(),
+        );
+        self.check_errors()?;
+        atoms.set_len(names.len());
+        /*println!(
+            "XInternAtoms atoms:{:?}",
+            atoms,
+        );*/
+        Ok(atoms)
+    }
+}

src/platform_impl/linux/x11/util/client_msg.rs

@@ -0,0 +1,95 @@
+use super::*;
+
+pub type ClientMsgPayload = [c_long; 5];
+
+impl XConnection {
+    pub fn send_event<T: Into<ffi::XEvent>>(
+        &self,
+        target_window: c_ulong,
+        event_mask: Option<c_long>,
+        event: T,
+    ) -> Flusher {
+        let event_mask = event_mask.unwrap_or(ffi::NoEventMask);
+        unsafe {
+            (self.xlib.XSendEvent)(
+                self.display,
+                target_window,
+                ffi::False,
+                event_mask,
+                &mut event.into(),
+            );
+        }
+        Flusher::new(self)
+    }
+
+    pub fn send_client_msg(
+        &self,
+        window: c_ulong,        // The window this is "about"; not necessarily this window
+        target_window: c_ulong, // The window we're sending to
+        message_type: ffi::Atom,
+        event_mask: Option<c_long>,
+        data: ClientMsgPayload,
+    ) -> Flusher {
+        let mut event: ffi::XClientMessageEvent = unsafe { mem::uninitialized() };
+        event.type_ = ffi::ClientMessage;
+        event.display = self.display;
+        event.window = window;
+        event.message_type = message_type;
+        event.format = c_long::FORMAT as c_int;
+        event.data = unsafe { mem::transmute(data) };
+        self.send_event(target_window, event_mask, event)
+    }
+
+    // Prepare yourself for the ultimate in unsafety!
+    // You should favor `send_client_msg` whenever possible, but some protocols (i.e. startup notification) require you
+    // to send more than one message worth of data.
+    pub fn send_client_msg_multi<T: Formattable>(
+        &self,
+        window: c_ulong,        // The window this is "about"; not necessarily this window
+        target_window: c_ulong, // The window we're sending to
+        message_type: ffi::Atom,
+        event_mask: Option<c_long>,
+        data: &[T],
+    ) -> Flusher {
+        let format = T::FORMAT;
+        let size_of_t = mem::size_of::<T>();
+        debug_assert_eq!(size_of_t, format.get_actual_size());
+        let mut event: ffi::XClientMessageEvent = unsafe { mem::uninitialized() };
+        event.type_ = ffi::ClientMessage;
+        event.display = self.display;
+        event.window = window;
+        event.message_type = message_type;
+        event.format = format as c_int;
+
+        let t_per_payload = format.get_payload_size() / size_of_t;
+        assert!(t_per_payload > 0);
+        let payload_count = data.len() / t_per_payload;
+        let payload_remainder = data.len() % t_per_payload;
+        let payload_ptr = data.as_ptr() as *const ClientMsgPayload;
+
+        let mut payload_index = 0;
+        while payload_index < payload_count {
+            let payload = unsafe { payload_ptr.offset(payload_index as isize) };
+            payload_index += 1;
+            event.data = unsafe { mem::transmute(*payload) };
+            self.send_event(target_window, event_mask, &event).queue();
+        }
+
+        if payload_remainder > 0 {
+            let mut payload: ClientMsgPayload = [0; 5];
+            let t_payload = payload.as_mut_ptr() as *mut T;
+            let invalid_payload = unsafe { payload_ptr.offset(payload_index as isize) };
+            let invalid_t_payload = invalid_payload as *const T;
+            let mut t_index = 0;
+            while t_index < payload_remainder {
+                let valid_t = unsafe { invalid_t_payload.offset(t_index as isize) };
+                unsafe { (*t_payload.offset(t_index as isize)) = (*valid_t).clone() };
+                t_index += 1;
+            }
+            event.data = unsafe { mem::transmute(payload) };
+            self.send_event(target_window, event_mask, &event).queue();
+        }
+
+        Flusher::new(self)
+    }
+}

src/platform_impl/linux/x11/util/format.rs

@@ -0,0 +1,58 @@
+use std::fmt::Debug;
+use std::mem;
+use std::os::raw::*;
+
+// This isn't actually the number of the bits in the format.
+// X11 does a match on this value to determine which type to call sizeof on.
+// Thus, we use 32 for c_long, since 32 maps to c_long which maps to 64.
+// ...if that sounds confusing, then you know why this enum is here.
+#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
+pub enum Format {
+    Char = 8,
+    Short = 16,
+    Long = 32,
+}
+
+impl Format {
+    pub fn from_format(format: usize) -> Option<Self> {
+        match format {
+            8 => Some(Format::Char),
+            16 => Some(Format::Short),
+            32 => Some(Format::Long),
+            _ => None,
+        }
+    }
+
+    pub fn is_same_size_as<T>(&self) -> bool {
+        mem::size_of::<T>() == self.get_actual_size()
+    }
+
+    pub fn get_actual_size(&self) -> usize {
+        match self {
+            &Format::Char => mem::size_of::<c_char>(),
+            &Format::Short => mem::size_of::<c_short>(),
+            &Format::Long => mem::size_of::<c_long>(),
+        }
+    }
+
+    pub fn get_payload_size(&self) -> usize {
+        match self {
+            // Due to the wonders of X11, half the space goes unused if you're not using longs (on 64-bit).
+            &Format::Char => mem::size_of::<c_char>() * 20,
+            &Format::Short => mem::size_of::<c_short>() * 10,
+            &Format::Long => mem::size_of::<c_long>() * 5,
+        }
+    }
+}
+
+pub trait Formattable: Debug + Clone + Copy + PartialEq + PartialOrd {
+    const FORMAT: Format;
+}
+
+// You might be surprised by the absence of c_int, but not as surprised as X11 would be by the presence of it.
+impl Formattable for c_schar { const FORMAT: Format = Format::Char; }
+impl Formattable for c_uchar { const FORMAT: Format = Format::Char; }
+impl Formattable for c_short { const FORMAT: Format = Format::Short; }
+impl Formattable for c_ushort { const FORMAT: Format = Format::Short; }
+impl Formattable for c_long { const FORMAT: Format = Format::Long; }
+impl Formattable for c_ulong { const FORMAT: Format = Format::Long; }

src/platform_impl/linux/x11/util/geometry.rs

@@ -0,0 +1,387 @@
+use std::cmp;
+
+use super::*;
+use {LogicalPosition, LogicalSize};
+
+// Friendly neighborhood axis-aligned rectangle
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct AaRect {
+    x: i64,
+    y: i64,
+    width: i64,
+    height: i64,
+}
+
+impl AaRect {
+    pub fn new((x, y): (i32, i32), (width, height): (u32, u32)) -> Self {
+        let (x, y) = (x as i64, y as i64);
+        let (width, height) = (width as i64, height as i64);
+        AaRect { x, y, width, height }
+    }
+
+    pub fn contains_point(&self, x: i64, y: i64) -> bool {
+        x >= self.x && x <= self.x + self.width && y >= self.y && y <= self.y + self.height
+    }
+
+    pub fn get_overlapping_area(&self, other: &Self) -> i64 {
+        let x_overlap = cmp::max(
+            0,
+            cmp::min(self.x + self.width, other.x + other.width) - cmp::max(self.x, other.x),
+        );
+        let y_overlap = cmp::max(
+            0,
+            cmp::min(self.y + self.height, other.y + other.height) - cmp::max(self.y, other.y),
+        );
+        x_overlap * y_overlap
+    }
+}
+
+#[derive(Debug)]
+pub struct TranslatedCoords {
+    pub x_rel_root: c_int,
+    pub y_rel_root: c_int,
+    pub child: ffi::Window,
+}
+
+#[derive(Debug)]
+pub struct Geometry {
+    pub root: ffi::Window,
+    // If you want positions relative to the root window, use translate_coords.
+    // Note that the overwhelming majority of window managers are reparenting WMs, thus the window
+    // ID we get from window creation is for a nested window used as the window's client area. If
+    // you call get_geometry with that window ID, then you'll get the position of that client area
+    // window relative to the parent it's nested in (the frame), which isn't helpful if you want
+    // to know the frame position.
+    pub x_rel_parent: c_int,
+    pub y_rel_parent: c_int,
+    // In that same case, this will give you client area size.
+    pub width: c_uint,
+    pub height: c_uint,
+    // xmonad and dwm were the only WMs tested that use the border return at all.
+    // The majority of WMs seem to simply fill it with 0 unconditionally.
+    pub border: c_uint,
+    pub depth: c_uint,
+}
+
+#[derive(Debug, Clone)]
+pub struct FrameExtents {
+    pub left: c_ulong,
+    pub right: c_ulong,
+    pub top: c_ulong,
+    pub bottom: c_ulong,
+}
+
+impl FrameExtents {
+    pub fn new(left: c_ulong, right: c_ulong, top: c_ulong, bottom: c_ulong) -> Self {
+        FrameExtents { left, right, top, bottom }
+    }
+
+    pub fn from_border(border: c_ulong) -> Self {
+        Self::new(border, border, border, border)
+    }
+
+    pub fn as_logical(&self, factor: f64) -> LogicalFrameExtents {
+        let logicalize = |value: c_ulong| value as f64 / factor;
+        LogicalFrameExtents {
+            left: logicalize(self.left),
+            right: logicalize(self.right),
+            top: logicalize(self.top),
+            bottom: logicalize(self.bottom),
+        }
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct LogicalFrameExtents {
+    pub left: f64,
+    pub right: f64,
+    pub top: f64,
+    pub bottom: f64,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum FrameExtentsHeuristicPath {
+    Supported,
+    UnsupportedNested,
+    UnsupportedBordered,
+}
+
+#[derive(Debug, Clone)]
+pub struct FrameExtentsHeuristic {
+    pub frame_extents: FrameExtents,
+    pub heuristic_path: FrameExtentsHeuristicPath,
+}
+
+impl FrameExtentsHeuristic {
+    pub fn inner_pos_to_outer(&self, x: i32, y: i32) -> (i32, i32) {
+        use self::FrameExtentsHeuristicPath::*;
+        if self.heuristic_path != UnsupportedBordered {
+            (x - self.frame_extents.left as i32, y - self.frame_extents.top as i32)
+        } else {
+            (x, y)
+        }
+    }
+
+    pub fn inner_pos_to_outer_logical(&self, mut logical: LogicalPosition, factor: f64) -> LogicalPosition {
+        use self::FrameExtentsHeuristicPath::*;
+        if self.heuristic_path != UnsupportedBordered {
+            let frame_extents = self.frame_extents.as_logical(factor);
+            logical.x -= frame_extents.left;
+            logical.y -= frame_extents.top;
+        }
+        logical
+    }
+
+    pub fn inner_size_to_outer(&self, width: u32, height: u32) -> (u32, u32) {
+        (
+            width.saturating_add(
+                self.frame_extents.left.saturating_add(self.frame_extents.right) as u32
+            ),
+            height.saturating_add(
+                self.frame_extents.top.saturating_add(self.frame_extents.bottom) as u32
+            ),
+        )
+    }
+
+    pub fn inner_size_to_outer_logical(&self, mut logical: LogicalSize, factor: f64) -> LogicalSize {
+        let frame_extents = self.frame_extents.as_logical(factor);
+        logical.width += frame_extents.left + frame_extents.right;
+        logical.height += frame_extents.top + frame_extents.bottom;
+        logical
+    }
+}
+
+impl XConnection {
+    // This is adequate for get_inner_position
+    pub fn translate_coords(&self, window: ffi::Window, root: ffi::Window) -> Result<TranslatedCoords, XError> {
+        let mut translated_coords: TranslatedCoords = unsafe { mem::uninitialized() };
+        unsafe {
+            (self.xlib.XTranslateCoordinates)(
+                self.display,
+                window,
+                root,
+                0,
+                0,
+                &mut translated_coords.x_rel_root,
+                &mut translated_coords.y_rel_root,
+                &mut translated_coords.child,
+            );
+        }
+        //println!("XTranslateCoordinates coords:{:?}", translated_coords);
+        self.check_errors().map(|_| translated_coords)
+    }
+
+    // This is adequate for get_inner_size
+    pub fn get_geometry(&self, window: ffi::Window) -> Result<Geometry, XError> {
+        let mut geometry: Geometry = unsafe { mem::uninitialized() };
+        let _status = unsafe {
+            (self.xlib.XGetGeometry)(
+                self.display,
+                window,
+                &mut geometry.root,
+                &mut geometry.x_rel_parent,
+                &mut geometry.y_rel_parent,
+                &mut geometry.width,
+                &mut geometry.height,
+                &mut geometry.border,
+                &mut geometry.depth,
+            )
+        };
+        //println!("XGetGeometry geo:{:?}", geometry);
+        self.check_errors().map(|_| geometry)
+    }
+
+    fn get_frame_extents(&self, window: ffi::Window) -> Option<FrameExtents> {
+        let extents_atom = unsafe { self.get_atom_unchecked(b"_NET_FRAME_EXTENTS\0") };
+
+        if !hint_is_supported(extents_atom) {
+            return None;
+        }
+
+        // Of the WMs tested, xmonad, i3, dwm, IceWM (1.3.x and earlier), and blackbox don't
+        // support this. As this is part of EWMH (Extended Window Manager Hints), it's likely to
+        // be unsupported by many smaller WMs.
+        let extents: Option<Vec<c_ulong>> = self.get_property(
+            window,
+            extents_atom,
+            ffi::XA_CARDINAL,
+        ).ok();
+
+        extents.and_then(|extents| {
+            if extents.len() >= 4 {
+                Some(FrameExtents {
+                    left: extents[0],
+                    right: extents[1],
+                    top: extents[2],
+                    bottom: extents[3],
+                })
+            } else {
+                None
+            }
+        })
+    }
+
+    pub fn is_top_level(&self, window: ffi::Window, root: ffi::Window) -> Option<bool> {
+        let client_list_atom = unsafe { self.get_atom_unchecked(b"_NET_CLIENT_LIST\0") };
+
+        if !hint_is_supported(client_list_atom) {
+            return None;
+        }
+
+        let client_list: Option<Vec<ffi::Window>> = self.get_property(
+            root,
+            client_list_atom,
+            ffi::XA_WINDOW,
+        ).ok();
+
+        client_list.map(|client_list| client_list.contains(&window))
+    }
+
+    fn get_parent_window(&self, window: ffi::Window) -> Result<ffi::Window, XError> {
+        let parent = unsafe {
+            let mut root: ffi::Window = mem::uninitialized();
+            let mut parent: ffi::Window = mem::uninitialized();
+            let mut children: *mut ffi::Window = ptr::null_mut();
+            let mut nchildren: c_uint = mem::uninitialized();
+
+            // What's filled into `parent` if `window` is the root window?
+            let _status = (self.xlib.XQueryTree)(
+                self.display,
+                window,
+                &mut root,
+                &mut parent,
+                &mut children,
+                &mut nchildren,
+            );
+
+            // The list of children isn't used
+            if children != ptr::null_mut() {
+                (self.xlib.XFree)(children as *mut _);
+            }
+
+            parent
+        };
+        self.check_errors().map(|_| parent)
+    }
+
+    fn climb_hierarchy(&self, window: ffi::Window, root: ffi::Window) -> Result<ffi::Window, XError> {
+        let mut outer_window = window;
+        loop {
+            let candidate = self.get_parent_window(outer_window)?;
+            if candidate == root {
+                break;
+            }
+            outer_window = candidate;
+        }
+        Ok(outer_window)
+    }
+
+    pub fn get_frame_extents_heuristic(&self, window: ffi::Window, root: ffi::Window) -> FrameExtentsHeuristic {
+        use self::FrameExtentsHeuristicPath::*;
+
+        // Position relative to root window.
+        // With rare exceptions, this is the position of a nested window. Cases where the window
+        // isn't nested are outlined in the comments throghout this function, but in addition to
+        // that, fullscreen windows often aren't nested.
+        let (inner_y_rel_root, child) = {
+            let coords = self.translate_coords(window, root).expect("Failed to translate window coordinates");
+            (
+                coords.y_rel_root,
+                coords.child,
+            )
+        };
+
+        let (width, height, border) = {
+            let inner_geometry = self.get_geometry(window).expect("Failed to get inner window geometry");
+            (
+                inner_geometry.width,
+                inner_geometry.height,
+                inner_geometry.border,
+            )
+        };
+
+        // The first condition is only false for un-nested windows, but isn't always false for
+        // un-nested windows. Mutter/Muffin/Budgie and Marco present a mysterious discrepancy:
+        // when y is on the range [0, 2] and if the window has been unfocused since being
+        // undecorated (or was undecorated upon construction), the first condition is true,
+        // requiring us to rely on the second condition.
+        let nested = !(window == child || self.is_top_level(child, root) == Some(true));
+
+        // Hopefully the WM supports EWMH, allowing us to get exact info on the window frames.
+        if let Some(mut frame_extents) = self.get_frame_extents(window) {
+            // Mutter/Muffin/Budgie and Marco preserve their decorated frame extents when
+            // decorations are disabled, but since the window becomes un-nested, it's easy to
+            // catch.
+            if !nested {
+                frame_extents = FrameExtents::new(0, 0, 0, 0);
+            }
+
+            // The difference between the nested window's position and the outermost window's
+            // position is equivalent to the frame size. In most scenarios, this is equivalent to
+            // manually climbing the hierarchy as is done in the case below. Here's a list of
+            // known discrepancies:
+            // * Mutter/Muffin/Budgie gives decorated windows a margin of 9px (only 7px on top) in
+            //   addition to a 1px semi-transparent border. The margin can be easily observed by
+            //   using a screenshot tool to get a screenshot of a selected window, and is
+            //   presumably used for drawing drop shadows. Getting window geometry information
+            //   via hierarchy-climbing results in this margin being included in both the
+            //   position and outer size, so a window positioned at (0, 0) would be reported as
+            //   having a position (-10, -8).
+            // * Compiz has a drop shadow margin just like Mutter/Muffin/Budgie, though it's 10px
+            //   on all sides, and there's no additional border.
+            // * Enlightenment otherwise gets a y position equivalent to inner_y_rel_root.
+            //   Without decorations, there's no difference. This is presumably related to
+            //   Enlightenment's fairly unique concept of window position; it interprets
+            //   positions given to XMoveWindow as a client area position rather than a position
+            //   of the overall window.
+
+            FrameExtentsHeuristic {
+                frame_extents,
+                heuristic_path: Supported,
+            }
+        } else if nested {
+            // If the position value we have is for a nested window used as the client area, we'll
+            // just climb up the hierarchy and get the geometry of the outermost window we're
+            // nested in.
+            let outer_window = self.climb_hierarchy(window, root).expect("Failed to climb window hierarchy");
+            let (outer_y, outer_width, outer_height) = {
+                let outer_geometry = self.get_geometry(outer_window).expect("Failed to get outer window geometry");
+                (
+                    outer_geometry.y_rel_parent,
+                    outer_geometry.width,
+                    outer_geometry.height,
+                )
+            };
+
+            // Since we have the geometry of the outermost window and the geometry of the client
+            // area, we can figure out what's in between.
+            let diff_x = outer_width.saturating_sub(width);
+            let diff_y = outer_height.saturating_sub(height);
+            let offset_y = inner_y_rel_root.saturating_sub(outer_y) as c_uint;
+
+            let left = diff_x / 2;
+            let right = left;
+            let top = offset_y;
+            let bottom = diff_y.saturating_sub(offset_y);
+
+            let frame_extents = FrameExtents::new(
+                left.into(),
+                right.into(),
+                top.into(),
+                bottom.into(),
+            );
+            FrameExtentsHeuristic {
+                frame_extents,
+                heuristic_path: UnsupportedNested,
+            }
+        } else {
+            // This is the case for xmonad and dwm, AKA the only WMs tested that supplied a
+            // border value. This is convenient, since we can use it to get an accurate frame.
+            let frame_extents = FrameExtents::from_border(border.into());
+            FrameExtentsHeuristic {
+                frame_extents,
+                heuristic_path: UnsupportedBordered,
+            }
+        }
+    }
+}

src/platform_impl/linux/x11/util/hint.rs

@@ -0,0 +1,236 @@
+use std::sync::Arc;
+
+use super::*;
+
+pub const MWM_HINTS_DECORATIONS: c_ulong = 2;
+
+#[derive(Debug)]
+pub enum StateOperation {
+    Remove = 0, // _NET_WM_STATE_REMOVE
+    Add = 1,    // _NET_WM_STATE_ADD
+    Toggle = 2, // _NET_WM_STATE_TOGGLE
+}
+
+impl From<bool> for StateOperation {
+    fn from(op: bool) -> Self {
+        if op {
+            StateOperation::Add
+        } else {
+            StateOperation::Remove
+        }
+    }
+}
+
+/// X window type. Maps directly to
+/// [`_NET_WM_WINDOW_TYPE`](https://specifications.freedesktop.org/wm-spec/wm-spec-1.5.html).
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+pub enum WindowType {
+    /// A desktop feature. This can include a single window containing desktop icons with the same dimensions as the
+    /// screen, allowing the desktop environment to have full control of the desktop, without the need for proxying
+    /// root window clicks.
+    Desktop,
+    /// A dock or panel feature. Typically a Window Manager would keep such windows on top of all other windows.
+    Dock,
+    /// Toolbar windows. "Torn off" from the main application.
+    Toolbar,
+    /// Pinnable menu windows. "Torn off" from the main application.
+    Menu,
+    /// A small persistent utility window, such as a palette or toolbox.
+    Utility,
+    /// The window is a splash screen displayed as an application is starting up.
+    Splash,
+    /// This is a dialog window.
+    Dialog,
+    /// A dropdown menu that usually appears when the user clicks on an item in a menu bar.
+    /// This property is typically used on override-redirect windows.
+    DropdownMenu,
+    /// A popup menu that usually appears when the user right clicks on an object.
+    /// This property is typically used on override-redirect windows.
+    PopupMenu,
+    /// A tooltip window. Usually used to show additional information when hovering over an object with the cursor.
+    /// This property is typically used on override-redirect windows.
+    Tooltip,
+    /// The window is a notification.
+    /// This property is typically used on override-redirect windows.
+    Notification,
+    /// This should be used on the windows that are popped up by combo boxes.
+    /// This property is typically used on override-redirect windows.
+    Combo,
+    /// This indicates the the window is being dragged.
+    /// This property is typically used on override-redirect windows.
+    Dnd,
+    /// This is a normal, top-level window.
+    Normal,
+}
+
+impl Default for WindowType {
+    fn default() -> Self {
+        WindowType::Normal
+    }
+}
+
+impl WindowType {
+    pub(crate) fn as_atom(&self, xconn: &Arc<XConnection>) -> ffi::Atom {
+        use self::WindowType::*;
+        let atom_name: &[u8] = match self {
+            &Desktop => b"_NET_WM_WINDOW_TYPE_DESKTOP\0",
+            &Dock => b"_NET_WM_WINDOW_TYPE_DOCK\0",
+            &Toolbar => b"_NET_WM_WINDOW_TYPE_TOOLBAR\0",
+            &Menu => b"_NET_WM_WINDOW_TYPE_MENU\0",
+            &Utility => b"_NET_WM_WINDOW_TYPE_UTILITY\0",
+            &Splash => b"_NET_WM_WINDOW_TYPE_SPLASH\0",
+            &Dialog => b"_NET_WM_WINDOW_TYPE_DIALOG\0",
+            &DropdownMenu => b"_NET_WM_WINDOW_TYPE_DROPDOWN_MENU\0",
+            &PopupMenu => b"_NET_WM_WINDOW_TYPE_POPUP_MENU\0",
+            &Tooltip => b"_NET_WM_WINDOW_TYPE_TOOLTIP\0",
+            &Notification => b"_NET_WM_WINDOW_TYPE_NOTIFICATION\0",
+            &Combo => b"_NET_WM_WINDOW_TYPE_COMBO\0",
+            &Dnd => b"_NET_WM_WINDOW_TYPE_DND\0",
+            &Normal => b"_NET_WM_WINDOW_TYPE_NORMAL\0",
+        };
+        unsafe { xconn.get_atom_unchecked(atom_name) }
+    }
+}
+
+pub struct NormalHints<'a> {
+    size_hints: XSmartPointer<'a, ffi::XSizeHints>,
+}
+
+impl<'a> NormalHints<'a> {
+    pub fn new(xconn: &'a XConnection) -> Self {
+        NormalHints { size_hints: xconn.alloc_size_hints() }
+    }
+
+    pub fn has_flag(&self, flag: c_long) -> bool {
+        has_flag(self.size_hints.flags, flag)
+    }
+
+    fn getter(&self, flag: c_long, field1: &c_int, field2: &c_int) -> Option<(u32, u32)> {
+        if self.has_flag(flag) {
+            Some((*field1 as _, *field2 as _))
+        } else {
+            None
+        }
+    }
+
+    pub fn get_size(&self) -> Option<(u32, u32)> {
+        self.getter(ffi::PSize, &self.size_hints.width, &self.size_hints.height)
+    }
+
+    // WARNING: This hint is obsolete
+    pub fn set_size(&mut self, size: Option<(u32, u32)>) {
+        if let Some((width, height)) = size {
+            self.size_hints.flags |= ffi::PSize;
+            self.size_hints.width = width as c_int;
+            self.size_hints.height = height as c_int;
+        } else {
+            self.size_hints.flags &= !ffi::PSize;
+        }
+    }
+
+    pub fn get_max_size(&self) -> Option<(u32, u32)> {
+        self.getter(ffi::PMaxSize, &self.size_hints.max_width, &self.size_hints.max_height)
+    }
+
+    pub fn set_max_size(&mut self, max_size: Option<(u32, u32)>) {
+        if let Some((max_width, max_height)) = max_size {
+            self.size_hints.flags |= ffi::PMaxSize;
+            self.size_hints.max_width = max_width as c_int;
+            self.size_hints.max_height = max_height as c_int;
+        } else {
+            self.size_hints.flags &= !ffi::PMaxSize;
+        }
+    }
+
+    pub fn get_min_size(&self) -> Option<(u32, u32)> {
+        self.getter(ffi::PMinSize, &self.size_hints.min_width, &self.size_hints.min_height)
+    }
+
+    pub fn set_min_size(&mut self, min_size: Option<(u32, u32)>) {
+        if let Some((min_width, min_height)) = min_size {
+            self.size_hints.flags |= ffi::PMinSize;
+            self.size_hints.min_width = min_width as c_int;
+            self.size_hints.min_height = min_height as c_int;
+        } else {
+            self.size_hints.flags &= !ffi::PMinSize;
+        }
+    }
+
+    pub fn get_resize_increments(&self) -> Option<(u32, u32)> {
+        self.getter(ffi::PResizeInc, &self.size_hints.width_inc, &self.size_hints.height_inc)
+    }
+
+    pub fn set_resize_increments(&mut self, resize_increments: Option<(u32, u32)>) {
+        if let Some((width_inc, height_inc)) = resize_increments {
+            self.size_hints.flags |= ffi::PResizeInc;
+            self.size_hints.width_inc = width_inc as c_int;
+            self.size_hints.height_inc = height_inc as c_int;
+        } else {
+            self.size_hints.flags &= !ffi::PResizeInc;
+        }
+    }
+
+    pub fn get_base_size(&self) -> Option<(u32, u32)> {
+        self.getter(ffi::PBaseSize, &self.size_hints.base_width, &self.size_hints.base_height)
+    }
+
+    pub fn set_base_size(&mut self, base_size: Option<(u32, u32)>) {
+        if let Some((base_width, base_height)) = base_size {
+            self.size_hints.flags |= ffi::PBaseSize;
+            self.size_hints.base_width = base_width as c_int;
+            self.size_hints.base_height = base_height as c_int;
+        } else {
+            self.size_hints.flags &= !ffi::PBaseSize;
+        }
+    }
+}
+
+impl XConnection {
+    pub fn get_wm_hints(&self, window: ffi::Window) -> Result<XSmartPointer<ffi::XWMHints>, XError> {
+        let wm_hints = unsafe { (self.xlib.XGetWMHints)(self.display, window) };
+        self.check_errors()?;
+        let wm_hints = if wm_hints.is_null() {
+            self.alloc_wm_hints()
+        } else {
+            XSmartPointer::new(self, wm_hints).unwrap()
+        };
+        Ok(wm_hints)
+    }
+
+    pub fn set_wm_hints(&self, window: ffi::Window, wm_hints: XSmartPointer<ffi::XWMHints>) -> Flusher {
+        unsafe {
+            (self.xlib.XSetWMHints)(
+                self.display,
+                window,
+                wm_hints.ptr,
+            );
+        }
+        Flusher::new(self)
+    }
+
+    pub fn get_normal_hints(&self, window: ffi::Window) -> Result<NormalHints, XError> {
+        let size_hints = self.alloc_size_hints();
+        let mut supplied_by_user: c_long = unsafe { mem::uninitialized() };
+        unsafe {
+            (self.xlib.XGetWMNormalHints)(
+                self.display,
+                window,
+                size_hints.ptr,
+                &mut supplied_by_user,
+            );
+        }
+        self.check_errors().map(|_| NormalHints { size_hints })
+    }
+
+    pub fn set_normal_hints(&self, window: ffi::Window, normal_hints: NormalHints) -> Flusher {
+        unsafe {
+            (self.xlib.XSetWMNormalHints)(
+                self.display,
+                window,
+                normal_hints.size_hints.ptr,
+            );
+        }
+        Flusher::new(self)
+    }
+}

src/platform_impl/linux/x11/util/icon.rs

@@ -0,0 +1,34 @@
+use {Icon, Pixel, PIXEL_SIZE};
+use super::*;
+
+impl Pixel {
+    pub fn to_packed_argb(&self) -> Cardinal {
+        let mut cardinal = 0;
+        assert!(CARDINAL_SIZE >= PIXEL_SIZE);
+        let as_bytes = &mut cardinal as *mut _ as *mut u8;
+        unsafe {
+            *as_bytes.offset(0) = self.b;
+            *as_bytes.offset(1) = self.g;
+            *as_bytes.offset(2) = self.r;
+            *as_bytes.offset(3) = self.a;
+        }
+        cardinal
+    }
+}
+
+impl Icon {
+    pub(crate) fn to_cardinals(&self) -> Vec<Cardinal> {
+        assert_eq!(self.rgba.len() % PIXEL_SIZE, 0);
+        let pixel_count = self.rgba.len() / PIXEL_SIZE;
+        assert_eq!(pixel_count, (self.width * self.height) as usize);
+        let mut data = Vec::with_capacity(pixel_count);
+        data.push(self.width as Cardinal);
+        data.push(self.height as Cardinal);
+        let pixels = self.rgba.as_ptr() as *const Pixel;
+        for pixel_index in 0..pixel_count {
+            let pixel = unsafe { &*pixels.offset(pixel_index as isize) };
+            data.push(pixel.to_packed_argb());
+        }
+        data
+    }
+}

src/platform_impl/linux/x11/util/input.rs

@@ -0,0 +1,159 @@
+use std::str;
+
+use super::*;
+use events::ModifiersState;
+
+pub const VIRTUAL_CORE_POINTER: c_int = 2;
+pub const VIRTUAL_CORE_KEYBOARD: c_int = 3;
+
+// A base buffer size of 1kB uses a negligible amount of RAM while preventing us from having to
+// re-allocate (and make another round-trip) in the *vast* majority of cases.
+// To test if `lookup_utf8` works correctly, set this to 1.
+const TEXT_BUFFER_SIZE: usize = 1024;
+
+impl From<ffi::XIModifierState> for ModifiersState {
+    fn from(mods: ffi::XIModifierState) -> Self {
+        let state = mods.effective as c_uint;
+        ModifiersState {
+            alt: state & ffi::Mod1Mask != 0,
+            shift: state & ffi::ShiftMask != 0,
+            ctrl: state & ffi::ControlMask != 0,
+            logo: state & ffi::Mod4Mask != 0,
+        }
+    }
+}
+
+pub struct PointerState<'a> {
+    xconn: &'a XConnection,
+    root: ffi::Window,
+    child: ffi::Window,
+    pub root_x: c_double,
+    pub root_y: c_double,
+    win_x: c_double,
+    win_y: c_double,
+    buttons: ffi::XIButtonState,
+    modifiers: ffi::XIModifierState,
+    group: ffi::XIGroupState,
+    relative_to_window: bool,
+}
+
+impl<'a> PointerState<'a> {
+    pub fn get_modifier_state(&self) -> ModifiersState {
+        self.modifiers.into()
+    }
+}
+
+impl<'a> Drop for PointerState<'a> {
+    fn drop(&mut self) {
+        if !self.buttons.mask.is_null() {
+            unsafe {
+                // This is why you need to read the docs carefully...
+                (self.xconn.xlib.XFree)(self.buttons.mask as _);
+            }
+        }
+    }
+}
+
+impl XConnection {
+    pub fn select_xinput_events(&self, window: c_ulong, device_id: c_int, mask: i32) -> Flusher {
+        let mut event_mask = ffi::XIEventMask {
+            deviceid: device_id,
+            mask: &mask as *const _ as *mut c_uchar,
+            mask_len: mem::size_of_val(&mask) as c_int,
+        };
+        unsafe {
+            (self.xinput2.XISelectEvents)(
+                self.display,
+                window,
+                &mut event_mask as *mut ffi::XIEventMask,
+                1, // number of masks to read from pointer above
+            );
+        }
+        Flusher::new(self)
+    }
+
+    #[allow(dead_code)]
+    pub fn select_xkb_events(&self, device_id: c_uint, mask: c_ulong) -> Option<Flusher> {
+        let status = unsafe {
+            (self.xlib.XkbSelectEvents)(
+                self.display,
+                device_id,
+                mask,
+                mask,
+            )
+        };
+        if status == ffi::True {
+            Some(Flusher::new(self))
+        } else {
+            None
+        }
+    }
+
+    pub fn query_pointer(&self, window: ffi::Window, device_id: c_int) -> Result<PointerState, XError> {
+        unsafe {
+            let mut pointer_state: PointerState = mem::uninitialized();
+            pointer_state.xconn = self;
+            pointer_state.relative_to_window = (self.xinput2.XIQueryPointer)(
+                self.display,
+                device_id,
+                window,
+                &mut pointer_state.root,
+                &mut pointer_state.child,
+                &mut pointer_state.root_x,
+                &mut pointer_state.root_y,
+                &mut pointer_state.win_x,
+                &mut pointer_state.win_y,
+                &mut pointer_state.buttons,
+                &mut pointer_state.modifiers,
+                &mut pointer_state.group,
+            ) == ffi::True;
+            if let Err(err) = self.check_errors() {
+                // Running the destrutor would be bad news for us...
+                mem::forget(pointer_state);
+                Err(err)
+            } else {
+                Ok(pointer_state)
+            }
+        }
+    }
+
+    fn lookup_utf8_inner(
+        &self,
+        ic: ffi::XIC,
+        key_event: &mut ffi::XKeyEvent,
+        buffer: &mut [u8],
+    ) -> (ffi::KeySym, ffi::Status, c_int) {
+        let mut keysym: ffi::KeySym = 0;
+        let mut status: ffi::Status = 0;
+        let count = unsafe {
+            (self.xlib.Xutf8LookupString)(
+                ic,
+                key_event,
+                buffer.as_mut_ptr() as *mut c_char,
+                buffer.len() as c_int,
+                &mut keysym,
+                &mut status,
+            )
+        };
+        (keysym, status, count)
+    }
+
+    pub fn lookup_utf8(&self, ic: ffi::XIC, key_event: &mut ffi::XKeyEvent) -> String {
+        let mut buffer: [u8; TEXT_BUFFER_SIZE] = unsafe { mem::uninitialized() };
+        let (_, status, count) = self.lookup_utf8_inner(ic, key_event, &mut buffer);
+        // The buffer overflowed, so we'll make a new one on the heap.
+        if status == ffi::XBufferOverflow {
+            let mut buffer = Vec::with_capacity(count as usize);
+            unsafe { buffer.set_len(count as usize) };
+            let (_, _, new_count) = self.lookup_utf8_inner(ic, key_event, &mut buffer);
+            debug_assert_eq!(count, new_count);
+            str::from_utf8(&buffer[..count as usize])
+                .unwrap_or("")
+                .to_string()
+        } else {
+            str::from_utf8(&buffer[..count as usize])
+                .unwrap_or("")
+                .to_string()
+        }
+    }
+}

src/platform_impl/linux/x11/util/memory.rs

@@ -0,0 +1,62 @@
+use std::ops::{Deref, DerefMut};
+
+use super::*;
+
+pub struct XSmartPointer<'a, T> {
+    xconn: &'a XConnection,
+    pub ptr: *mut T,
+}
+
+impl<'a, T> XSmartPointer<'a, T> {
+    // You're responsible for only passing things to this that should be XFree'd.
+    // Returns None if ptr is null.
+    pub fn new(xconn: &'a XConnection, ptr: *mut T) -> Option<Self> {
+        if !ptr.is_null() {
+            Some(XSmartPointer {
+                xconn,
+                ptr,
+            })
+        } else {
+            None
+        }
+    }
+}
+
+impl<'a, T> Deref for XSmartPointer<'a, T> {
+    type Target = T;
+
+    fn deref(&self) -> &T {
+        unsafe { &*self.ptr }
+    }
+}
+
+impl<'a, T> DerefMut for XSmartPointer<'a, T> {
+    fn deref_mut(&mut self) -> &mut T {
+        unsafe { &mut *self.ptr }
+    }
+}
+
+impl<'a, T> Drop for XSmartPointer<'a, T> {
+    fn drop(&mut self) {
+        unsafe {
+            (self.xconn.xlib.XFree)(self.ptr as *mut _);
+        }
+    }
+}
+
+impl XConnection {
+    pub fn alloc_class_hint(&self) -> XSmartPointer<ffi::XClassHint> {
+        XSmartPointer::new(self, unsafe { (self.xlib.XAllocClassHint)() })
+            .expect("`XAllocClassHint` returned null; out of memory")
+    }
+
+    pub fn alloc_size_hints(&self) -> XSmartPointer<ffi::XSizeHints> {
+        XSmartPointer::new(self, unsafe { (self.xlib.XAllocSizeHints)() })
+            .expect("`XAllocSizeHints` returned null; out of memory")
+    }
+
+    pub fn alloc_wm_hints(&self) -> XSmartPointer<ffi::XWMHints> {
+        XSmartPointer::new(self, unsafe { (self.xlib.XAllocWMHints)() })
+            .expect("`XAllocWMHints` returned null; out of memory")
+    }
+}

src/platform_impl/linux/x11/util/mod.rs

@@ -0,0 +1,104 @@
+// Welcome to the util module, where we try to keep you from shooting yourself in the foot.
+// *results may vary
+
+mod atom;
+mod client_msg;
+mod format;
+mod geometry;
+mod hint;
+mod icon;
+mod input;
+mod memory;
+mod randr;
+mod window_property;
+mod wm;
+
+pub use self::atom::*;
+pub use self::client_msg::*;
+pub use self::format::*;
+pub use self::geometry::*;
+pub use self::hint::*;
+pub use self::icon::*;
+pub use self::input::*;
+pub use self::memory::*;
+pub use self::randr::*;
+pub use self::window_property::*;
+pub use self::wm::*;
+
+use std::mem;
+use std::ptr;
+use std::ops::BitAnd;
+use std::os::raw::*;
+
+use super::{ffi, XConnection, XError};
+
+pub fn reinterpret<'a, A, B>(a: &'a A) -> &'a B {
+    let b_ptr = a as *const _ as *const B;
+    unsafe { &*b_ptr }
+}
+
+pub fn maybe_change<T: PartialEq>(field: &mut Option<T>, value: T) -> bool {
+    let wrapped = Some(value);
+    if *field != wrapped {
+        *field = wrapped;
+        true
+    } else {
+        false
+    }
+}
+
+pub fn has_flag<T>(bitset: T, flag: T) -> bool
+where T:
+    Copy + PartialEq + BitAnd<T, Output = T>
+{
+    bitset & flag == flag
+}
+
+#[must_use = "This request was made asynchronously, and is still in the output buffer. You must explicitly choose to either `.flush()` (empty the output buffer, sending the request now) or `.queue()` (wait to send the request, allowing you to continue to add more requests without additional round-trips). For more information, see the documentation for `util::flush_requests`."]
+pub struct Flusher<'a> {
+    xconn: &'a XConnection,
+}
+
+impl<'a> Flusher<'a> {
+    pub fn new(xconn: &'a XConnection) -> Self {
+        Flusher { xconn }
+    }
+
+    // "I want this request sent now!"
+    pub fn flush(self) -> Result<(), XError> {
+        self.xconn.flush_requests()
+    }
+
+    // "I want the response now too!"
+    pub fn sync(self) -> Result<(), XError> {
+        self.xconn.sync_with_server()
+    }
+
+    // "I'm aware that this request hasn't been sent, and I'm okay with waiting."
+    pub fn queue(self) {}
+}
+
+impl XConnection {
+    // This is impoartant, so pay attention!
+    // Xlib has an output buffer, and tries to hide the async nature of X from you.
+    // This buffer contains the requests you make, and is flushed under various circumstances:
+    // 1. `XPending`, `XNextEvent`, and `XWindowEvent` flush "as needed"
+    // 2. `XFlush` explicitly flushes
+    // 3. `XSync` flushes and blocks until all requests are responded to
+    // 4. Calls that have a return dependent on a response (i.e. `XGetWindowProperty`) sync internally.
+    //    When in doubt, check the X11 source; if a function calls `_XReply`, it flushes and waits.
+    // All util functions that abstract an async function will return a `Flusher`.
+    pub fn flush_requests(&self) -> Result<(), XError> {
+        unsafe { (self.xlib.XFlush)(self.display) };
+        //println!("XFlush");
+        // This isn't necessarily a useful time to check for errors (since our request hasn't
+        // necessarily been processed yet)
+        self.check_errors()
+    }
+
+    pub fn sync_with_server(&self) -> Result<(), XError> {
+        unsafe { (self.xlib.XSync)(self.display, ffi::False) };
+        //println!("XSync");
+        self.check_errors()
+    }
+}

src/platform_impl/linux/x11/util/randr.rs

@@ -0,0 +1,111 @@
+use std::{env, slice};
+use std::str::FromStr;
+
+use validate_hidpi_factor;
+use super::*;
+
+pub fn calc_dpi_factor(
+    (width_px, height_px): (u32, u32),
+    (width_mm, height_mm): (u64, u64),
+) -> f64 {
+    // Override DPI if `WINIT_HIDPI_FACTOR` variable is set
+    let dpi_override = env::var("WINIT_HIDPI_FACTOR")
+        .ok()
+        .and_then(|var| f64::from_str(&var).ok());
+    if let Some(dpi_override) = dpi_override {
+        if !validate_hidpi_factor(dpi_override) {
+            panic!(
+                "`WINIT_HIDPI_FACTOR` invalid; DPI factors must be normal floats greater than 0. Got `{}`",
+                dpi_override,
+            );
+        }
+        return dpi_override;
+    }
+
+    // See http://xpra.org/trac/ticket/728 for more information.
+    if width_mm == 0 || width_mm == 0 {
+        warn!("XRandR reported that the display's 0mm in size, which is certifiably insane");
+        return 1.0;
+    }
+
+    let ppmm = (
+        (width_px as f64 * height_px as f64) / (width_mm as f64 * height_mm as f64)
+    ).sqrt();
+    // Quantize 1/12 step size
+    let dpi_factor = ((ppmm * (12.0 * 25.4 / 96.0)).round() / 12.0).max(1.0);
+    assert!(validate_hidpi_factor(dpi_factor));
+    dpi_factor
+}
+
+pub enum MonitorRepr {
+    Monitor(*mut ffi::XRRMonitorInfo),
+    Crtc(*mut ffi::XRRCrtcInfo),
+}
+
+impl MonitorRepr {
+    pub unsafe fn get_output(&self) -> ffi::RROutput {
+        match *self {
+            // Same member names, but different locations within the struct...
+            MonitorRepr::Monitor(monitor) => *((*monitor).outputs.offset(0)),
+            MonitorRepr::Crtc(crtc) => *((*crtc).outputs.offset(0)),
+        }
+    }
+
+    pub unsafe fn get_dimensions(&self) -> (u32, u32) {
+        match *self {
+            MonitorRepr::Monitor(monitor) => ((*monitor).width as u32, (*monitor).height as u32),
+            MonitorRepr::Crtc(crtc) => ((*crtc).width as u32, (*crtc).height as u32),
+        }
+    }
+
+    pub unsafe fn get_position(&self) -> (i32, i32) {
+        match *self {
+            MonitorRepr::Monitor(monitor) => ((*monitor).x as i32, (*monitor).y as i32),
+            MonitorRepr::Crtc(crtc) => ((*crtc).x as i32, (*crtc).y as i32),
+        }
+    }
+}
+
+impl From<*mut ffi::XRRMonitorInfo> for MonitorRepr {
+    fn from(monitor: *mut ffi::XRRMonitorInfo) -> Self {
+        MonitorRepr::Monitor(monitor)
+    }
+}
+
+impl From<*mut ffi::XRRCrtcInfo> for MonitorRepr {
+    fn from(crtc: *mut ffi::XRRCrtcInfo) -> Self {
+        MonitorRepr::Crtc(crtc)
+    }
+}
+
+impl XConnection {
+    pub unsafe fn get_output_info(
+        &self,
+        resources: *mut ffi::XRRScreenResources,
+        repr: &MonitorRepr,
+    ) -> Option<(String, f64)> {
+        let output_info = (self.xrandr.XRRGetOutputInfo)(
+            self.display,
+            resources,
+            repr.get_output(),
+        );
+        if output_info.is_null() {
+            // When calling `XRRGetOutputInfo` on a virtual monitor (versus a physical display)
+            // it's possible for it to return null.
+            // https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=816596
+            let _ = self.check_errors(); // discard `BadRROutput` error
+            return None;
+        }
+        let name_slice = slice::from_raw_parts(
+            (*output_info).name as *mut u8,
+            (*output_info).nameLen as usize,
+        );
+        let name = String::from_utf8_lossy(name_slice).into();
+        let hidpi_factor = calc_dpi_factor(
+            repr.get_dimensions(),
+            ((*output_info).mm_width as u64, (*output_info).mm_height as u64),
+        );
+        (self.xrandr.XRRFreeOutputInfo)(output_info);
+        Some((name, hidpi_factor))
+    }
+}

src/platform_impl/linux/x11/util/window_property.rs

@@ -0,0 +1,144 @@
+use std;
+
+use super::*;
+
+pub type Cardinal = c_long;
+pub const CARDINAL_SIZE: usize = mem::size_of::<c_long>();
+
+#[derive(Debug, Clone)]
+pub enum GetPropertyError {
+    XError(XError),
+    TypeMismatch(ffi::Atom),
+    FormatMismatch(c_int),
+    NothingAllocated,
+}
+
+impl GetPropertyError {
+    pub fn is_actual_property_type(&self, t: ffi::Atom) -> bool {
+        if let GetPropertyError::TypeMismatch(actual_type) = *self {
+            actual_type == t
+        } else {
+            false
+        }
+    }
+}
+
+// Number of 32-bit chunks to retrieve per iteration of get_property's inner loop.
+// To test if `get_property` works correctly, set this to 1.
+const PROPERTY_BUFFER_SIZE: c_long = 1024; // 4k of RAM ought to be enough for anyone!
+
+#[derive(Debug)]
+pub enum PropMode {
+    Replace = ffi::PropModeReplace as isize,
+    Prepend = ffi::PropModePrepend as isize,
+    Append = ffi::PropModeAppend as isize,
+}
+
+impl XConnection {
+    pub fn get_property<T: Formattable>(
+        &self,
+        window: c_ulong,
+        property: ffi::Atom,
+        property_type: ffi::Atom,
+    ) -> Result<Vec<T>, GetPropertyError> {
+        let mut data = Vec::new();
+        let mut offset = 0;
+
+        let mut done = false;
+        while !done {
+            unsafe {
+                let mut actual_type: ffi::Atom = mem::uninitialized();
+                let mut actual_format: c_int = mem::uninitialized();
+                let mut quantity_returned: c_ulong = mem::uninitialized();
+                let mut bytes_after: c_ulong = mem::uninitialized();
+                let mut buf: *mut c_uchar = ptr::null_mut();
+                (self.xlib.XGetWindowProperty)(
+                    self.display,
+                    window,
+                    property,
+                    // This offset is in terms of 32-bit chunks.
+                    offset,
+                    // This is the quanity of 32-bit chunks to receive at once.
+                    PROPERTY_BUFFER_SIZE,
+                    ffi::False,
+                    property_type,
+                    &mut actual_type,
+                    &mut actual_format,
+                    // This is the quantity of items we retrieved in our format, NOT of 32-bit chunks!
+                    &mut quantity_returned,
+                    // ...and this is a quantity of bytes. So, this function deals in 3 different units.
+                    &mut bytes_after,
+                    &mut buf,
+                );
+
+                if let Err(e) = self.check_errors() {
+                    return Err(GetPropertyError::XError(e));
+                }
+
+                if actual_type != property_type {
+                    return Err(GetPropertyError::TypeMismatch(actual_type));
+                }
+
+                let format_mismatch = Format::from_format(actual_format as _) != Some(T::FORMAT);
+                if format_mismatch {
+                    return Err(GetPropertyError::FormatMismatch(actual_format));
+                }
+
+                if !buf.is_null() {
+                    offset += PROPERTY_BUFFER_SIZE;
+                    let new_data = std::slice::from_raw_parts(
+                        buf as *mut T,
+                        quantity_returned as usize,
+                    );
+                    /*println!(
+                        "XGetWindowProperty prop:{:?} fmt:{:02} len:{:02} off:{:02} out:{:02}, buf:{:?}",
+                        property,
+                        mem::size_of::<T>() * 8,
+                        data.len(),
+                        offset,
+                        quantity_returned,
+                        new_data,
+                    );*/
+                    data.extend_from_slice(&new_data);
+                    // Fun fact: XGetWindowProperty allocates one extra byte at the end.
+                    (self.xlib.XFree)(buf as _); // Don't try to access new_data after this.
+                } else {
+                    return Err(GetPropertyError::NothingAllocated);
+                }
+
+                done = bytes_after == 0;
+            }
+        }
+
+        Ok(data)
+    }
+
+    pub fn change_property<'a, T: Formattable>(
+        &'a self,
+        window: c_ulong,
+        property: ffi::Atom,
+        property_type: ffi::Atom,
+        mode: PropMode,
+        new_value: &[T],
+    ) -> Flusher<'a> {
+        debug_assert_eq!(mem::size_of::<T>(), T::FORMAT.get_actual_size());
+        unsafe {
+            (self.xlib.XChangeProperty)(
+                self.display,
+                window,
+                property,
+                property_type,
+                T::FORMAT as c_int,
+                mode as c_int,
+                new_value.as_ptr() as *const c_uchar,
+                new_value.len() as c_int,
+            );
+        }
+        /*println!(
+            "XChangeProperty prop:{:?} val:{:?}",
+            property,
+            new_value,
+        );*/
+        Flusher::new(self)
+    }
+}

src/platform_impl/linux/x11/util/wm.rs

@@ -0,0 +1,141 @@
+use parking_lot::Mutex;
+
+use super::*;
+
+// This info is global to the window manager.
+lazy_static! {
+    static ref SUPPORTED_HINTS: Mutex<Vec<ffi::Atom>> = Mutex::new(Vec::with_capacity(0));
+    static ref WM_NAME: Mutex<Option<String>> = Mutex::new(None);
+}
+
+pub fn hint_is_supported(hint: ffi::Atom) -> bool {
+    (*SUPPORTED_HINTS.lock()).contains(&hint)
+}
+
+pub fn wm_name_is_one_of(names: &[&str]) -> bool {
+    if let Some(ref name) = *WM_NAME.lock() {
+        names.contains(&name.as_str())
+    } else {
+        false
+    }
+}
+
+impl XConnection {
+    pub fn update_cached_wm_info(&self, root: ffi::Window) {
+        *SUPPORTED_HINTS.lock() = self.get_supported_hints(root);
+        *WM_NAME.lock() = self.get_wm_name(root);
+    }
+
+    fn get_supported_hints(&self, root: ffi::Window) -> Vec<ffi::Atom> {
+        let supported_atom = unsafe { self.get_atom_unchecked(b"_NET_SUPPORTED\0") };
+        self.get_property(
+            root,
+            supported_atom,
+            ffi::XA_ATOM,
+        ).unwrap_or_else(|_| Vec::with_capacity(0))
+    }
+
+    fn get_wm_name(&self, root: ffi::Window) -> Option<String> {
+        let check_atom = unsafe { self.get_atom_unchecked(b"_NET_SUPPORTING_WM_CHECK\0") };
+        let wm_name_atom = unsafe { self.get_atom_unchecked(b"_NET_WM_NAME\0") };
+
+        // Mutter/Muffin/Budgie doesn't have _NET_SUPPORTING_WM_CHECK in its _NET_SUPPORTED, despite
+        // it working and being supported. This has been reported upstream, but due to the
+        // inavailability of time machines, we'll just try to get _NET_SUPPORTING_WM_CHECK
+        // regardless of whether or not the WM claims to support it.
+        //
+        // Blackbox 0.70 also incorrectly reports not supporting this, though that appears to be fixed
+        // in 0.72.
+        /*if !supported_hints.contains(&check_atom) {
+            return None;
+        }*/
+
+        // IceWM (1.3.x and earlier) doesn't report supporting _NET_WM_NAME, but will nonetheless
+        // provide us with a value for it. Note that the unofficial 1.4 fork of IceWM works fine.
+        /*if !supported_hints.contains(&wm_name_atom) {
+            return None;
+        }*/
+
+        // Of the WMs tested, only xmonad and dwm fail to provide a WM name.
+
+        // Querying this property on the root window will give us the ID of a child window created by
+        // the WM.
+        let root_window_wm_check = {
+            let result = self.get_property(
+                root,
+                check_atom,
+                ffi::XA_WINDOW,
+            );
+
+            let wm_check = result
+                .ok()
+                .and_then(|wm_check| wm_check.get(0).cloned());
+
+            if let Some(wm_check) = wm_check {
+                wm_check
+            } else {
+                return None;
+            }
+        };
+
+        // Querying the same property on the child window we were given, we should get this child
+        // window's ID again.
+        let child_window_wm_check = {
+            let result = self.get_property(
+                root_window_wm_check,
+                check_atom,
+                ffi::XA_WINDOW,
+            );
+
+            let wm_check = result
+                .ok()
+                .and_then(|wm_check| wm_check.get(0).cloned());
+
+            if let Some(wm_check) = wm_check {
+                wm_check
+            } else {
+                return None;
+            }
+        };
+
+        // These values should be the same.
+        if root_window_wm_check != child_window_wm_check {
+            return None;
+        }
+
+        // All of that work gives us a window ID that we can get the WM name from.
+        let wm_name = {
+            let utf8_string_atom = unsafe { self.get_atom_unchecked(b"UTF8_STRING\0") };
+
+            let result = self.get_property(
+                root_window_wm_check,
+                wm_name_atom,
+                utf8_string_atom,
+            );
+
+            // IceWM requires this. IceWM was also the only WM tested that returns a null-terminated
+            // string. For more fun trivia, IceWM is also unique in including version and uname
+            // information in this string (this means you'll have to be careful if you want to match
+            // against it, though).
+            // The unofficial 1.4 fork of IceWM still includes the extra details, but properly
+            // returns a UTF8 string that isn't null-terminated.
+            let no_utf8 = if let Err(ref err) = result {
+                err.is_actual_property_type(ffi::XA_STRING)
+            } else {
+                false
+            };
+
+            if no_utf8 {
+                self.get_property(
+                    root_window_wm_check,
+                    wm_name_atom,
+                    ffi::XA_STRING,
+                )
+            } else {
+                result
+            }
+        }.ok();
+
+        wm_name.and_then(|wm_name| String::from_utf8(wm_name).ok())
+    }
+}

src/platform_impl/linux/x11/xdisplay.rs

@@ -0,0 +1,155 @@
+use std::ptr;
+use std::fmt;
+use std::error::Error;
+
+use libc;
+use parking_lot::Mutex;
+
+use super::ffi;
+
+/// A connection to an X server.
+pub struct XConnection {
+    pub xlib: ffi::Xlib,
+    /// Exposes XRandR functions from version < 1.5
+    pub xrandr: ffi::Xrandr_2_2_0,
+    /// Exposes XRandR functions from version = 1.5
+    pub xrandr_1_5: Option<ffi::Xrandr>,
+    pub xcursor: ffi::Xcursor,
+    pub xinput2: ffi::XInput2,
+    pub xlib_xcb: ffi::Xlib_xcb,
+    pub display: *mut ffi::Display,
+    pub latest_error: Mutex<Option<XError>>,
+}
+
+unsafe impl Send for XConnection {}
+unsafe impl Sync for XConnection {}
+
+pub type XErrorHandler = Option<unsafe extern fn(*mut ffi::Display, *mut ffi::XErrorEvent) -> libc::c_int>;
+
+impl XConnection {
+    pub fn new(error_handler: XErrorHandler) -> Result<XConnection, XNotSupported> {
+        // opening the libraries
+        let xlib = ffi::Xlib::open()?;
+        let xcursor = ffi::Xcursor::open()?;
+        let xrandr = ffi::Xrandr_2_2_0::open()?;
+        let xrandr_1_5 = ffi::Xrandr::open().ok();
+        let xinput2 = ffi::XInput2::open()?;
+        let xlib_xcb = ffi::Xlib_xcb::open()?;
+
+        unsafe { (xlib.XInitThreads)() };
+        unsafe { (xlib.XSetErrorHandler)(error_handler) };
+
+        // calling XOpenDisplay
+        let display = unsafe {
+            let display = (xlib.XOpenDisplay)(ptr::null());
+            if display.is_null() {
+                return Err(XNotSupported::XOpenDisplayFailed);
+            }
+            display
+        };
+
+        Ok(XConnection {
+            xlib,
+            xrandr,
+            xrandr_1_5,
+            xcursor,
+            xinput2,
+            xlib_xcb,
+            display,
+            latest_error: Mutex::new(None),
+        })
+    }
+
+    /// Checks whether an error has been triggered by the previous function calls.
+    #[inline]
+    pub fn check_errors(&self) -> Result<(), XError> {
+        let error = self.latest_error.lock().take();
+        if let Some(error) = error {
+            Err(error)
+        } else {
+            Ok(())
+        }
+    }
+
+    /// Ignores any previous error.
+    #[inline]
+    pub fn ignore_error(&self) {
+        *self.latest_error.lock() = None;
+    }
+}
+
+impl fmt::Debug for XConnection {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        self.display.fmt(f)
+    }
+}
+
+impl Drop for XConnection {
+    #[inline]
+    fn drop(&mut self) {
+        unsafe { (self.xlib.XCloseDisplay)(self.display) };
+    }
+}
+
+/// Error triggered by xlib.
+#[derive(Debug, Clone)]
+pub struct XError {
+    pub description: String,
+    pub error_code: u8,
+    pub request_code: u8,
+    pub minor_code: u8,
+}
+
+impl Error for XError {
+    #[inline]
+    fn description(&self) -> &str {
+        &self.description
+    }
+}
+
+impl fmt::Display for XError {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+        write!(formatter, "X error: {} (code: {}, request code: {}, minor code: {})",
+               self.description, self.error_code, self.request_code, self.minor_code)
+    }
+}
+
+/// Error returned if this system doesn't have XLib or can't create an X connection.
+#[derive(Clone, Debug)]
+pub enum XNotSupported {
+    /// Failed to load one or several shared libraries.
+    LibraryOpenError(ffi::OpenError),
+    /// Connecting to the X server with `XOpenDisplay` failed.
+    XOpenDisplayFailed,     // TODO: add better message
+}
+
+impl From<ffi::OpenError> for XNotSupported {
+    #[inline]
+    fn from(err: ffi::OpenError) -> XNotSupported {
+        XNotSupported::LibraryOpenError(err)
+    }
+}
+
+impl Error for XNotSupported {
+    #[inline]
+    fn description(&self) -> &str {
+        match *self {
+            XNotSupported::LibraryOpenError(_) => "Failed to load one of xlib's shared libraries",
+            XNotSupported::XOpenDisplayFailed => "Failed to open connection to X server",
+        }
+    }
+
+    #[inline]
+    fn cause(&self) -> Option<&Error> {
+        match *self {
+            XNotSupported::LibraryOpenError(ref err) => Some(err),
+            _ => None
+        }
+    }
+}
+
+impl fmt::Display for XNotSupported {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+        formatter.write_str(self.description())
+    }
+}