leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rework the X implementation to use only one X connection

Browse source
This commit is contained in:
Pierre Krieger 2015-05-17 11:19:06 +02:00
parent 7fe85cbc49
commit 3376332a85
6 changed files with 938 additions and 915 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/platform/linux/api_dispatch.rs
View file

@ -4,6 +4,7 @@ pub use api::x11::{Window, WindowProxy, MonitorID, get_available_monitors, get_p
pub use api::x11::{WaitEventsIterator, PollEventsIterator};*/
use std::collections::VecDeque;
use std::sync::Arc;
use BuilderAttribs;
use CreationError;
@ -16,9 +17,10 @@ use libc;
use api::wayland;
use api::x11;
use api::x11::XConnection;
enum Backend {
X,
X(Arc<XConnection>),
Wayland
}
@ -28,7 +30,7 @@ lazy_static!(
if false && wayland::is_available() {
Backend::Wayland
} else {
Backend::X
Backend::X(Arc::new(XConnection::new().unwrap()))
}
};
);
@ -70,16 +72,17 @@ pub fn get_available_monitors() -> VecDeque<MonitorID> {
.into_iter()
.map(MonitorID::Wayland)
.collect(),
Backend::X => x11::get_available_monitors()
.into_iter()
.map(MonitorID::X)
.collect(),
Backend::X(ref connec) => x11::get_available_monitors(connec)
.into_iter()
.map(MonitorID::X)
.collect(),
}
}
pub fn get_primary_monitor() -> MonitorID {
match *BACKEND {
Backend::Wayland => MonitorID::Wayland(wayland::get_primary_monitor()),
Backend::X => MonitorID::X(x11::get_primary_monitor()),
Backend::X(ref connec) => MonitorID::X(x11::get_primary_monitor(connec)),
}
}
@ -147,7 +150,7 @@ impl Window {
pub fn new(builder: BuilderAttribs) -> Result<Window, CreationError> {
match *BACKEND {
Backend::Wayland => wayland::Window::new(builder).map(Window::Wayland),
Backend::X => x11::Window::new(builder).map(Window::X),
Backend::X(ref connec) => x11::Window::new(connec, builder).map(Window::X),
}
}
@ -286,7 +289,6 @@ impl Window {
}
impl GlContext for Window {
unsafe fn make_current(&self) {
match self {
&Window::X(ref w) => w.make_current(),
@ -328,4 +330,4 @@ impl GlContext for Window {
&Window::Wayland(ref w) => w.get_pixel_format()
}
}
}
}