wayland: ensure external loop is notified with pump_events #4185
Conversation
| if let Some(pump_event_notifier) = self.pump_event_notifier.as_ref() { | ||
| // Notify that we should start waiting, since we're in winit. | ||
| *pump_event_notifier.control.0.lock().unwrap() = true; | ||
| pump_event_notifier.control.1.notify_one(); | ||
| } |
There was a problem hiding this comment.
| if let Some(pump_event_notifier) = self.pump_event_notifier.as_ref() { | |
| // Notify that we should start waiting, since we're in winit. | |
| *pump_event_notifier.control.0.lock().unwrap() = true; | |
| pump_event_notifier.control.1.notify_one(); | |
| } |
There was a problem hiding this comment.
yeah, that is redundant, though, I left for consistency.
There was a problem hiding this comment.
You shouldn't wake up the thread before having dispatched all messages since it will just immediately trigger a notification again.
There was a problem hiding this comment.
it would have been blocked in read_events, otherwise we'd had events to read and thus wake-up would have been needed anyway. But yeah should be fine.
| let mut source = wayland_dispatcher.as_source_mut(); | ||
| let _ = winit_state.dispatch_pending(source.queue()); |
There was a problem hiding this comment.
it's necessary. The dispatch isn't done otherwise IIRC, but I can test one more time though.
There was a problem hiding this comment.
Doesn't pump_app_events always dispatch events?
There was a problem hiding this comment.
Yeah, it's required. I think it's a bug though, should be fixed on calloop end.
| } | ||
|
|
||
| if let Some(read_guard) = connection.prepare_read() { | ||
| let _ = connection.flush(); |
There was a problem hiding this comment.
This needs to be a loop with polling until flush returns Ok.
There was a problem hiding this comment.
Docs should likely mention that, but I've never seen a wayland loop that flush in a loop until it works. I'd also assume that it may fail in a non-recoverable way.
| _handle: JoinHandle<()>, | ||
| } | ||
|
|
||
| fn spawn_wakeup_thread( |
There was a problem hiding this comment.
The thread needs to be shut down at some point.
There was a problem hiding this comment.
yeah, I just put it as a draft for now due to that.
kchibisov
force-pushed
the
wayland-pump-event-thread
branch
2 times, most recently
from
69201e9 to
b8f2792
Compare
kchibisov
force-pushed
the
wayland-pump-event-thread
branch
from
b8f2792 to
20ef834
Compare
|
I think now it should work, though, I'll need a patch for |
kchibisov
force-pushed
the
wayland-pump-event-thread
branch
from
20ef834 to
6011e7b
Compare
kchibisov
force-pushed
the
wayland-pump-event-thread
branch
from
6011e7b to
a2629e8
Compare
Fixes #4183.