Mercurial > mplayer.hg

changeset 15892:c8e414e49fef

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
more fullscreen behaviour fix for mouse cursor
author nplourde
date Sat, 02 Jul 2005 19:44:48 +0000
parents 451c9ca8fd47
children ca32c9d61865
files libvo/vo_quartz.c
diffstat 1 files changed, 12 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_quartz.c	Sat Jul 02 19:35:15 2005 +0000
+++ b/libvo/vo_quartz.c	Sat Jul 02 19:44:48 2005 +0000
@@ -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();
 }