diff -ru main/libvo/x11_common.c mplayer/libvo/x11_common.c
--- main/libvo/x11_common.c	2004-09-08 12:53:52 +0400
+++ mplayer/libvo/x11_common.c	2004-09-15 15:31:37 +0400
@@ -1406,7 +1406,8 @@
     if (vo_fs)
     {
         // fs->win
-        if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // not needed with EWMH fs
+        // if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // not needed with EWMH fs
+	// but probably harmless and fixes win size/position when going fs->win
         {
             if (vo_dwidth != vo_screenwidth && vo_dheight != vo_screenheight)
                 return;
@@ -1424,7 +1425,8 @@
         vo_x11_ewmh_fullscreen(_NET_WM_STATE_ADD);      // sends fullscreen state to be added if wm supports EWMH
 
         vo_fs = VO_TRUE;
-        if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // not needed with EWMH fs
+        // if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // not needed with EWMH fs
+	// but probably harmless and fixes win size/position when going fs->win
         {
             if (vo_old_width &&
                 (vo_dwidth == vo_screenwidth && vo_dwidth != vo_old_width) &&
@@ -1456,7 +1458,8 @@
         vo_fs_flip = 1;
     }
 
-    if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // not needed with EWMH fs
+    // if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // not needed with EWMH fs
+    // but probably harmless and fixes win size/position when going fs->win
     {
         vo_x11_decoration(mDisplay, vo_window, (vo_fs) ? 0 : 1);
         vo_x11_sizehint(x, y, w, h, 0);