[MPlayer-cvslog] r34119 - in trunk: Changelog libvo/x11_common.c

[ib]

Author: ib
Date: Wed Sep 21 15:15:04 2011
New Revision: 34119

Log:
Don't hide or show cursor if attached to an existing window.

This gives the application owning the window the control of the cursor.

Modified:
   trunk/Changelog
   trunk/libvo/x11_common.c

Modified: trunk/Changelog
==============================================================================
--- trunk/Changelog	Wed Sep 21 11:53:12 2011	(r34118)
+++ trunk/Changelog	Wed Sep 21 15:15:04 2011	(r34119)
@@ -16,6 +16,7 @@ MPlayer (1.0)
     * support adding noise at output resolution with -vo gl:noise-strength=8
     * experimental support for PGS (BluRay-compatible), DVB and XSUB subtitles.
     * experimental af_cmdline slave command to change e.g. audio equalizer options at runtime.
+    * vo x11: don't hide or show cursor any more if attached to an existing window (-wid)
 
     MEncoder:
     * -force-key-frames option to set explicit seek points.

Modified: trunk/libvo/x11_common.c
==============================================================================
--- trunk/libvo/x11_common.c	Wed Sep 21 11:53:12 2011	(r34118)
+++ trunk/libvo/x11_common.c	Wed Sep 21 15:15:04 2011	(r34119)
@@ -184,8 +184,8 @@ static void vo_hidecursor(Display * disp
     Colormap colormap;
     static char bm_no_data[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
 
-    if (WinID == 0)
-        return;                 // do not hide if playing on the root window
+    if (WinID >= 0)
+        return;        // do not hide if attached to an existing window
 
     colormap = DefaultColormap(disp, DefaultScreen(disp));
     if ( !XAllocNamedColor(disp, colormap, "black", &black, &dummy) )
@@ -203,8 +203,8 @@ static void vo_hidecursor(Display * disp
 
 static void vo_showcursor(Display * disp, Window win)
 {
-    if (WinID == 0)
-        return;
+    if (WinID >= 0)
+        return;        // do not show if attached to an existing window
     XDefineCursor(disp, win, 0);
 }