alex/baseview
1
0
Fork 0
Code Activity

store WindowHandler as trait object to reduce generics in winapi backend

Browse source
This commit is contained in:
Micah Johnston 2020-12-08 19:20:42 -06:00 committed by glowcoil
parent 8402310c88
commit 4e70af1162
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/win/window.rs
View file

@ -53,7 +53,7 @@ unsafe fn generate_guid() -> String {
const WIN_FRAME_TIMER: usize = 4242; const WIN_FRAME_TIMER: usize = 4242;
unsafe extern "system" fn wnd_proc<H: WindowHandler>( unsafe extern "system" fn wnd_proc(
hwnd: HWND, msg: UINT, wparam: WPARAM, lparam: LPARAM, hwnd: HWND, msg: UINT, wparam: WPARAM, lparam: LPARAM,
) -> LRESULT { ) -> LRESULT {
if msg == WM_CREATE { if msg == WM_CREATE {
@ -63,7 +63,7 @@ unsafe extern "system" fn wnd_proc<H: WindowHandler>(
let win_ptr = GetWindowLongPtrA(hwnd, GWLP_USERDATA) as *const c_void; let win_ptr = GetWindowLongPtrA(hwnd, GWLP_USERDATA) as *const c_void;
if !win_ptr.is_null() { if !win_ptr.is_null() {
let window_state = &*(win_ptr as *const RefCell<WindowState<H>>); let window_state = &*(win_ptr as *const RefCell<WindowState>);
let mut window = Window { hwnd }; let mut window = Window { hwnd };
let mut window = crate::Window(&mut window); let mut window = crate::Window(&mut window);
@ -160,13 +160,13 @@ unsafe extern "system" fn wnd_proc<H: WindowHandler>(
return DefWindowProcA(hwnd, msg, wparam, lparam); return DefWindowProcA(hwnd, msg, wparam, lparam);
} }
unsafe fn register_wnd_class<H: WindowHandler>() -> ATOM { unsafe fn register_wnd_class() -> ATOM {
// We generate a unique name for the new window class to prevent name collisions // We generate a unique name for the new window class to prevent name collisions
let class_name = format!("Baseview-{}", generate_guid()).as_ptr() as *const i8; let class_name = format!("Baseview-{}", generate_guid()).as_ptr() as *const i8;
let wnd_class = WNDCLASSA { let wnd_class = WNDCLASSA {
style: CS_OWNDC, style: CS_OWNDC,
lpfnWndProc: Some(wnd_proc::<H>), lpfnWndProc: Some(wnd_proc),
hInstance: null_mut(), hInstance: null_mut(),
lpszClassName: class_name, lpszClassName: class_name,
cbClsExtra: 0, cbClsExtra: 0,
@ -184,11 +184,11 @@ unsafe fn unregister_wnd_class(wnd_class: ATOM) {
UnregisterClassA(wnd_class as _, null_mut()); UnregisterClassA(wnd_class as _, null_mut());
} }
struct WindowState<H> { struct WindowState {
window_class: ATOM, window_class: ATOM,
window_info: WindowInfo, window_info: WindowInfo,
keyboard_state: KeyboardState, keyboard_state: KeyboardState,
handler: H, handler: Box<dyn WindowHandler>,
} }
pub struct Window { pub struct Window {
@ -225,14 +225,14 @@ impl Window {
options: WindowOpenOptions, options: WindowOpenOptions,
build: B build: B
) -> (crate::WindowHandle, Option<crate::AppRunner>) ) -> (crate::WindowHandle, Option<crate::AppRunner>)
where H: WindowHandler, where H: WindowHandler + 'static,
B: FnOnce(&mut crate::Window) -> H, B: FnOnce(&mut crate::Window) -> H,
B: Send + 'static B: Send + 'static
{ {
unsafe { unsafe {
let mut title = CString::new(&options.title[..]).unwrap(); let mut title = CString::new(&options.title[..]).unwrap();
let window_class = register_wnd_class::<H>(); let window_class = register_wnd_class();
// todo: manage error ^ // todo: manage error ^
let mut flags = WS_POPUPWINDOW let mut flags = WS_POPUPWINDOW
@ -289,7 +289,7 @@ impl Window {
); );
// todo: manage error ^ // todo: manage error ^
let handler = build(&mut crate::Window(&mut Window { hwnd })); let handler = Box::new(build(&mut crate::Window(&mut Window { hwnd })));
let window_state = Box::new(RefCell::new(WindowState { let window_state = Box::new(RefCell::new(WindowState {
window_class, window_class,

2
src/window.rs
View file

@ -27,7 +27,7 @@ impl<'a> Window<'a> {
options: WindowOpenOptions, options: WindowOpenOptions,
build: B build: B
) -> (WindowHandle, Option<AppRunner>) ) -> (WindowHandle, Option<AppRunner>)
where H: WindowHandler, where H: WindowHandler + 'static,
B: FnOnce(&mut Window) -> H, B: FnOnce(&mut Window) -> H,
B: Send + 'static B: Send + 'static
{ {