tjh.dev
1--- a/src/client/sdl/scrap.c 2012-09-02 11:25:23.000000000 +0200
2+++ b/src/client/sdl/scrap.c 2025-03-23 12:01:51.968751308 +0100
3@@ -71,13 +71,13 @@
4 #if defined(X11_SCRAP)
5 /* * */
6 static Display *SDL_Display;
7-static Window SDL_Window;
8+static Window BloodsPilot_SDL_Window;
9 static void (*Lock_Display) (void);
10 static void (*Unlock_Display) (void);
11
12 #elif defined(WIN_SCRAP)
13 /* * */
14-static HWND SDL_Window;
15+static HWND BloodsPilot_SDL_Window;
16
17 #elif defined(QNX_SCRAP)
18 /* * */
19@@ -274,7 +274,7 @@
20 /* * */
21 if (info.subsystem == SDL_SYSWM_X11) {
22 SDL_Display = info.info.x11.display;
23- SDL_Window = info.info.x11.window;
24+ BloodsPilot_SDL_Window = info.info.x11.window;
25 Lock_Display = info.info.x11.lock_func;
26 Unlock_Display = info.info.x11.unlock_func;
27
28@@ -290,7 +290,7 @@
29
30 #elif defined(WIN_SCRAP)
31 /* * */
32- SDL_Window = info.window;
33+ BloodsPilot_SDL_Window = info.window;
34 retval = 0;
35
36 #elif defined(QNX_SCRAP)
37@@ -310,12 +310,12 @@
38 #if defined(X11_SCRAP)
39 /* * */
40 Lock_Display();
41- retval = (XGetSelectionOwner(SDL_Display, XA_PRIMARY) != SDL_Window);
42+ retval = (XGetSelectionOwner(SDL_Display, XA_PRIMARY) != BloodsPilot_SDL_Window);
43 Unlock_Display();
44
45 #elif defined(WIN_SCRAP)
46 /* * */
47- retval = (GetClipboardOwner() != SDL_Window);
48+ retval = (GetClipboardOwner() != BloodsPilot_SDL_Window);
49
50 #elif defined(QNX_SCRAP)
51 /* * */
52@@ -346,14 +346,14 @@
53 (unsigned char *) dst, dstlen);
54 free(dst);
55 if (lost_scrap())
56- XSetSelectionOwner(SDL_Display, XA_PRIMARY, SDL_Window,
57+ XSetSelectionOwner(SDL_Display, XA_PRIMARY, BloodsPilot_SDL_Window,
58 CurrentTime);
59 Unlock_Display();
60 }
61
62 #elif defined(WIN_SCRAP)
63 /* * */
64- if (OpenClipboard(SDL_Window)) {
65+ if (OpenClipboard(BloodsPilot_SDL_Window)) {
66 HANDLE hMem;
67
68 hMem = GlobalAlloc((GMEM_MOVEABLE | GMEM_DDESHARE), dstlen);
69@@ -441,7 +441,7 @@
70 Lock_Display();
71 owner = XGetSelectionOwner(SDL_Display, XA_PRIMARY);
72 Unlock_Display();
73- if ((owner == None) || (owner == SDL_Window)) {
74+ if ((owner == None) || (owner == BloodsPilot_SDL_Window)) {
75 owner = DefaultRootWindow(SDL_Display);
76 selection1 = XA_CUT_BUFFER0;
77 }
78@@ -449,7 +449,7 @@
79 int selection_response = 0;
80 SDL_Event event;
81
82- owner = SDL_Window;
83+ owner = BloodsPilot_SDL_Window;
84 Lock_Display();
85 selection1 = XInternAtom(SDL_Display, "SDL_SELECTION", False);
86 XConvertSelection(SDL_Display, XA_PRIMARY, format,
87@@ -485,7 +485,7 @@
88
89 #elif defined(WIN_SCRAP)
90 /* * */
91- if (IsClipboardFormatAvailable(format) && OpenClipboard(SDL_Window)) {
92+ if (IsClipboardFormatAvailable(format) && OpenClipboard(BloodsPilot_SDL_Window)) {
93 HANDLE hMem;
94 char *src;
95