leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename internal structs for consistency (#2149)

Browse source 
Proxy -> EventLoopProxy
Id -> WindowId or DeviceId
WindowTarget -> EventLoopWindowTarget
Handle -> MonitorHandle
Mode -> VideoMode
PlatformSpecificBuilderAttributes -> PlatformSpecificWindowBuilderAttributes
SuperWindowId -> RootWindowId
This commit is contained in:
Mads Marquart 2022-03-18 14:09:39 +01:00 • committed by GitHub
parent 85baf79d17
commit a438091266
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 134 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

86
src/platform_impl/web/event_loop/window_target.rs
View file

@ -1,37 +1,41 @@
use super::{super::monitor, backend, device, proxy::Proxy, runner, window};
use super::{
super::monitor::MonitorHandle, backend, device::DeviceId, proxy::EventLoopProxy, runner,
window::WindowId,
};
use crate::dpi::{PhysicalSize, Size};
use crate::event::{
DeviceEvent, DeviceId, ElementState, Event, KeyboardInput, TouchPhase, WindowEvent,
DeviceEvent, DeviceId as RootDeviceId, ElementState, Event, KeyboardInput, TouchPhase,
WindowEvent,
};
use crate::event_loop::ControlFlow;
use crate::monitor::MonitorHandle as RootMH;
use crate::window::{Theme, WindowId};
use crate::window::{Theme, WindowId as RootWindowId};
use std::cell::RefCell;
use std::clone::Clone;
use std::collections::{vec_deque::IntoIter as VecDequeIter, VecDeque};
use std::rc::Rc;
pub struct WindowTarget<T: 'static> {
pub struct EventLoopWindowTarget<T: 'static> {
pub(crate) runner: runner::Shared<T>,
}
impl<T> Clone for WindowTarget<T> {
impl<T> Clone for EventLoopWindowTarget<T> {
fn clone(&self) -> Self {
WindowTarget {
Self {
runner: self.runner.clone(),
}
}
}
impl<T> WindowTarget<T> {
impl<T> EventLoopWindowTarget<T> {
pub fn new() -> Self {
WindowTarget {
Self {
runner: runner::Shared::new(),
}
}
pub fn proxy(&self) -> Proxy<T> {
Proxy::new(self.runner.clone())
pub fn proxy(&self) -> EventLoopProxy<T> {
EventLoopProxy::new(self.runner.clone())
}
pub fn run(&self, event_handler: Box<dyn FnMut(Event<'_, T>, &mut ControlFlow)>) {
@ -42,19 +46,19 @@ impl<T> WindowTarget<T> {
});
}
pub fn generate_id(&self) -> window::Id {
window::Id(self.runner.generate_id())
pub fn generate_id(&self) -> WindowId {
WindowId(self.runner.generate_id())
}
pub fn register(&self, canvas: &Rc<RefCell<backend::Canvas>>, id: window::Id) {
self.runner.add_canvas(WindowId(id), canvas);
pub fn register(&self, canvas: &Rc<RefCell<backend::Canvas>>, id: WindowId) {
self.runner.add_canvas(RootWindowId(id), canvas);
let mut canvas = canvas.borrow_mut();
canvas.set_attribute("data-raw-handle", &id.0.to_string());
let runner = self.runner.clone();
canvas.on_blur(move || {
runner.send_event(Event::WindowEvent {
window_id: WindowId(id),
window_id: RootWindowId(id),
event: WindowEvent::Focused(false),
});
});
@ -62,7 +66,7 @@ impl<T> WindowTarget<T> {
let runner = self.runner.clone();
canvas.on_focus(move || {
runner.send_event(Event::WindowEvent {
window_id: WindowId(id),
window_id: RootWindowId(id),
event: WindowEvent::Focused(true),
});
});
@ -71,9 +75,9 @@ impl<T> WindowTarget<T> {
canvas.on_keyboard_press(move |scancode, virtual_keycode, modifiers| {
#[allow(deprecated)]
runner.send_event(Event::WindowEvent {
window_id: WindowId(id),
window_id: RootWindowId(id),
event: WindowEvent::KeyboardInput {
device_id: DeviceId(unsafe { device::Id::dummy() }),
device_id: RootDeviceId(unsafe { DeviceId::dummy() }),
input: KeyboardInput {
scancode,
state: ElementState::Pressed,
@ -89,9 +93,9 @@ impl<T> WindowTarget<T> {
canvas.on_keyboard_release(move |scancode, virtual_keycode, modifiers| {
#[allow(deprecated)]
runner.send_event(Event::WindowEvent {
window_id: WindowId(id),
window_id: RootWindowId(id),
event: WindowEvent::KeyboardInput {
device_id: DeviceId(unsafe { device::Id::dummy() }),
device_id: RootDeviceId(unsafe { DeviceId::dummy() }),
input: KeyboardInput {
scancode,
state: ElementState::Released,
@ -106,7 +110,7 @@ impl<T> WindowTarget<T> {
let runner = self.runner.clone();
canvas.on_received_character(move |char_code| {
runner.send_event(Event::WindowEvent {
window_id: WindowId(id),
window_id: RootWindowId(id),
event: WindowEvent::ReceivedCharacter(char_code),
});
});
@ -114,9 +118,9 @@ impl<T> WindowTarget<T> {
let runner = self.runner.clone();
canvas.on_cursor_leave(move |pointer_id| {
runner.send_event(Event::WindowEvent {
window_id: WindowId(id),
window_id: RootWindowId(id),
event: WindowEvent::CursorLeft {
device_id: DeviceId(device::Id(pointer_id)),
device_id: RootDeviceId(DeviceId(pointer_id)),
},
});
});
@ -124,9 +128,9 @@ impl<T> WindowTarget<T> {
let runner = self.runner.clone();
canvas.on_cursor_enter(move |pointer_id| {
runner.send_event(Event::WindowEvent {
window_id: WindowId(id),
window_id: RootWindowId(id),
event: WindowEvent::CursorEntered {
device_id: DeviceId(device::Id(pointer_id)),
device_id: RootDeviceId(DeviceId(pointer_id)),
},
});
});
@ -134,15 +138,15 @@ impl<T> WindowTarget<T> {
let runner = self.runner.clone();
canvas.on_cursor_move(move |pointer_id, position, delta, modifiers| {
runner.send_event(Event::WindowEvent {
window_id: WindowId(id),
window_id: RootWindowId(id),
event: WindowEvent::CursorMoved {
device_id: DeviceId(device::Id(pointer_id)),
device_id: RootDeviceId(DeviceId(pointer_id)),
position,
modifiers,
},
});
runner.send_event(Event::DeviceEvent {
device_id: DeviceId(device::Id(pointer_id)),
device_id: RootDeviceId(DeviceId(pointer_id)),
event: DeviceEvent::MouseMotion {
delta: (delta.x, delta.y),
},
@ -156,17 +160,17 @@ impl<T> WindowTarget<T> {
// user code has the correct cursor position.
runner.send_events(
std::iter::once(Event::WindowEvent {
window_id: WindowId(id),
window_id: RootWindowId(id),
event: WindowEvent::CursorMoved {
device_id: DeviceId(device::Id(pointer_id)),
device_id: RootDeviceId(DeviceId(pointer_id)),
position,
modifiers,
},
})
.chain(std::iter::once(Event::WindowEvent {
window_id: WindowId(id),
window_id: RootWindowId(id),
event: WindowEvent::MouseInput {
device_id: DeviceId(device::Id(pointer_id)),
device_id: RootDeviceId(DeviceId(pointer_id)),
state: ElementState::Pressed,
button,
modifiers,
@ -178,9 +182,9 @@ impl<T> WindowTarget<T> {
let runner = self.runner.clone();
canvas.on_mouse_release(move |pointer_id, button, modifiers| {
runner.send_event(Event::WindowEvent {
window_id: WindowId(id),
window_id: RootWindowId(id),
event: WindowEvent::MouseInput {
device_id: DeviceId(device::Id(pointer_id)),
device_id: RootDeviceId(DeviceId(pointer_id)),
state: ElementState::Released,
button,
modifiers,
@ -191,9 +195,9 @@ impl<T> WindowTarget<T> {
let runner = self.runner.clone();
canvas.on_mouse_wheel(move |pointer_id, delta, modifiers| {
runner.send_event(Event::WindowEvent {
window_id: WindowId(id),
window_id: RootWindowId(id),
event: WindowEvent::MouseWheel {
device_id: DeviceId(device::Id(pointer_id)),
device_id: RootDeviceId(DeviceId(pointer_id)),
delta,
phase: TouchPhase::Moved,
modifiers,
@ -225,10 +229,10 @@ impl<T> WindowTarget<T> {
backend::set_canvas_size(&raw, Size::Physical(new_size));
runner.send_event(Event::WindowEvent {
window_id: WindowId(id),
window_id: RootWindowId(id),
event: WindowEvent::Resized(new_size),
});
runner.request_redraw(WindowId(id));
runner.request_redraw(RootWindowId(id));
});
let runner = self.runner.clone();
@ -239,19 +243,19 @@ impl<T> WindowTarget<T> {
Theme::Light
};
runner.send_event(Event::WindowEvent {
window_id: WindowId(id),
window_id: RootWindowId(id),
event: WindowEvent::ThemeChanged(theme),
});
});
}
pub fn available_monitors(&self) -> VecDequeIter<monitor::Handle> {
pub fn available_monitors(&self) -> VecDequeIter<MonitorHandle> {
VecDeque::new().into_iter()
}
pub fn primary_monitor(&self) -> Option<RootMH> {
Some(RootMH {
inner: monitor::Handle,
inner: MonitorHandle,
})
}
}