Mercurial > mplayer.hg

diff libvo/vo_gl.c @ 18116:d75953576ae4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix and improve xinerama support
author reimar
date Sun, 16 Apr 2006 13:38:28 +0000
parents f57317460375
children fc3f25278021
line wrap: on
line diff
--- a/libvo/vo_gl.c	Sun Apr 16 13:25:14 2006 +0000
+++ b/libvo/vo_gl.c	Sun Apr 16 13:38:28 2006 +0000
@@ -310,13 +310,15 @@
 	panscan_init();
 	aspect_save_orig(width,height);
 	aspect_save_prescale(d_width,d_height);
-	aspect_save_screenres(vo_screenwidth,vo_screenheight);
+	update_xinerama_info();
 
 	aspect(&d_width,&d_height,A_NOZOOM);
 	vo_dx = (int)(vo_screenwidth - d_width) / 2;
 	vo_dy = (int)(vo_screenheight - d_height) / 2;
 	geometry(&vo_dx, &vo_dy, &d_width, &d_height,
 	          vo_screenwidth, vo_screenheight);
+	vo_dx += xinerama_x;
+	vo_dy += xinerama_y;
 #ifdef HAVE_NEW_GUI
   if (use_gui) {
     // GUI creates and manages window for us
@@ -378,9 +380,6 @@
 	  XSetStandardProperties(mDisplay, vo_window, title, title, None, NULL, 0, &hint);
 	  /* Map window. */
 	  XMapWindow(mDisplay, vo_window);
-#ifdef HAVE_XINERAMA
-	  vo_x11_xinerama_move(mDisplay,vo_window);
-#endif
 
 	  /* Wait for map. */
 	  do