Wayland: Fix panic when calling set_cursor_grab from a different thread than evlp's one. #1206
Conversation
| @@ -441,6 +441,8 @@ impl WindowStore { | |||
| bool, | |||
| bool, | |||
| bool, | |||
| Option<bool>, | |||
| &wl_surface::WlSurface, | |||
There was a problem hiding this comment.
Is there any particular reason we don't just pass a reference to the entire internal window instead of many bit and pieces of it?
There was a problem hiding this comment.
They wont be the same and we can't really pass it, since we want to mutate existing one and send something different (replace, take). make_wid doesn't make sense in event loop proxy either. We can try to do it ofc, but I'd like to leave it as it is.
@vberger probably have some explanation on why things are written this way though.
There was a problem hiding this comment.
To be quite honest I don't remember exactly the reason I set it like that originally, most likely I didn't find a better way. And then things grew on top of it without changing the pattern.
There may certainly be a better way to structure this, but I agree this would be for an other PR. In general I suspect there is room for some refactoring / reorganization of winit's wayland backend, and I also suspect this would better be done in link with Smithay/client-toolkit#77.
kchibisov
force-pushed
the
wayland-cursor-fix
branch
from
a0ebf61 to
5bfe3f6
Compare
| self.current_cursor = cursor; | ||
|
|
||
| self.set_cursor_icon_impl(cursor); | ||
| if self.cursor_visible { |
There was a problem hiding this comment.
Follow X11 behavior on cursor icon updates when it's in invisible state.
kchibisov
force-pushed
the
wayland-cursor-fix
branch
from
5bfe3f6 to
ad601b1
Compare
…ad than evlp's one. This commit also start following X11 behavior on cursor icon update when cursor is invisible. Fixes regression introdced in 5ced36e
kchibisov
force-pushed
the
wayland-cursor-fix
branch
from
ad601b1 to
6ac885c
Compare
CursorManagers`
grab_pointercan only be called from a thread on whichpointer_constraints_proxyevent queue is located, so calling it directly from a Window doesn't work well, in case you've sent your window to another thread, so we need to pass cursor grab updates to the event loop and call this function from there.The code is basically a copy of @andersrein approach for handling a cursor grab thing.
Fixes regression introdced in 5ced36e
Some explanation why things were changed in #1204.
However @andersrein approach is not a good one for
set_cursor_iconandset_cursor_visible, since you can face cursor icon update delays when pressing and holding Shift for e.g., the cursor icon will be changed with a bit of a delay according to my testing. I didn't find it at the first place while testing alacritty, since this case was quite odd and I completely forgot about it. So cursor_grab was auto converted to follow set_cursor_icon.cargo fmthas been run on this branchCHANGELOG.mdif knowledge of this change could be valuable to users