RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-14 19:07:14 +00:00
Code Issues Releases Wiki Activity

fix -fs and 'f'

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6000 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
pontscho 2002-05-06 16:56:41 +00:00
parent 48da357ce5
commit a1f7ba2ba7
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libvo/vo_x11.c
View File

@ -303,11 +303,11 @@ static uint32_t config( uint32_t width,uint32_t height,uint32_t d_width,uint32_t
}
else
#endif
if ( fullscreen )
{
hint.width=vo_screenwidth;
hint.height=vo_screenheight;
}
// if ( fullscreen )
// {
// hint.width=vo_screenwidth;
// hint.height=vo_screenheight;
// }
hint.flags=PPosition | PSize;
bg=WhitePixel( mDisplay,mScreen );
@ -344,10 +344,10 @@ static uint32_t config( uint32_t width,uint32_t height,uint32_t d_width,uint32_t
vo_x11_classhint( mDisplay,vo_window,"x11" );
vo_hidecursor(mDisplay,vo_window);
if ( fullscreen ) vo_x11_decoration( mDisplay,vo_window,0 );
XSelectInput( mDisplay,vo_window,StructureNotifyMask );
XSetStandardProperties( mDisplay,vo_window,title,title,None,NULL,0,&hint );
XMapWindow( mDisplay,vo_window );
if ( fullscreen ) vo_x11_fullscreen();
#ifdef HAVE_XINERAMA
vo_x11_xinerama_move(mDisplay,vo_window);
#endif

14
libvo/vo_xmga.c
View File

@ -232,11 +232,11 @@ static uint32_t config( uint32_t width, uint32_t height, uint32_t d_width, uint3
mvWidth=width; mvHeight=height;
wndX=0; wndY=0;
vo_fs=fullscreen&1;
vo_dwidth=d_width; vo_dheight=d_height;
if ( vo_fs )
{ vo_old_width=d_width; vo_old_height=d_height; }
vo_mouse_autohide=1;
// vo_fs=fullscreen&1;
// if ( vo_fs )
// { vo_old_width=d_width; vo_old_height=d_height; }
switch ( vo_depthonscreen )
{
@ -259,8 +259,8 @@ static uint32_t config( uint32_t width, uint32_t height, uint32_t d_width, uint3
{
if ( vo_fs )
{
vo_dwidth=vo_screenwidth;
vo_dheight=vo_screenheight;
// vo_dwidth=vo_screenwidth;
// vo_dheight=vo_screenheight;
#ifdef X11_FULLSCREEN
aspect(&dwidth,&dheight,A_ZOOM);
#endif
@ -292,10 +292,12 @@ static uint32_t config( uint32_t width, uint32_t height, uint32_t d_width, uint3
vo_x11_classhint( mDisplay,vo_window,"xmga" );
vo_hidecursor(mDisplay,vo_window);
if ( vo_fs ) vo_x11_decoration( mDisplay,vo_window,0 );
// if ( vo_fs ) vo_x11_decoration( mDisplay,vo_window,0 );
XStoreName( mDisplay,vo_window,mTitle );
XMapWindow( mDisplay,vo_window );
if ( fullscreen&1 ) vo_x11_fullscreen();
#ifdef HAVE_XINERAMA
vo_x11_xinerama_move(mDisplay,vo_window);

13
libvo/vo_xv.c
View File

@ -338,9 +338,9 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32
vo_mouse_autohide=1;
vo_dwidth=d_width; vo_dheight=d_height;
vo_fs=flags&1;
if ( vo_fs )
{ vo_old_width=d_width; vo_old_height=d_height; }
// vo_fs=flags&1;
// if ( vo_fs )
// { vo_old_width=d_width; vo_old_height=d_height; }
#ifdef HAVE_XF86VM
if( flags&0x02 ) vm = 1;
@ -388,8 +388,8 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32
#endif
if ( vo_fs )
{
hint.width=vo_screenwidth;
hint.height=vo_screenheight;
// hint.width=vo_screenwidth;
// hint.height=vo_screenheight;
#ifdef X11_FULLSCREEN
/* this code replaces X11_FULLSCREEN hack in mplayer.c
* aspect() is available through aspect.h for all vos.
@ -437,8 +437,9 @@ static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32
);
XSetStandardProperties(mDisplay, vo_window, hello, hello, None, NULL, 0, &hint);
XSetWMNormalHints( mDisplay,vo_window,&hint );
if ( vo_fs ) vo_x11_decoration( mDisplay,vo_window,0 );
// if ( vo_fs ) vo_x11_decoration( mDisplay,vo_window,0 );
XMapWindow(mDisplay, vo_window);
if ( flags&1 ) vo_x11_fullscreen();
#ifdef HAVE_XINERAMA
vo_x11_xinerama_move(mDisplay,vo_window);
#endif