eden-emu/SDL
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed display added/removed events for consistency with the rest of the API

Browse source 
Fixes https://github.com/libsdl-org/SDL/issues/8425
This commit is contained in:
Sam Lantinga 2023-10-23 08:59:07 -07:00
parent c2a3112b6f
commit c98a14fdeb
9 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/README-migration.md
View file

@ -738,7 +738,7 @@ The following functions have been renamed:
* SDL_PixelFormatEnumToMasks() => SDL_GetMasksForPixelFormatEnum() * SDL_PixelFormatEnumToMasks() => SDL_GetMasksForPixelFormatEnum()
The following symbols have been renamed: The following symbols have been renamed:
* SDL_DISPLAYEVENT_DISCONNECTED => SDL_EVENT_DISPLAY_DISCONNECTED * SDL_DISPLAYEVENT_DISCONNECTED => SDL_EVENT_DISPLAY_REMOVED
* SDL_DISPLAYEVENT_MOVED => SDL_EVENT_DISPLAY_MOVED * SDL_DISPLAYEVENT_MOVED => SDL_EVENT_DISPLAY_MOVED
* SDL_DISPLAYEVENT_ORIENTATION => SDL_EVENT_DISPLAY_ORIENTATION * SDL_DISPLAYEVENT_ORIENTATION => SDL_EVENT_DISPLAY_ORIENTATION
* SDL_WINDOWEVENT_CLOSE => SDL_EVENT_WINDOW_CLOSE_REQUESTED * SDL_WINDOWEVENT_CLOSE => SDL_EVENT_WINDOW_CLOSE_REQUESTED

4
include/SDL3/SDL_events.h
View file

@ -92,8 +92,8 @@ typedef enum
/* Display events */ /* Display events */
/* 0x150 was SDL_DISPLAYEVENT, reserve the number for sdl2-compat */ /* 0x150 was SDL_DISPLAYEVENT, reserve the number for sdl2-compat */
SDL_EVENT_DISPLAY_ORIENTATION = 0x151, /**< Display orientation has changed to data1 */ SDL_EVENT_DISPLAY_ORIENTATION = 0x151, /**< Display orientation has changed to data1 */
SDL_EVENT_DISPLAY_CONNECTED, /**< Display has been added to the system */ SDL_EVENT_DISPLAY_ADDED, /**< Display has been added to the system */
SDL_EVENT_DISPLAY_DISCONNECTED, /**< Display has been removed from the system */ SDL_EVENT_DISPLAY_REMOVED, /**< Display has been removed from the system */
SDL_EVENT_DISPLAY_MOVED, /**< Display has changed position */ SDL_EVENT_DISPLAY_MOVED, /**< Display has changed position */
SDL_EVENT_DISPLAY_CONTENT_SCALE_CHANGED, /**< Display has changed content scale */ SDL_EVENT_DISPLAY_CONTENT_SCALE_CHANGED, /**< Display has changed content scale */
SDL_EVENT_DISPLAY_FIRST = SDL_EVENT_DISPLAY_ORIENTATION, SDL_EVENT_DISPLAY_FIRST = SDL_EVENT_DISPLAY_ORIENTATION,

8
include/SDL3/SDL_oldnames.h
View file

