RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-16 20:27:23 +00:00
Code Issues Releases Wiki Activity

Indentation fix from previous patch, as discussed on IRC.

Browse Source 
Patch by Alexander Strasser


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12799 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
rtognimp 2004-07-11 22:27:18 +00:00
parent 9b0045f5e1
commit 1772486e47
2 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Gui/wm/ws.c
View File

@ -772,13 +772,13 @@ void wsFullScreen( wsTWindow * win )
{
vo_x11_ewmh_fullscreen( _NET_WM_STATE_REMOVE ); // removes fullscreen state if wm supports EWMH
if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // shouldn't be needed with EWMH fs
{
win->X=win->OldX;
win->Y=win->OldY;
win->Width=win->OldWidth;
win->Height=win->OldHeight;
decoration=win->Decorations;
}
{
win->X=win->OldX;
win->Y=win->OldY;
win->Width=win->OldWidth;
win->Height=win->OldHeight;
decoration=win->Decorations;
}
#ifdef ENABLE_DPMS
wsScreenSaverOn( wsDisplay );
@ -789,12 +789,12 @@ void wsFullScreen( wsTWindow * win )
else
{
if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // shouldn't be needed with EWMH fs
{
win->OldX=win->X; win->OldY=win->Y;
win->OldWidth=win->Width; win->OldHeight=win->Height;
win->X=wsOrgX; win->Y=wsOrgY;
win->Width=wsMaxX; win->Height=wsMaxY;
}
{
win->OldX=win->X; win->OldY=win->Y;
win->OldWidth=win->Width; win->OldHeight=win->Height;
win->X=wsOrgX; win->Y=wsOrgY;
win->Width=wsMaxX; win->Height=wsMaxY;
}
win->isFullScreen=True;
#ifdef ENABLE_DPMS
@ -805,19 +805,19 @@ void wsFullScreen( wsTWindow * win )
}
if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // shouldn't be needed with EWMH fs
{
vo_x11_decoration( wsDisplay,win->WindowID,decoration );
vo_x11_sizehint( win->X,win->Y,win->Width,win->Height,0 );
vo_x11_setlayer( wsDisplay,win->WindowID,win->isFullScreen );
{
vo_x11_decoration( wsDisplay,win->WindowID,decoration );
vo_x11_sizehint( win->X,win->Y,win->Width,win->Height,0 );
vo_x11_setlayer( wsDisplay,win->WindowID,win->isFullScreen );
if ((!(win->isFullScreen)) & vo_ontop) vo_x11_setlayer(wsDisplay, win->WindowID,1);
if ((!(win->isFullScreen)) & vo_ontop) vo_x11_setlayer(wsDisplay, win->WindowID,1);
XMoveResizeWindow( wsDisplay,win->WindowID,win->X,win->Y,win->Width,win->Height );
}
XMoveResizeWindow( wsDisplay,win->WindowID,win->X,win->Y,win->Width,win->Height );
}
if ( vo_wm_type == 0 && !(vo_fsmode&16) )
{
XWithdrawWindow( wsDisplay,win->WindowID,wsScreen );
XWithdrawWindow( wsDisplay,win->WindowID,wsScreen );
}

50
libvo/x11_common.c
View File

@ -1405,13 +1405,13 @@ void vo_x11_fullscreen(void)
// fs->win
if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // not needed with EWMH fs
{
if (vo_dwidth != vo_screenwidth && vo_dheight != vo_screenheight)
return;
x = vo_old_x;
y = vo_old_y;
w = vo_old_width;
h = vo_old_height;
}
if (vo_dwidth != vo_screenwidth && vo_dheight != vo_screenheight)
return;
x = vo_old_x;
y = vo_old_y;
w = vo_old_width;
h = vo_old_height;
}
vo_x11_ewmh_fullscreen(_NET_WM_STATE_REMOVE); // removes fullscreen state if wm supports EWMH
vo_fs = VO_FALSE;
@ -1423,18 +1423,18 @@ void vo_x11_fullscreen(void)
vo_fs = VO_TRUE;
if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // not needed with EWMH fs
{
if (vo_old_width &&
(vo_dwidth == vo_screenwidth && vo_dwidth != vo_old_width) &&
(vo_dheight == vo_screenheight && vo_dheight != vo_old_height))
return;
vo_old_x = vo_dx;
vo_old_y = vo_dy;
vo_old_width = vo_dwidth;
vo_old_height = vo_dheight;
x = 0;
y = 0;
w = vo_screenwidth;
h = vo_screenheight;
if (vo_old_width &&
(vo_dwidth == vo_screenwidth && vo_dwidth != vo_old_width) &&
(vo_dheight == vo_screenheight && vo_dheight != vo_old_height))
return;
vo_old_x = vo_dx;
vo_old_y = vo_dy;
vo_old_width = vo_dwidth;
vo_old_height = vo_dheight;
x = 0;
y = 0;
w = vo_screenwidth;
h = vo_screenheight;
}
}
{
@ -1455,14 +1455,14 @@ void vo_x11_fullscreen(void)
if ( ! (vo_fs_type & vo_wm_FULLSCREEN) ) // not needed with EWMH fs
{
vo_x11_decoration(mDisplay, vo_window, (vo_fs) ? 0 : 1);
vo_x11_sizehint(x, y, w, h, 0);
vo_x11_setlayer(mDisplay, vo_window, vo_fs);
vo_x11_decoration(mDisplay, vo_window, (vo_fs) ? 0 : 1);
vo_x11_sizehint(x, y, w, h, 0);
vo_x11_setlayer(mDisplay, vo_window, vo_fs);
if ((!(vo_fs)) & vo_ontop)
vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
if ((!(vo_fs)) & vo_ontop)
vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
XMoveResizeWindow(mDisplay, vo_window, x, y, w, h);
XMoveResizeWindow(mDisplay, vo_window, x, y, w, h);
}
#ifdef HAVE_XINERAMA
vo_x11_xinerama_move(mDisplay, vo_window);