mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-04 00:46:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

SDL API renaming: SDL_video.h

Browse Source 
Fixes https://github.com/libsdl-org/SDL/issues/6880
This commit is contained in:
Sam Lantinga
2022-12-27 06:38:34 -08:00
parent cc0296c934
commit c6969df4d7
10 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dynapi/SDL_dynapi.sym
View File

@@ -536,8 +536,8 @@ SDL3_0.0.0 {
SDL_GetDesktopDisplayMode;
SDL_GetCurrentDisplayMode;
SDL_GetClosestDisplayMode;
SDL_GetPointDisplayIndex;
SDL_GetRectDisplayIndex;
SDL_GetDisplayIndexForPoint;
SDL_GetDisplayIndexForRect;
SDL_GetWindowDisplayIndex;
SDL_SetWindowDisplayMode;
SDL_GetWindowDisplayMode;

4
src/dynapi/SDL_dynapi_overrides.h
View File

@@ -852,8 +852,8 @@
#define SDL_GetOriginalMemoryFunctions SDL_GetOriginalMemoryFunctions_REAL
#define SDL_ResetKeyboard SDL_ResetKeyboard_REAL
#define SDL_GetDefaultAudioInfo SDL_GetDefaultAudioInfo_REAL
#define SDL_GetPointDisplayIndex SDL_GetPointDisplayIndex_REAL
#define SDL_GetRectDisplayIndex SDL_GetRectDisplayIndex_REAL
#define SDL_GetDisplayIndexForPoint SDL_GetDisplayIndexForPoint_REAL
#define SDL_GetDisplayIndexForRect SDL_GetDisplayIndexForRect_REAL
#define SDL_ResetHint SDL_ResetHint_REAL
#define SDL_crc16 SDL_crc16_REAL
#define SDL_GetWindowSizeInPixels SDL_GetWindowSizeInPixels_REAL

4
src/dynapi/SDL_dynapi_procs.h
View File

@@ -924,8 +924,8 @@ SDL_DYNAPI_PROC(int,SDL_GDKGetTaskQueue,(XTaskQueueHandle *a),(a),return)
SDL_DYNAPI_PROC(void,SDL_GetOriginalMemoryFunctions,(SDL_malloc_func *a, SDL_calloc_func *b, SDL_realloc_func *c, SDL_free_func *d),(a,b,c,d),)
SDL_DYNAPI_PROC(void,SDL_ResetKeyboard,(void),(),)
SDL_DYNAPI_PROC(int,SDL_GetDefaultAudioInfo,(char **a, SDL_AudioSpec *b, int c),(a,b,c),return)
SDL_DYNAPI_PROC(int,SDL_GetPointDisplayIndex,(const SDL_Point *a),(a),return)
SDL_DYNAPI_PROC(int,SDL_GetRectDisplayIndex,(const SDL_Rect *a),(a),return)
SDL_DYNAPI_PROC(int,SDL_GetDisplayIndexForPoint,(const SDL_Point *a),(a),return)
SDL_DYNAPI_PROC(int,SDL_GetDisplayIndexForRect,(const SDL_Rect *a),(a),return)
SDL_DYNAPI_PROC(SDL_bool,SDL_ResetHint,(const char *a),(a),return)
SDL_DYNAPI_PROC(Uint16,SDL_crc16,(Uint16 a, const void *b, size_t c),(a,b,c),return)
SDL_DYNAPI_PROC(void,SDL_GetWindowSizeInPixels,(SDL_Window *a, int *b, int *c),(a,b,c),)

2
src/video/SDL_sysvideo.h
View File

@@ -513,7 +513,7 @@ extern float SDL_ComputeDiagonalDPI(int hpix, int vpix, float hinches, float vin
extern void SDL_ToggleDragAndDropSupport(void);
extern int SDL_GetPointDisplayIndex(const SDL_Point *point);
extern int SDL_GetDisplayIndexForPoint(const SDL_Point *point);
extern int SDL_GL_SwapWindowWithResult(SDL_Window *window);

4
src/video/SDL_video.c
View File

@@ -1133,12 +1133,12 @@ static int GetRectDisplayIndex(int x, int y, int w, int h)
return closest;
}
int SDL_GetPointDisplayIndex(const SDL_Point *point)
int SDL_GetDisplayIndexForPoint(const SDL_Point *point)
{
return GetRectDisplayIndex(point->x, point->y, 1, 1);
}
int SDL_GetRectDisplayIndex(const SDL_Rect *rect)
int SDL_GetDisplayIndexForRect(const SDL_Rect *rect)
{
return GetRectDisplayIndex(rect->x, rect->y, rect->w, rect->h);
}

2
src/video/windows/SDL_windowsmodes.c
View File

@@ -610,7 +610,7 @@ void WIN_ScreenPointFromSDL(int *x, int *y, int *dpiOut)
}
/* Can't use MonitorFromPoint for this because we currently have SDL coordinates, not pixels */
displayIndex = SDL_GetPointDisplayIndex(&point);
displayIndex = SDL_GetDisplayIndexForPoint(&point);
if (displayIndex < 0) {
return;