From b9a4f5fbe90a94fbca2e6816b92a129dabfe81fd Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Sun, 20 Sep 2015 08:42:32 +0200
Subject: Err when a X connection cannot be created instead of panicking

---
 src/api/x11/mod.rs      |  2 +-
 src/api/x11/xdisplay.rs | 22 ++++++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

(limited to 'src/api/x11')

diff --git a/src/api/x11/mod.rs b/src/api/x11/mod.rs
index 39b99f3..a7c997b 100644
--- a/src/api/x11/mod.rs
+++ b/src/api/x11/mod.rs
@@ -2,7 +2,7 @@
 
 pub use self::monitor::{MonitorID, get_available_monitors, get_primary_monitor};
 pub use self::window::{Window, XWindow, PollEventsIterator, WaitEventsIterator, Context, WindowProxy};
-pub use self::xdisplay::XConnection;
+pub use self::xdisplay::{XConnection, XNotSupported};
 
 pub mod ffi;
 
diff --git a/src/api/x11/xdisplay.rs b/src/api/x11/xdisplay.rs
index c960c00..d48d947 100644
--- a/src/api/x11/xdisplay.rs
+++ b/src/api/x11/xdisplay.rs
@@ -1,4 +1,6 @@
 use std::ptr;
+use std::fmt;
+use std::error::Error;
 use std::ffi::CString;
 
 use libc;
@@ -21,10 +23,6 @@ pub struct XConnection {
 unsafe impl Send for XConnection {}
 unsafe impl Sync for XConnection {}
 
-/// Error returned if this system doesn't have XLib or can't create an X connection.
-#[derive(Copy, Clone, Debug)]
-pub struct XNotSupported;
-
 impl XConnection {
     pub fn new() -> Result<XConnection, XNotSupported> {
         // opening the libraries
@@ -104,3 +102,19 @@ impl Drop for XConnection {
         unsafe { (self.xlib.XCloseDisplay)(self.display) };
     }
 }
+
+/// Error returned if this system doesn't have XLib or can't create an X connection.
+#[derive(Copy, Clone, Debug)]
+pub struct XNotSupported;
+
+impl Error for XNotSupported {
+    fn description(&self) -> &str {
+        "The X windowing system could not be initialized"
+    }
+}
+
+impl fmt::Display for XNotSupported {
+    fn fmt(&self, formatter: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+        formatter.write_str(self.description())
+    }
+}
-- 
cgit v1.2.3


From 82bb047fda3912489d024dbf40613168ded50527 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Sun, 20 Sep 2015 08:48:53 +0200
Subject: Report the error from x11-rs when failing to open shared libraries

---
 src/api/x11/ffi.rs      |  2 ++
 src/api/x11/xdisplay.rs | 37 +++++++++++++++++++++++++++++--------
 2 files changed, 31 insertions(+), 8 deletions(-)

(limited to 'src/api/x11')

diff --git a/src/api/x11/ffi.rs b/src/api/x11/ffi.rs
index 3d4f0ed..465aa95 100644
--- a/src/api/x11/ffi.rs
+++ b/src/api/x11/ffi.rs
@@ -5,6 +5,8 @@ pub use x11_dl::xlib::*;
 pub use x11_dl::xinput::*;
 pub use x11_dl::xinput2::*;
 
+pub use x11_dl::error::OpenError;
+
 pub use self::glx::types::GLXContext;
 
 /// GLX bindings
diff --git a/src/api/x11/xdisplay.rs b/src/api/x11/xdisplay.rs
index d48d947..2aa5d95 100644
--- a/src/api/x11/xdisplay.rs
+++ b/src/api/x11/xdisplay.rs
@@ -26,10 +26,10 @@ unsafe impl Sync for XConnection {}
 impl XConnection {
     pub fn new() -> Result<XConnection, XNotSupported> {
         // opening the libraries
-        let xlib = try!(ffi::Xlib::open().map_err(|_| XNotSupported));
-        let xcursor = try!(ffi::Xcursor::open().map_err(|_| XNotSupported));
-        let xf86vmode = try!(ffi::Xf86vmode::open().map_err(|_| XNotSupported));
-        let xinput2 = try!(ffi::XInput2::open().map_err(|_| XNotSupported));
+        let xlib = try!(ffi::Xlib::open());
+        let xcursor = try!(ffi::Xcursor::open());
+        let xf86vmode = try!(ffi::Xf86vmode::open());
+        let xinput2 = try!(ffi::XInput2::open());
 
         unsafe extern "C" fn x_error_callback(_: *mut ffi::Display, event: *mut ffi::XErrorEvent)
                                               -> libc::c_int
@@ -80,7 +80,7 @@ impl XConnection {
         let display = unsafe {
             let display = (xlib.XOpenDisplay)(ptr::null());
             if display.is_null() {
-                return Err(XNotSupported);
+                return Err(XNotSupported::XOpenDisplayFailed);
             }
             display
         };
@@ -104,12 +104,33 @@ impl Drop for XConnection {
 }
 
 /// Error returned if this system doesn't have XLib or can't create an X connection.
-#[derive(Copy, Clone, Debug)]
-pub struct XNotSupported;
+#[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 {
+    fn from(err: ffi::OpenError) -> XNotSupported {
+        XNotSupported::LibraryOpenError(err)
+    }
+}
 
 impl Error for XNotSupported {
     fn description(&self) -> &str {
-        "The X windowing system could not be initialized"
+        match *self {
+            XNotSupported::LibraryOpenError(_) => "Failed to load one of xlib's shared libraries",
+            XNotSupported::XOpenDisplayFailed => "Failed to open connection to X server",
+        }
+    }
+
+    fn cause(&self) -> Option<&Error> {
+        match *self {
+            XNotSupported::LibraryOpenError(ref err) => Some(err),
+            _ => None
+        }
     }
 }
 
-- 
cgit v1.2.3