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

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

4
src/events/SDL_displayevents.c
View File

@@ -54,8 +54,8 @@ int SDL_SendDisplayEvent(SDL_VideoDisplay *display, SDL_EventType displayevent,
}
switch (displayevent) {
case SDL_EVENT_DISPLAY_CONNECTED:
SDL_OnDisplayConnected(display);
case SDL_EVENT_DISPLAY_ADDED:
SDL_OnDisplayAdded(display);
break;
default:
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); \
break
SDL_DISPLAYEVENT_CASE(SDL_EVENT_DISPLAY_ORIENTATION);
SDL_DISPLAYEVENT_CASE(SDL_EVENT_DISPLAY_CONNECTED);
SDL_DISPLAYEVENT_CASE(SDL_EVENT_DISPLAY_DISCONNECTED);
SDL_DISPLAYEVENT_CASE(SDL_EVENT_DISPLAY_ADDED);
SDL_DISPLAYEVENT_CASE(SDL_EVENT_DISPLAY_REMOVED);
SDL_DISPLAYEVENT_CASE(SDL_EVENT_DISPLAY_MOVED);
SDL_DISPLAYEVENT_CASE(SDL_EVENT_DISPLAY_CONTENT_SCALE_CHANGED);
#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:
SDL_Log("SDL EVENT: System theme changed to %s\n", SystemThemeName());
break;
case SDL_EVENT_DISPLAY_CONNECTED:
SDL_Log("SDL EVENT: Display %" SDL_PRIu32 " connected",
case SDL_EVENT_DISPLAY_ADDED:
SDL_Log("SDL EVENT: Display %" SDL_PRIu32 " attached",
event->display.displayID);
break;
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",
event->display.displayID, DisplayOrientationName(event->display.data1));
break;
case SDL_EVENT_DISPLAY_DISCONNECTED:
SDL_Log("SDL EVENT: Display %" SDL_PRIu32 " disconnected",
case SDL_EVENT_DISPLAY_REMOVED:
SDL_Log("SDL EVENT: Display %" SDL_PRIu32 " removed",
event->display.displayID);
break;
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_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_OnWindowHidden(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) {
SDL_SendDisplayEvent(new_display, SDL_EVENT_DISPLAY_CONNECTED, 0);
SDL_SendDisplayEvent(new_display, SDL_EVENT_DISPLAY_ADDED, 0);
}
return id;
}
void SDL_OnDisplayConnected(SDL_VideoDisplay *display)
void SDL_OnDisplayAdded(SDL_VideoDisplay *display)
{
SDL_Window *window;
@@ -715,7 +715,7 @@ void SDL_DelVideoDisplay(SDL_DisplayID displayID, SDL_bool send_event)
display = _this->displays[display_index];
if (send_event) {
SDL_SendDisplayEvent(display, SDL_EVENT_DISPLAY_DISCONNECTED, 0);
SDL_SendDisplayEvent(display, SDL_EVENT_DISPLAY_REMOVED, 0);
}
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_DisplayData *driverdata = display->driverdata;
if (driverdata->state == DisplayAdded) {
SDL_SendDisplayEvent(display, SDL_EVENT_DISPLAY_CONNECTED, 0);
SDL_SendDisplayEvent(display, SDL_EVENT_DISPLAY_ADDED, 0);
}
}
}