[Mplayer-cvslog] CVS: main/libvo video_out.c,1.59,1.60 video_out.h,1.42,1.43 vo_dga.c,1.51,1.52 vo_x11.c,1.117,1.118 vo_xv.c,1.117,1.118

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv18436/libvo

Modified Files:
	video_out.c video_out.h vo_dga.c vo_x11.c vo_xv.c 
Log Message:
-nograbpointer, based on old patch by Christian Ohm <chr.ohm at gmx.net>


Index: video_out.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- video_out.c	28 Sep 2002 19:03:50 -0000	1.59
+++ video_out.c	28 Sep 2002 20:09:14 -0000	1.60
@@ -30,6 +30,7 @@
 int vo_dheight=0;
 int vo_dbpp=0;
 
+int vo_grabpointer = 1;
 int vo_doublebuffering = 0;
 int vo_vsync = 0;
 int vo_fs = 0;

Index: video_out.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- video_out.h	18 Sep 2002 01:22:03 -0000	1.42
+++ video_out.h	28 Sep 2002 20:09:14 -0000	1.43
@@ -170,6 +170,7 @@
 extern int vo_dheight;
 extern int vo_dbpp;
 
+extern int vo_grabpointer;
 extern int vo_doublebuffering;
 extern int vo_directrendering;
 extern int vo_vsync;

Index: vo_dga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_dga.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- vo_dga.c	28 Sep 2002 18:50:45 -0000	1.51
+++ vo_dga.c	28 Sep 2002 20:09:14 -0000	1.52
@@ -579,6 +579,7 @@
   if(vo_dga_is_running){	
     vo_dga_is_running = 0;
     mp_msg(MSGT_VO,  MSGL_V, "vo_dga: in uninit\n");
+    if(vo_grabpointer)
     XUngrabPointer (vo_dga_dpy, CurrentTime);
     XUngrabKeyboard (vo_dga_dpy, CurrentTime);
 #ifdef HAVE_DGA2
@@ -1037,6 +1038,7 @@
   
   XGrabKeyboard (vo_dga_dpy, DefaultRootWindow(vo_dga_dpy), True, 
                  GrabModeAsync,GrabModeAsync, CurrentTime);
+  if(vo_grabpointer)
   XGrabPointer (vo_dga_dpy, DefaultRootWindow(vo_dga_dpy), True, 
                 ButtonPressMask,GrabModeAsync, GrabModeAsync, 
                 None, None, CurrentTime);

Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- vo_x11.c	3 Sep 2002 18:10:42 -0000	1.117
+++ vo_x11.c	28 Sep 2002 20:09:14 -0000	1.118
@@ -372,6 +372,7 @@
     if ( vm )
      {
       /* Grab the mouse pointer in our window */
+      if(vo_grabpointer)
       XGrabPointer(mDisplay, vo_window, True, 0,
                    GrabModeAsync, GrabModeAsync,
                    vo_window, None, CurrentTime);

Index: vo_xv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xv.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- vo_xv.c	28 Sep 2002 18:03:34 -0000	1.117
+++ vo_xv.c	28 Sep 2002 20:09:14 -0000	1.118
@@ -404,6 +404,7 @@
     if ( vm )
      {
       /* Grab the mouse pointer in our window */
+      if(vo_grabpointer)
       XGrabPointer(mDisplay, vo_window, True, 0,
                    GrabModeAsync, GrabModeAsync,
                    vo_window, None, CurrentTime);