diff options
| -rw-r--r-- | src/lib.rs | 3 | ||||
| -rw-r--r-- | src/x11/ffi.rs | 1 | ||||
| -rw-r--r-- | src/x11/mod.rs | 4 |
3 files changed, 3 insertions, 5 deletions
@@ -58,7 +58,6 @@ pub struct WindowBuilder { title: String, monitor: Option<winimpl::MonitorID>, gl_version: Option<(uint, uint)>, - is_fullscreen: bool, } impl WindowBuilder { @@ -69,7 +68,6 @@ impl WindowBuilder { title: "gl-init-rs window".to_string(), monitor: None, gl_version: None, - is_fullscreen: false, } } @@ -93,7 +91,6 @@ impl WindowBuilder { pub fn with_fullscreen(mut self, monitor: MonitorID) -> WindowBuilder { let MonitorID(monitor) = monitor; self.monitor = Some(monitor); - self.is_fullscreen = true; self } diff --git a/src/x11/ffi.rs b/src/x11/ffi.rs index 0bc52b5..f781b48 100644 --- a/src/x11/ffi.rs +++ b/src/x11/ffi.rs @@ -1426,6 +1426,7 @@ 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, diff --git a/src/x11/mod.rs b/src/x11/mod.rs index 21e46b7..7dd3fb0 100644 --- a/src/x11/mod.rs +++ b/src/x11/mod.rs @@ -148,7 +148,7 @@ impl Window { }; let mut window_attributes = ffi::CWBorderPixel | ffi::CWColormap | ffi:: CWEventMask; - if builder.is_fullscreen { + if builder.monitor.is_some() { window_attributes |= ffi::CWOverrideRedirect; unsafe { ffi::XF86VidModeSwitchToMode(display, screen_id, *modes.offset(best_mode as int)); @@ -270,7 +270,7 @@ impl Window { wm_delete_window: wm_delete_window, xf86_desk_mode: xf86_desk_mode, screen_id: screen_id, - is_fullscreen: builder.is_fullscreen, + is_fullscreen: builder.monitor.is_some(), }; // calling glViewport |