Mercurial > mplayer.hg

changeset 29514:23a59bb3baf4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
First attempts at supporting -fs with -wid, -vo gl on X11 only so far
author reimar
date Thu, 27 Aug 2009 12:03:02 +0000
parents 3dd6ae109bd2
children d3700065005f
files libvo/vo_gl.c libvo/x11_common.c
diffstat 2 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_gl.c	Thu Aug 27 11:04:52 2009 +0000
+++ b/libvo/vo_gl.c	Thu Aug 27 12:03:02 2009 +0000
@@ -1149,6 +1149,9 @@
       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 {
--- a/libvo/x11_common.c	Thu Aug 27 11:04:52 2009 +0000
+++ b/libvo/x11_common.c	Thu Aug 27 12:03:02 2009 +0000
@@ -1086,6 +1086,7 @@
 {
   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 @@
 {
     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)