646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
96 lines
2.6 KiB
Diff
96 lines
2.6 KiB
Diff
--- a/src/client/sdl/scrap.c 2012-09-02 11:25:23.000000000 +0200
|
|
+++ b/src/client/sdl/scrap.c 2025-03-23 12:01:51.968751308 +0100
|
|
@@ -71,13 +71,13 @@
|
|
#if defined(X11_SCRAP)
|
|
/* * */
|
|
static Display *SDL_Display;
|
|
-static Window SDL_Window;
|
|
+static Window BloodsPilot_SDL_Window;
|
|
static void (*Lock_Display) (void);
|
|
static void (*Unlock_Display) (void);
|
|
|
|
#elif defined(WIN_SCRAP)
|
|
/* * */
|
|
-static HWND SDL_Window;
|
|
+static HWND BloodsPilot_SDL_Window;
|
|
|
|
#elif defined(QNX_SCRAP)
|
|
/* * */
|
|
@@ -274,7 +274,7 @@
|
|
/* * */
|
|
if (info.subsystem == SDL_SYSWM_X11) {
|
|
SDL_Display = info.info.x11.display;
|
|
- SDL_Window = info.info.x11.window;
|
|
+ BloodsPilot_SDL_Window = info.info.x11.window;
|
|
Lock_Display = info.info.x11.lock_func;
|
|
Unlock_Display = info.info.x11.unlock_func;
|
|
|
|
@@ -290,7 +290,7 @@
|
|
|
|
#elif defined(WIN_SCRAP)
|
|
/* * */
|
|
- SDL_Window = info.window;
|
|
+ BloodsPilot_SDL_Window = info.window;
|
|
retval = 0;
|
|
|
|
#elif defined(QNX_SCRAP)
|
|
@@ -310,12 +310,12 @@
|
|
#if defined(X11_SCRAP)
|
|
/* * */
|
|
Lock_Display();
|
|
- retval = (XGetSelectionOwner(SDL_Display, XA_PRIMARY) != SDL_Window);
|
|
+ retval = (XGetSelectionOwner(SDL_Display, XA_PRIMARY) != BloodsPilot_SDL_Window);
|
|
Unlock_Display();
|
|
|
|
#elif defined(WIN_SCRAP)
|
|
/* * */
|
|
- retval = (GetClipboardOwner() != SDL_Window);
|
|
+ retval = (GetClipboardOwner() != BloodsPilot_SDL_Window);
|
|
|
|
#elif defined(QNX_SCRAP)
|
|
/* * */
|
|
@@ -346,14 +346,14 @@
|
|
(unsigned char *) dst, dstlen);
|
|
free(dst);
|
|
if (lost_scrap())
|
|
- XSetSelectionOwner(SDL_Display, XA_PRIMARY, SDL_Window,
|
|
+ XSetSelectionOwner(SDL_Display, XA_PRIMARY, BloodsPilot_SDL_Window,
|
|
CurrentTime);
|
|
Unlock_Display();
|
|
}
|
|
|
|
#elif defined(WIN_SCRAP)
|
|
/* * */
|
|
- if (OpenClipboard(SDL_Window)) {
|
|
+ if (OpenClipboard(BloodsPilot_SDL_Window)) {
|
|
HANDLE hMem;
|
|
|
|
hMem = GlobalAlloc((GMEM_MOVEABLE | GMEM_DDESHARE), dstlen);
|
|
@@ -441,7 +441,7 @@
|
|
Lock_Display();
|
|
owner = XGetSelectionOwner(SDL_Display, XA_PRIMARY);
|
|
Unlock_Display();
|
|
- if ((owner == None) || (owner == SDL_Window)) {
|
|
+ if ((owner == None) || (owner == BloodsPilot_SDL_Window)) {
|
|
owner = DefaultRootWindow(SDL_Display);
|
|
selection1 = XA_CUT_BUFFER0;
|
|
}
|
|
@@ -449,7 +449,7 @@
|
|
int selection_response = 0;
|
|
SDL_Event event;
|
|
|
|
- owner = SDL_Window;
|
|
+ owner = BloodsPilot_SDL_Window;
|
|
Lock_Display();
|
|
selection1 = XInternAtom(SDL_Display, "SDL_SELECTION", False);
|
|
XConvertSelection(SDL_Display, XA_PRIMARY, format,
|
|
@@ -485,7 +485,7 @@
|
|
|
|
#elif defined(WIN_SCRAP)
|
|
/* * */
|
|
- if (IsClipboardFormatAvailable(format) && OpenClipboard(SDL_Window)) {
|
|
+ if (IsClipboardFormatAvailable(format) && OpenClipboard(BloodsPilot_SDL_Window)) {
|
|
HANDLE hMem;
|
|
char *src;
|
|
|