[MPlayer-cvslog] CVS: main/libvo vo_quartz.c,1.51,1.52

[Nicolas Plourde CVS]

CVS change done by Nicolas Plourde CVS

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv11402/libvo

Modified Files:
	vo_quartz.c 
Log Message:
more fullscreen behaviour fix for mouse cursor

Index: vo_quartz.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_quartz.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- vo_quartz.c	2 Jul 2005 13:28:25 -0000	1.51
+++ vo_quartz.c	2 Jul 2005 19:44:48 -0000	1.52
@@ -87,7 +87,7 @@
 
 static int int_pause = 0;
 static float winAlpha = 1;
-static int mouseHide = 0;
+static int mouseHide = FALSE;
 
 static int device_width;
 static int device_height;
@@ -433,13 +433,19 @@
 				
 			case kAspectFullCmd:
 				movie_aspect = 4.0f/3.0f;
-				SizeWindow(theWindow, dstRect.right, (dstRect.right/movie_aspect),1);
+				if(!vo_quartz_fs)
+				{
+					SizeWindow(theWindow, dstRect.right, (dstRect.right/movie_aspect),1);
+				}
 				window_resized();
 				break;
 				
 			case kAspectWideCmd:
 				movie_aspect = 16.0f/9.0f;
-				SizeWindow(theWindow, dstRect.right, (dstRect.right/movie_aspect),1);
+				if(!vo_quartz_fs)
+				{
+					SizeWindow(theWindow, dstRect.right, (dstRect.right/movie_aspect),1);
+				}
 				window_resized();
 				break;
 				
@@ -1353,7 +1359,7 @@
 			{
 				SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar);
 				HideCursor();
-				mouseHide = 1;
+				mouseHide = TRUE;
 			}
 			
 			if(fs_res_x != 0 || fs_res_y != 0)
@@ -1385,6 +1391,7 @@
 	}
 	else //go back to windowed mode
 	{
+		vo_quartz_fs = 0;
 		if(restoreState != NULL)
 		{
 			EndFullScreen(restoreState, NULL);
@@ -1400,14 +1407,12 @@
 
 		//show mouse cursor
 		ShowCursor();
-		mouseHide = 0;
+		mouseHide = FALSE;
 		
 		//revert window to previous setting
 		ChangeWindowAttributes(theWindow, 0, kWindowNoShadowAttribute);
 		SizeWindow(theWindow, oldWinRect.right, oldWinRect.bottom,1);
 		MoveWindow(theWindow, oldWinBounds.left, oldWinBounds.top, 1);
-
- 		vo_quartz_fs = 0;
 	}
 	window_resized();
 }