diff -r 4feced261c68 -r de822cd3df3a misc/winutils/include/SDL_syswm.h --- a/misc/winutils/include/SDL_syswm.h Tue Jan 21 22:38:13 2014 +0100 +++ b/misc/winutils/include/SDL_syswm.h Tue Jan 21 22:43:06 2014 +0100 @@ -65,16 +65,16 @@ /** These are the various supported subsystems under UNIX */ typedef enum { - SDL_SYSWM_X11 + SDL_SYSWM_X11 } SDL_SYSWM_TYPE; /** The UNIX custom event structure */ struct SDL_SysWMmsg { - SDL_version version; - SDL_SYSWM_TYPE subsystem; - union { - XEvent xevent; - } event; + SDL_version version; + SDL_SYSWM_TYPE subsystem; + union { + XEvent xevent; + } event; }; /** The UNIX custom window manager information structure. @@ -82,35 +82,35 @@ * low level system it is using, and will be one of SDL_SYSWM_TYPE. */ typedef struct SDL_SysWMinfo { - SDL_version version; - SDL_SYSWM_TYPE subsystem; - union { - struct { - Display *display; /**< The X11 display */ - Window window; /**< The X11 display window */ - /** These locking functions should be called around - * any X11 functions using the display variable, + SDL_version version; + SDL_SYSWM_TYPE subsystem; + union { + struct { + Display *display; /**< The X11 display */ + Window window; /**< The X11 display window */ + /** These locking functions should be called around + * any X11 functions using the display variable, * but not the gfxdisplay variable. * They lock the event thread, so should not be - * called around event functions or from event filters. - */ + * called around event functions or from event filters. + */ /*@{*/ - void (*lock_func)(void); - void (*unlock_func)(void); + void (*lock_func)(void); + void (*unlock_func)(void); /*@}*/ - /** @name Introduced in SDL 1.0.2 */ + /** @name Introduced in SDL 1.0.2 */ /*@{*/ - Window fswindow; /**< The X11 fullscreen window */ - Window wmwindow; /**< The X11 managed input window */ + Window fswindow; /**< The X11 fullscreen window */ + Window wmwindow; /**< The X11 managed input window */ /*@}*/ - /** @name Introduced in SDL 1.2.12 */ + /** @name Introduced in SDL 1.2.12 */ /*@{*/ - Display *gfxdisplay; /**< The X11 display to which rendering is done */ + Display *gfxdisplay; /**< The X11 display to which rendering is done */ /*@}*/ - } x11; - } info; + } x11; + } info; } SDL_SysWMinfo; #elif defined(SDL_VIDEO_DRIVER_NANOX) @@ -118,14 +118,14 @@ /** The generic custom event structure */ struct SDL_SysWMmsg { - SDL_version version; - int data; + SDL_version version; + int data; }; /** The windows custom window manager information structure */ typedef struct SDL_SysWMinfo { - SDL_version version ; - GR_WINDOW_ID window ; /* The display window */ + SDL_version version ; + GR_WINDOW_ID window ; /* The display window */ } SDL_SysWMinfo; #elif defined(SDL_VIDEO_DRIVER_WINDIB) || defined(SDL_VIDEO_DRIVER_DDRAW) || defined(SDL_VIDEO_DRIVER_GAPI) @@ -134,35 +134,35 @@ /** The windows custom event structure */ struct SDL_SysWMmsg { - SDL_version version; - HWND hwnd; /**< The window for the message */ - UINT msg; /**< The type of message */ - WPARAM wParam; /**< WORD message parameter */ - LPARAM lParam; /**< LONG message parameter */ + SDL_version version; + HWND hwnd; /**< The window for the message */ + UINT msg; /**< The type of message */ + WPARAM wParam; /**< WORD message parameter */ + LPARAM lParam; /**< LONG message parameter */ }; /** The windows custom window manager information structure */ typedef struct SDL_SysWMinfo { - SDL_version version; - HWND window; /**< The Win32 display window */ - HGLRC hglrc; /**< The OpenGL context, if any */ + SDL_version version; + HWND window; /**< The Win32 display window */ + HGLRC hglrc; /**< The OpenGL context, if any */ } SDL_SysWMinfo; #elif defined(SDL_VIDEO_DRIVER_RISCOS) /** RISC OS custom event structure */ struct SDL_SysWMmsg { - SDL_version version; - int eventCode; /**< The window for the message */ - int pollBlock[64]; + SDL_version version; + int eventCode; /**< The window for the message */ + int pollBlock[64]; }; /** The RISC OS custom window manager information structure */ typedef struct SDL_SysWMinfo { - SDL_version version; - int wimpVersion; /**< Wimp version running under */ - int taskHandle; /**< The RISC OS task handle */ - int window; /**< The RISC OS display window */ + SDL_version version; + int wimpVersion; /**< Wimp version running under */ + int taskHandle; /**< The RISC OS task handle */ + int window; /**< The RISC OS display window */ } SDL_SysWMinfo; #elif defined(SDL_VIDEO_DRIVER_PHOTON) @@ -171,28 +171,28 @@ /** The QNX custom event structure */ struct SDL_SysWMmsg { - SDL_version version; - int data; + SDL_version version; + int data; }; /** The QNX custom window manager information structure */ typedef struct SDL_SysWMinfo { - SDL_version version; - int data; + SDL_version version; + int data; } SDL_SysWMinfo; #else /** The generic custom event structure */ struct SDL_SysWMmsg { - SDL_version version; - int data; + SDL_version version; + int data; }; /** The generic custom window manager information structure */ typedef struct SDL_SysWMinfo { - SDL_version version; - int data; + SDL_version version; + int data; } SDL_SysWMinfo; #endif /* video driver type */ @@ -203,7 +203,7 @@ /** * This function gives you custom hooks into the window manager information. * It fills the structure pointed to by 'info' with custom information and - * returns 0 if the function is not implemented, 1 if the function is + * returns 0 if the function is not implemented, 1 if the function is * implemented and no error occurred, and -1 if the version member of * the 'info' structure is not filled in or not supported. *