gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix touch screen display IDs on the 3DS

Browse Source
This commit is contained in:
Cameron Cawley
2026-01-14 22:17:28 +00:00
committed by Sam Lantinga
parent 77290f9788
commit 02c9f2045b
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/video/n3ds/SDL_n3dsvideo.c
View File

@@ -31,7 +31,7 @@
#define N3DSVID_DRIVER_NAME "n3ds" #define N3DSVID_DRIVER_NAME "n3ds"
static bool AddN3DSDisplay(gfxScreen_t screen); static SDL_DisplayID AddN3DSDisplay(gfxScreen_t screen);
static bool N3DS_VideoInit(SDL_VideoDevice *_this); static bool N3DS_VideoInit(SDL_VideoDevice *_this);
static void N3DS_VideoQuit(SDL_VideoDevice *_this); static void N3DS_VideoQuit(SDL_VideoDevice *_this);
@@ -136,14 +136,14 @@ static bool N3DS_VideoInit(SDL_VideoDevice *_this)
return true; return true;
} }
static bool AddN3DSDisplay(gfxScreen_t screen) static SDL_DisplayID AddN3DSDisplay(gfxScreen_t screen)
{ {
SDL_DisplayMode mode; SDL_DisplayMode mode;
SDL_DisplayModeData *modedata; SDL_DisplayModeData *modedata;
SDL_VideoDisplay display; SDL_VideoDisplay display;
SDL_DisplayData *display_driver_data = SDL_calloc(1, sizeof(SDL_DisplayData)); SDL_DisplayData *display_driver_data = SDL_calloc(1, sizeof(SDL_DisplayData));
if (!display_driver_data) { if (!display_driver_data) {
return false; return 0;
} }
SDL_zero(mode); SDL_zero(mode);
@@ -153,7 +153,7 @@ static bool AddN3DSDisplay(gfxScreen_t screen)
modedata = SDL_malloc(sizeof(SDL_DisplayModeData)); modedata = SDL_malloc(sizeof(SDL_DisplayModeData));
if (!modedata) { if (!modedata) {
return false; return 0;
} }
mode.w = (screen == GFX_TOP) ? GSP_SCREEN_HEIGHT_TOP : GSP_SCREEN_HEIGHT_BOTTOM; mode.w = (screen == GFX_TOP) ? GSP_SCREEN_HEIGHT_TOP : GSP_SCREEN_HEIGHT_BOTTOM;
@@ -167,10 +167,7 @@ static bool AddN3DSDisplay(gfxScreen_t screen)
display.desktop_mode = mode; display.desktop_mode = mode;
display.internal = display_driver_data; display.internal = display_driver_data;
if (SDL_AddVideoDisplay(&display, false) == 0) { return SDL_AddVideoDisplay(&display, false);
return false;
}
return true;
} }
static void N3DS_VideoQuit(SDL_VideoDevice *_this) static void N3DS_VideoQuit(SDL_VideoDevice *_this)

4
src/video/n3ds/SDL_n3dsvideo.h
View File

@@ -29,8 +29,8 @@
struct SDL_VideoData struct SDL_VideoData
{ {
int top_display; SDL_DisplayID top_display;
int touch_display; SDL_DisplayID touch_display;
}; };
struct SDL_WindowData struct SDL_WindowData