[SCM] mplayer packaging branch, master.experimental, updated. debian/1.0.rc3++final-1.exp1-8-gf51a9b9

[siretart at users.alioth.debian.org]

The following commit has been merged in the master.experimental branch:
commit 2149ffcb3d4e67d242ac65a168e4fa568891ee55
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jul 28 21:12:50 2010 -0400

    remove 22disable-xscreensaver.patch
    
    doesn't apply any longer and needs major rework. since it is anyway half broken remove it.

diff --git a/debian/patches/22disable-xscreensaver.patch b/debian/patches/22disable-xscreensaver.patch
deleted file mode 100644
index 0012b36..0000000
--- a/debian/patches/22disable-xscreensaver.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Author: <mennucc1 at debian.org>
-Description: This patch avoids xscreensaver from blanking onto your favorite movie ; it was made by me, based on code posted in mplayer-dev-eng by Adam  Tlałka . It works as follows: when the cursor is inside the MPlayer window, and it is hidden, then the cursor is artificially moved  a bit every 10seconds (+-), so as to disable the screensaver. Of course, it would be a VERY bad idea to move aroundthe cursor when it is in another window (e.g. the user may end up clicking the wrong button)- so it does not work when the cursor is outside the MPlayer window.
---- a/libvo/x11_common.c
-+++ b/libvo/x11_common.c
-@@ -177,6 +177,9 @@ void vo_x11_ewmh_fullscreen(int action)
-     }
- }
- 
-+static int pointer_is_hidden = 0;
-+
-+
- void vo_hidecursor(Display * disp, Window win)
- {
-     Cursor no_ptr;
-@@ -196,6 +199,7 @@ void vo_hidecursor(Display * disp, Windo
-     bm_no = XCreateBitmapFromData(disp, win, bm_no_data, 8, 8);
-     no_ptr = XCreatePixmapCursor(disp, bm_no, bm_no, &black, &black, 0, 0);
-     XDefineCursor(disp, win, no_ptr);
-+    pointer_is_hidden = 1;
-     XFreeCursor(disp, no_ptr);
-     if (bm_no != None)
-         XFreePixmap(disp, bm_no);
-@@ -207,6 +211,7 @@ void vo_showcursor(Display * disp, Windo
-     if (WinID == 0)
-         return;
-     XDefineCursor(disp, win, 0);
-+    pointer_is_hidden = 0;
- }
- 
- static int x11_errorhandler(Display * display, XErrorEvent * event)
-@@ -805,6 +810,7 @@ void vo_x11_uninit(void)
- 
- static unsigned int mouse_timer;
- static int mouse_waiting_hide;
-+static int mouse_ignore_motion = 0;
- 
- int vo_x11_check_events(Display * mydisplay)
- {
-@@ -878,7 +884,9 @@ int vo_x11_check_events(Display * mydisp
-                     sprintf(cmd_str,"set_mouse_pos %i %i",Event.xmotion.x, Event.xmotion.y);
-                     mp_input_queue_cmd(mp_input_parse_cmd(cmd_str));
-                 }
--
-+		if (mouse_ignore_motion)
-+		  mouse_ignore_motion = 0;
-+		else
-                 if (vo_mouse_autohide)
-                 {
-                     vo_showcursor(mydisplay, vo_window);
-@@ -1443,6 +1451,16 @@ void xscreensaver_heartbeat(void)
- 
-         XResetScreenSaver(mDisplay);
-     }
-+
-+    static unsigned int last_warp_time = 0;
-+    static int fake_move_distance = 16;
-+    if (mDisplay &&  vo_window && pointer_is_hidden && (time - last_warp_time ) > 10000) {
-+      last_warp_time = time;
-+      mouse_ignore_motion = 1;
-+      XWarpPointer(mDisplay,  vo_window, None, 0, 0, 0, 0, fake_move_distance, 0);
-+      fake_move_distance = -fake_move_distance;
-+      mp_msg(MSGT_VO, MSGL_DBG2, "Warping cursor to disable gnome-screensaver.\n");
-+    }
- }
- 
- static int xss_suspend(Bool suspend)
---- a/DOCS/man/en/mplayer.1
-+++ b/DOCS/man/en/mplayer.1
-@@ -3257,8 +3257,10 @@ Specify the screen width for video outpu
- do not know the screen resolution like fbdev, x11 and TV-out.
- .
- .TP
--.B \-stop\-xscreensaver (X11 only)
-+.B \-stop\-xscreensaver (X11 , KDE and GNOME only)
- Turns off xscreensaver at startup and turns it on again on exit.
-+Note that the GNOME screensaver is disabled only as long
-+as the mouse cursor is kept inside the MPlayer window.
- If your screensaver supports neither the XSS nor XResetScreenSaver
- API please use \-heartbeat\-cmd instead.
- .
diff --git a/debian/patches/series b/debian/patches/series
index 654f8bf..456959d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-22disable-xscreensaver.patch
 23mplayer-debug-printf.patch

-- 
mplayer packaging