alex/baseview
1
0
Fork 0
Code Activity

Merge pull request #151 from Fredemus/feature/x11-cursor-enter-leave

Browse source 
Add logic for CursorEntered/CursorLeft on x11
This commit is contained in:
Robbert van der Helm 2023-10-08 14:02:37 +02:00 committed by GitHub
parent 54af726498 486bb1f069
commit f0639b787b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/x11/window.rs
View file

@ -281,10 +281,12 @@ impl Window {
| xcb::EVENT_MASK_BUTTON_RELEASE | xcb::EVENT_MASK_BUTTON_RELEASE
| xcb::EVENT_MASK_KEY_PRESS | xcb::EVENT_MASK_KEY_PRESS
| xcb::EVENT_MASK_KEY_RELEASE | xcb::EVENT_MASK_KEY_RELEASE
| xcb::EVENT_MASK_STRUCTURE_NOTIFY, | xcb::EVENT_MASK_STRUCTURE_NOTIFY
| xcb::EVENT_MASK_ENTER_WINDOW
| xcb::EVENT_MASK_LEAVE_WINDOW,
), ),
// As mentioend above, these two values are needed to be able to create a window // As mentioned above, these two values are needed to be able to create a window
// with a dpeth of 32-bits when the parent window has a different depth // with a depth of 32-bits when the parent window has a different depth
(xcb::CW_COLORMAP, colormap), (xcb::CW_COLORMAP, colormap),
(xcb::CW_BORDER_PIXEL, 0), (xcb::CW_BORDER_PIXEL, 0),
], ],
@ -609,6 +611,30 @@ impl Window {
} }
} }
xcb::ENTER_NOTIFY => {
handler.on_event(
&mut crate::Window::new(self),
Event::Mouse(MouseEvent::CursorEntered),
);
// since no `MOTION_NOTIFY` event is generated when `ENTER_NOTIFY` is generated,
// we generate a CursorMoved as well, so the mouse position from here isn't lost
let event = unsafe { xcb::cast_event::<xcb::EnterNotifyEvent>(&event) };
let physical_pos = PhyPoint::new(event.event_x() as i32, event.event_y() as i32);
let logical_pos = physical_pos.to_logical(&self.window_info);
handler.on_event(
&mut crate::Window::new(self),
Event::Mouse(MouseEvent::CursorMoved {
position: logical_pos,
modifiers: key_mods(event.state()),
}),
);
}
xcb::LEAVE_NOTIFY => {
handler
.on_event(&mut crate::Window::new(self), Event::Mouse(MouseEvent::CursorLeft));
}
xcb::BUTTON_PRESS => { xcb::BUTTON_PRESS => {
let event = unsafe { xcb::cast_event::<xcb::ButtonPressEvent>(&event) }; let event = unsafe { xcb::cast_event::<xcb::ButtonPressEvent>(&event) };
let detail = event.detail(); let detail = event.detail();