From: Ben Low <ben@bdlow.net>

[PATCH] xineramascreen for gmplayer (the right way)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10195 b3059339-0415-0410-9bf9-f77b7e298cf2

5 files changed, 55 insertions, 19 deletions

diff --git a/Gui/mplayer/menu.c b/Gui/mplayer/menu.c
index f0d72176bf..513746c19d 100644
--- a/Gui/mplayer/menu.c
+++ b/Gui/mplayer/menu.c
@@ -82,9 +82,9 @@ void mplShowMenu( int mx,int my )
  if ( !appMPlayer.menuIsPresent || !appMPlayer.menuBase.Bitmap.Image ) return;
 
  x=mx;
- if ( x + appMPlayer.menuWindow.Width > wsMaxX ) x=wsMaxX - appMPlayer.menuWindow.Width - 1;
+ if ( x + appMPlayer.menuWindow.Width > wsMaxX ) x=wsMaxX - appMPlayer.menuWindow.Width - 1 + wsOrgX;
  y=my;
- if ( y + appMPlayer.menuWindow.Height > wsMaxY ) y=wsMaxY - appMPlayer.menuWindow.Height - 1;
+ if ( y + appMPlayer.menuWindow.Height > wsMaxY ) y=wsMaxY - appMPlayer.menuWindow.Height - 1 + wsOrgY;
 
  mplMenuX=x; mplMenuY=y;
 
diff --git a/Gui/mplayer/mw.c b/Gui/mplayer/mw.c
index a3b4ddce93..b1fec53154 100644
--- a/Gui/mplayer/mw.c
+++ b/Gui/mplayer/mw.c
@@ -282,8 +282,8 @@ set_volume:
         if ( guiIntfStruct.Playing )
          {
           appMPlayer.subWindow.isFullScreen=True;
-          appMPlayer.subWindow.OldX=( wsMaxX - guiIntfStruct.MovieWidth * 2 ) / 2;
-          appMPlayer.subWindow.OldY=( wsMaxY - guiIntfStruct.MovieHeight * 2 ) / 2;
+          appMPlayer.subWindow.OldX=( wsMaxX - guiIntfStruct.MovieWidth * 2 ) / 2 + wsOrgX;
+          appMPlayer.subWindow.OldY=( wsMaxY - guiIntfStruct.MovieHeight * 2 ) / 2 + wsOrgY;
           appMPlayer.subWindow.OldWidth=guiIntfStruct.MovieWidth * 2; appMPlayer.subWindow.OldHeight=guiIntfStruct.MovieHeight * 2;
           wsFullScreen( &appMPlayer.subWindow );
 	  vo_fs=0;
@@ -294,8 +294,8 @@ set_volume:
         if ( guiIntfStruct.Playing )
          {
           appMPlayer.subWindow.isFullScreen=True;
-          appMPlayer.subWindow.OldX=( wsMaxX - guiIntfStruct.MovieWidth ) / 2;
-          appMPlayer.subWindow.OldY=( wsMaxY - guiIntfStruct.MovieHeight ) / 2;
+          appMPlayer.subWindow.OldX=( wsMaxX - guiIntfStruct.MovieWidth ) / 2 + wsOrgX;
+          appMPlayer.subWindow.OldY=( wsMaxY - guiIntfStruct.MovieHeight ) / 2 + wsOrgY;
           appMPlayer.subWindow.OldWidth=guiIntfStruct.MovieWidth; appMPlayer.subWindow.OldHeight=guiIntfStruct.MovieHeight;
           wsFullScreen( &appMPlayer.subWindow );
 	  vo_fs=0;
diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c
index 4977dbe183..37d4cb6782 100644
--- a/Gui/mplayer/play.c
+++ b/Gui/mplayer/play.c
@@ -43,14 +43,14 @@ void mplFullScreen( void )
     appMPlayer.subWindow.OldWidth=guiIntfStruct.MovieWidth; appMPlayer.subWindow.OldHeight=guiIntfStruct.MovieHeight; 
     switch ( appMPlayer.sub.x )
      {
-      case -1: appMPlayer.subWindow.OldX=( wsMaxX / 2 ) - ( appMPlayer.subWindow.OldWidth / 2 ); break;
-      case -2: appMPlayer.subWindow.OldX=wsMaxX - appMPlayer.subWindow.OldWidth; break;
+      case -1: appMPlayer.subWindow.OldX=( wsMaxX / 2 ) - ( appMPlayer.subWindow.OldWidth / 2 ) + wsOrgX; break;
+      case -2: appMPlayer.subWindow.OldX=wsMaxX - appMPlayer.subWindow.OldWidth + wsOrgX; break;
       default: appMPlayer.subWindow.OldX=appMPlayer.sub.x; break;
      }
     switch ( appMPlayer.sub.y )
      {
-      case -1: appMPlayer.subWindow.OldY=( wsMaxY / 2 ) - ( appMPlayer.subWindow.OldHeight / 2 ); break;
-      case -2: appMPlayer.subWindow.OldY=wsMaxY - appMPlayer.subWindow.OldHeight; break;
+      case -1: appMPlayer.subWindow.OldY=( wsMaxY / 2 ) - ( appMPlayer.subWindow.OldHeight / 2 ) + wsOrgY; break;
+      case -2: appMPlayer.subWindow.OldY=wsMaxY - appMPlayer.subWindow.OldHeight + wsOrgY; break;
       default: appMPlayer.subWindow.OldY=appMPlayer.sub.y; break;
      }
    }
diff --git a/Gui/wm/ws.c b/Gui/wm/ws.c
index 3b021fed6b..99535ef88d 100644
--- a/Gui/wm/ws.c
+++ b/Gui/wm/ws.c
@@ -33,11 +33,19 @@
 #include <X11/extensions/shape.h>
 #endif
 
+#ifdef HAVE_XINERAMA
+#include <X11/extensions/Xinerama.h>
+#endif
+
 #include <sys/ipc.h>
 #include <sys/shm.h>
 
 #undef ENABLE_DPMS 
 
+#ifdef HAVE_XINERAMA
+extern int xinerama_screen;
+#endif
+
 typedef struct
 {
  unsigned long flags;
@@ -51,6 +59,8 @@ Atom                 wsMotifHints;
 
 int                  wsMaxX         = 0; // Screen width.
 int                  wsMaxY         = 0; // Screen height.
+int                  wsOrgX         = 0; // Screen origin x.
+int                  wsOrgY         = 0; // Screen origin y.
 
 Display            * wsDisplay;
 int                  wsScreen;
@@ -227,8 +237,29 @@ 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_STATUS,"[ws] screens %d Max %d, %d Org %d,%d\n", 
+    num_screens, wsMaxX, wsMaxY, wsOrgX, wsOrgY);
+  XFree(screens);
+  }
+  else
+#endif
+ {
+ wsOrgX = wsOrgY = 0;
  wsMaxX=DisplayWidth( wsDisplay,wsScreen );
  wsMaxY=DisplayHeight( wsDisplay,wsScreen );
+ }
 
  wsGetDepthOnScreen();
 #ifdef DEBUG
