From fae324dacb55b8f0eb78520209897061f2fd7489 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Wed, 5 Mar 2025 12:27:16 -0800
Subject: [PATCH] Update XSync code to match SDL3 conventions
---
src/video/x11/SDL_x11xsync.c | 12 ++++++------
src/video/x11/SDL_x11xsync.h | 16 ++++++++--------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/video/x11/SDL_x11xsync.c b/src/video/x11/SDL_x11xsync.c
index 5310d6715a18c..4cad912b6f8a0 100644
--- a/src/video/x11/SDL_x11xsync.c
+++ b/src/video/x11/SDL_x11xsync.c
@@ -26,7 +26,7 @@
#include "SDL_x11video.h"
#include "SDL_x11xsync.h"
-static int xsync_initialized = 0;
+static bool xsync_initialized = false;
static int query_xsync_version(Display *display, int major, int minor)
{
@@ -59,15 +59,15 @@ void X11_InitXsync(SDL_VideoDevice *_this)
return; /* X server does not support the version we want at all. */
}
- xsync_initialized = 1;
+ xsync_initialized = true;
}
-int X11_XsyncIsInitialized(void)
+bool X11_XsyncIsInitialized(void)
{
return xsync_initialized;
}
-int X11_InitResizeSync(SDL_Window *window)
+bool X11_InitResizeSync(SDL_Window *window)
{
SDL_assert(window != NULL);
SDL_WindowData *data = window->internal;
@@ -94,7 +94,7 @@ int X11_InitResizeSync(SDL_Window *window)
X11_XChangeProperty(display, data->xwindow, counter_prop, XA_CARDINAL, 32,
PropModeReplace, (unsigned char *)&counter_id, 1);
- return 0;
+ return true;
}
void X11_TermResizeSync(SDL_Window *window)
@@ -145,4 +145,4 @@ void X11_HandlePresent(SDL_Window *window)
data->resize_in_progress = false;
}
-#endif /* SDL_VIDEO_DRIVER_X11 && SDL_VIDEO_DRIVER_X11_XSYNC */
+#endif // SDL_VIDEO_DRIVER_X11 && SDL_VIDEO_DRIVER_X11_XSYNC
diff --git a/src/video/x11/SDL_x11xsync.h b/src/video/x11/SDL_x11xsync.h
index bc747c15e284c..80a52337cc6d3 100644
--- a/src/video/x11/SDL_x11xsync.h
+++ b/src/video/x11/SDL_x11xsync.h
@@ -27,13 +27,13 @@
#ifdef SDL_VIDEO_DRIVER_X11_XSYNC
extern void X11_InitXsync(SDL_VideoDevice *_this);
-extern int X11_XsyncIsInitialized(void);
-int X11_InitResizeSync(SDL_Window *window);
-void X11_TermResizeSync(SDL_Window *window);
-void X11_HandleSyncRequest(SDL_Window *window, XClientMessageEvent *event);
-void X11_HandleConfigure(SDL_Window *window, XConfigureEvent *event);
-void X11_HandlePresent(SDL_Window *window);
+extern bool X11_XsyncIsInitialized(void);
+extern bool X11_InitResizeSync(SDL_Window *window);
+extern void X11_TermResizeSync(SDL_Window *window);
+extern void X11_HandleSyncRequest(SDL_Window *window, XClientMessageEvent *event);
+extern void X11_HandleConfigure(SDL_Window *window, XConfigureEvent *event);
+extern void X11_HandlePresent(SDL_Window *window);
-#endif /* SDL_VIDEO_DRIVER_X11_XSYNC */
+#endif // SDL_VIDEO_DRIVER_X11_XSYNC
-#endif /* SDL_x11xsync_h_ */
+#endif // SDL_x11xsync_h_