Hello community, here is the log from the commit of package xterm checked in at Tue Nov 28 17:20:35 CET 2006. -------- --- xterm/xterm.changes 2006-10-18 11:36:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/STABLE/xterm/xterm.changes 2006-11-28 06:06:47.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Nov 28 06:02:04 CET 2006 - sndirsch@suse.de + +- bug220728.diff: + * Essentially the problem reported is that xterm #216 does a more + complete job of applying modifier parameters to cursor-, + function- and other keys. Some users would like to disable the + feature. Patch to allow modifyCursorKeys to be disabled. + Currently the resource accepts values 0 to 3. This adds a -1 to + disable the feature. Most users won't want to do this. + (Bug #220728) + +------------------------------------------------------------------- New: ---- bug220728.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xterm.spec ++++++ --- /var/tmp/diff_new_pack.7sO69G/_old 2006-11-28 17:19:43.000000000 +0100 +++ /var/tmp/diff_new_pack.7sO69G/_new 2006-11-28 17:19:43.000000000 +0100 @@ -13,12 +13,12 @@ Name: xterm BuildRequires: freetype2-devel update-desktop-files utempter xorg-x11-devel URL: http://invisible-island.net/xterm/ -License: Other License(s), see package +License: X11/MIT Group: System/X11/Utilities Provides: xorg-x11:/usr/X11R6/bin/xterm XFree86:/usr/X11R6/bin/xterm Autoreqprov: on Version: 222 -Release: 1 +Release: 12 Summary: The basic X terminal program Source: %name.tar.gz Source1: luitx @@ -33,6 +33,7 @@ Patch: p_xterm-config.diff Patch1: p_xterm-settings.diff Patch2: p_xterm-sigwinch.diff +Patch3: bug220728.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -42,58 +43,119 @@ Authors: -------- + Thomas E Dickey + Adam Sulmicki + Alan Hourihane + Alexander Pohoyda + Alexander V Lukyanov + Andrew Sumner + Andrew Tipton + Anton Kovalenko + Ben Yoshino + Bernhard Rosenkraenzer + Bill Nottingham + Bob Maynard + Bradd W. Szonye + Bram Moolenaar + Bruno Haible + Christian Biere + Christian Weisgerber + Chuck Blake + D Roland Walker + David Dawes + David Madore + David Martinez Moreno + David Mathog + David Yeo + Dennis Schneider + Derek Foreman + Dr Werner Fink + Eddy De Greef Egbert Eich + Emanuele Giaquinta + Eugene Konev + Fabrice Bellard + Frank Giessler + Frank Guangxin Liu + Frank Liu + Gael Roualland + George Peter Staplin + Greg Klanderman + Greg Smith + H Merijn Brand + Harold Hunt + Holger Veit + Ilya Zakharevich + Jason Vas Dias + Jeff Uphoff + Jens Schweikhardt + Jeremy Buhler + Jeroen Ruigrok + Jess Thrysoee + Joe Allen + Juergen Keil + Juliusz Chroboczek + Jungshik Shin + Kean Johnston Keith Packard - Roland Mainz - Alan Coopersmith - Russ Blaine - Alexander Gottwald - Alan Hourihane - Chisato Yamauchi - Eric Anholt - Nolan Leake - Stefan Dirsch - Rik Faith - Daniel Berrange + Ken Martin + Kevin Buhr + Kiyokazu Suto + Larry Riedel + Lee Olsen + Marc La France + Mark Waggoner + Markus Kuhn + Matthias Scheler Matthieu Herrb - John Heasley - Ryan Underwood - Alex Deucher - Ty Sarna - Torrey T Lyons Darwin - Stuart Kreitman - Kevin E. Martin - Greg Parker - John Harper - Adam Jackson - Peter Kunzman - Aaron Plattner - Chisato Yamauchi - Michel Daenzer - Kristian Høgsberg - Søren Sandmann - Owen Taylor - Mike A. Harris - Ivan Kokshaysky - Bryan Stine - Guy Martin - Paul Anderson - Yu Shao - David Dawes - Harold L. Hunt II - Andreas Luik - Travis Tilley - Ryan Lortie - Ryan Breen - Deron Johnson - Ronny Vindenes - Jim Gettys + Michael Rohleder + Michael Schroeder + Mike Fabian + Mike Hopkirk + Min Sik Kim + Nam SungHyun + Nelson Beebe + Nicolas George + Paul Gilmartin + Paul Giordano + Paul Szabo + Paul Vojta + Paul Williams + Pavel Roskin + Peter Berg Larsen + Peter Chubb + Phil Sidler + Ray Neuman + Richard Griswold + Robert Brady + Robert Earl + Robin Cutshaw + Ross Paterson + Sam Stephenson + Scott Sewall + Semen A Ustimenko + Sergei Laskavy + Steve Wall + Stuart Lissaman + Suhaib Siddiqi + Sven Verdoolaege + Taneli Huuskonen + Tim Adye + Todd Larason + Todd Miller + Tomasz Cholewo + Tomohiro Kubota + Tor Lillqvist + Torrey T. Lyons + Yong Li + Zarick Lau %prep %setup -n xterm-%version -b7 %patch -p2 -b .xterm-config %patch1 -p0 -b .xterm-settings %patch2 -p0 -b .xterm-sigwinch +%patch3 cp $RPM_SOURCE_DIR/*bdf.bz2 . bunzip2 *.bdf.bz2 @@ -183,6 +245,15 @@ /usr/share/pixmaps/terminal.png %changelog -n xterm +* Tue Nov 28 2006 - sndirsch@suse.de +- bug220728.diff: + * Essentially the problem reported is that xterm #216 does a more + complete job of applying modifier parameters to cursor-, + function- and other keys. Some users would like to disable the + feature. Patch to allow modifyCursorKeys to be disabled. + Currently the resource accepts values 0 to 3. This adds a -1 to + disable the feature. Most users won't want to do this. + (Bug #220728) * Wed Oct 18 2006 - sndirsch@suse.de - updated to xterm-222 * minor optimization for recoloring cursor via dynamic colors. @@ -367,9 +438,9 @@ "maximize" in Gnome or KDE which do not use the window manager hints for this case (Debian #289123, Novell #61153). * fixes for Novell #113277: -- specify weight for wide font which may be derived from normal + - specify weight for wide font which may be derived from normal fontname. -- cache the derived wide- and widebolt-fontnames. + - cache the derived wide- and widebolt-fontnames. - obsoletes bugzilla-99564.patch * Sat Aug 27 2005 - sndirsch@suse.de - added vttest; useful for testing terminals @@ -383,7 +454,7 @@ immediate match is found by asking for a bold variant of the wide-font. The result was to use overstriking rather than the actual bold font (Debian #318162, patch by Eugene Konev). ---> obsoletes mfabian's patch mentioned below + --> obsoletes mfabian's patch mentioned below * Mon Aug 01 2005 - mfabian@suse.de - Bugzilla #99564: fix the problem that bold fonts were not used unless the resource boldMode was set to "false". ++++++ bug220728.diff ++++++ --- input.c.orig 2006-09-02 00:15:55.000000000 +0000 +++ input.c 2006-11-27 03:10:42.000000000 +0000 @@ -303,19 +303,13 @@ allowModifierParm(XtermWidget xw, KEY_DA Bool result = False; (void) screen; - if (1 -#if OPT_SUNPC_KBD || OPT_VT52 - && !(((IsKeypadKey(kd->keysym) && keypad_mode) - || kd->is_fkey) - && (0 + if (!(IsKeypadKey(kd->keysym) && keypad_mode) #if OPT_SUNPC_KBD - || (keyboard->type == keyboardIsVT220) + && keyboard->type != keyboardIsVT220 #endif #if OPT_VT52_MODE - || (screen->vtXX_level == 0) + && screen->vtXX_level != 0 #endif - )) -#endif /* OPT_SUNPC_KBD || OPT_VT52 */ ) { result = True; } =================================================================== RCS file: RCS/input.c,v retrieving revision 1.267 diff -u -r1.267 input.c --- input.c 2006/11/26 22:33:06 1.267 +++ input.c 2006/11/28 01:24:26 @@ -608,10 +608,13 @@ } static void -modifyCursorKey(ANSI * reply, int modify, int modify_parm) +modifyCursorKey(ANSI * reply, int modify, int *modify_parm) { - if (modify_parm > 1) { - if (modify) { + if (*modify_parm > 1) { + if (modify < 0) { + *modify_parm = 0; + } + if (modify > 0) { reply->a_type = CSI; /* SS3 should not have params */ } if (modify > 1 && reply->a_nparam == 0) { @@ -742,7 +745,7 @@ int key = False; ANSI reply; int dec_code; - short modify_parm = 0; + int modify_parm = 0; int keypad_mode = ((keyboard->flags & MODE_DECKPAM) != 0); unsigned evt_state = event->state; unsigned mod_state; @@ -1016,7 +1019,7 @@ || IsEditFunctionKey(kd.keysym)) ? keyboard->modify_now.function_keys : keyboard->modify_now.cursor_keys), - modify_parm); + &modify_parm); MODIFIER_PARM; unparseseq(xw, &reply); } else if (((kd.is_fkey @@ -1049,7 +1052,7 @@ reply.a_final = A2E(dec_code - 11 + E2A('P')); modifyCursorKey(&reply, keyboard->modify_now.function_keys, - modify_parm); + &modify_parm); MODIFIER_PARM; unparseseq(xw, &reply); } @@ -1075,7 +1078,7 @@ if (kd.is_fkey) { modifyCursorKey(&reply, keyboard->modify_now.function_keys, - modify_parm); + &modify_parm); } MODIFIER_PARM; #endif @@ -1111,7 +1114,7 @@ } else { reply.a_type = CSI; } - modifyCursorKey(&reply, keyboard->modify_now.cursor_keys, modify_parm); + modifyCursorKey(&reply, keyboard->modify_now.cursor_keys, &modify_parm); reply.a_final = curfinal[kd.keysym - XK_Home]; VT52_CURSOR_KEYS; MODIFIER_PARM; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org