From a1c1f1b6b20b5fe6eb9605c3cf1e9d30750f4bc9 Mon Sep 17 00:00:00 2001
From: Daniel Gibson <metalcaedes@gmail.com>
Date: Thu, 3 Jan 2013 08:15:09 +0100
Subject: [PATCH] Support resizing windows for SDL1.2

By implementing GLimp_SetScreenParms() for SDL1.2
and enhancing the event handling
---
 neo/sys/sdl/sdl_events.cpp | 18 +++++++++++++++-
 neo/sys/sdl/sdl_glimp.cpp  | 43 ++++++++++++++++++++++++++------------
 2 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/neo/sys/sdl/sdl_events.cpp b/neo/sys/sdl/sdl_events.cpp
index b7988c6a..251830d8 100644
--- a/neo/sys/sdl/sdl_events.cpp
+++ b/neo/sys/sdl/sdl_events.cpp
@@ -802,8 +802,24 @@ sysEvent_t Sys_GetEvent()
 			
 			case SDL_VIDEOEXPOSE:
 				return res_none;
-#endif
 				
+				// DG: handle resizing and moving of window
+			case SDL_VIDEORESIZE:
+			{
+				int w = ev.resize.w;
+				int h = ev.resize.h;
+				r_windowWidth.SetInteger( w );
+				r_windowHeight.SetInteger( h );
+			
+				glConfig.nativeScreenWidth = w;
+				glConfig.nativeScreenHeight = h;
+				// for some reason this needs a vid_restart in SDL1 but not SDL2 so GLimp_SetScreenParms() is called
+				PushConsoleEvent( "vid_restart" );
+				return res_none;
+			}
+			// DG end
+#endif
+			
 			case SDL_KEYDOWN:
 				if( ev.key.keysym.sym == SDLK_RETURN && ( ev.key.keysym.mod & KMOD_ALT ) > 0 )
 				{
diff --git a/neo/sys/sdl/sdl_glimp.cpp b/neo/sys/sdl/sdl_glimp.cpp
index fc1022d2..fee6c78f 100644
--- a/neo/sys/sdl/sdl_glimp.cpp
+++ b/neo/sys/sdl/sdl_glimp.cpp
@@ -55,6 +55,7 @@ static SDL_GLContext context = NULL;
 static SDL_Surface* window = NULL;
 #define SDL_WINDOW_OPENGL SDL_OPENGL
 #define SDL_WINDOW_FULLSCREEN SDL_FULLSCREEN
+#define SDL_WINDOW_RESIZABLE SDL_RESIZABLE
 #endif
 
 bool QGL_Init( const char* dllname );
@@ -307,7 +308,7 @@ bool GLimp_Init( glimpParms_t parms )
 */
 
 #if SDL_VERSION_ATLEAST(2, 0, 0)
-// SDL1 doesn't support multiple displays
+// SDL1 doesn't support multiple displays, so the source is much shorter and doesn't need seperate functions
 // makes sure the window will be full-screened on the right display and returns the SDL display index
 static int ScreenParmsHandleDisplayIndex( glimpParms_t parms )
 {
@@ -346,11 +347,9 @@ static int ScreenParmsHandleDisplayIndex( glimpParms_t parms )
 	}
 	return displayIdx;
 }
-#endif // SDL_VERSION_ATLEAST(2, 0, 0)
 
 static bool SetScreenParmsFullscreen( glimpParms_t parms )
 {
-#if SDL_VERSION_ATLEAST(2, 0, 0)
 	SDL_DisplayMode m = {0};
 	int displayIdx = ScreenParmsHandleDisplayIndex( parms );
 	if( displayIdx < 0 )
@@ -381,15 +380,11 @@ static bool SetScreenParmsFullscreen( glimpParms_t parms )
 			return false;
 		}
 	}
-#else // ! SDL_VERSION_ATLEAST(2, 0, 0) => SDL1.2
-	// TODO: SDL1.2 fullscreen handling
-#endif // SDL_VERSION_ATLEAST(2, 0, 0)
 	return true;
 }
 
 static bool SetScreenParmsWindowed( glimpParms_t parms )
 {
-#if SDL_VERSION_ATLEAST(2, 0, 0)
 	SDL_SetWindowSize( window, parms.width, parms.height );
 	SDL_SetWindowPosition( window, parms.x, parms.y );
 	
@@ -402,11 +397,9 @@ static bool SetScreenParmsWindowed( glimpParms_t parms )
 			return false;
 		}
 	}
-#else // SDL 1.2
-	// TODO: SDL1.2 windowed handling
-#endif
 	return true;
 }
+#endif // SDL_VERSION_ATLEAST(2, 0, 0)
 
 /*
 ===================
@@ -431,6 +424,33 @@ bool GLimp_SetScreenParms( glimpParms_t parms )
 		common->Warning( "GLimp_SetScreenParms: fullScreen -1 (borderless window for multiple displays) currently unsupported!" );
 		return false;
 	}
+#else // SDL 1.2 - so much shorter, but doesn't handle multiple displays
+	SDL_Surface* s = SDL_GetVideoSurface();
+	if( s == NULL )
+	{
+		common->Warning( "GLimp_SetScreenParms: Couldn't get video information, reason: %s", SDL_GetError() );
+		return false;
+	}
+	
+	
+	int bitsperpixel = 24;
+	if( s->format )
+		bitsperpixel = s->format->BitsPerPixel;
+	
+	Uint32 flags = s->flags;
+	
+	if( parms.fullScreen )
+		flags |= SDL_FULLSCREEN;
+	else
+		flags &= ~SDL_FULLSCREEN;
+	
+	s = SDL_SetVideoMode( parms.width, parms.height, bitsperpixel, flags );
+	if( s == NULL )
+	{
+		common->Warning( "GLimp_SetScreenParms: Couldn't set video information, reason: %s", SDL_GetError() );
+		return false;
+	}
+#endif // SDL_VERSION_ATLEAST(2, 0, 0)
 	
 	// Note: the following stuff would also work with SDL1.2
 	SDL_GL_SetAttribute( SDL_GL_STEREO, parms.stereo ? 1 : 0 );
@@ -444,9 +464,6 @@ bool GLimp_SetScreenParms( glimpParms_t parms )
 	glConfig.nativeScreenHeight = parms.height;
 	glConfig.displayFrequency = parms.displayHz;
 	glConfig.multisamples = parms.multiSamples;
-#else // SDL 1.2
-	common->Printf( "TODO: Implement GLimp_SetScreenParms() for SDL1.2\n" );
-#endif
 	
 	return true;
 }