geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland+x11: free system cursors when quiting video

main
Anonymous Maarten 2023-11-27 21:30:59 +01:00 committed by Anonymous Maarten
parent 7484d02a2e
commit fbb0914b78
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/video/wayland/SDL_waylandmouse.c
View File

@ -831,6 +831,7 @@ void Wayland_InitMouse(void)
void Wayland_FiniMouse(SDL_VideoData *data) void Wayland_FiniMouse(SDL_VideoData *data)
{ {
struct SDL_WaylandInput *input = data->input; struct SDL_WaylandInput *input = data->input;
int i;
Wayland_FreeCursorThemes(data); Wayland_FreeCursorThemes(data);
@ -840,6 +841,11 @@ void Wayland_FiniMouse(SDL_VideoData *data)
SDL_DelHintCallback(SDL_HINT_VIDEO_WAYLAND_EMULATE_MOUSE_WARP, SDL_DelHintCallback(SDL_HINT_VIDEO_WAYLAND_EMULATE_MOUSE_WARP,
Wayland_EmulateMouseWarpChanged, input); Wayland_EmulateMouseWarpChanged, input);
for (i = 0; i < SDL_arraysize(sys_cursors); i++) {
Wayland_FreeCursor(sys_cursors[i]);
sys_cursors[i] = NULL;
}
} }
void Wayland_SetHitTestCursor(SDL_HitTestResult rc) void Wayland_SetHitTestCursor(SDL_HitTestResult rc)

6
src/video/x11/SDL_x11mouse.c
View File

@ -511,6 +511,12 @@ void X11_QuitMouse(SDL_VideoDevice *_this)
SDL_VideoData *data = _this->driverdata; SDL_VideoData *data = _this->driverdata;
SDL_XInput2DeviceInfo *i; SDL_XInput2DeviceInfo *i;
SDL_XInput2DeviceInfo *next; SDL_XInput2DeviceInfo *next;
int j;
for (j = 0; j < SDL_arraysize(sys_cursors); j++) {
X11_FreeCursor(sys_cursors[j]);
sys_cursors[j] = NULL;
}
for (i = data->mouse_device_info; i; i = next) { for (i = data->mouse_device_info; i; i = next) {
next = i->next; next = i->next;