2 files changed, 51 insertions, 13 deletions

diff --git a/src/platform/linux/api_dispatch.rs b/src/platform/linux/api_dispatch.rs
index e580ab1..46c58bb 100644
--- a/src/platform/linux/api_dispatch.rs
+++ b/src/platform/linux/api_dispatch.rs
@@ -6,23 +6,27 @@ pub use api::x11::{WaitEventsIterator, PollEventsIterator};*/
 use std::collections::VecDeque;
 use std::sync::Arc;
 
-use BuilderAttribs;
 use ContextError;
 use CreationError;
 use CursorState;
 use Event;
+use GlAttributes;
 use GlContext;
 use MouseCursor;
 use PixelFormat;
+use PixelFormatRequirements;
+use WindowAttributes;
 use libc;
 
 use api::wayland;
 use api::x11;
 use api::x11::XConnection;
+use api::x11::XNotSupported;
 
 enum Backend {
     X(Arc<XConnection>),
-    Wayland
+    Wayland,
+    Error(XNotSupported),
 }
 
 lazy_static!(
@@ -31,7 +35,10 @@ lazy_static!(
         if false && wayland::is_available() {
             Backend::Wayland
         } else {
-            Backend::X(Arc::new(XConnection::new().unwrap()))
+            match XConnection::new() {
+                Ok(x) => Backend::X(Arc::new(x)),
+                Err(e) => Backend::Error(e),
+            }
         }
     };
 );
@@ -65,7 +72,9 @@ pub enum MonitorID {
     #[doc(hidden)]
     X(x11::MonitorID),
     #[doc(hidden)]
-    Wayland(wayland::MonitorID)
+    Wayland(wayland::MonitorID),
+    #[doc(hidden)]
+    None,
 }
 
 pub fn get_available_monitors() -> VecDeque<MonitorID> {
@@ -78,6 +87,7 @@ pub fn get_available_monitors() -> VecDeque<MonitorID> {
                                     .into_iter()
                                     .map(MonitorID::X)
                                     .collect(),
+        Backend::Error(_) => { let mut d = VecDeque::new(); d.push_back(MonitorID::None); d},
     }
 }
 
@@ -85,6 +95,7 @@ pub fn get_primary_monitor() -> MonitorID {
     match *BACKEND {
         Backend::Wayland => MonitorID::Wayland(wayland::get_primary_monitor()),
         Backend::X(ref connec) => MonitorID::X(x11::get_primary_monitor(connec)),
+        Backend::Error(_) => MonitorID::None,
     }
 }
 
@@ -92,21 +103,24 @@ impl MonitorID {
     pub fn get_name(&self) -> Option<String> {
         match self {
             &MonitorID::X(ref m) => m.get_name(),
-            &MonitorID::Wayland(ref m) => m.get_name()
+            &MonitorID::Wayland(ref m) => m.get_name(),
+            &MonitorID::None => None,
         }
     }
 
     pub fn get_native_identifier(&self) -> ::native_monitor::NativeMonitorId {
         match self {
             &MonitorID::X(ref m) => m.get_native_identifier(),
-            &MonitorID::Wayland(ref m) => m.get_native_identifier()
+            &MonitorID::Wayland(ref m) => m.get_native_identifier(),
+            &MonitorID::None => unimplemented!()        // FIXME: 
         }
     }
 
     pub fn get_dimensions(&self) -> (u32, u32) {
         match self {
             &MonitorID::X(ref m) => m.get_dimensions(),
-            &MonitorID::Wayland(ref m) => m.get_dimensions()
+            &MonitorID::Wayland(ref m) => m.get_dimensions(),
+            &MonitorID::None => (800, 600),     // FIXME: 
         }
     }
 }
@@ -149,10 +163,29 @@ impl<'a> Iterator for WaitEventsIterator<'a> {
 }
 
 impl Window {
-    pub fn new(builder: BuilderAttribs) -> Result<Window, CreationError> {
+    pub fn new(window: &WindowAttributes, pf_reqs: &PixelFormatRequirements,
+               opengl: &GlAttributes<&Window>) -> Result<Window, CreationError>
+    {
         match *BACKEND {
-            Backend::Wayland => wayland::Window::new(builder).map(Window::Wayland),
-            Backend::X(ref connec) => x11::Window::new(connec, builder).map(Window::X),
+            Backend::Wayland => {
+                let opengl = opengl.clone().map_sharing(|w| match w {
+                    &Window::Wayland(ref w) => w,
+                    _ => panic!()       // TODO: return an error
+                });
+
+                wayland::Window::new(window, pf_reqs, &opengl).map(Window::Wayland)
+            },
+
+            Backend::X(ref connec) => {
+                let opengl = opengl.clone().map_sharing(|w| match w {
+                    &Window::X(ref w) => w,
+                    _ => panic!()       // TODO: return an error
+                });
+
+                x11::Window::new(connec, window, pf_reqs, &opengl).map(Window::X)
+            },
+
+            Backend::Error(ref error) => Err(CreationError::NoBackendAvailable(Box::new(error.clone())))
         }
     }
 
diff --git a/src/platform/linux/mod.rs b/src/platform/linux/mod.rs
index 3525ce5..f5d663b 100644
--- a/src/platform/linux/mod.rs
+++ b/src/platform/linux/mod.rs
@@ -1,11 +1,12 @@
 #![cfg(any(target_os = "linux", target_os = "dragonfly", target_os = "freebsd"))]
 
 use Api;
-use BuilderAttribs;
 use ContextError;
 use CreationError;
+use GlAttributes;
 use GlContext;
 use PixelFormat;
+use PixelFormatRequirements;
 use libc;
 
 use api::osmesa::{self, OsMesaContext};
@@ -25,8 +26,12 @@ pub type MonitorID = ();       // TODO: hack to make things work
 pub struct HeadlessContext(OsMesaContext);
 
 impl HeadlessContext {
-    pub fn new(builder: BuilderAttribs) -> Result<HeadlessContext, CreationError> {
-        match OsMesaContext::new(builder) {
+    pub fn new(dimensions: (u32, u32), pf_reqs: &PixelFormatRequirements,
+               opengl: &GlAttributes<&HeadlessContext>) -> Result<HeadlessContext, CreationError>
+    {
+        let opengl = opengl.clone().map_sharing(|c| &c.0);
+
+        match OsMesaContext::new(dimensions, pf_reqs, &opengl) {
             Ok(c) => return Ok(HeadlessContext(c)),
             Err(osmesa::OsMesaCreationError::NotSupported) => (),
             Err(osmesa::OsMesaCreationError::CreationError(e)) => return Err(e),