[MPlayer-cvslog] r35751 - in trunk/gui: interface.c wm/ws.c wm/ws.h

[ib]

Author: ib
Date: Tue Jan 15 13:44:03 2013
New Revision: 35751

Log:
Add property wsAspect.

Windows with this property shall regard option 'keepaspect'.

Tag video window with wsAspect.

Modified:
   trunk/gui/interface.c
   trunk/gui/wm/ws.c
   trunk/gui/wm/ws.h

Modified: trunk/gui/interface.c
==============================================================================
--- trunk/gui/interface.c	Tue Jan 15 13:37:42 2013	(r35750)
+++ trunk/gui/interface.c	Tue Jan 15 13:44:03 2013	(r35751)
@@ -172,7 +172,7 @@ void guiInit(void)
     if (guiWinID >= 0)
         guiApp.mainWindow.Parent = guiWinID;
 
-    wsCreateWindow(&guiApp.videoWindow, guiApp.video.x, guiApp.video.y, guiApp.video.width, guiApp.video.height, wsNoBorder, wsShowMouseCursor | wsHandleMouseButton | wsHandleMouseMove, wsShowFrame | wsHideWindow | wsWaitMap, "MPlayer - Video");
+    wsCreateWindow(&guiApp.videoWindow, guiApp.video.x, guiApp.video.y, guiApp.video.width, guiApp.video.height, wsNoBorder, wsShowMouseCursor | wsHandleMouseButton | wsHandleMouseMove, wsShowFrame | wsHideWindow | wsWaitMap | wsAspect, "MPlayer - Video");
     wsDestroyImage(&guiApp.videoWindow);
     wsCreateImage(&guiApp.videoWindow, guiApp.video.Bitmap.Width, guiApp.video.Bitmap.Height);
     wsXDNDMakeAwareness(&guiApp.videoWindow);

Modified: trunk/gui/wm/ws.c
==============================================================================
--- trunk/gui/wm/ws.c	Tue Jan 15 13:37:42 2013	(r35750)
+++ trunk/gui/wm/ws.c	Tue Jan 15 13:44:03 2013	(r35751)
@@ -471,7 +471,7 @@ static void wsSizeHint(wsWindow *win)
         win->SizeHint.max_height = win->Height;
     }
 
-    if (vo_keepaspect /*&& (win->Property & wsAspect)*/) {
+    if (vo_keepaspect && (win->Property & wsAspect)) {
         win->SizeHint.flags |= PAspect;
         win->SizeHint.min_aspect.x = win->Width;
         win->SizeHint.min_aspect.y = win->Height;

Modified: trunk/gui/wm/ws.h
==============================================================================
--- trunk/gui/wm/ws.h	Tue Jan 15 13:37:42 2013	(r35750)
+++ trunk/gui/wm/ws.h	Tue Jan 15 13:44:03 2013	(r35751)
@@ -72,6 +72,7 @@
 #define  wsHideWindow   16
 #define  wsOverredirect 32
 #define  wsWaitMap      64
+#define  wsAspect       128
 
 #define  wsNoBorder 0