diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-05 18:16:27 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-05-05 18:16:27 +0000 |
| commit | 2d3655ed7138f946294d49ed020596f495f4ced3 (patch) | |
| tree | 3bc8de3e769860eb5618efb71342e9596cda1f49 /libvo | |
| parent | 816258171c2096545c5483175dcaca37c8812afc (diff) | |
| download | mpv-2d3655ed7138f946294d49ed020596f495f4ced3.tar.bz2 mpv-2d3655ed7138f946294d49ed020596f495f4ced3.tar.xz | |
the Right Fix for gui window setup
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5986 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_xmga.c | 11 | ||||
| -rw-r--r-- | libvo/vo_xv.c | 10 |
2 files changed, 11 insertions, 10 deletions
diff --git a/libvo/vo_xmga.c b/libvo/vo_xmga.c index 5ad5d923fd..9b3280549d 100644 --- a/libvo/vo_xmga.c +++ b/libvo/vo_xmga.c @@ -250,10 +250,13 @@ static uint32_t config( uint32_t width, uint32_t height, uint32_t d_width, uint3 inited=1; aspect(&vo_dwidth,&vo_dheight,A_NOZOOM); + #ifdef HAVE_NEW_GUI - if ( vo_window == None ) - { + if(use_gui) + guiGetEvent( guiSetShVideo,0 ); // the GUI will set up / resize the window + else #endif + { if ( vo_fs ) { vo_dwidth=vo_screenwidth; @@ -298,9 +301,7 @@ static uint32_t config( uint32_t width, uint32_t height, uint32_t d_width, uint3 vo_x11_xinerama_move(mDisplay,vo_window); #endif vo_gc=XCreateGC( mDisplay,vo_window,GCForeground,&wGCV ); -#ifdef HAVE_NEW_GUI - } else if(use_gui) guiGetEvent( guiSetShVideo,0 ); -#endif + } set_window(); diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index 8dc55f461d..ae5658cce4 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -361,9 +361,11 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32 aspect_save_screenres(vo_screenwidth,vo_screenheight); #ifdef HAVE_NEW_GUI - if ( vo_window == None ) - { + if(use_gui) + guiGetEvent( guiSetShVideo,0 ); // let the GUI to setup/resize our window + else #endif + { hint.x = 0; hint.y = 0; hint.width = d_width; @@ -453,9 +455,7 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32 XSetInputFocus(mDisplay, vo_window, RevertToNone, CurrentTime); } #endif -#ifdef HAVE_NEW_GUI - } else if(use_gui) guiGetEvent( guiSetShVideo,0 ); -#endif + } mp_msg(MSGT_VO,MSGL_V, "using Xvideo port %d for hw scaling\n",xv_port ); |