Merge SDL2 upstream #66
Merged
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
If the relative protocol is unsupported, this will always be null and the destroy function won't be called. (cherry picked from commit 0e87b71)
(cherry picked from commit 875e45e)
This reverts commit e5a15f9. It turns out removing this check allows mice like the ROG PUGIO II to show up as game controllers. We need to find a different way to differentiate between gaming mice and pedals. Since these mice show up as controllers, and potentially causing games to use them instead of real controllers, we'll go ahead revert this change for now. Reopens #8227 (cherry picked from commit ad0af48)
XINPUT_STATE_EX isn't actually a thing, we can just use the normal XINPUT_STATE Fixes #2797
(cherry picked from commit 1a83bf2)
This makes sure stuff that was still pending for conversion/resampling doesn't pop in later when the device is unpaused again. Fixes #8485.
(This fix was originally from @themightyoarfish on GitHub. Thanks!) Fixes #8428. Reference PR #8431. (cherry picked from commit c6d9fb1)
…sticks in Emscripten (thanks David!) Emscripten was using its own, private integer in order to allocate new SDL_JoystickIDs. SDL keeps a similar integer for allocating joystick-ids, one which is shared across multiple joystick backends. SDL 2.0.13 introduces a new joystick-backend, a Virtual joystick backend, which allows for software-driven joysticks, and which is designed to sit alongside joystick-backends that provide access to physical joysticks. The Emscripten and the Virtual backends were, at times, getting allocated the same SDL_JoystickIDs, if and when both backends were used simultaneously. This could happen if, for example, an application was using a virtual joystick in order to drive a touch-screen based joystick, while also supporting physical joysticks through the Emscripten backend. When two joysticks end up with the same SDL_JoystickID, conflicts can occur. For example, disconnecting a physical joystick with the same SDL_JoystickID as a virtual one, can lead to the virtual joystick being closed, inadvertently. This fix makes the Emscripten backend use SDL's cross-joystick-backend integer counter, which is shared among joystick backends, for allocating new SDL_JoystickIDs, rather than a private, Emscripten-specific counter. Fixes #3647 (cherry picked from commit 07cb7c1)
Existing code is erroneous, because it adds or removes dependency's ref count based on number of InitSubSystem/QuitSubSystem calls, while ref count diff should depend on number of inited or quit dependents. Recursive approach seems to be simplest solution that guarantees proper ref count.
… (thanks @WizzardSK!) Fixes #7116 (cherry picked from commit 28e623c)
(cherry picked from commit 04e98d2)
(cherry picked from commit 7cc3e94)
(cherry picked from commit d9e6dcc)
(cherry picked from commit a4c6b38)
(cherry picked from commit fbb6934)
(cherry picked from commit 2e6c48d)
(cherry picked from commit 87794d0)
`driverdata->width` and `driverdata->height` represent the width and height in logical pixels on scaled outputs with xdg_output. However, to correctly calculate the display's DPI value, we need to use its native resolution. For example, on a 27" 4K screen with 175% scaling, we have `width` == 2192 and `height` == 1233, resulting in a bogus value of 92dpi, whereas 162dpi are correct for 3840x2160 pixels at 27 inches. Tested on GNOME mutter 45.1.
Rework the code to clearly prefer 64-bit sysctls first, then legacy sysctls, and eliminate a second ifdef. Signed-off-by: Nia Alarie <nia@NetBSD.org> (cherry picked from commit 69cae07)
This mouse actually enumerates as a gamepad with 2 axes, 8 buttons and a hat. We'll ignore it like the other ROG mice, unless someone specifically wants to use it as a gamepad. (cherry picked from commit edd044e)
…d axes" This reverts commit ad0af48. It turns out the ROG PUGIO II actually enumerates as a gamepad, so this change didn't have any effect anyway. We're getting lots of reports of people's racing pedals and similar devices no longer showing up, so we'll revert this again. Fixes #8227 Fixes #8484 (cherry picked from commit 2c1fbe1)
(cherry picked from commit 15504da)
…ether the IOKit and GCController drivers should be used for joystick support. This can be used to work around issues where the Apple GCController driver doesn't work for some controllers but there's no way to know which GCController maps to which IOKit device. (cherry picked from commit 708f18d)
(cherry picked from commit 34392db)
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.
No description provided.