[Mplayer-cvslog] CVS: main/libvo video_out.c,1.73,1.74 video_out.h,1.51,1.52 vo_sdl.c,1.103,1.104 x11_common.c,1.153,1.154

[Alex Beregszaszi]

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

Modified Files:
	video_out.c video_out.h vo_sdl.c x11_common.c 
Log Message:
-nomouseinput support for vo_sdl

Index: video_out.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- video_out.c	31 Aug 2003 23:00:39 -0000	1.73
+++ video_out.c	1 Sep 2003 18:24:27 -0000	1.74
@@ -33,6 +33,7 @@
 int vo_dheight=0;
 int vo_dbpp=0;
 
+int vo_nomouse_input = 0;
 int vo_grabpointer = 1;
 int vo_doublebuffering = 0;
 int vo_vsync = 0;

Index: video_out.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/video_out.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- video_out.h	12 Mar 2003 15:04:05 -0000	1.51
+++ video_out.h	1 Sep 2003 18:24:27 -0000	1.52
@@ -204,6 +204,7 @@
 extern int vo_gamma_blue_intensity;
 
 extern int vo_mouse_timer_const;
+extern int vo_nomouse_input;
 
 extern int vo_pts;
 extern float vo_fps;

Index: vo_sdl.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_sdl.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- vo_sdl.c	27 Jul 2003 21:55:54 -0000	1.103
+++ vo_sdl.c	1 Sep 2003 18:24:27 -0000	1.104
@@ -1191,6 +1191,8 @@
 			break;
 			
 			case SDL_MOUSEBUTTONDOWN:
+				if(vo_nomouse_input)
+				    break;
 				if(event.button.button == 4 || event.button.button == 5)
 					mplayer_put_key(MOUSE_BASE+event.button.button-1);
 				else
@@ -1198,6 +1200,8 @@
 				break;			    
 		
 			case SDL_MOUSEBUTTONUP:
+				if(vo_nomouse_input)
+				    break;
 				mplayer_put_key(MOUSE_BASE+event.button.button-1);
 				break;
 	

Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- x11_common.c	31 Aug 2003 23:13:45 -0000	1.153
+++ x11_common.c	1 Sep 2003 18:24:27 -0000	1.154
@@ -71,7 +71,6 @@
 
 /* output window id */
 int WinID=-1;
-int vo_nomouse_input = 0;
 int vo_mouse_autohide = 0;
 int vo_wm_type = 0;
 static int vo_fs_type = 0;