[MPlayer-cvslog] r29556 - in trunk/libvo: vo_gl.c x11_common.c

[reimar]

Author: reimar
Date: Thu Aug 27 14:03:02 2009
New Revision: 29556

Log:
First attempts at supporting -fs with -wid, -vo gl on X11 only so far

Modified:
   trunk/libvo/vo_gl.c
   trunk/libvo/x11_common.c

Modified: trunk/libvo/vo_gl.c
==============================================================================
--- trunk/libvo/vo_gl.c	Thu Aug 27 13:04:52 2009	(r29555)
+++ trunk/libvo/vo_gl.c	Thu Aug 27 14:03:02 2009	(r29556)
@@ -1149,6 +1149,9 @@ static int control(uint32_t request, voi
       if (scaled_osd) {r->w = image_width; r->h = image_height;}
       else if (vo_fs) {
         r->w = vo_screenwidth; r->h = vo_screenheight;
+        if (WinID >= 0) {
+            r->w = vo_dwidth; r->h = vo_dheight;
+        }
         r->ml = r->mr = ass_border_x;
         r->mt = r->mb = ass_border_y;
       } else {

Modified: trunk/libvo/x11_common.c
==============================================================================
--- trunk/libvo/x11_common.c	Thu Aug 27 13:04:52 2009	(r29555)
+++ trunk/libvo/x11_common.c	Thu Aug 27 14:03:02 2009	(r29556)
@@ -1086,6 +1086,7 @@ void vo_x11_create_vo_window(XVisualInfo
 {
   XGCValues xgcv;
   if (WinID >= 0) {
+    vo_fs = flags & VOFLAG_FULLSCREEN;
     vo_window = WinID ? (Window)WinID : mRootWin;
     if (col_map != CopyFromParent) {
       unsigned long xswamask = CWColormap;
@@ -1343,7 +1344,11 @@ void vo_x11_fullscreen(void)
 {
     int x, y, w, h;
 
-    if (WinID >= 0 || vo_fs_flip)
+    if (WinID >= 0) {
+        vo_fs = !vo_fs;
+        return;
+    }
+    if (vo_fs_flip)
         return;
 
     if (vo_fs)