diff -urb ./libvo/vo_gl.c ../MPlayer-0.90pre6.new/libvo/vo_gl.c --- ./libvo/vo_gl.c Mon May 27 13:47:10 2002 +++ ../MPlayer-0.90pre6.new/libvo/vo_gl.c Thu Aug 8 22:55:18 2002 @@ -35,7 +35,7 @@ #include "x11_common.h" #include "aspect.h" - +extern int slave_mode; static vo_info_t vo_info = { "X11 (OpenGL)", @@ -204,6 +204,9 @@ // bpp = myximage->bits_per_pixel; //XSelectInput(mDisplay, vo_window, StructureNotifyMask); // !!!! + if( slave_mode) + XSelectInput(mDisplay, vo_window, StructureNotifyMask | PointerMotionMask ); + else XSelectInput(mDisplay, vo_window, StructureNotifyMask | KeyPressMask | PointerMotionMask #ifdef HAVE_NEW_INPUT | ButtonPressMask | ButtonReleaseMask Only in ../MPlayer-0.90pre6.new/libvo: vo_gl.c.rej Only in ../MPlayer-0.90pre6.new/libvo: vo_gl.o diff -urb ./libvo/vo_gl2.c ../MPlayer-0.90pre6.new/libvo/vo_gl2.c --- ./libvo/vo_gl2.c Mon May 27 13:48:54 2002 +++ ../MPlayer-0.90pre6.new/libvo/vo_gl2.c Thu Aug 8 22:43:08 2002 @@ -33,6 +33,8 @@ #define NDEBUG //#undef NDEBUG +extern int slave_mode; + static vo_info_t vo_info = { "X11 (OpenGL) - multiple textures version", @@ -708,6 +710,9 @@ XSync(mDisplay, False); //XSelectInput(mDisplay, vo_window, StructureNotifyMask); // !!!! + if( slave_mode ) + XSelectInput(mDisplay, vo_window, StructureNotifyMask | PointerMotionMask ); + else XSelectInput(mDisplay, vo_window, StructureNotifyMask | KeyPressMask | PointerMotionMask #ifdef HAVE_NEW_INPUT | ButtonPressMask | ButtonReleaseMask Only in ../MPlayer-0.90pre6.new/libvo: vo_gl2.c.rej Only in ../MPlayer-0.90pre6.new/libvo: vo_gl2.o Only in ../MPlayer-0.90pre6.new/libvo: vo_jpeg.o Only in ../MPlayer-0.90pre6.new/libvo: vo_md5.o Only in ../MPlayer-0.90pre6.new/libvo: vo_mpegpes.o Only in ../MPlayer-0.90pre6.new/libvo: vo_null.o Only in ../MPlayer-0.90pre6.new/libvo: vo_pgm.o Only in ../MPlayer-0.90pre6.new/libvo: vo_png.o Only in ../MPlayer-0.90pre6.new/libvo: vo_sdl.o Only in ../MPlayer-0.90pre6.new/libvo: vo_vesa.o diff -urb ./libvo/vo_x11.c ../MPlayer-0.90pre6.new/libvo/vo_x11.c --- ./libvo/vo_x11.c Wed Jul 31 15:40:33 2002 +++ ../MPlayer-0.90pre6.new/libvo/vo_x11.c Thu Aug 8 22:56:38 2002 @@ -49,6 +49,8 @@ #include "../mplayer.h" #endif +extern int slave_mode; + static vo_info_t vo_info = { "X11 ( XImage/Shm )", @@ -332,7 +334,11 @@ { XUnmapWindow( mDisplay,vo_window ); XChangeWindowAttributes( mDisplay,vo_window,xswamask,&xswa ); + if( slave_mode ) + XSelectInput( mDisplay,vo_window,StructureNotifyMask | PropertyChangeMask | PointerMotionMask | ExposureMask ); + else XSelectInput( mDisplay,vo_window,StructureNotifyMask | KeyPressMask | PropertyChangeMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask | ExposureMask ); + XMapWindow( mDisplay,vo_window ); } else XSelectInput( mDisplay,vo_window,ExposureMask ); } @@ -361,7 +367,11 @@ XFlush( mDisplay ); XSync( mDisplay,False ); - // we cannot grab mouse events on root window :( + // we cannot grab mouse events on root window : + if( slave_mode ) + XSelectInput( mDisplay,vo_window,StructureNotifyMask | PropertyChangeMask | ExposureMask | + ((WinID==0)?0:( PointerMotionMask)) ); + else XSelectInput( mDisplay,vo_window,StructureNotifyMask | KeyPressMask | PropertyChangeMask | ExposureMask | ((WinID==0)?0:(ButtonPressMask | ButtonReleaseMask | PointerMotionMask)) ); Only in ../MPlayer-0.90pre6.new/libvo: vo_x11.c.rej Only in ../MPlayer-0.90pre6.new/libvo: vo_x11.o diff -urb ./libvo/vo_xmga.c ../MPlayer-0.90pre6.new/libvo/vo_xmga.c --- ./libvo/vo_xmga.c Fri Jul 19 16:51:47 2002 +++ ../MPlayer-0.90pre6.new/libvo/vo_xmga.c Thu Aug 8 22:43:08 2002 @@ -293,6 +293,9 @@ { XUnmapWindow( mDisplay,vo_window ); XChangeWindowAttributes( mDisplay,vo_window,xswamask,&xWAttribs); + if( slave_mode ) + XSelectInput( mDisplay,vo_window,StructureNotifyMask | PropertyChangeMask | PointerMotionMask | ExposureMask ); + else XSelectInput( mDisplay,vo_window,StructureNotifyMask | KeyPressMask | PropertyChangeMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask | ExposureMask ); } else XSelectInput( mDisplay,vo_window,ExposureMask ); Only in ../MPlayer-0.90pre6.new/libvo: vo_xmga.c.rej diff -urb ./libvo/vo_xv.c ../MPlayer-0.90pre6.new/libvo/vo_xv.c --- ./libvo/vo_xv.c Thu Jul 25 16:23:18 2002 +++ ../MPlayer-0.90pre6.new/libvo/vo_xv.c Thu Aug 8 22:54:36 2002 @@ -57,6 +57,8 @@ #include "../Gui/interface.h" #endif +extern int slave_mode; + static vo_info_t vo_info = { "X11/Xv", @@ -383,6 +385,9 @@ { XUnmapWindow( mDisplay,vo_window ); XChangeWindowAttributes( mDisplay,vo_window,xswamask,&xswa ); + if( slave_mode ) + XSelectInput( mDisplay,vo_window,StructureNotifyMask | PropertyChangeMask | PointerMotionMask | ExposureMask ); + else XSelectInput( mDisplay,vo_window,StructureNotifyMask | KeyPressMask | PropertyChangeMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask | ExposureMask ); XMapWindow( mDisplay,vo_window ); } else { drwX=vo_dx; drwY=vo_dy; } @@ -395,12 +400,18 @@ vo_x11_classhint( mDisplay,vo_window,"xv" ); vo_hidecursor(mDisplay,vo_window); + if( slave_mode ) + XSelectInput(mDisplay, vo_window, StructureNotifyMask | KeyPressMask | PropertyChangeMask | + ((WinID==0) ? 0 : PointerMotionMask)); + + else XSelectInput(mDisplay, vo_window, StructureNotifyMask | KeyPressMask | PropertyChangeMask | ((WinID==0) ? 0 : (PointerMotionMask #ifdef HAVE_NEW_INPUT | ButtonPressMask | ButtonReleaseMask #endif ))); + XSetStandardProperties(mDisplay, vo_window, hello, hello, None, NULL, 0, &hint); XSetWMNormalHints( mDisplay,vo_window,&hint ); XMapWindow(mDisplay, vo_window); Only in ../MPlayer-0.90pre6.new/libvo: vo_xv.c.orig Only in ../MPlayer-0.90pre6.new/libvo: vo_xv.c.rej Only in ../MPlayer-0.90pre6.new/libvo: vo_xv.o diff -urb ./libvo/vo_xvidix.c ../MPlayer-0.90pre6.new/libvo/vo_xvidix.c --- ./libvo/vo_xvidix.c Tue Jul 30 12:40:42 2002 +++ ../MPlayer-0.90pre6.new/libvo/vo_xvidix.c Thu Aug 8 22:44:18 2002 @@ -49,6 +49,8 @@ #define UNUSED(x) ((void)(x)) /* Removes warning about unused arguments */ +extern int slave_mode; + /* X11 related variables */ /* Colorkey handling */ static XGCValues mGCV; @@ -292,6 +294,9 @@ { XUnmapWindow(mDisplay, vo_window); XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xswa); + if( slave_mode ) + XSelectInput( mDisplay,vo_window,StructureNotifyMask | PropertyChangeMask | PointerMotionMask | ExposureMask ); + else XSelectInput( mDisplay,vo_window,StructureNotifyMask | KeyPressMask | PropertyChangeMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask | ExposureMask ); } else XSelectInput( mDisplay,vo_window,ExposureMask ); } diff -urb ./mplayer.c ../MPlayer-0.90pre6.new/mplayer.c --- ./mplayer.c Mon Aug 5 14:37:14 2002 +++ ../MPlayer-0.90pre6.new/mplayer.c Thu Aug 8 22:44:18 2002 @@ -743,7 +743,7 @@ #ifdef HAVE_NEW_INPUT current_module = "init_input"; mp_input_init(); -if(keyb_fifo_get > 0) +if(( keyb_fifo_get > 0) && !slave_mode ) mp_input_add_key_fd(keyb_fifo_get,1,NULL,NULL); if(slave_mode) mp_input_add_cmd_fd(0,1,NULL,NULL);