alex/baseview
1
0
Fork 0
Code Activity

api unification: add Linux support

Browse source
This commit is contained in:
Joakim Frostegård 2020-11-23 22:18:36 +01:00
parent 185bd62447
commit 6450bff368
1 changed files with 26 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/x11/window.rs
View file

@ -46,7 +46,7 @@ type WindowOpenResult = Result<(), ()>;
impl Window { impl Window {
pub fn open<H, B>(options: WindowOpenOptions, build: B) -> WindowHandle pub fn open<H, B>(options: WindowOpenOptions, build: B) -> WindowHandle
where H: WindowHandler, where H: WindowHandler,
B: FnOnce(&mut Window) -> H, B: FnOnce(&mut crate::Window) -> H,
B: Send + 'static B: Send + 'static
{ {
let (tx, rx) = mpsc::sync_channel::<WindowOpenResult>(1); let (tx, rx) = mpsc::sync_channel::<WindowOpenResult>(1);
@ -66,7 +66,7 @@ impl Window {
fn window_thread<H, B>(options: WindowOpenOptions, build: B, fn window_thread<H, B>(options: WindowOpenOptions, build: B,
tx: mpsc::SyncSender<WindowOpenResult>) -> WindowOpenResult tx: mpsc::SyncSender<WindowOpenResult>) -> WindowOpenResult
where H: WindowHandler, where H: WindowHandler,
B: FnOnce(&mut Window) -> H, B: FnOnce(&mut crate::Window) -> H,
B: Send + 'static B: Send + 'static
{ {
// Connect to the X server // Connect to the X server
@ -173,7 +173,7 @@ impl Window {
new_physical_size: None, new_physical_size: None,
}; };
let mut handler = build(&mut window); let mut handler = build(&mut crate::Window(&mut window));
let _ = tx.send(Ok(())); let _ = tx.send(Ok(()));
@ -222,9 +222,12 @@ impl Window {
self.window_info.scale() self.window_info.scale()
); );
handler.on_event(self, Event::Window( let window_info = self.window_info;
WindowEvent::Resized(self.window_info)
)) handler.on_event(
&mut crate::Window(self),
Event::Window(WindowEvent::Resized(window_info))
)
} }
} }
@ -313,7 +316,10 @@ impl Window {
.unwrap_or(xcb::NONE); .unwrap_or(xcb::NONE);
if wm_delete_window == data32[0] { if wm_delete_window == data32[0] {
handler.on_event(self, Event::Window(WindowEvent::WillClose)); handler.on_event(
&mut crate::Window(self),
Event::Window(WindowEvent::WillClose)
);
// FIXME: handler should decide whether window stays open or not // FIXME: handler should decide whether window stays open or not
self.event_loop_running = false; self.event_loop_running = false;
@ -342,7 +348,7 @@ impl Window {
let logical_pos = physical_pos.to_logical(&self.window_info); let logical_pos = physical_pos.to_logical(&self.window_info);
handler.on_event( handler.on_event(
self, &mut crate::Window(self),
Event::Mouse(MouseEvent::CursorMoved { Event::Mouse(MouseEvent::CursorMoved {
position: logical_pos, position: logical_pos,
}), }),
@ -357,7 +363,7 @@ impl Window {
match detail { match detail {
4 => { 4 => {
handler.on_event( handler.on_event(
self, &mut crate::Window(self),
Event::Mouse(MouseEvent::WheelScrolled(ScrollDelta::Lines { Event::Mouse(MouseEvent::WheelScrolled(ScrollDelta::Lines {
x: 0.0, x: 0.0,
y: 1.0, y: 1.0,
@ -366,7 +372,7 @@ impl Window {
} }
5 => { 5 => {
handler.on_event( handler.on_event(
self, &mut crate::Window(self),
Event::Mouse(MouseEvent::WheelScrolled(ScrollDelta::Lines { Event::Mouse(MouseEvent::WheelScrolled(ScrollDelta::Lines {
x: 0.0, x: 0.0,
y: -1.0, y: -1.0,
@ -375,7 +381,10 @@ impl Window {
} }
detail => { detail => {
let button_id = mouse_id(detail); let button_id = mouse_id(detail);
handler.on_event(self, Event::Mouse(MouseEvent::ButtonPressed(button_id))); handler.on_event(
&mut crate::Window(self),
Event::Mouse(MouseEvent::ButtonPressed(button_id))
);
} }
} }
} }
@ -386,7 +395,10 @@ impl Window {
if detail != 4 && detail != 5 { if detail != 4 && detail != 5 {
let button_id = mouse_id(detail); let button_id = mouse_id(detail);
handler.on_event(self, Event::Mouse(MouseEvent::ButtonReleased(button_id))); handler.on_event(
&mut crate::Window(self),
Event::Mouse(MouseEvent::ButtonReleased(button_id))
);
} }
} }
@ -397,7 +409,7 @@ impl Window {
let event = unsafe { xcb::cast_event::<xcb::KeyPressEvent>(&event) }; let event = unsafe { xcb::cast_event::<xcb::KeyPressEvent>(&event) };
handler.on_event( handler.on_event(
self, &mut crate::Window(self),
Event::Keyboard(convert_key_press_event(&event)) Event::Keyboard(convert_key_press_event(&event))
); );
} }
@ -406,7 +418,7 @@ impl Window {
let event = unsafe { xcb::cast_event::<xcb::KeyReleaseEvent>(&event) }; let event = unsafe { xcb::cast_event::<xcb::KeyReleaseEvent>(&event) };
handler.on_event( handler.on_event(
self, &mut crate::Window(self),
Event::Keyboard(convert_key_release_event(&event)) Event::Keyboard(convert_key_release_event(&event))
); );
} }