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

Implemented revamped RedrawRequested for linux wayland (#1237)

Browse source 
Signed-off-by: Heghedus Razvan <heghedus.razvan@gmail.com>
This commit is contained in:
Heghedus Razvan 2019-10-25 00:27:32 +03:00 • committed by Osspial
parent eb38ff453a
commit cdc32eb817
2 changed files with 60 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

62
src/platform_impl/linux/wayland/event_loop.rs
View file

@ -509,24 +509,34 @@ impl<T: 'static> EventLoop<T> {
);
}
}
// do a second run of post-dispatch-triggers, to handle user-generated "request-redraw"
// in response of resize & friends
self.post_dispatch_triggers();
// send Events cleared
{
let mut guard = sink.lock().unwrap();
guard.empty_with(|evt| {
sticky_exit_callback(
crate::event::Event::MainEventsCleared,
&self.window_target,
&mut control_flow,
&mut callback,
);
}
// handle request-redraw
{
self.redraw_triggers(|wid, window_target| {
sticky_exit_callback(
evt,
&self.window_target,
crate::event::Event::RedrawRequested(crate::window::WindowId(
crate::platform_impl::WindowId::Wayland(wid),
)),
window_target,
&mut control_flow,
&mut callback,
);
});
}
// send Events cleared
// send RedrawEventsCleared
{
sticky_exit_callback(
crate::event::Event::MainEventsCleared,
crate::event::Event::RedrawEventsCleared,
&self.window_target,
&mut control_flow,
&mut callback,
@ -652,6 +662,31 @@ impl<T> EventLoopWindowTarget<T> {
*/
impl<T> EventLoop<T> {
fn redraw_triggers<F>(&mut self, mut callback: F)
where
F: FnMut(WindowId, &RootELW<T>),
{
let window_target = match self.window_target.p {
crate::platform_impl::EventLoopWindowTarget::Wayland(ref wt) => wt,
_ => unreachable!(),
};
window_target.store.lock().unwrap().for_each_redraw_trigger(
|refresh, frame_refresh, wid, frame| {
if let Some(frame) = frame {
if frame_refresh {
frame.refresh();
if !refresh {
frame.surface().commit()
}
}
}
if refresh {
callback(wid, &self.window_target);
}
},
)
}
fn post_dispatch_triggers(&mut self) {
let mut sink = self.sink.lock().unwrap();
let window_target = match self.window_target.p {
@ -690,11 +725,6 @@ impl<T> EventLoop<T> {
*window.size = (w, h);
}
} else if window.frame_refresh {
frame.refresh();
if !window.refresh {
frame.surface().commit()
}
}
}
if let Some(dpi) = window.new_dpi {
@ -703,10 +733,6 @@ impl<T> EventLoop<T> {
window.wid,
);
}
if window.refresh {
unimplemented!()
//sink.send_window_event(crate::event::WindowEvent::RedrawRequested, window.wid);
}
if window.closed {
sink.send_window_event(crate::event::WindowEvent::CloseRequested, window.wid);
}