# HG changeset patch
# User arpi
# Date 1019689841 0
# Node ID 8e3251d0d9a6c61fa264d75b0ab86a0512186451
# Parent  4ddef5a1038a34c57ec1b6cd87b3806a0833d356
-rootwin fixed, keys work, mouse doesn't

diff -r 4ddef5a1038a -r 8e3251d0d9a6 libvo/vo_x11.c
--- a/libvo/vo_x11.c	Wed Apr 24 22:49:58 2002 +0000
+++ b/libvo/vo_x11.c	Wed Apr 24 23:10:41 2002 +0000
@@ -353,6 +353,7 @@
 #ifdef HAVE_XINERAMA
    vo_x11_xinerama_move(mDisplay,vo_window);
 #endif
+    if(WinID!=0)
     do { XNextEvent( mDisplay,&xev ); } while ( xev.type != MapNotify || xev.xmap.event != vo_window );
     XSelectInput( mDisplay,vo_window,NoEventMask );
 
@@ -360,7 +361,9 @@
     XSync( mDisplay,False );
     vo_gc=XCreateGC( mDisplay,vo_window,0L,&xgcv );
 
-    XSelectInput( mDisplay,vo_window,StructureNotifyMask | KeyPressMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask);
+    // we cannot grab mouse events on root window :(
+    XSelectInput( mDisplay,vo_window,StructureNotifyMask | KeyPressMask | 
+	((WinID==0)?0:(ButtonPressMask | ButtonReleaseMask | PointerMotionMask)) );
 
 #ifdef HAVE_XF86VM
     if ( vm )
diff -r 4ddef5a1038a -r 8e3251d0d9a6 libvo/vo_xv.c
--- a/libvo/vo_xv.c	Wed Apr 24 22:49:58 2002 +0000
+++ b/libvo/vo_xv.c	Wed Apr 24 23:10:41 2002 +0000
@@ -417,11 +417,12 @@
    vo_x11_classhint( mDisplay,vo_window,"xv" );
    vo_hidecursor(mDisplay,vo_window);
 
-   if(WinID!=0)
-   XSelectInput(mDisplay, vo_window, StructureNotifyMask | KeyPressMask | PointerMotionMask
+   XSelectInput(mDisplay, vo_window, StructureNotifyMask | KeyPressMask | 
+	((WinID==0) ? 0 : (PointerMotionMask
 #ifdef HAVE_NEW_INPUT
 		| ButtonPressMask | ButtonReleaseMask
 #endif
+	))
    );
    XSetStandardProperties(mDisplay, vo_window, hello, hello, None, NULL, 0, &hint);
    if ( vo_fs ) vo_x11_decoration( mDisplay,vo_window,0 );