alex/baseview
1
0
Fork 0
Code Activity

Rename Application tratit to AppWindow

Browse source
This commit is contained in:
Billy Messenger 2020-09-05 11:19:09 -05:00
parent 29917b87cd
commit 6cf5966afa
5 changed files with 30 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
examples/open_window.rs
View file

@ -20,7 +20,7 @@ fn main() {
} }
struct MyProgram {} struct MyProgram {}
impl baseview::Application for MyProgram { impl baseview::AppWindow for MyProgram {
type AppMessage = (); type AppMessage = ();
fn create_context( fn create_context(

2
src/lib.rs
View file

@ -33,7 +33,7 @@ pub struct WindowOpenOptions<'a> {
pub parent: Parent, pub parent: Parent,
} }
pub trait Application { pub trait AppWindow {
type AppMessage; type AppMessage;
fn create_context( fn create_context(

10
src/macos/window.rs
View file

@ -6,17 +6,17 @@ use cocoa::appkit::{
use cocoa::base::{nil, NO}; use cocoa::base::{nil, NO};
use cocoa::foundation::{NSAutoreleasePool, NSPoint, NSRect, NSSize, NSString}; use cocoa::foundation::{NSAutoreleasePool, NSPoint, NSRect, NSSize, NSString};
use crate::{Application, Event, MouseButtonID, MouseScroll, WindowOpenOptions}; use crate::{AppWindow, Event, MouseButtonID, MouseScroll, WindowOpenOptions};
pub struct Window<A: Application> { pub struct Window<A: AppWindow> {
application: A, app_window: A,
app_message_rx: mpsc::Receiver<A::AppMessage>, app_message_rx: mpsc::Receiver<A::AppMessage>,
} }
impl<A: Application> Window<A> { impl<A: Application> Window<A> {
pub fn open( pub fn open(
options: WindowOpenOptions, options: WindowOpenOptions,
application: A, app_window: A,
app_message_rx: mpsc::Receiver<A::AppMessage>, app_message_rx: mpsc::Receiver<A::AppMessage>,
) -> Self { ) -> Self {
unsafe { unsafe {
@ -50,7 +50,7 @@ impl<A: Application> Window<A> {
app.run(); app.run();
Window { Window {
application, app_window,
app_message_rx, app_message_rx,
} }
} }

16
src/win/window.rs
View file

@ -26,7 +26,7 @@ use self::winapi::um::winuser::{
use self::winapi::ctypes::c_void; use self::winapi::ctypes::c_void;
use crate::Parent::WithParent; use crate::Parent::WithParent;
use crate::{handle_message, WindowOpenOptions}; use crate::{handle_message, WindowOpenOptions};
use crate::{Application, Event, MouseButtonID, MouseScroll}; use crate::{AppWindow, Event, MouseButtonID, MouseScroll};
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
unsafe fn message_box(title: &str, msg: &str) { unsafe fn message_box(title: &str, msg: &str) {
@ -113,12 +113,12 @@ unsafe fn unregister_wnd_class(wnd_class: ATOM) {
unsafe fn init_gl_context() {} unsafe fn init_gl_context() {}
pub struct Window<A: Application> { pub struct Window<A: AppWindow> {
pub(crate) hwnd: HWND, pub(crate) hwnd: HWND,
hdc: HDC, hdc: HDC,
gl_context: HGLRC, gl_context: HGLRC,
window_class: ATOM, window_class: ATOM,
application: A, app_window: A,
app_message_rx: mpsc::Receiver<A::AppMessage>, app_message_rx: mpsc::Receiver<A::AppMessage>,
scaling: Option<f64>, // DPI scale, 96.0 is "default". scaling: Option<f64>, // DPI scale, 96.0 is "default".
r: f32, r: f32,
@ -126,10 +126,10 @@ pub struct Window<A: Application> {
b: f32, b: f32,
} }
impl<A: Application> Window<A> { impl<A: AppWindow> Window<A> {
pub fn open( pub fn open(
options: WindowOpenOptions, options: WindowOpenOptions,
application: A, app_window: A,
app_message_rx: mpsc::Receiver<A::AppMessage>, app_message_rx: mpsc::Receiver<A::AppMessage>,
) { ) {
unsafe { unsafe {
@ -138,7 +138,7 @@ impl<A: Application> Window<A> {
hdc: null_mut(), hdc: null_mut(),
gl_context: null_mut(), gl_context: null_mut(),
window_class: 0, window_class: 0,
application, app_window,
app_message_rx, app_message_rx,
scaling: None, scaling: None,
r: 0.3, r: 0.3,
@ -264,7 +264,7 @@ impl<A: Application> Window<A> {
} }
pub fn close(&self) { pub fn close(&self) {
self.application.on_event(Event::WillClose); self.app_window.on_event(Event::WillClose);
// todo: see https://github.com/wrl/rutabaga/blob/f30ff67e157375cafdbafe5fb549f1790443a3a8/src/platform/win/window.c#L402 // todo: see https://github.com/wrl/rutabaga/blob/f30ff67e157375cafdbafe5fb549f1790443a3a8/src/platform/win/window.c#L402
unsafe { unsafe {
@ -289,6 +289,6 @@ impl<A: Application> Window<A> {
self.r = r; self.r = r;
self.g = g; self.g = g;
self.application.on_message(Event::CursorMotion(x, y)); self.app_window.on_message(Event::CursorMotion(x, y));
} }
} }

32
src/x11/window.rs
View file

@ -6,23 +6,21 @@ use ::x11::xlib;
// use xcb::dri2; // needed later // use xcb::dri2; // needed later
use super::XcbConnection; use super::XcbConnection;
use crate::{ use crate::{AppWindow, Event, MouseButtonID, MouseScroll, Parent, WindowInfo, WindowOpenOptions};
Application, Event, MouseButtonID, MouseScroll, Parent, WindowInfo, WindowOpenOptions,
};
use raw_window_handle::RawWindowHandle; use raw_window_handle::RawWindowHandle;
pub struct Window<A: Application> { pub struct Window<A: AppWindow> {
scaling: Option<f64>, // DPI scale, 96.0 is "default". scaling: Option<f64>, // DPI scale, 96.0 is "default".
xcb_connection: XcbConnection, xcb_connection: XcbConnection,
application: A, app_window: A,
app_message_rx: mpsc::Receiver<A::AppMessage>, app_message_rx: mpsc::Receiver<A::AppMessage>,
} }
impl<A: Application> Window<A> { impl<A: AppWindow> Window<A> {
pub fn open( pub fn open(
options: WindowOpenOptions, options: WindowOpenOptions,
application: A, app_window: A,
app_message_rx: mpsc::Receiver<A::AppMessage>, app_message_rx: mpsc::Receiver<A::AppMessage>,
) -> Self { ) -> Self {
// Convert the parent to a X11 window ID if we're given one // Convert the parent to a X11 window ID if we're given one
@ -136,7 +134,7 @@ impl<A: Application> Window<A> {
let mut x11_window = Self { let mut x11_window = Self {
scaling: None, scaling: None,
xcb_connection, xcb_connection,
application, app_window,
app_message_rx, app_message_rx,
}; };
@ -151,7 +149,7 @@ impl<A: Application> Window<A> {
}; };
x11_window x11_window
.application .app_window
.create_context(raw_handle, &window_info); .create_context(raw_handle, &window_info);
x11_window.run_event_loop(); x11_window.run_event_loop();
@ -191,14 +189,14 @@ impl<A: Application> Window<A> {
match event_type { match event_type {
xcb::EXPOSE => { xcb::EXPOSE => {
self.application.on_event(Event::RenderExpose); self.app_window.on_event(Event::RenderExpose);
} }
xcb::MOTION_NOTIFY => { xcb::MOTION_NOTIFY => {
let event = unsafe { xcb::cast_event::<xcb::MotionNotifyEvent>(&event) }; let event = unsafe { xcb::cast_event::<xcb::MotionNotifyEvent>(&event) };
let detail = event.detail(); let detail = event.detail();
if detail != 4 && detail != 5 { if detail != 4 && detail != 5 {
self.application.on_event(Event::CursorMotion( self.app_window.on_event(Event::CursorMotion(
event.event_x() as i32, event.event_x() as i32,
event.event_y() as i32, event.event_y() as i32,
)); ));
@ -210,20 +208,20 @@ impl<A: Application> Window<A> {
match detail { match detail {
4 => { 4 => {
self.application.on_event(Event::MouseScroll(MouseScroll { self.app_window.on_event(Event::MouseScroll(MouseScroll {
x_delta: 0.0, x_delta: 0.0,
y_delta: 1.0, y_delta: 1.0,
})); }));
} }
5 => { 5 => {
self.application.on_event(Event::MouseScroll(MouseScroll { self.app_window.on_event(Event::MouseScroll(MouseScroll {
x_delta: 0.0, x_delta: 0.0,
y_delta: -1.0, y_delta: -1.0,
})); }));
} }
detail => { detail => {
let button_id = mouse_id(detail); let button_id = mouse_id(detail);
self.application.on_event(Event::MouseDown(button_id)); self.app_window.on_event(Event::MouseDown(button_id));
} }
} }
} }
@ -233,20 +231,20 @@ impl<A: Application> Window<A> {
if detail != 4 && detail != 5 { if detail != 4 && detail != 5 {
let button_id = mouse_id(detail); let button_id = mouse_id(detail);
self.application.on_event(Event::MouseUp(button_id)); self.app_window.on_event(Event::MouseUp(button_id));
} }
} }
xcb::KEY_PRESS => { xcb::KEY_PRESS => {
let event = unsafe { xcb::cast_event::<xcb::KeyPressEvent>(&event) }; let event = unsafe { xcb::cast_event::<xcb::KeyPressEvent>(&event) };
let detail = event.detail(); let detail = event.detail();
self.application.on_event(Event::KeyDown(detail)); self.app_window.on_event(Event::KeyDown(detail));
} }
xcb::KEY_RELEASE => { xcb::KEY_RELEASE => {
let event = unsafe { xcb::cast_event::<xcb::KeyReleaseEvent>(&event) }; let event = unsafe { xcb::cast_event::<xcb::KeyReleaseEvent>(&event) };
let detail = event.detail(); let detail = event.detail();
self.application.on_event(Event::KeyUp(detail)); self.app_window.on_event(Event::KeyUp(detail));
} }
_ => { _ => {
println!("Unhandled event type: {:?}", event_type); println!("Unhandled event type: {:?}", event_type);