@ -91,8 +91,8 @@
#define SDL_ControllerDeviceEvent SDL_GamepadDeviceEvent #define SDL_ControllerDeviceEvent SDL_GamepadDeviceEvent
#define SDL_ControllerSensorEvent SDL_GamepadSensorEvent #define SDL_ControllerSensorEvent SDL_GamepadSensorEvent
#define SDL_ControllerTouchpadEvent SDL_GamepadTouchpadEvent #define SDL_ControllerTouchpadEvent SDL_GamepadTouchpadEvent
#define SDL_DISPLAYEVENT_CONNECTED SDL_EVENT_DISPLAY_CONNECTED #define SDL_DISPLAYEVENT_CONNECTED SDL_EVENT_DISPLAY_ADDED
#define SDL_DISPLAYEVENT_DISCONNECTED SDL_EVENT_DISPLAY_DISCONNECTED #define SDL_DISPLAYEVENT_DISCONNECTED SDL_EVENT_DISPLAY_REMOVED
#define SDL_DISPLAYEVENT_MOVED SDL_EVENT_DISPLAY_MOVED #define SDL_DISPLAYEVENT_MOVED SDL_EVENT_DISPLAY_MOVED
#define SDL_DISPLAYEVENT_ORIENTATION SDL_EVENT_DISPLAY_ORIENTATION #define SDL_DISPLAYEVENT_ORIENTATION SDL_EVENT_DISPLAY_ORIENTATION
#define SDL_DROPBEGIN SDL_EVENT_DROP_BEGIN #define SDL_DROPBEGIN SDL_EVENT_DROP_BEGIN
@ -539,8 +539,8 @@
#define SDL_ControllerDeviceEvent SDL_ControllerDeviceEvent_renamed_SDL_GamepadDeviceEvent #define SDL_ControllerDeviceEvent SDL_ControllerDeviceEvent_renamed_SDL_GamepadDeviceEvent
#define SDL_ControllerSensorEvent SDL_ControllerSensorEvent_renamed_SDL_GamepadSensorEvent #define SDL_ControllerSensorEvent SDL_ControllerSensorEvent_renamed_SDL_GamepadSensorEvent
#define SDL_ControllerTouchpadEvent SDL_ControllerTouchpadEvent_renamed_SDL_GamepadTouchpadEvent #define SDL_ControllerTouchpadEvent SDL_ControllerTouchpadEvent_renamed_SDL_GamepadTouchpadEvent
#define SDL_DISPLAYEVENT_CONNECTED SDL_DISPLAYEVENT_CONNECTED_renamed_SDL_EVENT_DISPLAY_CONNECTED #define SDL_DISPLAYEVENT_CONNECTED SDL_DISPLAYEVENT_CONNECTED_renamed_SDL_EVENT_DISPLAY_ADDED
#define SDL_DISPLAYEVENT_DISCONNECTED SDL_DISPLAYEVENT_DISCONNECTED_renamed_SDL_EVENT_DISPLAY_DISCONNECTED #define SDL_DISPLAYEVENT_DISCONNECTED SDL_DISPLAYEVENT_DISCONNECTED_renamed_SDL_EVENT_DISPLAY_REMOVED
#define SDL_DISPLAYEVENT_MOVED SDL_DISPLAYEVENT_MOVED_renamed_SDL_EVENT_DISPLAY_MOVED #define SDL_DISPLAYEVENT_MOVED SDL_DISPLAYEVENT_MOVED_renamed_SDL_EVENT_DISPLAY_MOVED
#define SDL_DISPLAYEVENT_ORIENTATION SDL_DISPLAYEVENT_ORIENTATION_renamed_SDL_EVENT_DISPLAY_ORIENTATION #define SDL_DISPLAYEVENT_ORIENTATION SDL_DISPLAYEVENT_ORIENTATION_renamed_SDL_EVENT_DISPLAY_ORIENTATION
#define SDL_DROPBEGIN SDL_DROPBEGIN_renamed_SDL_EVENT_DROP_BEGIN #define SDL_DROPBEGIN SDL_DROPBEGIN_renamed_SDL_EVENT_DROP_BEGIN

4
src/events/SDL_displayevents.c
View file

@ -54,8 +54,8 @@ int SDL_SendDisplayEvent(SDL_VideoDisplay *display, SDL_EventType displayevent,
} }
switch (displayevent) { switch (displayevent) {
case SDL_EVENT_DISPLAY_CONNECTED: case SDL_EVENT_DISPLAY_ADDED:
SDL_OnDisplayConnected(display); SDL_OnDisplayAdded(display);
break; break;
default: default:
break; break;

4
src/events/SDL_events.c
View file

@ -222,8 +222,8 @@ static void SDL_LogEvent(const SDL_Event *event)
(uint)event->display.timestamp, (uint)event->display.displayID, name, (int)event->display.data1); \ (uint)event->display.timestamp, (uint)event->display.displayID, name, (int)event->display.data1); \
break break
SDL_DISPLAYEVENT_CASE(SDL_EVENT_DISPLAY_ORIENTATION); SDL_DISPLAYEVENT_CASE(SDL_EVENT_DISPLAY_ORIENTATION);
SDL_DISPLAYEVENT_CASE(SDL_EVENT_DISPLAY_CONNECTED); SDL_DISPLAYEVENT_CASE(SDL_EVENT_DISPLAY_ADDED);
SDL_DISPLAYEVENT_CASE(SDL_EVENT_DISPLAY_DISCONNECTED); SDL_DISPLAYEVENT_CASE(SDL_EVENT_DISPLAY_REMOVED);
SDL_DISPLAYEVENT_CASE(SDL_EVENT_DISPLAY_MOVED); SDL_DISPLAYEVENT_CASE(SDL_EVENT_DISPLAY_MOVED);
SDL_DISPLAYEVENT_CASE(SDL_EVENT_DISPLAY_CONTENT_SCALE_CHANGED); SDL_DISPLAYEVENT_CASE(SDL_EVENT_DISPLAY_CONTENT_SCALE_CHANGED);
#undef SDL_DISPLAYEVENT_CASE #undef SDL_DISPLAYEVENT_CASE

8
src/test/SDL_test_common.c
View file

