From e12f06ad485404a2b0d4ce4bb58ee174e9102b3a Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Fri, 24 Apr 2015 09:25:39 +0200 Subject: Fix and re-enable the fullscreen example --- examples-disabled/fullscreen.rs | 52 --------------------------------------- examples/fullscreen.rs | 54 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 52 deletions(-) delete mode 100644 examples-disabled/fullscreen.rs create mode 100644 examples/fullscreen.rs diff --git a/examples-disabled/fullscreen.rs b/examples-disabled/fullscreen.rs deleted file mode 100644 index 3b9e2c1..0000000 --- a/examples-disabled/fullscreen.rs +++ /dev/null @@ -1,52 +0,0 @@ -#[cfg(target_os = "android")] -#[macro_use] -extern crate android_glue; - -extern crate glutin; - -use std::old_io::stdio::stdin; - -mod support; - -#[cfg(target_os = "android")] -android_start!(main); - -#[cfg(not(feature = "window"))] -fn main() { println!("This example requires glutin to be compiled with the `window` feature"); } - -#[cfg(feature = "window")] -fn main() { - // enumerating monitors - let monitor = { - for (num, monitor) in glutin::get_available_monitors().enumerate() { - println!("Monitor #{}: {:?}", num, monitor.get_name()); - } - - print!("Please write the number of the monitor to use: "); - let num = stdin().read_line().unwrap().as_slice().trim().parse() - .ok().expect("Please enter a number"); - let monitor = glutin::get_available_monitors().nth(num).expect("Please enter a valid ID"); - - println!("Using {:?}", monitor.get_name()); - - monitor - }; - - let window = glutin::WindowBuilder::new() - .with_title("Hello world!".to_string()) - .with_fullscreen(monitor) - .build() - .unwrap(); - - unsafe { window.make_current() }; - - - let context = support::load(&window); - - while !window.is_closed() { - context.draw_frame((0.0, 1.0, 0.0, 1.0)); - window.swap_buffers(); - - println!("{:?}", window.wait_events().next()); - } -} diff --git a/examples/fullscreen.rs b/examples/fullscreen.rs new file mode 100644 index 0000000..d64224b --- /dev/null +++ b/examples/fullscreen.rs @@ -0,0 +1,54 @@ +#[cfg(target_os = "android")] +#[macro_use] +extern crate android_glue; + +extern crate glutin; + +use std::io; + +mod support; + +#[cfg(target_os = "android")] +android_start!(main); + +#[cfg(not(feature = "window"))] +fn main() { println!("This example requires glutin to be compiled with the `window` feature"); } + +#[cfg(feature = "window")] +fn main() { + // enumerating monitors + let monitor = { + for (num, monitor) in glutin::get_available_monitors().enumerate() { + println!("Monitor #{}: {:?}", num, monitor.get_name()); + } + + print!("Please write the number of the monitor to use: "); + + let mut num = String::new(); + io::stdin().read_line(&mut num).unwrap(); + let num = num.trim().parse().ok().expect("Please enter a number"); + let monitor = glutin::get_available_monitors().nth(num).expect("Please enter a valid ID"); + + println!("Using {:?}", monitor.get_name()); + + monitor + }; + + let window = glutin::WindowBuilder::new() + .with_title("Hello world!".to_string()) + .with_fullscreen(monitor) + .build() + .unwrap(); + + unsafe { window.make_current() }; + + + let context = support::load(&window); + + while !window.is_closed() { + context.draw_frame((0.0, 1.0, 0.0, 1.0)); + window.swap_buffers(); + + println!("{:?}", window.wait_events().next()); + } +} -- cgit v1.2.3