Skip to content

Commit 6c21d53

Browse files
Re-aranged WM records and WM info records to reflect structure in SDL_syswm.h + added a comment
1 parent c1b1b71 commit 6c21d53

File tree

1 file changed

+67
-37
lines changed

1 file changed

+67
-37
lines changed

units/sdlsyswm.inc

Lines changed: 67 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -106,27 +106,80 @@ type
106106
wParam: WPARAM; {**< WORD message parameter *}
107107
lParam: LPARAM; {**< LONG message parameter *}
108108
end;
109+
{$ENDIF}
110+
111+
{$IFDEF SDL_VIDEO_DRIVER_X11}
112+
__SYSWM_X11 = record
113+
event: {$IFDEF FPC} TXEvent {$ELSE} XEvent {$ENDIF};
114+
end;
115+
{$ENDIF}
116+
117+
{$IFDEF SDL_VIDEO_DRIVER_DIRECTFB}
118+
__SYSWM_DIRECTFB = record
119+
event: DFBEvent;
120+
end;
121+
{$ENDIF}
122+
123+
{$IFDEF SDL_VIDEO_DRIVER_COCOA}
124+
__SYSWM_COCOA = record
125+
(* No Cocoa window events yet *)
126+
dummy: cint;
127+
end;
128+
{$ENDIF}
129+
130+
{$IFDEF SDL_VIDEO_DRIVER_UIKIT}
131+
__SYSWM_UIKIT = record
132+
(* No UIKit window events yet *)
133+
dummy: cint;
134+
end;
135+
{$ENDIF}
136+
137+
{$IFDEF SDL_VIDEO_DRIVER_VIVANTE}
138+
__SYSWM_VIVANTE = record
139+
(* No Vivante window events yet *)
140+
dummy: cint;
141+
end;
142+
{$ENDIF}
143+
144+
{$IFDEF SDL_VIDEO_DRIVER_OS2}
145+
__SYSWM_OS2 = record
146+
fFrame: Boolean; {**< TRUE if hwnd is a frame window *}
147+
hwnd: HWND; {**< The window receiving the message *}
148+
msg: ULONG; {**< The message identifier *}
149+
mp1: MPARAM; {**< The first first message parameter *}
150+
mp2: MPARAM; {**< The second first message parameter *}
151+
end;
152+
{$ENDIF}
153+
154+
{**
155+
* The custom window manager information structure.
156+
*
157+
* When this structure is returned, it holds information about which
158+
* low level system it is using, and will be one of SDL_SYSWM_TYPE.
159+
*}
160+
161+
{$IFDEF SDL_VIDEO_DRIVER_WINDOWS}
109162
__WMINFO_WINDOWS = record
110163
window: HWND; {**< The window handle *}
111164
hdc: HDC; {**< The window device context *}
112165
hinstance: HINST; {**< The instance handle *}
113166
end;
114167
{$ENDIF}
115168

116-
{$IFDEF SDL_VIDEO_DRIVER_X11}
117-
__SYSWM_X11 = record
118-
event: {$IFDEF FPC} TXEvent {$ELSE} XEvent {$ENDIF};
169+
{$IFDEF SDL_VIDEO_DRIVER_WINRT}
170+
__WMINFO_WINRT = record
171+
window: IInspectable; {**< The WinRT CoreWindow *}
119172
end;
173+
{$ENDIF}
174+
175+
{$IFDEF SDL_VIDEO_DRIVER_X11}
120176
__WMINFO_X11 = record
121177
display: PDisplay; {**< The X11 display *}
122178
window: TWindow; {**< The X11 window *}
123179
end;
124180
{$ENDIF}
125181

126182
{$IFDEF SDL_VIDEO_DRIVER_DIRECTFB}
127-
__SYSWM_DIRECTFB = record
128-
event: DFBEvent;
129-
end;
130183
__WMINFO_DIRECTFB = record
131184
dfb: IDirectFB; {**< The directfb main interface *}
132185
window: IDirectFBWindow; {**< The directfb window handle *}
@@ -135,20 +188,12 @@ type
135188
{$ENDIF}
136189

137190
{$IFDEF SDL_VIDEO_DRIVER_COCOA}
138-
__SYSWM_COCOA = record
139-
(* No Cocoa window events yet *)
140-
dummy: cint;
141-
end;
142191
__WMINFO_COCOA = record
143192
window: NSWindow; {* The Cocoa window *}
144193
end;
145194
{$ENDIF}
146195

147196
{$IFDEF SDL_VIDEO_DRIVER_UIKIT}
148-
__SYSWM_UIKIT = record
149-
(* No UIKit window events yet *)
150-
dummy: cint;
151-
end;
152197
__WMINFO_UIKIT = record
153198
window: UIWindow; {* The UIKit window *}
154199
framebuffer: GLuint; {* The GL view's Framebuffer Object. It must be bound when rendering to the screen using GL. *}
@@ -177,43 +222,28 @@ type
177222
end;
178223
{$ENDIF}
179224

180-
{$IFDEF SDL_VIDEO_DRIVER_WINRT}
181-
__WMINFO_WINRT = record
182-
window: IInspectable; {**< The WinRT CoreWindow *}
183-
end;
184-
{$ENDIF}
185-
186225
{$IFDEF SDL_VIDEO_DRIVER_ANDROID}
187226
__WMINFO_ANDROID = record
188227
window: Pointer; // PANativeWindow;
189228
surface: Pointer; // PEGLSurface;
190229
end;
191230
{$ENDIF}
192231

193-
{$IFDEF SDL_VIDEO_DRIVER_VIVANTE}
194-
__SYSWM_VIVANTE = record
195-
(* No Vivante window events yet *)
196-
dummy: cint;
232+
{$IFDEF SDL_VIDEO_DRIVER_OS2}
233+
__WMINFO_OS2 = record
234+
hwnd: HWND; {**< The window handle *}
235+
hwndFrame: HWND; {**< The frame window handle *}
197236
end;
237+
{$ENDIF}
238+
239+
{$IFDEF SDL_VIDEO_DRIVER_VIVANTE}
198240
__WMINFO_VIVANTE = record
199241
display: EGLNativeDisplayType;
200242
window: EGLNativeWindowType;
201243
end;
202244
{$ENDIF}
203245

204-
{$IFDEF SDL_VIDEO_DRIVER_OS2}
205-
__SYSWM_OS2 = record
206-
fFrame: Boolean; {**< TRUE if hwnd is a frame window *}
207-
hwnd: HWND; {**< The window receiving the message *}
208-
msg: ULONG; {**< The message identifier *}
209-
mp1: MPARAM; {**< The first first message parameter *}
210-
mp2: MPARAM; {**< The second first message parameter *}
211-
end;
212-
__WMINFO_OS2 = record
213-
hwnd: HWND; {**< The window handle *}
214-
hwndFrame: HWND; {**< The frame window handle *}
215-
end;
216-
{$ENDIF}
246+
217247

218248

219249
{**

0 commit comments

Comments
 (0)