[MPlayer-cvslog] CVS: main/libvo vo_gl.c, 1.68, 1.69 vo_gl2.c, 1.63, 1.64

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var2/tmp/cvs-serv29249/libvo

Modified Files:
	vo_gl.c vo_gl2.c 
Log Message:
Implement -geometry for vo gl and gl2.


Index: vo_gl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- vo_gl.c	18 Apr 2005 15:52:38 -0000	1.68
+++ vo_gl.c	29 May 2005 17:04:51 -0000	1.69
@@ -162,6 +162,8 @@
 	aspect_save_screenres(vo_screenwidth,vo_screenheight);
 
 	aspect(&d_width,&d_height,A_NOZOOM);
+	geometry(&vo_dx, &vo_dy, &d_width, &d_height,
+	          vo_screenwidth, vo_screenheight);
 #ifdef X11_FULLSCREEN
 //        if( flags&VOFLAG_FULLSCREEN ){ // (-fs)
 //          aspect(&d_width,&d_height,A_ZOOM);
@@ -186,8 +188,8 @@
 
 	vo_fs = VO_FALSE;
 
-	hint.x = 0;
-	hint.y = 0;
+	hint.x = vo_dx;
+	hint.y = vo_dy;
 	hint.width = d_width;
 	hint.height = d_height;
 	hint.flags = PPosition | PSize;
@@ -241,7 +243,7 @@
   }
       if (vo_ontop) vo_x11_setlayer(mDisplay, vo_window, vo_ontop);
 
-  vo_x11_nofs_sizepos(0, 0, d_width, d_height);
+  vo_x11_nofs_sizepos(vo_dx, vo_dy, d_width, d_height);
   if (vo_fs ^ (flags & VOFLAG_FULLSCREEN))
     vo_x11_fullscreen();
   setGlWindow(&gl_vinfo, &gl_context, vo_window);

Index: vo_gl2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_gl2.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- vo_gl2.c	21 Feb 2005 14:44:39 -0000	1.63
+++ vo_gl2.c	29 May 2005 17:04:51 -0000	1.64
@@ -692,8 +692,8 @@
 	XVisualInfo *vinfo, vinfo_buf;
 	XEvent xev;
 
-		hint.x = 0;
-		hint.y = 0;
+		hint.x = vo_dx;
+		hint.y = vo_dy;
 		hint.width = d_width;
 		hint.height = d_height;
 		hint.flags = PPosition | PSize;
@@ -745,7 +745,7 @@
 		 | ButtonPressMask | ButtonReleaseMask | ExposureMask
         );
   }
-  vo_x11_nofs_sizepos(0, 0, d_width, d_height);
+  vo_x11_nofs_sizepos(vo_dx, vo_dy, d_width, d_height);
   if (vo_fs ^ (flags & VOFLAG_FULLSCREEN))
     vo_x11_fullscreen();
 
@@ -829,6 +829,8 @@
 	aspect_save_screenres(vo_screenwidth,vo_screenheight);
 
 	aspect(&d_width,&d_height,A_NOZOOM);
+	geometry(&vo_dx, &vo_dy, &d_width, &d_height,
+	          vo_screenwidth, vo_screenheight);
 
 #if defined(HAVE_NEW_GUI) && !defined(GL_WIN32)
 	if (use_gui) {