[MPlayer-cvslog] CVS: main/libvo vo_x11.c, 1.142, 1.143 vo_xmga.c, 1.92, 1.93 vo_xover.c, 1.12, 1.13 vo_xv.c, 1.165, 1.166 vo_xvidix.c, 1.72, 1.73 vo_xvmc.c, 1.20, 1.21

[Alexander Strasser beastd]

CVS change done by Alexander Strasser (beastd)

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

Modified Files:
	vo_x11.c vo_xmga.c vo_xover.c vo_xv.c vo_xvidix.c vo_xvmc.c 
Log Message:
Make -wid behave more consistent.
Original patch by kiriuja |mplayer-patches >ta< en-directo >tod< net|


Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- vo_x11.c	18 Apr 2005 15:52:38 -0000	1.142
+++ vo_x11.c	21 May 2005 17:31:44 -0000	1.143
@@ -377,6 +377,8 @@
             vo_window = WinID ? ((Window) WinID) : mRootWin;
             if (WinID)
             {
+                int border;
+                Window win;
                 XUnmapWindow(mDisplay, vo_window);
                 XChangeWindowAttributes(mDisplay, vo_window, xswamask,
                                         &xswa);
@@ -389,6 +391,9 @@
                                            ButtonReleaseMask |
                                            ExposureMask);
                 XMapWindow(mDisplay, vo_window);
+                XGetGeometry(mDisplay, vo_window, &mRootWin,
+                             &vo_dx, &vo_dy, &vo_dwidth, &vo_dheight,
+                             &border, &depth);
             } else
                 XSelectInput(mDisplay, vo_window, ExposureMask);
         } else

Index: vo_xmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- vo_xmga.c	18 Apr 2005 15:52:38 -0000	1.92
+++ vo_xmga.c	21 May 2005 17:31:44 -0000	1.93
@@ -213,6 +213,7 @@
                                            ButtonPressMask |
                                            ButtonReleaseMask |
                                            ExposureMask);
+                XMapWindow(mDisplay, vo_window);
             } else
                 XSelectInput(mDisplay, vo_window, ExposureMask);
 

Index: vo_xover.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xover.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- vo_xover.c	18 Apr 2005 15:52:38 -0000	1.12
+++ vo_xover.c	21 May 2005 17:31:44 -0000	1.13
@@ -300,6 +300,7 @@
 	      XUnmapWindow(mDisplay, vo_window);
 	      XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xswa);
 	      vo_x11_selectinput_witherr( mDisplay,vo_window,StructureNotifyMask | KeyPressMask | PropertyChangeMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask | ExposureMask );
+	      XMapWindow(mDisplay, vo_window);
 	    } else XSelectInput( mDisplay,vo_window,ExposureMask );
 	}
       else

Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- vo_xv.c	18 Apr 2005 15:52:38 -0000	1.165
+++ vo_xv.c	21 May 2005 17:31:44 -0000	1.166
@@ -298,6 +298,11 @@
                                            ButtonReleaseMask |
                                            ExposureMask);
                 XMapWindow(mDisplay, vo_window);
+                XGetGeometry(mDisplay, vo_window, &mRoot,
+                             &drwX, &drwY, &vo_dwidth, &vo_dheight,
+                             &drwBorderWidth, &drwDepth);
+                drwX = drwY = 0; // coordinates need to be local to the window
+                aspect_save_prescale(vo_dwidth, vo_dheight);
             } else
             {
                 drwX = vo_dx;

Index: vo_xvidix.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xvidix.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- vo_xvidix.c	18 Apr 2005 15:52:38 -0000	1.72
+++ vo_xvidix.c	21 May 2005 17:31:44 -0000	1.73
@@ -347,6 +347,7 @@
                                            ButtonPressMask |
                                            ButtonReleaseMask |
                                            ExposureMask);
+                XMapWindow(mDisplay, vo_window);
             } else
                 XSelectInput(mDisplay, vo_window, ExposureMask);
         } else

Index: vo_xvmc.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xvmc.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- vo_xvmc.c	18 Apr 2005 15:52:38 -0000	1.20
+++ vo_xvmc.c	21 May 2005 17:31:44 -0000	1.21
@@ -666,10 +666,17 @@
       vo_window = WinID ? ((Window)WinID) : mRootWin;
       if ( WinID ) 
       {
+         Window mRoot;
+         uint32_t drwBorderWidth, drwDepth;
          XUnmapWindow( mDisplay,vo_window );
          XChangeWindowAttributes( mDisplay,vo_window,xswamask,&xswa );
 	 vo_x11_selectinput_witherr( mDisplay,vo_window,StructureNotifyMask | KeyPressMask | PropertyChangeMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask | ExposureMask );
          XMapWindow( mDisplay,vo_window );
+         XGetGeometry(mDisplay, vo_window, &mRoot,
+                      &drwX, &drwY, &vo_dwidth, &vo_dheight,
+                      &drwBorderWidth, &drwDepth);
+         drwX = drwY = 0; // coordinates need to be local to the window
+         aspect_save_prescale(vo_dwidth, vo_dheight);
       } else { drwX=vo_dx; drwY=vo_dy; }
    } else 
       if ( vo_window == None ){