SysWW/X11: Return the X11 window as wmwindow and x11window #292
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
Steel Storm (and presumably other darkplaces, SDL 1.2-based games) expect x11.wmwindow to be valid if they've created a window and are running under X11. Just pass the same game window like we do for x11.window. See the old darkplaces code here: https://github.com/xonotic/darkplaces/blob/a0465ad2ee16719587b0b7a80d4c1c2f7df1ac0e/vid_sdl.c#L2334 This should fix the BadWindow errors on Steel Storm Burning Retribution (issue libsdl-org#290)
slouken
reviewed
May 19, 2023
icculus
added a commit
that referenced
this pull request
May 19, 2023
|
@icculus, was 4c22ab5 intended to be a functional change? If I suspect you might have meant this? - info12->info.x11.fswindow = info20.info.x11.window;
- info12->info.x11.wmwindow = info20.info.x11.window;
+ info12->info.x11.fswindow = info12->info.x11.window;
+ info12->info.x11.wmwindow = info12->info.x11.window;(Sorry, I'm not able to re-test #290 with this change at the moment.) |
|
Shoot, good catch, I pasted the wrong thing. 😬 |
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.
Steel Storm (and presumably other darkplaces, SDL 1.2-based games) expect x11.wmwindow to be valid if they've created a window and are running under X11. Just pass the same game window like we do for x11.window.
See the old darkplaces code here:
https://github.com/xonotic/darkplaces/blob/a0465ad2ee16719587b0b7a80d4c1c2f7df1ac0e/vid_sdl.c#L2334
This should fix the BadWindow errors on Steel Storm Burning Retribution (issue #290)