diff --git a/irssi-0.8.11_support-meta-cursor-xterm.patch b/irssi-0.8.11_support-meta-cursor-xterm.patch new file mode 100644 index 0000000..9a7178e --- /dev/null +++ b/irssi-0.8.11_support-meta-cursor-xterm.patch @@ -0,0 +1,44 @@ +------------------------------------------------------------------------ +r4603 | jilles | 2007-08-24 19:13:21 +0200 (Fri, 24 Aug 2007) | 3 lines +Changed paths: + M /irssi/trunk/src/fe-text/gui-readline.c + +Make alt/meta+arrow keys work in recent versions of xterm. +Bug #496 + +------------------------------------------------------------------------ +Index: src/fe-text/gui-readline.c +=================================================================== +--- src/fe-text/gui-readline.c (revision 4602) ++++ src/fe-text/gui-readline.c (revision 4603) +@@ -1087,6 +1087,15 @@ + key_bind("key", NULL, "meta2-1;5D", "cleft", (SIGNAL_FUNC) key_combo); + key_bind("key", NULL, "meta2-1;5C", "cright", (SIGNAL_FUNC) key_combo); + ++ key_bind("key", NULL, "meta2-1;3A", "mup", (SIGNAL_FUNC) key_combo); ++ key_bind("key", NULL, "meta2-1;3B", "mdown", (SIGNAL_FUNC) key_combo); ++ key_bind("key", NULL, "meta2-1;3D", "mleft", (SIGNAL_FUNC) key_combo); ++ key_bind("key", NULL, "meta2-1;3C", "mright", (SIGNAL_FUNC) key_combo); ++ key_bind("key", NULL, "meta-up", "mup", (SIGNAL_FUNC) key_combo); ++ key_bind("key", NULL, "meta-down", "mdown", (SIGNAL_FUNC) key_combo); ++ key_bind("key", NULL, "meta-left", "mleft", (SIGNAL_FUNC) key_combo); ++ key_bind("key", NULL, "meta-right", "mright", (SIGNAL_FUNC) key_combo); ++ + /* cursor movement */ + key_bind("backward_character", "", "left", NULL, (SIGNAL_FUNC) key_backward_character); + key_bind("forward_character", "", "right", NULL, (SIGNAL_FUNC) key_forward_character); +@@ -1132,10 +1141,10 @@ + /* window managing */ + key_bind("previous_window", "Previous window", "^P", NULL, (SIGNAL_FUNC) key_previous_window); + key_bind("next_window", "Next window", "^N", NULL, (SIGNAL_FUNC) key_next_window); +- key_bind("upper_window", "Upper window", "meta-up", NULL, (SIGNAL_FUNC) key_upper_window); +- key_bind("lower_window", "Lower window", "meta-down", NULL, (SIGNAL_FUNC) key_lower_window); +- key_bind("left_window", "Window in left", "meta-left", NULL, (SIGNAL_FUNC) key_left_window); +- key_bind("right_window", "Window in right", "meta-right", NULL, (SIGNAL_FUNC) key_right_window); ++ key_bind("upper_window", "Upper window", "mup", NULL, (SIGNAL_FUNC) key_upper_window); ++ key_bind("lower_window", "Lower window", "mdown", NULL, (SIGNAL_FUNC) key_lower_window); ++ key_bind("left_window", "Window in left", "mleft", NULL, (SIGNAL_FUNC) key_left_window); ++ key_bind("right_window", "Window in right", "mright", NULL, (SIGNAL_FUNC) key_right_window); + key_bind("active_window", "Go to next window with the highest activity", "meta-a", NULL, (SIGNAL_FUNC) key_active_window); + key_bind("next_window_item", "Next channel/query", "^X", NULL, (SIGNAL_FUNC) key_next_window_item); + key_bind("previous_window_item", "Previous channel/query", NULL, NULL, (SIGNAL_FUNC) key_previous_window_item); diff --git a/irssi-support-meta-cursor-xterm.patch b/irssi-support-meta-cursor-xterm.patch deleted file mode 100644 index 0b9a5a5..0000000 --- a/irssi-support-meta-cursor-xterm.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: src/fe-text/gui-readline.c -=================================================================== ---- src/fe-text/gui-readline.c (revision 4490) -+++ src/fe-text/gui-readline.c (working copy) -@@ -1058,6 +1058,7 @@ - key_bind("key", NULL, "meta-[", "meta2", (SIGNAL_FUNC) key_combo); - key_bind("key", NULL, "meta-O", "meta2", (SIGNAL_FUNC) key_combo); - key_bind("key", NULL, "meta-[O", "meta2", (SIGNAL_FUNC) key_combo); -+ key_bind("key", NULL, "[1;3", "meta2", (SIGNAL_FUNC) key_combo); - - /* arrow keys */ - key_bind("key", NULL, "meta2-A", "up", (SIGNAL_FUNC) key_combo); diff --git a/irssi.changes b/irssi.changes index 7a30e8f..e45940e 100644 --- a/irssi.changes +++ b/irssi.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Sep 10 21:59:22 CEST 2007 - mrueckert@suse.de + +- replaced irssi-support-meta-cursor-xterm.patch + with irssi-0.8.11_support-meta-cursor-xterm.patch: (#294166) + the original patch from the bug broke the handling on other + terminals. use the updated patch from svn. + ------------------------------------------------------------------- Thu Aug 23 00:47:49 CEST 2007 - mrueckert@suse.de diff --git a/irssi.spec b/irssi.spec index e5afbe8..e435f74 100644 --- a/irssi.spec +++ b/irssi.spec @@ -12,7 +12,7 @@ Name: irssi Version: 0.8.11 -Release: 11 +Release: 14 # License: GPL v2 or later Group: Productivity/Networking/IRC @@ -25,7 +25,7 @@ URL: http://www.irssi.org Source: http://www.irssi.org/files/irssi-%{version}.tar.bz2 Patch: irssi-0.8.10rc5-install_vendor.diff Patch1: irssi-0.8.11-avoid_version.patch -Patch2: irssi-support-meta-cursor-xterm.patch +Patch2: irssi-0.8.11_support-meta-cursor-xterm.patch # Summary: A Modular, Secure, and Well Designed IRC Client @@ -123,6 +123,11 @@ rm -rf %{buildroot} %{_includedir}/irssi/ %changelog +* Mon Sep 10 2007 - mrueckert@suse.de +- replaced irssi-support-meta-cursor-xterm.patch + with irssi-0.8.11_support-meta-cursor-xterm.patch: (#294166) + the original patch from the bug broke the handling on other + terminals. use the updated patch from svn. * Thu Aug 23 2007 - mrueckert@suse.de - added irssi-support-meta-cursor-xterm.patch: (#294166) fix meta-key in newer xterms. patch from upstream bug