aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Partouche <contact@manateedev.com>2014-09-04 11:38:33 +0200
committerTomaka17 <pierre.krieger1708@gmail.com>2014-09-19 20:26:41 +0200
commitb149fca83d390c9c04277501811a617832edc682 (patch)
treee0129e85b1a59864fecb8a0522fffa650e61a73f
parentd8171a0c73921a28b2005030df741ef11a262900 (diff)
downloadglutin-b149fca83d390c9c04277501811a617832edc682.tar.gz
glutin-b149fca83d390c9c04277501811a617832edc682.zip
Added fullscreen support for X11
-rw-r--r--src/lib.rs21
-rw-r--r--src/x11/ffi.rs24
-rw-r--r--src/x11/mod.rs85
3 files changed, 104 insertions, 26 deletions
diff --git a/src/lib.rs b/src/lib.rs
index 8db5f40..12bf209 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -7,9 +7,9 @@
//! platforms as possible.
//!
//! # Building a window
-//!
+//!
//! There are two ways to create a window:
-//!
+//!
//! - Calling `Window::new()`.
//! - Calling `let builder = WindowBuilder::new()` then `builder.build()`.
//!
@@ -58,6 +58,7 @@ pub struct WindowBuilder {
title: String,
monitor: Option<winimpl::MonitorID>,
gl_version: Option<(uint, uint)>,
+ is_fullscreen: bool,
}
impl WindowBuilder {
@@ -68,6 +69,7 @@ impl WindowBuilder {
title: "gl-init-rs window".to_string(),
monitor: None,
gl_version: None,
+ is_fullscreen: false,
}
}
@@ -91,6 +93,7 @@ impl WindowBuilder {
pub fn with_fullscreen(mut self, monitor: MonitorID) -> WindowBuilder {
let MonitorID(monitor) = monitor;
self.monitor = Some(monitor);
+ self.is_fullscreen = true;
self
}
@@ -104,7 +107,7 @@ impl WindowBuilder {
}
/// Builds the window.
- ///
+ ///
/// Error should be very rare and only occur in case of permission denied, incompatible system,
/// out of memory, etc.
pub fn build(mut self) -> Result<Window, String> {
@@ -129,16 +132,16 @@ impl WindowBuilder {
///
/// ```ignore
/// let window = Window::new().unwrap();
-///
+///
/// unsafe { window.make_current() };
-///
+///
/// loop {
/// for event in window.poll_events() {
/// // process events here
/// _ => ()
/// }
/// }
-///
+///
/// // draw everything here
///
/// window.swap_buffers();
@@ -159,7 +162,7 @@ impl Window {
/// Creates a new OpenGL context, and a Window for platforms where this is appropriate.
///
/// This function is equivalent to `WindowBuilder::new().build()`.
- ///
+ ///
/// Error should be very rare and only occur in case of permission denied, incompatible system,
/// out of memory, etc.
#[inline]
@@ -249,7 +252,7 @@ impl Window {
}
/// Returns an iterator to all the events that are currently in the window's events queue.
- ///
+ ///
/// Contrary to `wait_events`, this function never blocks.
#[inline]
pub fn poll_events(&self) -> PollEventsIterator {
@@ -258,7 +261,7 @@ impl Window {
/// Waits for an event, then returns an iterator to all the events that are currently
/// in the window's events queue.
- ///
+ ///
/// If there are no events in queue when you call the function,
/// this function will block until there is one.
#[inline]
diff --git a/src/x11/ffi.rs b/src/x11/ffi.rs
index 2bd2075..0bc52b5 100644
--- a/src/x11/ffi.rs
+++ b/src/x11/ffi.rs
@@ -1337,8 +1337,26 @@ pub struct XButtonEvent {
pub same_screen: Bool,
}
+#[repr(C)]
+pub struct XF86VidModeModeInfo {
+ pub dotclock: libc::c_uint,
+ pub hdisplay: libc::c_ushort,
+ pub hsyncstart: libc::c_ushort,
+ pub hsyncend: libc::c_ushort,
+ pub htotal: libc::c_ushort,
+ pub hskew: libc::c_ushort,
+ pub vdisplay: libc::c_ushort,
+ pub vsyncstart: libc::c_ushort,
+ pub vsyncend: libc::c_ushort,
+ pub vtotal: libc::c_ushort,
+ pub flags: libc::c_uint,
+ privsize: libc::c_int,
+ private: libc::c_long,
+}
+
#[link(name = "GL")]
#[link(name = "X11")]
+#[link(name = "Xxf86vm")]
extern "C" {
pub fn XCloseDisplay(display: *mut Display);
pub fn XCheckMaskEvent(display: *mut Display, event_mask: libc::c_long,
@@ -1408,6 +1426,12 @@ extern "C" {
pub fn glXSwapBuffers(dpy: *mut Display, drawable: GLXDrawable);
pub fn XkbSetDetectableAutoRepeat(dpy: *mut Display, detectable: bool, supported_rtm: *mut bool) -> bool;
+ pub fn XF86VidModeSwitchToMode(dpy: *mut Display, screen: libc::c_int,
+ modeline: *mut XF86VidModeModeInfo) -> Bool;
+ pub fn XF86VidModeSetViewPort(dpy: *mut Display, screen: libc::c_int,
+ x: libc::c_int, y: libc::c_int) -> Bool;
+ pub fn XF86VidModeGetAllModeLines(dpy: *mut Display, screen: libc::c_int,
+ modecount_return: *mut libc::c_int, modesinfo: *mut *mut *mut XF86VidModeModeInfo) -> Bool;
}
/*
diff --git a/src/x11/mod.rs b/src/x11/mod.rs
index 1b1e116..21e46b7 100644
--- a/src/x11/mod.rs
+++ b/src/x11/mod.rs
@@ -14,16 +14,19 @@ pub struct Window {
context: ffi::GLXContext,
is_closed: AtomicBool,
wm_delete_window: ffi::Atom,
+ xf86_desk_mode: *mut ffi::XF86VidModeModeInfo,
+ screen_id: libc::c_int,
+ is_fullscreen: bool,
}
pub struct MonitorID(uint);
pub fn get_available_monitors() -> Vec<MonitorID> {
- unimplemented!()
+ vec![get_primary_monitor()]
}
pub fn get_primary_monitor() -> MonitorID {
- unimplemented!()
+ MonitorID(0u)
}
impl MonitorID {
@@ -32,14 +35,15 @@ impl MonitorID {
}
pub fn get_dimensions(&self) -> (uint, uint) {
- unimplemented!()
+ //unimplemented!()
+ // TODO: Get the real dimensions from the monitor
+ (1024, 768)
}
}
impl Window {
pub fn new(builder: WindowBuilder) -> Result<Window, String> {
- // TODO: temporary
- let dimensions = builder.dimensions;
+ let dimensions = builder.dimensions.unwrap_or((800, 600));
// calling XOpenDisplay
let display = unsafe {
@@ -50,7 +54,9 @@ impl Window {
display
};
- // TODO: set error handler?
+ let screen_id = unsafe {
+ ffi::XDefaultScreen(display)
+ };
// getting the FBConfig
let fb_config = unsafe {
@@ -81,6 +87,31 @@ impl Window {
preferred_fb
};
+ let mut best_mode = -1;
+ let modes = unsafe {
+ let mut mode_num: libc::c_int = mem::uninitialized();
+ let mut modes: *mut *mut ffi::XF86VidModeModeInfo = mem::uninitialized();
+ if ffi::XF86VidModeGetAllModeLines(display, screen_id, &mut mode_num, &mut modes) == 0 {
+ return Err(format!("Could not query the video modes"));
+ }
+
+ for i in range(0, mode_num) {
+ let mode: ffi::XF86VidModeModeInfo = **modes.offset(i as int);
+ if mode.hdisplay == dimensions.val0() as u16 && mode.vdisplay == dimensions.val1() as u16 {
+ best_mode = i;
+ }
+ };
+ if best_mode == -1 {
+ return Err(format!("Could not find a suitable graphics mode"));
+ }
+
+ modes
+ };
+
+ let xf86_desk_mode = unsafe {
+ *modes.offset(0)
+ };
+
// getting the visual infos
let visual_infos = unsafe {
let vi = ffi::glXGetVisualFromFBConfig(display, fb_config);
@@ -109,18 +140,28 @@ impl Window {
swa.colormap = cmap;
swa.event_mask = ffi::ExposureMask | ffi::ResizeRedirectMask |
ffi::VisibilityChangeMask | ffi::KeyPressMask | ffi::PointerMotionMask |
- ffi::KeyPressMask | ffi::KeyReleaseMask | ffi::ButtonPressMask |
+ ffi::KeyReleaseMask | ffi::ButtonPressMask |
ffi::ButtonReleaseMask | ffi::KeymapStateMask;
+ swa.border_pixel = 0;
+ swa.override_redirect = 0;
swa
};
+ let mut window_attributes = ffi::CWBorderPixel | ffi::CWColormap | ffi:: CWEventMask;
+ if builder.is_fullscreen {
+ window_attributes |= ffi::CWOverrideRedirect;
+ unsafe {
+ ffi::XF86VidModeSwitchToMode(display, screen_id, *modes.offset(best_mode as int));
+ ffi::XF86VidModeSetViewPort(display, screen_id, 0, 0);
+ set_win_attr.override_redirect = 1;
+ }
+ }
+
// finally creating the window
let window = unsafe {
- let dimensions = dimensions.unwrap_or((800, 600));
-
let win = ffi::XCreateWindow(display, root, 50, 50, dimensions.val0() as libc::c_uint,
dimensions.val1() as libc::c_uint, 0, visual_infos.depth, ffi::InputOutput,
- visual_infos.visual, ffi::CWColormap | ffi::CWEventMask,
+ visual_infos.visual, window_attributes,
&mut set_win_attr);
win
};
@@ -148,7 +189,7 @@ impl Window {
addr = ffi::glXGetProcAddress(b"glXCreateContextAttribsARB".as_ptr()
as *const u8) as *const ();
}
-
+
addr.to_option().map(|addr| {
let addr: extern "system" fn(*mut ffi::Display, ffi::GLXFBConfig, ffi::GLXContext,
ffi::Bool, *const libc::c_int) -> ffi::GLXContext = mem::transmute(addr);
@@ -202,13 +243,13 @@ impl Window {
}
attributes.push(0);
-
+
let context = if create_context_attribs.is_some() {
let create_context_attribs = create_context_attribs.unwrap();
create_context_attribs(display, fb_config, ptr::null(), 1,
attributes.as_ptr())
} else {
- ffi::glXCreateNewContext(display, fb_config, ffi::GLX_RGBA_TYPE, ptr::null(), 1)
+ ffi::glXCreateContext(display, &visual_infos, ptr::null(), 1)
};
if context.is_null() {
@@ -227,6 +268,9 @@ impl Window {
context: context,
is_closed: AtomicBool::new(false),
wm_delete_window: wm_delete_window,
+ xf86_desk_mode: xf86_desk_mode,
+ screen_id: screen_id,
+ is_fullscreen: builder.is_fullscreen,
};
// calling glViewport
@@ -300,9 +344,9 @@ impl Window {
pub fn poll_events(&self) -> Vec<Event> {
use std::mem;
-
+
let mut events = Vec::new();
-
+
loop {
use std::num::Bounded;
@@ -362,7 +406,7 @@ impl Window {
let mut buffer: [u8, ..16] = [mem::uninitialized(), ..16];
let raw_ev: *mut ffi::XKeyEvent = event;
- let count = ffi::Xutf8LookupString(self.ic, mem::transmute(raw_ev),
+ let count = ffi::Xutf8LookupString(self.ic, mem::transmute(raw_ev),
mem::transmute(buffer.as_mut_ptr()),
buffer.len() as libc::c_int, ptr::mut_null(), ptr::mut_null());
@@ -402,7 +446,7 @@ impl Window {
};
match button {
- Some(button) =>
+ Some(button) =>
events.push(MouseInput(state, button)),
None => ()
};
@@ -457,7 +501,14 @@ impl Window {
impl Drop for Window {
fn drop(&mut self) {
+ unsafe { ffi::glXMakeCurrent(self.display, 0, ptr::null()); }
unsafe { ffi::glXDestroyContext(self.display, self.context); }
+
+ if self.is_fullscreen {
+ unsafe { ffi::XF86VidModeSwitchToMode(self.display, self.screen_id, self.xf86_desk_mode); }
+ unsafe { ffi::XF86VidModeSetViewPort(self.display, self.screen_id, 0, 0); }
+ }
+
unsafe { ffi::XDestroyIC(self.ic); }
unsafe { ffi::XCloseIM(self.im); }
unsafe { ffi::XDestroyWindow(self.display, self.window); }