diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-06-27 10:26:13 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-06-27 10:26:13 +0000 |
commit | f131aafff160e816a3c5904d664561ffe9f32058 (patch) | |
tree | 31eb8b5970484238c36a7ca3d2cad288785879a3 /libvo/vo_xover.c | |
parent | b4be37acaf5d725d0c81508907fef9733acab444 (diff) | |
download | mpv-f131aafff160e816a3c5904d664561ffe9f32058.tar.bz2 mpv-f131aafff160e816a3c5904d664561ffe9f32058.tar.xz |
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
Diffstat (limited to 'libvo/vo_xover.c')
-rw-r--r-- | libvo/vo_xover.c | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/libvo/vo_xover.c b/libvo/vo_xover.c index 2a3d8ff9cb..2ec9f7dea3 100644 --- a/libvo/vo_xover.c +++ b/libvo/vo_xover.c @@ -300,22 +300,10 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, } else { - if ( vo_window == None ) - { - vo_window = XCreateWindow(mDisplay, RootWindow(mDisplay, mScreen), - vo_dx, vo_dy, window_width, window_height, xswa.border_pixel, - vinfo.depth, InputOutput, vinfo.visual, xswamask, &xswa); - - vo_x11_classhint(mDisplay, vo_window, "xvidix"); - vo_hidecursor(mDisplay, vo_window); - vo_x11_sizehint( vo_dx,vo_dy,vo_dwidth,vo_dheight,0 ); - - XStoreName(mDisplay, vo_window, title); - XMapWindow(mDisplay, vo_window); - - if ( flags&VOFLAG_FULLSCREEN ) vo_x11_fullscreen(); - - } else if ( !(flags&VOFLAG_FULLSCREEN) ) XMoveResizeWindow( mDisplay,vo_window,vo_dx,vo_dy,vo_dwidth,vo_dheight ); + vo_x11_create_vo_window(&vinfo, vo_dx, vo_dy, + window_width, window_height, flags, + InputOutput, "xvidix", title); + XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xswa); } if ( vo_gc != None ) XFreeGC( mDisplay,vo_gc ); |