Merge pull request #404 from tomaka/headless-win32

Extract headless context from api/win32 to platform/windows
This commit is contained in:
tomaka 2015-04-29 11:05:09 +02:00
commit c752142e04
3 changed files with 30 additions and 42 deletions

View file

@ -1,40 +0,0 @@
use super::Window;
use super::init;
use Api;
use BuilderAttribs;
use CreationError;
///
pub struct HeadlessContext(Window);
impl HeadlessContext {
/// See the docs in the crate root file.
pub fn new(builder: BuilderAttribs) -> Result<HeadlessContext, CreationError> {
let (builder, _) = builder.extract_non_static();
init::new_window(builder, None).map(|w| HeadlessContext(w))
}
/// See the docs in the crate root file.
pub unsafe fn make_current(&self) {
self.0.make_current()
}
/// See the docs in the crate root file.
pub fn is_current(&self) -> bool {
self.0.is_current()
}
/// See the docs in the crate root file.
pub fn get_proc_address(&self, addr: &str) -> *const () {
self.0.get_proc_address(addr)
}
/// See the docs in the crate root file.
pub fn get_api(&self) -> Api {
Api::OpenGl
}
pub fn set_window_resize_callback(&mut self, _: Option<fn(u32, u32)>) {
}
}

View file

@ -18,7 +18,6 @@ use CursorState;
use PixelFormat;
use BuilderAttribs;
pub use self::headless::HeadlessContext;
pub use self::monitor::{MonitorID, get_available_monitors, get_primary_monitor};
use winapi;
@ -29,7 +28,6 @@ use gdi32;
mod callback;
mod event;
mod gl;
mod headless;
mod init;
mod make_current_guard;
mod monitor;

View file

@ -1,3 +1,33 @@
#![cfg(target_os = "windows")]
pub use api::win32::*;
use Api;
use BuilderAttribs;
use CreationError;
///
pub struct HeadlessContext(Window);
impl HeadlessContext {
pub fn new(mut builder: BuilderAttribs) -> Result<HeadlessContext, CreationError> {
builder.visible = false;
Window::new(builder).map(|w| HeadlessContext(w))
}
pub unsafe fn make_current(&self) {
self.0.make_current()
}
pub fn is_current(&self) -> bool {
self.0.is_current()
}
pub fn get_proc_address(&self, addr: &str) -> *const () {
self.0.get_proc_address(addr)
}
pub fn get_api(&self) -> Api {
self.0.get_api()
}
}