From 5182023fd6f14469290b80f0f5e9b0dead73048e Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Mon, 21 Sep 2015 11:52:21 +0200 Subject: Switch X11 and wayland to the new design --- src/platform/linux/api_dispatch.rs | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) (limited to 'src/platform') diff --git a/src/platform/linux/api_dispatch.rs b/src/platform/linux/api_dispatch.rs index f25bda9..0fae6a0 100644 --- a/src/platform/linux/api_dispatch.rs +++ b/src/platform/linux/api_dispatch.rs @@ -162,9 +162,29 @@ impl<'a> Iterator for WaitEventsIterator<'a> { impl Window { pub fn new(builder: BuilderAttribs) -> Result { + let window = builder.window; + let pf_reqs = builder.pf_reqs; + let opengl = builder.opengl; + 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.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.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()))) } } -- cgit v1.2.3