Ticket #278: fixforblackbox070.diff

libvo/x11_common.c

@@ -1440 +1440 @@
         {
             if (vo_dwidth != vo_screenwidth && vo_dheight != vo_screenheight)
                 return;
-            x = vo_old_x;
-            y = vo_old_y;
-            w = vo_old_width;
-            h = vo_old_height;
-        }
+                }
 
+                // Since the size IS hinted for EWMH, now, we need to restore the proper size.
+        x = vo_old_x;
+        y = vo_old_y;
+        w = vo_old_width;
+        h = vo_old_height;
+        vo_x11_sizehint(x, y, w, h, 0);
         vo_x11_ewmh_fullscreen(_NET_WM_STATE_REMOVE);   // removes fullscreen state if wm supports EWMH
         vo_fs = VO_FALSE;
     } else
     {
         // win->fs
-        vo_x11_ewmh_fullscreen(_NET_WM_STATE_ADD);      // sends fullscreen state to be added if wm supports EWMH
-
-        vo_fs = VO_TRUE;
+                // There's a small problems with EWMH and keepaspect: Blackbox 0.70.0 tries to obey both the aspect
+                // and the fullscreen request, resulting in a loss of about 1/5th of the bottom of the mplayer
+                // window. This is fixed by sizehinting the window to the screen size.
         if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // not needed with EWMH fs
         {
             if (vo_old_width &&
                 (vo_dwidth == vo_screenwidth && vo_dwidth != vo_old_width) &&
-                (vo_dheight == vo_screenheight && vo_dheight != vo_old_height))
+                (vo_dheight == vo_screenheight && vo_dheight != vo_old_height)) {
+                vo_fs = VO_TRUE;
                 return;
-            vo_old_x = vo_dx;
-            vo_old_y = vo_dy;
-            vo_old_width = vo_dwidth;
-            vo_old_height = vo_dheight;
-            x = 0;
-            y = 0;
-            w = vo_screenwidth;
-            h = vo_screenheight;
+            }
         }
+        vo_old_x = vo_dx;
+        vo_old_y = vo_dy;
+        vo_old_width = vo_dwidth;
+        vo_old_height = vo_dheight;
+        x = 0;
+        y = 0;
+        w = vo_screenwidth;
+        h = vo_screenheight;
+        vo_x11_sizehint( x, y, w, h, 0);
+        vo_x11_ewmh_fullscreen(_NET_WM_STATE_ADD);      // sends fullscreen state to be added if wm supports EWMH
+
+        vo_fs = VO_TRUE;
     }
     {
         long dummy;
@@ -1489 +1497 @@
     if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // not needed with EWMH fs
     {
         vo_x11_decoration(mDisplay, vo_window, (vo_fs) ? 0 : 1);
-        vo_x11_sizehint(x, y, w, h, 0);
+//      vo_x11_sizehint(x, y, w, h, 0);
         vo_x11_setlayer(mDisplay, vo_window, vo_fs);