[SCM] mplayer packaging branch, karmic, updated. debian/1.0.rc3+svn20090426-1ubuntu3-1-gd2ac685

[siretart at users.alioth.debian.org]

The following commit has been merged in the karmic branch:
commit d2ac685e61922ea7e53686568b6c887a0ac6eaaf
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jun 17 16:29:03 2009 +0200

    remove 22disable-xscreensaver.patch
    
    Faking input keyboard or mouse events is clearly the wrong approach to
    the problem. Actually, it is even potentially dangerous, because it can
    cause unexpected sideeffects on the users desktop (closing windows,
    sending messages, etc). Moreover, this doesn't seem to work with
    gnome-screensaver after all.

diff --git a/debian/patches/22disable-xscreensaver.patch b/debian/patches/22disable-xscreensaver.patch
deleted file mode 100644
index a88dc78..0000000
--- a/debian/patches/22disable-xscreensaver.patch
+++ /dev/null
@@ -1,66 +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
---- 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);
-@@ -1437,6 +1445,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)
diff --git a/debian/patches/series b/debian/patches/series
index 372f257..563f299 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 11configure-mktemp.patch
-22disable-xscreensaver.patch
 23mplayer-debug-printf.patch
 30_add_gmplayer_man_rules.diff
 40_improve_desktop_file.patch

-- 
mplayer packaging