From b82742d4f392aa26ecb761ccbfbbb24f8e08fbb6 Mon Sep 17 00:00:00 2001
From: tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>
Date: Mon, 1 Sep 2008 21:22:41 +0000
Subject: * The latest round of SDL tweaks

git-svn-id: svn://svn.icculus.org/quake3/trunk@1469 edf5b092-35ff-0310-97b2-ce42778d08ea
---
 misc/sdl-win32-fixes.diff | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

(limited to 'misc')

diff --git a/misc/sdl-win32-fixes.diff b/misc/sdl-win32-fixes.diff
index 2a4ff63..3c0b868 100644
--- a/misc/sdl-win32-fixes.diff
+++ b/misc/sdl-win32-fixes.diff
@@ -171,7 +171,17 @@ Index: src/video/wincommon/SDL_sysmouse.c
 ===================================================================
 --- src/video/wincommon/SDL_sysmouse.c	(revision 4067)
 +++ src/video/wincommon/SDL_sysmouse.c	(working copy)
-@@ -208,15 +208,20 @@
+@@ -188,8 +188,7 @@
+ {
+ 	POINT mouse_pos;
+ 
+-	/* The fullscreen cursor must be done in software with DirectInput */
+-	if ( !this->screen || DDRAW_FULLSCREEN() ) {
++	if ( !this->screen ) {
+ 		return(0);
+ 	}
+ 
+@@ -208,15 +207,20 @@
  
  void WIN_WarpWMCursor(_THIS, Uint16 x, Uint16 y)
  {
@@ -195,7 +205,7 @@ Index: src/video/wincommon/SDL_sysmouse.c
  		pt.x = x;
  		pt.y = y;
  		ClientToScreen(SDL_Window, &pt);
-@@ -227,20 +232,15 @@
+@@ -227,20 +231,15 @@
  /* Update the current mouse state and position */
  void WIN_UpdateMouse(_THIS)
  {
@@ -251,7 +261,7 @@ Index: src/video/windib/SDL_dibevents.c
 +			SetCursorPos(center.x, center.y);
 +			posted = SDL_PrivateMouseMotion(0, 1, mouse.x, mouse.y);
 +		}
-+	} else {
++	} else if ( SDL_GetAppState() & SDL_APPMOUSEFOCUS ) {
 +		ScreenToClient(SDL_Window, &mouse);
 +#ifdef _WIN32_WCE
 +		if (SDL_VideoSurface)
@@ -288,7 +298,7 @@ Index: src/video/windx5/SDL_dx5events.c
 ===================================================================
 --- src/video/windx5/SDL_dx5events.c	(revision 4067)
 +++ src/video/windx5/SDL_dx5events.c	(working copy)
-@@ -143,7 +143,12 @@
+@@ -143,9 +143,14 @@
  		(DISCL_FOREGROUND|DISCL_NONEXCLUSIVE),
  		(DISCL_FOREGROUND|DISCL_NONEXCLUSIVE), handle_keyboard },
  	{ "mouse",
@@ -300,8 +310,11 @@ Index: src/video/windx5/SDL_dx5events.c
 +		&c_dfDIMouse,
 +#endif
  		(DISCL_FOREGROUND|DISCL_NONEXCLUSIVE),
- 		(DISCL_FOREGROUND|DISCL_EXCLUSIVE), handle_mouse },
+-		(DISCL_FOREGROUND|DISCL_EXCLUSIVE), handle_mouse },
++		(DISCL_FOREGROUND|DISCL_NONEXCLUSIVE), handle_mouse },
  	{ NULL, NULL, NULL, 0, 0, NULL }
+ };
+ 	
 @@ -285,6 +290,76 @@
  		}
  	}
-- 
cgit v1.2.3