This repository was archived by the owner on Feb 10, 2024. It is now read-only.
Merge 1.2 upstream #187
Merged
Merge 1.2 upstream #187
Conversation
This file contains hidden or 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
--HG-- branch : SDL-1.2
--HG-- branch : SDL-1.2
Detect gamepads that use a D-pad instead of an analog stick. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- src/joystick/linux/SDL_sysjoystick.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --HG-- branch : SDL-1.2
When not using the old Linux input event interface, SDL parses the name of a device to know what it's capable of. It expects the name to match the following string: "Analog %d-axis %d-button %d-hat". This patch allows to use devices with a custom name. For instance: "My Joystick Device (Analog 2-axis 6-button 2-hat)" Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- src/joystick/linux/SDL_sysjoystick.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) --HG-- branch : SDL-1.2
resolution If an exact resolution match is not found, SDL will accept a higher resolution and add black bars around it. For example, when 320x200 is requested by only 320x240 is available, it will add 20 black lines on the top and the bottom of the screen. The surface that SDL returns to the application will look like it actually got 320x200. When double buffering, the actual video mode's height should be used instead of the height before adding the black borders. For the pixel pointer this was done correctly, but for the vertical panning offset the wrong height was used. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- src/video/fbcon/SDL_fbvideo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --HG-- branch : SDL-1.2
When the video subsystem is initialized, the framebuffer might not be in the video mode that the application targets. In that case, if we don't clear the framebuffer, for a short moment the display will show the previous image distorded by the mode change. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- src/video/fbcon/SDL_fbvideo.c | 3 +++ 1 file changed, 3 insertions(+) --HG-- branch : SDL-1.2
framebuffer By setting the environment variable SDL_FBCON_DONT_CLEAR, the application won't clear the framebuffer when exiting. We use it inside an app launcher, which will set this variable before exiting, in order for the loading screen to stay visible until the launched application takes hand. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- src/video/fbcon/SDL_fbvideo.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) --HG-- branch : SDL-1.2
shell When not started from a shell, SDL was segfaulting while trying to detach the process from the controlling terminal. However, it doesn't make any sense for an SDL app to detach from its controlling terminal, unless the app is a daemon. Since we have never seen a SDL app detach from its controlling terminal, even when starting it from a shell, the feature was probably broken. Thus, the code has been dropped. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- src/video/fbcon/SDL_fbevents.c | 11 ----------- 1 file changed, 11 deletions(-) --HG-- branch : SDL-1.2
Implement triple-buffering using a dedicated thread which will wait on VSYNC and then flip the two back buffers. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- include/SDL_video.h | 1 + src/video/fbcon/SDL_fbvideo.c | 157 +++++++++++++++++++++++++++++++--- src/video/fbcon/SDL_fbvideo.h | 19 +++- 3 files changed, 166 insertions(+), 11 deletions(-) --HG-- branch : SDL-1.2
The /dev/ttyX nodes obey the same rules as others, it's possible to use them as non-root users provided that the access rights bits are correctly set. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- src/video/fbcon/SDL_fbevents.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --HG-- branch : SDL-1.2
This ioctl never made it to upstream Linux. Besides, with KMS drivers page-flipping already happens in the vblank. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- src/video/fbcon/SDL_fbvideo.c | 4 ---- 1 file changed, 4 deletions(-) --HG-- branch : SDL-1.2
When the kernel reports absinfo.minimum > absinfo.maximum, the coefficient value was previously incorrectly calculated. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- src/joystick/linux/SDL_sysjoystick.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --HG-- branch : SDL-1.2
--HG-- branch : SDL-1.2
--HG-- branch : SDL-1.2
... with os2 joystick driver defs based on docs at edm2.com && in old drivers available at hobbes.nmsu.edu and www.os2site.com Watcom-OS2.zip updated accordingly. --HG-- branch : SDL-1.2
…ry() --HG-- branch : SDL-1.2
the previous one had always crashed for me, this one does not... --HG-- branch : SDL-1.2
--HG-- branch : SDL-1.2
--HG-- branch : SDL-1.2
--HG-- branch : SDL-1.2
--HG-- branch : SDL-1.2
…ysInfo (noticed in an SDL os/2 modification by 'sava' http://bauxite.sakura.ne.jp/software/os2/#sdl ) --HG-- branch : SDL-1.2
--HG-- branch : SDL-1.2
--HG-- branch : SDL-1.2
--HG-- branch : SDL-1.2
…hwdata --HG-- branch : SDL-1.2
--HG-- branch : SDL-1.2
--HG-- branch : SDL-1.2
(Thanks Cameron Cawley for back-porting the patch of bug 4503) --HG-- branch : SDL-1.2
--HG-- branch : SDL-1.2
--HG-- branch : SDL-1.2
... had been outdated for quite some time. --HG-- branch : SDL-1.2
the patch has been in SDL satellite projects for quite some time, but somehow hadn't made it into SDL tree itself.. --HG-- branch : SDL-1.2
Specifically this patch which does not invoke _AC_PATH_X_XMKMF and _AC_PATH_X_DIRECT internal autoconf routines when cross-compiling: http://git.savannah.gnu.org/gitweb/?p=autoconf.git;a=commitdiff;h=33c3a47c04ab70a4dd54963fe433a171bc03747f Without this, CFLAGS would brokenly have system include paths like -I/usr/include/X11 when cross-compiling e.g. for windows. (And it also resulted in annoying imake crashes for my setup...) --HG-- branch : SDL-1.2
--HG-- branch : SDL-1.2
From maxi@daemonizer.de: Since some time I stated to observe an annoying bug with the forward movement suddenly stopping while I was still pressing the corresponding key for the forward movement. Releasing and pressing the key again continued the movement. I observed this in the game "Unreal Tournament 2004", but other software is probably also affected. The stop basically happens after a few minutues of pressing the key, though the time needed to reproduce the issue is not constant. While investigating the issue I found it started with a commit [1] in the Xorg xserver. Digging deeper into the code I found two commits [2] [3] in libsdl2 which looked like they would also fix the issue in libsdl1.2. I backported these two commits to the libsdl1.2 in Debian and can confirm that the bug got fixed by this. [1] https://cgit.freedesktop.org/xorg/xserver/commit/?id=c67f2eac56518163981af59f5accb7c79bc00f6a [2] https://hg.libsdl.org/SDL/rev/a1c4c17410e8 [3] https://hg.libsdl.org/SDL/rev/764129077d18 --HG-- branch : SDL-1.2
patch from David Carlier. --HG-- branch : SDL-1.2
fixes bug #5241 ( https://bugzilla.libsdl.org/show_bug.cgi?id=5241 ) -- patch from pj5085. --HG-- branch : SDL-1.2
Recognizes riscv32be and riscv64be. --HG-- branch : SDL-1.2
also updated README.OS2, extracted Watcom-OS2.zip. --HG-- branch : SDL-1.2
--HG-- branch : SDL-1.2
--HG-- branch : SDL-1.2
--HG-- branch : SDL-1.2
--HG-- branch : SDL-1.2
…YSTICK_H --HG-- branch : SDL-1.2
--HG-- branch : SDL-1.2
MBeijer
approved these changes
May 14, 2021
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6 participants
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.