# HG changeset patch
# User ib
# Date 1358253843 0
# Node ID eadf0731a29a548c90702f844f94902cc2279046
# Parent  f2093dc82b5f66e54aae4954570d1fb3117a92e2
Add property wsAspect.

Windows with this property shall regard option 'keepaspect'.

Tag video window with wsAspect.

diff -r f2093dc82b5f -r eadf0731a29a gui/interface.c
--- a/gui/interface.c	Tue Jan 15 12:37:42 2013 +0000
+++ b/gui/interface.c	Tue Jan 15 12:44:03 2013 +0000
@@ -172,7 +172,7 @@
     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);
diff -r f2093dc82b5f -r eadf0731a29a gui/wm/ws.c
--- a/gui/wm/ws.c	Tue Jan 15 12:37:42 2013 +0000
+++ b/gui/wm/ws.c	Tue Jan 15 12:44:03 2013 +0000
@@ -471,7 +471,7 @@
         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;
diff -r f2093dc82b5f -r eadf0731a29a gui/wm/ws.h
--- a/gui/wm/ws.h	Tue Jan 15 12:37:42 2013 +0000
+++ b/gui/wm/ws.h	Tue Jan 15 12:44:03 2013 +0000
@@ -72,6 +72,7 @@
 #define  wsHideWindow   16
 #define  wsOverredirect 32
 #define  wsWaitMap      64
+#define  wsAspect       128
 
 #define  wsNoBorder 0