RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Somewhat fix Gui with xinerama, reuse existing code, maybe one day the Gui will 

consist of something besides duplicate code.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19017 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-07-11 18:40:02 +00:00
parent b6091747f1
commit 9f4c23ecc5
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Gui/wm/ws.c
View File

@ -237,24 +237,6 @@ wsXDNDInitialize();
wsScreen=DefaultScreen( wsDisplay );
wsRootWin=RootWindow( wsDisplay,wsScreen );
#ifdef HAVE_XINERAMA
if(XineramaIsActive(wsDisplay))
{
XineramaScreenInfo *screens;
int num_screens;
screens = XineramaQueryScreens(wsDisplay, &num_screens);
if(xinerama_screen >= num_screens) xinerama_screen = 0;
wsOrgX = screens[xinerama_screen].x_org;
wsOrgY = screens[xinerama_screen].y_org;
wsMaxX=screens[xinerama_screen].width;
wsMaxY=screens[xinerama_screen].height;
mp_msg( MSGT_GPLAYER,MSGL_V,"[ws] screens %d Max %d, %d Org %d,%d\n",
num_screens, wsMaxX, wsMaxY, wsOrgX, wsOrgY);
XFree(screens);
}
else
#endif
#ifdef HAVE_XF86VM
{
int clock;
@ -272,6 +254,11 @@ wsXDNDInitialize();
if ( !wsMaxY )
wsMaxY=DisplayHeight( wsDisplay,wsScreen );
}
vo_screenwidth = wsMaxX; vo_screenheight = wsMaxY;
xinerama_x = wsOrgX; xinerama_y = wsOrgY;
update_xinerama_info();
wsMaxX = vo_screenwidth; wsMaxY = vo_screenheight;
wsOrgX = xinerama_x; wsOrgY = xinerama_y;
wsGetDepthOnScreen();
#ifdef DEBUG
@ -794,6 +781,13 @@ void wsFullScreen( wsTWindow * win )
{
win->OldX=win->X; win->OldY=win->Y;
win->OldWidth=win->Width; win->OldHeight=win->Height;
vo_dx = win->X; vo_dy = win->Y;
vo_dwidth = win->Width; vo_dheight = win->Height;
vo_screenwidth = wsMaxX; vo_screenheight = wsMaxY;
xinerama_x = wsOrgX; xinerama_y = wsOrgY;
update_xinerama_info();
wsMaxX = vo_screenwidth; wsMaxY = vo_screenheight;
wsOrgX = xinerama_x; wsOrgY = xinerama_y;
win->X=wsOrgX; win->Y=wsOrgY;
win->Width=wsMaxX; win->Height=wsMaxY;
}