wayland: Uncomment support for wl_display_reconnect

Author: flibitijibibo

src/events/SDL_mouse.c

@@ -266,14 +266,6 @@ SDL_GetMouseFocus(void)
     return mouse->focus;
 }
 
-/* TODO RECONNECT: Hello from the Wayland video driver!
- * This was once removed from SDL, but it's been added back in comment form
- * because we will need it when Wayland adds compositor reconnect support.
- * If you need this before we do, great! Otherwise, leave this alone, we'll
- * uncomment it at the right time.
- * -flibit
- */
-#if 0
 void
 SDL_ResetMouse(void)
 {
@@ -288,7 +280,6 @@ SDL_ResetMouse(void)
     }
     SDL_assert(GetButtonState(mouse, SDL_FALSE) == 0);
 }
-#endif /* 0 */
 
 void
 SDL_SetMouseFocus(SDL_Window * window)

src/events/SDL_mouse_c.h

@@ -164,10 +164,8 @@ extern int SDL_SendMouseWheel(SDL_Window * window, SDL_MouseID mouseID, float x,
 /* Warp the mouse within the window, potentially overriding relative mode */
 extern void SDL_PerformWarpMouseInWindow(SDL_Window *window, int x, int y, SDL_bool ignore_relative_mode);
 
-/* TODO RECONNECT: Set mouse state to "zero" */
-#if 0
+/* Set mouse state to "zero" */
 extern void SDL_ResetMouse(void);
-#endif /* 0 */
 
 /* Shutdown the mouse subsystem */
 extern void SDL_MouseQuit(void);

src/video/wayland/SDL_waylandmouse.c

@@ -601,7 +601,6 @@ Wayland_EmulateMouseWarpChanged(void *userdata, const char *name, const char *ol
     input->warp_emulation_prohibited = !SDL_GetStringBoolean(hint, !input->warp_emulation_prohibited);
 }
 
-#if 0 /* TODO RECONNECT: See waylandvideo.c for more information! */
 static void
 Wayland_RecreateCursor(SDL_Cursor *cursor, SDL_VideoData *vdata)
 {
@@ -657,7 +656,6 @@ Wayland_RecreateCursors(void)
         }
     }
 }
-#endif /* 0 */
 
 void
 Wayland_InitMouse(void)

src/video/wayland/SDL_waylandmouse.h

@@ -27,8 +27,6 @@
 
 extern void Wayland_InitMouse(void);
 extern void Wayland_FiniMouse(SDL_VideoData *data);
-#if 0 /* TODO RECONNECT: See waylandvideo.c for more information! */
 extern void Wayland_RecreateCursors(void);
-#endif /* 0 */
 
 #endif

src/video/wayland/SDL_waylandsym.h

@@ -86,11 +86,8 @@ SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_flags, (struct wl_proxy *prox
 SDL_WAYLAND_SYM(struct wl_proxy*, wl_proxy_marshal_array_flags, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version,  uint32_t flags, union wl_argument *args))
 #endif
 
-#if 0 /* TODO RECONNECT: See waylandvideo.c for more information! */
-#if SDL_WAYLAND_CHECK_VERSION(broken, on, purpose)
-SDL_WAYLAND_SYM(int, wl_display_reconnect, (struct wl_display*));
-#endif
-#endif /* 0 */
+SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_SOON)
+SDL_WAYLAND_SYM(int, wl_display_reconnect, (struct wl_display*))
 
 SDL_WAYLAND_INTERFACE(wl_seat_interface)
 SDL_WAYLAND_INTERFACE(wl_surface_interface)

src/video/wayland/SDL_waylandvideo.c

@@ -1153,7 +1153,6 @@ Wayland_VideoCleanup(_THIS)
 SDL_bool
 Wayland_VideoReconnect(_THIS)
 {
-#if 0 /* TODO RECONNECT: Uncomment all when https://invent.kde.org/plasma/kwin/-/wikis/Restarting is completed */
     SDL_VideoData *data = _this->driverdata;
 
     SDL_Window *window = NULL;
@@ -1166,7 +1165,7 @@ Wayland_VideoReconnect(_THIS)
 
     SDL_ResetKeyboard();
     SDL_ResetMouse();
-    if (WAYLAND_wl_display_reconnect(data->display) < 0) {
+    if (!SDL_WAYLAND_HAVE_WAYLAND_CLIENT_1_SOON || WAYLAND_wl_display_reconnect(data->display) < 0) {
         return SDL_FALSE;
     }
 
@@ -1193,9 +1192,6 @@ Wayland_VideoReconnect(_THIS)
         SDL_GL_MakeCurrent (current_window, current_ctx);
     }
     return SDL_TRUE;
-#else
-    return SDL_FALSE;
-#endif /* 0 */
 }
 
 void