@ -1566,8 +1566,8 @@ static void SDLTest_PrintEvent(SDL_Event *event)
case SDL_EVENT_SYSTEM_THEME_CHANGED: case SDL_EVENT_SYSTEM_THEME_CHANGED:
SDL_Log("SDL EVENT: System theme changed to %s\n", SystemThemeName()); SDL_Log("SDL EVENT: System theme changed to %s\n", SystemThemeName());
break; break;
case SDL_EVENT_DISPLAY_CONNECTED: case SDL_EVENT_DISPLAY_ADDED:
SDL_Log("SDL EVENT: Display %" SDL_PRIu32 " connected", SDL_Log("SDL EVENT: Display %" SDL_PRIu32 " attached",
event->display.displayID); event->display.displayID);
break; break;
case SDL_EVENT_DISPLAY_CONTENT_SCALE_CHANGED: case SDL_EVENT_DISPLAY_CONTENT_SCALE_CHANGED:
@ -1585,8 +1585,8 @@ static void SDLTest_PrintEvent(SDL_Event *event)
SDL_Log("SDL EVENT: Display %" SDL_PRIu32 " changed orientation to %s", SDL_Log("SDL EVENT: Display %" SDL_PRIu32 " changed orientation to %s",
event->display.displayID, DisplayOrientationName(event->display.data1)); event->display.displayID, DisplayOrientationName(event->display.data1));
break; break;
case SDL_EVENT_DISPLAY_DISCONNECTED: case SDL_EVENT_DISPLAY_REMOVED:
SDL_Log("SDL EVENT: Display %" SDL_PRIu32 " disconnected", SDL_Log("SDL EVENT: Display %" SDL_PRIu32 " removed",
event->display.displayID); event->display.displayID);
break; break;
case SDL_EVENT_WINDOW_SHOWN: case SDL_EVENT_WINDOW_SHOWN:

2
src/video/SDL_sysvideo.h
View file

@ -521,7 +521,7 @@ extern SDL_bool SDL_HasWindows(void);
extern void SDL_RelativeToGlobalForWindow(SDL_Window *window, int rel_x, int rel_y, int *abs_x, int *abs_y); extern void SDL_RelativeToGlobalForWindow(SDL_Window *window, int rel_x, int rel_y, int *abs_x, int *abs_y);
extern void SDL_GlobalToRelativeForWindow(SDL_Window *window, int abs_x, int abs_y, int *rel_x, int *rel_y); extern void SDL_GlobalToRelativeForWindow(SDL_Window *window, int abs_x, int abs_y, int *rel_x, int *rel_y);
extern void SDL_OnDisplayConnected(SDL_VideoDisplay *display); extern void SDL_OnDisplayAdded(SDL_VideoDisplay *display);
extern void SDL_OnWindowShown(SDL_Window *window); extern void SDL_OnWindowShown(SDL_Window *window);
extern void SDL_OnWindowHidden(SDL_Window *window); extern void SDL_OnWindowHidden(SDL_Window *window);
extern void SDL_OnWindowMoved(SDL_Window *window); extern void SDL_OnWindowMoved(SDL_Window *window);

6
src/video/SDL_video.c
View file

@ -689,12 +689,12 @@ SDL_DisplayID SDL_AddVideoDisplay(const SDL_VideoDisplay *display, SDL_bool send
} }
if (send_event) { if (send_event) {
SDL_SendDisplayEvent(new_display, SDL_EVENT_DISPLAY_CONNECTED, 0); SDL_SendDisplayEvent(new_display, SDL_EVENT_DISPLAY_ADDED, 0);
} }
return id; return id;
} }
void SDL_OnDisplayConnected(SDL_VideoDisplay *display) void SDL_OnDisplayAdded(SDL_VideoDisplay *display)
{ {
SDL_Window *window; SDL_Window *window;
@ -715,7 +715,7 @@ void SDL_DelVideoDisplay(SDL_DisplayID displayID, SDL_bool send_event)
display = _this->displays[display_index]; display = _this->displays[display_index];
if (send_event) { if (send_event) {
SDL_SendDisplayEvent(display, SDL_EVENT_DISPLAY_DISCONNECTED, 0); SDL_SendDisplayEvent(display, SDL_EVENT_DISPLAY_REMOVED, 0);
} }
SDL_free(display->name); SDL_free(display->name);

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

@ -677,7 +677,7 @@ void WIN_RefreshDisplays(SDL_VideoDevice *_this)
SDL_VideoDisplay *display = _this->displays[i]; SDL_VideoDisplay *display = _this->displays[i];
SDL_DisplayData *driverdata = display->driverdata; SDL_DisplayData *driverdata = display->driverdata;
if (driverdata->state == DisplayAdded) { if (driverdata->state == DisplayAdded) {
SDL_SendDisplayEvent(display, SDL_EVENT_DISPLAY_CONNECTED, 0); SDL_SendDisplayEvent(display, SDL_EVENT_DISPLAY_ADDED, 0);
} }
} }
} }