[Mplayer-cvslog] CVS: main/Gui/wm ws.c,1.73,1.74

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/Gui/wm
In directory mail:/var2/tmp/cvs-serv30556

Modified Files:
	ws.c 
Log Message:
detect screen resolution as in x11_common.c
Patch by Philippe Dumont (dumont (at) lifl (dot) fr)


Index: ws.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/wm/ws.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- ws.c	2 Jun 2004 02:34:39 -0000	1.73
+++ ws.c	13 Jun 2004 10:53:06 -0000	1.74
@@ -38,6 +38,10 @@
 #include <X11/extensions/Xinerama.h>
 #endif
 
+#ifdef HAVE_XF86VM
+#include <X11/extensions/xf86vmode.h>
+#endif
+
 #include <sys/ipc.h>
 #include <sys/shm.h>
 
@@ -249,9 +253,21 @@
   }
   else
 #endif
+#ifdef HAVE_XF86VM
+    {
+      int clock;
+      XF86VidModeModeLine modeline;
+
+      XF86VidModeGetModeLine( wsDisplay,wsScreen,&clock ,&modeline );
+      wsMaxX=modeline.hdisplay;
+      wsMaxY=modeline.vdisplay;
+    }
+#endif
  {
  wsOrgX = wsOrgY = 0;
+ if ( !wsMaxX )
  wsMaxX=DisplayWidth( wsDisplay,wsScreen );
+ if ( !wsMaxY )
  wsMaxY=DisplayHeight( wsDisplay,wsScreen );
  }