From fb10acf778d9d30b1e8c5aa5f43ef2c246d2f565 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Fri, 20 Jul 2007 03:30:41 +0000
Subject: [PATCH] Merged window position fix from windib code

---
 src/video/windx5/SDL_dx5video.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/video/windx5/SDL_dx5video.c b/src/video/windx5/SDL_dx5video.c
index aae58be62..50b74f614 100644
--- a/src/video/windx5/SDL_dx5video.c
+++ b/src/video/windx5/SDL_dx5video.c
@@ -1018,6 +1018,7 @@ SDL_Surface *DX5_SetVideoMode(_THIS, SDL_Surface *current,
 				int width, int height, int bpp, Uint32 flags)
 {
 	SDL_Surface *video;
+	int prev_w, prev_h;
 	HRESULT result;
 	DWORD sharemode;
 	DWORD style;
@@ -1103,6 +1104,8 @@ SDL_Surface *DX5_SetVideoMode(_THIS, SDL_Surface *current,
 		}
 
 		/* Fill in part of the video surface */
+		prev_w = video->w;
+		prev_h = video->h;
 		video->flags = 0;	/* Clear flags */
 		video->w = width;
 		video->h = height;
@@ -1178,7 +1181,7 @@ SDL_Surface *DX5_SetVideoMode(_THIS, SDL_Surface *current,
 			const char *window = NULL;
 			const char *center = NULL;
 
-			if ( !SDL_windowX && !SDL_windowY ) {
+			if ( video->w != prev_w || video->h != prev_h ) {
 				window = SDL_getenv("SDL_VIDEO_WINDOW_POS");
 				center = SDL_getenv("SDL_VIDEO_CENTERED");
 				if ( window ) {
@@ -1454,6 +1457,8 @@ SDL_Surface *DX5_SetVideoMode(_THIS, SDL_Surface *current,
 			SDL_OutOfMemory();
 			return(NULL);
 		}
+		prev_w = video->w;
+		prev_h = video->h;
 		video->w = width;
 		video->h = height;
 		video->pitch = 0;
@@ -1581,7 +1586,7 @@ SDL_Surface *DX5_SetVideoMode(_THIS, SDL_Surface *current,
 			const char *window = NULL;
 			const char *center = NULL;
 
-			if ( !SDL_windowX && !SDL_windowY ) {
+			if ( video->w != prev_w || video->h != prev_h ) {
 				window = SDL_getenv("SDL_VIDEO_WINDOW_POS");
 				center = SDL_getenv("SDL_VIDEO_CENTERED");
 				if ( window ) {