diff src/video/wincommon/SDL_lowvideo.h @ 1895:c121d94672cb

SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head.
author Sam Lantinga <slouken@libsdl.org>
date Mon, 10 Jul 2006 21:04:37 +0000
parents 21b1fbb53f4a
children
line wrap: on
line diff
--- a/src/video/wincommon/SDL_lowvideo.h	Thu Jul 06 18:01:37 2006 +0000
+++ b/src/video/wincommon/SDL_lowvideo.h	Mon Jul 10 21:04:37 2006 +0000
@@ -51,17 +51,17 @@
 #define WINDIB_FULLSCREEN()						\
 (									\
 	SDL_VideoSurface &&						\
-	((SDL_VideoSurface->flags & SDL_FULLSCREEN) == SDL_FULLSCREEN) && \
-	(((SDL_VideoSurface->flags & SDL_OPENGL   ) == SDL_OPENGL    ) || \
-	((SDL_strcmp(this->name, "windib") == 0) || \
-	 (SDL_strcmp(this->name, "gapi") == 0))) \
+	(SDL_VideoSurface->flags & SDL_FULLSCREEN) &&			\
+	((SDL_VideoSurface->flags & SDL_INTERNALOPENGL) ||		\
+	((SDL_strcmp(this->name, "windib") == 0) ||			\
+	 (SDL_strcmp(this->name, "gapi") == 0)))			\
 )
 #define DDRAW_FULLSCREEN() 						\
 (									\
 	SDL_VideoSurface &&						\
-	((SDL_VideoSurface->flags & SDL_FULLSCREEN) == SDL_FULLSCREEN) && \
-	((SDL_VideoSurface->flags & SDL_OPENGL    ) != SDL_OPENGL    ) && \
-	(SDL_strcmp(this->name, "directx") == 0)				\
+	(SDL_VideoSurface->flags & SDL_FULLSCREEN) &&			\
+	(SDL_VideoSurface->flags & SDL_INTERNALOPENGL) &&		\
+	(SDL_strcmp(this->name, "directx") == 0)			\
 )
 
 #define DINPUT_FULLSCREEN()	DDRAW_FULLSCREEN()
@@ -82,16 +82,17 @@
 extern void WIN_FlushMessageQueue();
 
 /* Called by windows message loop when system palette is available */
-extern void (*WIN_RealizePalette)(_THIS);
+extern void (*WIN_RealizePalette) (_THIS);
 
 /* Called by windows message loop when the system palette changes */
-extern void (*WIN_PaletteChanged)(_THIS, HWND window);
+extern void (*WIN_PaletteChanged) (_THIS, HWND window);
 
 /* Called by windows message loop when a portion of the screen needs update */
-extern void (*WIN_WinPAINT)(_THIS, HDC hdc);
+extern void (*WIN_WinPAINT) (_THIS, HDC hdc);
 
 /* Called by windows message loop when the message isn't handled */
-extern LONG (*HandleMessage)(_THIS, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
+extern LONG(*HandleMessage) (_THIS, HWND hwnd, UINT msg, WPARAM wParam,
+                             LPARAM lParam);
 
 /* The window cursor (from SDL_sysmouse.c) */
 extern HCURSOR SDL_hcursor;
@@ -123,11 +124,13 @@
 
 /* DJM: This is really from SDL_sysevents.c, we need it in
    GDL_CreateWindow as well */
-LRESULT CALLBACK WinMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
+LRESULT CALLBACK WinMessage(HWND hwnd, UINT msg, WPARAM wParam,
+                            LPARAM lParam);
 
 /* JFP: Implementation of ToUnicode() that works on 9x/ME/2K/XP */
-typedef int (WINAPI *ToUnicodeFN)(UINT, UINT, PBYTE, LPWSTR, int, UINT);
+typedef int (WINAPI * ToUnicodeFN) (UINT, UINT, PBYTE, LPWSTR, int, UINT);
 
 extern ToUnicodeFN SDL_ToUnicode;
 
 #endif /* SDL_lowvideo_h */
+/* vi: set ts=4 sw=4 expandtab: */