@@ -236,6 +267,9 @@ wsXDNDInitialize();
    int minor,major,shp;
    mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[ws] Screen depth: %d\n",wsDepthOnScreen );
    mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[ws]  size: %dx%d\n",wsMaxX,wsMaxY );
+#ifdef HAVE_XINERAMA
+   mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[ws]  origin: +%d+%d\n",wsOrgX,wsOrgY );
+#endif
    mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[ws]  red mask: 0x%x\n",wsRedMask );
    mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[ws]  green mask: 0x%x\n",wsGreenMask );
    mp_msg( MSGT_GPLAYER,MSGL_DBG2,"[ws]  blue mask: 0x%x\n",wsBlueMask );
@@ -318,14 +352,14 @@ void wsCreateWindow( wsTWindow * win,int X,int Y,int wX,int hY,int bW,int cV,uns
 // The window position and size.
  switch ( X )
   {
-   case -1: win->X=( wsMaxX / 2 ) - ( wX / 2 ); break;
-   case -2: win->X=wsMaxX - wX - 1; break;
+   case -1: win->X=( wsMaxX / 2 ) - ( wX / 2 ) + wsOrgX; break;
+   case -2: win->X=wsMaxX - wX - 1 + wsOrgX; break;
    default: win->X=X; break;
   }
  switch ( Y )
   {
-   case -1: win->Y=( wsMaxY / 2 ) - ( hY / 2 ); break;
-   case -2: win->Y=wsMaxY - hY - 1; break;
+   case -1: win->Y=( wsMaxY / 2 ) - ( hY / 2 ) + wsOrgY; break;
+   case -2: win->Y=wsMaxY - hY - 1 + wsOrgY; break;
    default: win->Y=Y; break;
   }
  win->Width=wX;
@@ -740,7 +774,7 @@ void wsFullScreen( wsTWindow * win )
    {
     win->OldX=win->X; win->OldY=win->Y;
     win->OldWidth=win->Width; win->OldHeight=win->Height;
-    win->X=0; win->Y=0;
+    win->X=wsOrgX; win->Y=wsOrgY;
     win->Width=wsMaxX; win->Height=wsMaxY;
     win->isFullScreen=True;
 #ifdef ENABLE_DPMS
@@ -811,14 +845,14 @@ void wsMoveWindow( wsTWindow * win,int b,int x, int y )
   {
    switch ( x )
     {
-     case -1: win->X=( wsMaxX / 2 ) - ( win->Width / 2 ); break;
-     case -2: win->X=wsMaxX - win->Width; break;
+     case -1: win->X=( wsMaxX / 2 ) - ( win->Width / 2 ) + wsOrgX; break;
+     case -2: win->X=wsMaxX - win->Width + wsOrgX; break;
      default: win->X=x; break;
     }
    switch ( y )
     {
-     case -1: win->Y=( wsMaxY / 2 ) - ( win->Height / 2 ); break;
-     case -2: win->Y=wsMaxY - win->Height; break;
+     case -1: win->Y=( wsMaxY / 2 ) - ( win->Height / 2 ) + wsOrgY; break;
+     case -2: win->Y=wsMaxY - win->Height + wsOrgY; break;
      default: win->Y=y; break;
     }
   }
diff --git a/Gui/wm/ws.h b/Gui/wm/ws.h
index f14b01483a..f836848b28 100644
--- a/Gui/wm/ws.h
+++ b/Gui/wm/ws.h
@@ -169,6 +169,8 @@ typedef struct
 
 extern int                  wsMaxX;
 extern int                  wsMaxY;
+extern int                  wsOrgX;
+extern int                  wsOrgY;
 
 extern Display            * wsDisplay;
 extern int                  wsScreen;