Add Wayland support for Window.GetHandle #2561
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
unawarez
commented
Jun 13, 2024
unawarez
commented
Jun 14, 2024
This comment was marked as outdated.
This comment was marked as outdated.
This adds support for getting a Wayland `wl_surface` from `Window.GetHandle`. The behavior of the function is now to return either an X11 window ID or Wayland `wl_surface` if running a GTK build on those backends, return 0 on any other GTK backend, or else return the C++ `GetHandle` result unmodified. This is the simplest fix for the Wayland issue without worrying about breaking existing user code, as this function already failed for any non-X11 GTK build. Returning 0 on non-X11/Wayland GTK platforms sidesteps the issue of making sure e.g. GTK Mac GetHandle returns the same type as native Cocoa Mac GetHandle.
unawarez
changed the title
|
Radically simplified & should be ready to go. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #1217
This PR adds support for getting a
wl_surfacefrom Window.GetHandle when running on GTK+Wayland. This patch was originally more complicated by trying to support all the GTK windowing backends. Now, any GTK backend besides X11 or Wayland will return 0. This is less confusing than trying to figure out and match the return type of C++ GetHandle on Windows/Mac/etc in the unlikely case someone uses the GTK port on those platforms. This maintains backwards compatibility because up to now, GetHandle failed and returned 0 on any non-X11 GTK backend.I tested on Wayland and X11 on current Arch with Python 3.12. Both work (at least, return a nonzero number) as long as you call
frame.Show()before callingframe.GetHandle(). Also confirmed ARM Mac without GTK hasn't broken. I was not able to test Windows.Suggestions welcome!