From 310b44f35be8146623d8e5fbbe380ae14f30de72 Mon Sep 17 00:00:00 2001 From: Victor Berger Date: Tue, 12 May 2015 22:47:34 +0200 Subject: Make platform::linux generic over X11 and Wayland. --- src/api/x11/mod.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'src/api/x11/mod.rs') diff --git a/src/api/x11/mod.rs b/src/api/x11/mod.rs index 0dcf85b..30adadc 100644 --- a/src/api/x11/mod.rs +++ b/src/api/x11/mod.rs @@ -21,6 +21,8 @@ use api::dlopen; use api::glx::Context as GlxContext; use api::egl::Context as EglContext; +use platform::MonitorID as PlatformMonitorID; + pub use self::monitor::{MonitorID, get_available_monitors, get_primary_monitor}; mod events; @@ -310,9 +312,9 @@ pub struct Window { impl Window { pub fn new(builder: BuilderAttribs) -> Result { - let xlib = ffi::Xlib::open().unwrap(); // FIXME: gracious handling - let xcursor = ffi::Xcursor::open().unwrap(); // FIXME: gracious handling - let xf86vmode = ffi::Xf86vmode::open().unwrap(); // FIXME: gracious handling + let xlib = try!(ffi::Xlib::open().map_err(|_| CreationError::NotSupported)); + let xcursor = try!(ffi::Xcursor::open().map_err(|_| CreationError::NotSupported)); + let xf86vmode = try!(ffi::Xf86vmode::open().map_err(|_| CreationError::NotSupported)); let glx = { let mut libglx = unsafe { dlopen::dlopen(b"libGL.so.1\0".as_ptr() as *const _, dlopen::RTLD_NOW) }; @@ -342,8 +344,8 @@ impl Window { }; let screen_id = match builder.monitor { - Some(MonitorID(monitor)) => monitor as i32, - None => unsafe { (xlib.XDefaultScreen)(display) }, + Some(PlatformMonitorID::X(MonitorID(monitor))) => monitor as i32, + _ => unsafe { (xlib.XDefaultScreen)(display) }, }; // getting the FBConfig -- cgit v1.2.3