fix PR pkg/35375: xine-ui freezes konsole sessions from

Sergey Svishchev, patch from xine CVS

4 files changed, 53 insertions, 7 deletions

diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile
index 22548f492e8..26ab5156eac 100644
--- a/multimedia/xine-ui/Makefile
+++ b/multimedia/xine-ui/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2007/01/07 12:25:55 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2007/01/09 14:52:41 drochner Exp $
 #
 
 DISTNAME=		xine-ui-0.99.4
-PKGREVISION=		5
+PKGREVISION=		6
 CATEGORIES=		multimedia
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xine/}
 
diff --git a/multimedia/xine-ui/distinfo b/multimedia/xine-ui/distinfo
index ce38c6c5875..4998381d9c5 100644
--- a/multimedia/xine-ui/distinfo
+++ b/multimedia/xine-ui/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2006/04/21 11:11:26 drochner Exp $
+$NetBSD: distinfo,v 1.12 2007/01/09 14:52:41 drochner Exp $
 
 SHA1 (xine-ui-0.99.4.tar.gz) = b982e5697f183559c216f9243b9410d61b9c58aa
 RMD160 (xine-ui-0.99.4.tar.gz) = eeead5c6e566ade5505c8fcb924272c74eb4f49a
@@ -13,4 +13,5 @@ SHA1 (patch-am) = 57567b2c1f86ef575ff4abcbfaa5f06e3178a056
 SHA1 (patch-ao) = 09e83615b88dffbdfeb0b0bad07dcdc60024ba67
 SHA1 (patch-ap) = f4f360e5fc8008882f07c649b7ea29ef163c6731
 SHA1 (patch-aq) = 212d5c561422e5866cdc05cd39c609b1274aa8b6
-SHA1 (patch-ar) = a64614bc76e73a7d0600daee0a72affe2dc6de15
+SHA1 (patch-ar) = 50c45ce7c272385100bc562b8d1d668c3d860df7
+SHA1 (patch-as) = 96f680bcab84c7a832f0ea4ae2b6a5b687f79244
diff --git a/multimedia/xine-ui/patches/patch-ar b/multimedia/xine-ui/patches/patch-ar
index a018321f625..26c0cd4199e 100644
--- a/multimedia/xine-ui/patches/patch-ar
+++ b/multimedia/xine-ui/patches/patch-ar
@@ -1,8 +1,29 @@
-$NetBSD: patch-ar,v 1.1 2006/04/21 11:11:26 drochner Exp $
+$NetBSD: patch-ar,v 1.2 2007/01/09 14:52:41 drochner Exp $
 
---- src/xitk/xine-toolkit/xitk.c.orig	2006-04-21 12:52:41.000000000 +0200
+--- src/xitk/xine-toolkit/xitk.c.orig	2005-05-21 00:02:05.000000000 +0200
 +++ src/xitk/xine-toolkit/xitk.c
-@@ -1877,7 +1877,7 @@ void xitk_init(Display *display, XColor 
+@@ -147,7 +147,7 @@ typedef struct {
+   
+   struct timeval              keypress;
+ 
+-  KeyCode                     ignore_keys[3];
++  KeyCode                     ignore_keys[2];
+ 
+   pthread_t                  *tips_thread;
+   unsigned long               tips_timeout;
+@@ -1805,9 +1805,8 @@ void xitk_init(Display *display, XColor 
+   xitk_x_error           = 0;
+   gXitk->x_error_handler = NULL;
+   gXitk->modalw          = None;
+-  gXitk->ignore_keys[0]  = XKeysymToKeycode(display, XK_Scroll_Lock);
+-  gXitk->ignore_keys[1]  = XKeysymToKeycode(display, XK_Num_Lock);
+-  gXitk->ignore_keys[2]  = XKeysymToKeycode(display, XK_Caps_Lock);
++  gXitk->ignore_keys[0]  = XKeysymToKeycode(display, XK_Shift_L);
++  gXitk->ignore_keys[1]  = XKeysymToKeycode(display, XK_Control_L);
+   gXitk->tips_timeout    = TIPS_TIMEOUT;
+   XGetInputFocus(display, &(gXitk->parent.window), &(gXitk->parent.focus));
+ 
+@@ -1877,7 +1876,7 @@ void xitk_init(Display *display, XColor 
    sprintf(buffer, "%s%s", buffer, " ]-");
  
    if(verbosity)
diff --git a/multimedia/xine-ui/patches/patch-as b/multimedia/xine-ui/patches/patch-as
new file mode 100644
index 00000000000..adee45b0309
--- /dev/null
+++ b/multimedia/xine-ui/patches/patch-as
@@ -0,0 +1,24 @@
+$NetBSD: patch-as,v 1.1 2007/01/09 14:52:41 drochner Exp $
+
+--- src/xitk/videowin.c.orig	2007-01-08 18:39:40.000000000 +0100
++++ src/xitk/videowin.c
+@@ -1449,8 +1449,8 @@ void video_window_init (window_attribute
+   gVw->desktopHeight      = DisplayHeight(gGui->video_display, gGui->video_screen);
+ 
+ #ifdef HAVE_XTESTEXTENSION
+-  gVw->fake_keys[0] = XKeysymToKeycode(gGui->video_display, XK_Scroll_Lock);
+-  gVw->fake_keys[1] = XKeysymToKeycode(gGui->video_display, XK_Num_Lock);
++  gVw->fake_keys[0] = XKeysymToKeycode(gGui->video_display, XK_Shift_L);
++  gVw->fake_keys[1] = XKeysymToKeycode(gGui->video_display, XK_Control_L);
+   gVw->fake_key_cur = 0;
+ #endif
+   
+@@ -2151,8 +2151,6 @@ void video_window_reset_ssaver(void) {
+       XLockDisplay(gGui->video_display);
+       XTestFakeKeyEvent(gGui->video_display, gVw->fake_keys[gVw->fake_key_cur], True, CurrentTime);
+       XTestFakeKeyEvent(gGui->video_display, gVw->fake_keys[gVw->fake_key_cur], False, CurrentTime);
+-      XTestFakeKeyEvent(gGui->video_display, gVw->fake_keys[gVw->fake_key_cur], True, CurrentTime);
+-      XTestFakeKeyEvent(gGui->video_display, gVw->fake_keys[gVw->fake_key_cur], False, CurrentTime);
+       XSync(gGui->video_display, False);
+       XUnlockDisplay(gGui->video_display);
+     }