Skip to content

Commit 4377680

Browse files
OsspialOsspial
committed
Re-organize into module structure
1 parent f20fac9 commit 4377680

31 files changed

+731
-692
lines changed

‎examples/cursor.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
extern crate winit;
22

3-
use winit::{Event, EventLoop, ElementState, MouseCursor, WindowEvent, KeyboardInput, ControlFlow};
3+
use winit::window::{WindowBuilder, MouseCursor};
4+
use winit::event::{Event, WindowEvent, ElementState, KeyboardInput};
5+
use winit::event_loop::{EventLoop, ControlFlow};
46

57
fn main() {
68
let events_loop = EventLoop::new();
79

8-
let window = winit::WindowBuilder::new().build(&events_loop).unwrap();
10+
let window = WindowBuilder::new().build(&events_loop).unwrap();
911
window.set_title("A fantastic window!");
1012

1113
let mut cursor_idx = 0;

‎examples/cursor_grab.rs

+14-11
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,34 @@
11
extern crate winit;
22

3+
use winit::window::WindowBuilder;
4+
use winit::event::{Event, WindowEvent, ElementState, KeyboardInput};
5+
use winit::event_loop::{EventLoop, ControlFlow};
6+
37
fn main() {
4-
let events_loop = winit::EventLoop::new();
8+
let events_loop = EventLoop::new();
59

6-
let window = winit::WindowBuilder::new()
10+
let window = WindowBuilder::new()
711
.with_title("Super Cursor Grab'n'Hide Simulator 9000")
812
.build(&events_loop)
913
.unwrap();
1014

1115
events_loop.run(move |event, _, control_flow| {
12-
*control_flow = winit::ControlFlow::Wait;
13-
if let winit::Event::WindowEvent { event, .. } = event {
14-
use winit::WindowEvent::*;
16+
*control_flow = ControlFlow::Wait;
17+
if let Event::WindowEvent { event, .. } = event {
1518
match event {
16-
CloseRequested => *control_flow = winit::ControlFlow::Exit,
17-
KeyboardInput {
18-
input: winit::KeyboardInput {
19-
state: winit::ElementState::Released,
19+
WindowEvent::CloseRequested => *control_flow = ControlFlow::Exit,
20+
WindowEvent::KeyboardInput {
21+
input: KeyboardInput {
22+
state: ElementState::Released,
2023
virtual_keycode: Some(key),
2124
modifiers,
2225
..
2326
},
2427
..
2528
} => {
26-
use winit::VirtualKeyCode::*;
29+
use winit::event::VirtualKeyCode::*;
2730
match key {
28-
Escape => *control_flow = winit::ControlFlow::Exit,
31+
Escape => *control_flow = ControlFlow::Exit,
2932
G => window.grab_cursor(!modifiers.shift).unwrap(),
3033
H => window.hide_cursor(!modifiers.shift),
3134
_ => (),

‎examples/fullscreen.rs

+10-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
extern crate winit;
22

33
use std::io::{self, Write};
4-
use winit::{ControlFlow, Event, WindowEvent};
4+
use winit::window::WindowBuilder;
5+
use winit::event::{Event, WindowEvent, VirtualKeyCode, ElementState, KeyboardInput};
6+
use winit::event_loop::{EventLoop, ControlFlow};
57

68
fn main() {
7-
let events_loop = winit::EventLoop::new();
9+
let events_loop = EventLoop::new();
810

911
// enumerating monitors
1012
let monitor = {
@@ -25,7 +27,7 @@ fn main() {
2527
monitor
2628
};
2729

28-
let window = winit::WindowBuilder::new()
30+
let window = WindowBuilder::new()
2931
.with_title("Hello world!")
3032
.with_fullscreen(Some(monitor))
3133
.build(&events_loop)
@@ -44,27 +46,27 @@ fn main() {
4446
WindowEvent::CloseRequested => *control_flow = ControlFlow::Exit,
4547
WindowEvent::KeyboardInput {
4648
input:
47-
winit::KeyboardInput {
49+
KeyboardInput {
4850
virtual_keycode: Some(virtual_code),
4951
state,
5052
..
5153
},
5254
..
5355
} => match (virtual_code, state) {
54-
(winit::VirtualKeyCode::Escape, _) => *control_flow = ControlFlow::Exit,
55-
(winit::VirtualKeyCode::F, winit::ElementState::Pressed) => {
56+
(VirtualKeyCode::Escape, _) => *control_flow = ControlFlow::Exit,
57+
(VirtualKeyCode::F, ElementState::Pressed) => {
5658
is_fullscreen = !is_fullscreen;
5759
if !is_fullscreen {
5860
window.set_fullscreen(None);
5961
} else {
6062
window.set_fullscreen(Some(window.get_current_monitor()));
6163
}
6264
}
63-
(winit::VirtualKeyCode::M, winit::ElementState::Pressed) => {
65+
(VirtualKeyCode::M, ElementState::Pressed) => {
6466
is_maximized = !is_maximized;
6567
window.set_maximized(is_maximized);
6668
}
67-
(winit::VirtualKeyCode::D, winit::ElementState::Pressed) => {
69+
(VirtualKeyCode::D, ElementState::Pressed) => {
6870
decorations = !decorations;
6971
window.set_decorations(decorations);
7072
}

‎examples/handling_close.rs

+14-11
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
11
extern crate winit;
22

3+
use winit::window::WindowBuilder;
4+
use winit::event::{Event, WindowEvent, KeyboardInput};
5+
use winit::event_loop::{EventLoop, ControlFlow};
6+
37
fn main() {
4-
let events_loop = winit::EventLoop::new();
8+
let events_loop = EventLoop::new();
59

6-
let _window = winit::WindowBuilder::new()
10+
let _window = WindowBuilder::new()
711
.with_title("Your faithful window")
812
.build(&events_loop)
913
.unwrap();
1014

1115
let mut close_requested = false;
1216

1317
events_loop.run(move |event, _, control_flow| {
14-
use winit::WindowEvent::*;
15-
use winit::ElementState::Released;
16-
use winit::VirtualKeyCode::{N, Y};
18+
use winit::event::ElementState::Released;
19+
use winit::event::VirtualKeyCode::{N, Y};
1720

1821
match event {
19-
winit::Event::WindowEvent { event, .. } => match event {
20-
CloseRequested => {
22+
Event::WindowEvent { event, .. } => match event {
23+
WindowEvent::CloseRequested => {
2124
// `CloseRequested` is sent when the close button on the window is pressed (or
2225
// through whatever other mechanisms the window manager provides for closing a
2326
// window). If you don't handle this event, the close button won't actually do
@@ -34,9 +37,9 @@ fn main() {
3437
// closing the window. How to close the window is detailed in the handler for
3538
// the Y key.
3639
}
37-
KeyboardInput {
40+
WindowEvent::KeyboardInput {
3841
input:
39-
winit::KeyboardInput {
42+
KeyboardInput {
4043
virtual_keycode: Some(virtual_code),
4144
state: Released,
4245
..
@@ -53,7 +56,7 @@ fn main() {
5356
// event loop (i.e. if it's a multi-window application), you need to
5457
// drop the window. That closes it, and results in `Destroyed` being
5558
// sent.
56-
*control_flow = winit::ControlFlow::Exit;
59+
*control_flow = ControlFlow::Exit;
5760
}
5861
}
5962
N => {
@@ -69,6 +72,6 @@ fn main() {
6972
_ => (),
7073
}
7174

72-
*control_flow = winit::ControlFlow::Wait;
75+
*control_flow = ControlFlow::Wait;
7376
});
7477
}

‎examples/min_max_size.rs

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
extern crate winit;
22

33
use winit::dpi::LogicalSize;
4+
use winit::window::WindowBuilder;
5+
use winit::event::{Event, WindowEvent};
6+
use winit::event_loop::{EventLoop, ControlFlow};
47

58
fn main() {
6-
let events_loop = winit::EventLoop::new();
9+
let events_loop = EventLoop::new();
710

8-
let window = winit::WindowBuilder::new()
11+
let window = WindowBuilder::new()
912
.build(&events_loop)
1013
.unwrap();
1114

@@ -16,9 +19,9 @@ fn main() {
1619
println!("{:?}", event);
1720

1821
match event {
19-
winit::Event::WindowEvent { event: winit::WindowEvent::CloseRequested, .. } =>
20-
*control_flow = winit::ControlFlow::Exit,
21-
_ => *control_flow = winit::ControlFlow::Wait,
22+
Event::WindowEvent { event: WindowEvent::CloseRequested, .. } =>
23+
*control_flow = ControlFlow::Exit,
24+
_ => *control_flow = ControlFlow::Wait,
2225
}
2326
});
2427
}

‎examples/monitor_list.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
extern crate winit;
2+
use winit::event_loop::EventLoop;
3+
use winit::window::WindowBuilder;
24

35
fn main() {
4-
let event_loop = winit::EventLoop::new();
5-
let window = winit::WindowBuilder::new().build(&event_loop).unwrap();
6+
let event_loop = EventLoop::new();
7+
let window = WindowBuilder::new().build(&event_loop).unwrap();
68
println!("{:#?}\nPrimary: {:#?}", window.get_available_monitors(), window.get_primary_monitor());
79
}

‎examples/multiwindow.rs

+11-8
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,36 @@
11
extern crate winit;
22

33
use std::collections::HashMap;
4+
use winit::window::Window;
5+
use winit::event::{Event, WindowEvent, ElementState, KeyboardInput};
6+
use winit::event_loop::{EventLoop, ControlFlow};
47

58
fn main() {
6-
let events_loop = winit::EventLoop::new();
9+
let events_loop = EventLoop::new();
710

811
let mut windows = HashMap::new();
912
for _ in 0..3 {
10-
let window = winit::Window::new(&events_loop).unwrap();
13+
let window = Window::new(&events_loop).unwrap();
1114
windows.insert(window.id(), window);
1215
}
1316

1417
events_loop.run(move |event, events_loop, control_flow| {
15-
*control_flow = winit::ControlFlow::Wait;
18+
*control_flow = ControlFlow::Wait;
1619
match event {
17-
winit::Event::WindowEvent { event, window_id } => {
20+
Event::WindowEvent { event, window_id } => {
1821
match event {
19-
winit::WindowEvent::CloseRequested => {
22+
WindowEvent::CloseRequested => {
2023
println!("Window {:?} has received the signal to close", window_id);
2124

2225
// This drops the window, causing it to close.
2326
windows.remove(&window_id);
2427

2528
if windows.is_empty() {
26-
*control_flow = winit::ControlFlow::Exit;
29+
*control_flow = ControlFlow::Exit;
2730
}
2831
},
29-
winit::WindowEvent::KeyboardInput{..} => {
30-
let window = winit::Window::new(&events_loop).unwrap();
32+
WindowEvent::KeyboardInput { input: KeyboardInput { state: ElementState::Pressed, .. }, .. } => {
33+
let window = Window::new(&events_loop).unwrap();
3134
windows.insert(window.id(), window);
3235
},
3336
_ => ()

‎examples/proxy.rs

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
extern crate winit;
2-
use winit::{EventLoop, WindowBuilder};
2+
use winit::window::WindowBuilder;
3+
use winit::event::{Event, WindowEvent};
4+
use winit::event_loop::{EventLoop, ControlFlow};
35

46
fn main() {
57
let events_loop: EventLoop<i32> = EventLoop::new_user_event();
@@ -24,9 +26,9 @@ fn main() {
2426
events_loop.run(move |event, _, control_flow| {
2527
println!("{:?}", event);
2628
match event {
27-
winit::Event::WindowEvent { event: winit::WindowEvent::CloseRequested, .. } =>
28-
*control_flow = winit::ControlFlow::Exit,
29-
_ => *control_flow = winit::ControlFlow::Wait,
29+
Event::WindowEvent { event: WindowEvent::CloseRequested, .. } =>
30+
*control_flow = ControlFlow::Exit,
31+
_ => *control_flow = ControlFlow::Wait,
3032
}
3133
});
3234
}

‎examples/request_redraw.rs

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
extern crate winit;
2-
use winit::{Event, WindowEvent};
32
use std::time::{Instant, Duration};
43

4+
use winit::window::WindowBuilder;
5+
use winit::event::{Event, WindowEvent};
6+
use winit::event_loop::{EventLoop, ControlFlow};
7+
58
fn main() {
6-
let events_loop = winit::EventLoop::new();
9+
let events_loop = EventLoop::new();
710

8-
let window = winit::WindowBuilder::new()
11+
let window = WindowBuilder::new()
912
.with_title("A fantastic window!")
1013
.build(&events_loop)
1114
.unwrap();
@@ -17,10 +20,10 @@ fn main() {
1720
Event::WindowEvent {
1821
event: WindowEvent::CloseRequested,
1922
..
20-
} => *control_flow = winit::ControlFlow::Exit,
23+
} => *control_flow = ControlFlow::Exit,
2124
Event::EventsCleared => {
2225
window.request_redraw();
23-
*control_flow = winit::ControlFlow::WaitUntil(Instant::now() + Duration::new(1, 0))
26+
*control_flow = ControlFlow::WaitUntil(Instant::now() + Duration::new(1, 0))
2427
},
2528
_ => ()
2629
}

‎examples/resizable.rs

+12-9
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
11
extern crate winit;
2+
use winit::window::WindowBuilder;
3+
use winit::event::{Event, WindowEvent, VirtualKeyCode, ElementState, KeyboardInput};
4+
use winit::event_loop::{EventLoop, ControlFlow};
25

36
fn main() {
4-
let events_loop = winit::EventLoop::new();
7+
let events_loop = EventLoop::new();
58

69
let mut resizable = false;
710

8-
let window = winit::WindowBuilder::new()
11+
let window = WindowBuilder::new()
912
.with_title("Hit space to toggle resizability.")
1013
.with_dimensions((400, 200).into())
1114
.with_resizable(resizable)
1215
.build(&events_loop)
1316
.unwrap();
1417

1518
events_loop.run(move |event, _, control_flow| {
16-
*control_flow = winit::ControlFlow::Wait;
19+
*control_flow = ControlFlow::Wait;
1720
match event {
18-
winit::Event::WindowEvent { event, .. } => match event {
19-
winit::WindowEvent::CloseRequested => *control_flow = winit::ControlFlow::Exit,
20-
winit::WindowEvent::KeyboardInput {
21+
Event::WindowEvent { event, .. } => match event {
22+
WindowEvent::CloseRequested => *control_flow = ControlFlow::Exit,
23+
WindowEvent::KeyboardInput {
2124
input:
22-
winit::KeyboardInput {
23-
virtual_keycode: Some(winit::VirtualKeyCode::Space),
24-
state: winit::ElementState::Released,
25+
KeyboardInput {
26+
virtual_keycode: Some(VirtualKeyCode::Space),
27+
state: ElementState::Released,
2528
..
2629
},
2730
..

0 commit comments

Comments
 (0)