Make X11 window creation and (with -fixed-vo) management simpler and more

consistent by introducing a new function that handles most of the
ugly things. Changes of behaviour with some vos is unavoidable, bug reports
welcome.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23675 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 2 insertions, 25 deletions

diff --git a/libvo/vo_xmga.c b/libvo/vo_xmga.c
index cd57f5d12e..0b74ec1e7e 100644
--- a/libvo/vo_xmga.c
+++ b/libvo/vo_xmga.c
@@ -220,31 +220,8 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
 
         } else
         {
-
-            if (vo_window == None)
-            {
-                vo_window = XCreateWindow(mDisplay, mRootWin,
-                                          vo_dx, vo_dy,
-                                          vo_dwidth, vo_dheight,
-                                          xWAttribs.border_pixel,
-                                          mDepth,
-                                          InputOutput,
-                                          vinfo.visual, xswamask,
-                                          &xWAttribs);
-
-                vo_x11_classhint(mDisplay, vo_window, "xmga");
-                vo_hidecursor(mDisplay, vo_window);
-                vo_x11_sizehint(vo_dx, vo_dy, vo_dwidth, vo_dheight, 0);
-
-                XStoreName(mDisplay, vo_window, mTitle);
-                XMapWindow(mDisplay, vo_window);
-                vo_x11_nofs_sizepos(vo_dx, vo_dy, vo_dwidth, vo_dheight);
-
-                if (flags & VOFLAG_FULLSCREEN)
-                    vo_x11_fullscreen();
-
-            } else
-                vo_x11_nofs_sizepos(vo_dx, vo_dy, vo_dwidth, vo_dheight);
+            vo_x11_create_vo_window(&vinfo, vo_dx, vo_dy, d_width, d_height,
+                    flags, InputOutput, "xmga", title);
         }
 
         if (vo_gc != None)