Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xterm for openSUSE:Factory checked in at 2021-02-01 13:25:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xterm (Old) and /work/SRC/openSUSE:Factory/.xterm.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xterm" Mon Feb 1 13:25:00 2021 rev:123 rq:866528 version:363 Changes: -------- --- /work/SRC/openSUSE:Factory/xterm/xterm.changes 2020-09-21 17:10:44.123316480 +0200 +++ /work/SRC/openSUSE:Factory/.xterm.new.28504/xterm.changes 2021-02-01 13:25:00.993804856 +0100 @@ -1,0 +2,89 @@ +Tue Jan 12 02:57:05 UTC 2021 - Avindra Goolcharan <avindra@opensuse.org> + +- Update to Patch#363 - 2020/12/26 + * disable groff hyphenation in generated html when using man2html. + * change SCS ���&4��� Cyrillic to non-NRCS, per VT520 manual. + * amend fix for SCS in patch #198 to remove DEL rather than converting + it to a space (report by Thomas Wolff). + * modify state transitions for selecting character sets to eliminate + an ambiguity between the ���A��� used in VT220 versus VT320. + improve error recovery when selecting characters by resetting to US + ASCII when no suitable encoding is found, e.g., attempting to use + an NRCS sequence when NRCS is not enabled. + * turn off hyphenation in ���.txt��� conversion, prompted by groff changes. + * add VT5xx ISO Latin-2 (prompted by discussion with Thomas Wolff). + * amend change from patch #361 to event-handling in CopyWait to handle + active-icon as a special case (Debian #975687). + * add call to loadColorTable to get the visual information needed to + decode BE RGBA32 color format (patch by Leandro Lupori). + * modify the resource-parsing for disallowedPasteControls and similar + lists of names/numbers to recognize ���~;��� (tilde) for cancelling a given name/number. + * add ENQ, EOT and NUL to default for disallowedPasteControls. + * change default for disallowedPasteControls to omit the tab character + (suggested by Harald Dunkel). + * fix swapped height/width in regisScreenSize and maxGraphicSize resources + using "auto" value, from patch #314 (report by Anton Lavrentiev) + * revise patch #362 change for shift-modifier versus mouse protocol + and select/paste by adding resource shiftEscape, which can be enabled + via a control sequence (prompted by discussion with Matthijs van Duin). + * simplify/improve ifdef in trace code for using a separate set of files + for each run of xterm. + * add options -r and -t to vttests/query-color.pl to show the 6-digit + RGB code and actual colors. + * add nel to xterm-basic terminfo. + * alter vttests/modify-keys.pl to omit HTML reference links to the + modified-keys table where no keycode was available. +- includes Patch #361 - 2020/10/14 + * treat the return value of strerror as readonly (patch by Philipp + Klaus Krause). + * modify event-handling in CopyWait to work around hanging while writing + large amounts of text to an active icon and at the same time iconifying/ + deiconifying (report by Dave Kemper). + * initialize double-buffer for active-icon window. + * improve manual page description of scrollbar resources (report by Brian Lindholm). + correct ifdef for menu entry for active-icon, when initializing + it with toolbar configuration. + * add preprocessor option to makefile to set internal definition of + pixmaps directory to match the install-configuration (FreeBSD #250036) + * cleanup of calls to free, removing checks for null (Walter Harms) + * add fallback actions pointer-button and pointer-motion which handle + events for the mouse control-sequences protocol if the select-related + translations are omitted with *omitTranslation:select (prompted by + discussion with "Ergus") + * amend rule for using shift-key to override mouse-protocol for select/ + paste to limit that feature to mouse-buttons which are actually + bound to select/paste actions (prompted by discussion with "Ergus"). + * corrected mapping in special case for repainting wrap-marks when viewing + the scrollback area. + * use separate GCs for showWrapMarks feature, to work around cursor + coloring change in patch #345 (report by Paulo Silva de Al��bano). +- includes Patch #360 - 2020/09/20 + * mention decGraphicsID in ctlseqs.ms (suggested by Thomas Wolff). + * modify pixel-coordinate mouse reponse to use as origin the VT100- + window rather than the underlying widget, which includes the scrollbar (report by Thomas Wolff). + * add configure option --disable-print-graphics (Ross Combs). + * add test_ptydata to ���make check��� rule. + * minor fixes for ctlseqs.ms (report by Jean-Marc Bourguet). + * minor fixes for manpage style (report/patch by "a1346054"). + * correct cleanup from switch between italics/normal font in the show/ + hide cursor functions (report/testcase by Peter Fabinski) + * integrated patch by Ross Combs: + internal renaming of GraphicsID symbols, for readability. + adjust logic for VT125, treating it as a ReGIS terminal. + * update configure macros, for compiler-warning fixes. + * integrated patch by Ross Combs: + add control sequence modes for graphics printing. + improve conversion to bitmaps for TrueType fonts in ReGIS + add font7 resource, for an ���enormous��� bitmap font. + do not reset graphics in a soft-reset. + add pointerFont resource, and -pf command-line option. + * improve typography of manual page (patch by Branden Robinson). + * amend patch #359 change to df-install.in to ignore a command-line + assignment to DESTDIR if followed by an explicit --dir (report by Sven Joachim) +- merged 2 patches to form xterm-suse.patch +- remove xterm-settings.patch +- remove xterm-better-fonts.patch +- rebase xterm-sigwinch.patch +- cleanup spec + +------------------------------------------------------------------- Old: ---- xterm-359.tgz xterm-359.tgz.asc xterm-better-fonts.patch xterm-settings.patch New: ---- xterm-363.tgz xterm-363.tgz.asc xterm-suse.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xterm.spec ++++++ --- /var/tmp/diff_new_pack.FXvjHL/_old 2021-02-01 13:25:02.025806474 +0100 +++ /var/tmp/diff_new_pack.FXvjHL/_new 2021-02-01 13:25:02.029806481 +0100 @@ -1,7 +1,7 @@ # # spec file for package xterm # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %define splitbin 0%{?suse_version} >= 1300 Name: xterm -Version: 359 +Version: 363 Release: 0 Summary: The basic X terminal program License: MIT @@ -37,7 +37,7 @@ Source11: xterm.keyring # Snoop for the escape sequence assignment of the keypad Source20: snooper.tar.bz2 -Patch1: xterm-settings.patch +Patch1: xterm-suse.patch Patch2: xterm-sigwinch.patch Patch3: xterm-double_width_fonts.patch Patch4: xterm-desktop_file_icon.patch @@ -46,7 +46,6 @@ Patch7: xterm-allow_iso-utf_fonts_in_menu.patch Patch8: xterm-decomposed_bitmaps.patch Patch9: xterm-desktop-item-in-gnome-utilities-appfolder.patch -Patch10: xterm-better-fonts.patch BuildRequires: groff BuildRequires: ncurses-devel BuildRequires: pkgconfig @@ -85,17 +84,7 @@ This package contains the basic X.Org terminal program. %prep -%setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 +%autosetup -p1 cp -t . %{SOURCE8} %{SOURCE9} bunzip2 %{basename:%{SOURCE8}} %{basename:%{SOURCE9}} @@ -120,7 +109,7 @@ #ensure we do not lose FreeType support (boo#911683) grep "#define XRENDERFONT 1" xtermcfg.h -make %{?_smp_mflags} +%make_build if ! which bdftopcf &> /dev/null; then exit 1; fi for i in *.bdf ++++++ xterm-359.tgz -> xterm-363.tgz ++++++ ++++ 26301 lines of diff (skipped) ++++++ xterm-sigwinch.patch ++++++ --- /var/tmp/diff_new_pack.FXvjHL/_old 2021-02-01 13:25:02.445807133 +0100 +++ /var/tmp/diff_new_pack.FXvjHL/_new 2021-02-01 13:25:02.445807133 +0100 @@ -2,24 +2,14 @@ # Parent 547d2ea5029c2c3edd129a9d23e424877c6f29f0 diff --git a/screen.c b/screen.c +index 6fb6b3b..238591f 100644 --- a/screen.c +++ b/screen.c -@@ -2229,17 +2229,17 @@ ScreenResize(XtermWidget xw, - XConfigureWindow(XtDisplay(xw), screen->iconVwin.window, - CWWidth | CWHeight | CWBorderWidth, &changes); - } - #endif /* NO_ACTIVE_ICON */ +@@ -2330,7 +2330,7 @@ ScreenResize(XtermWidget xw, #ifdef TTYSIZE_STRUCT - update_winsize(screen->respond, rows, cols, height, width); - + if (update_winsize(screen->respond, rows, cols, height, width) == 0) { -#if defined(SIGWINCH) && defined(TIOCGPGRP) +#if defined(SIGWINCH) && (defined(TIOCGPGRP) || defined(linux)) - if (screen->pid > 1) { - int pgrp; - - TRACE(("getting process-group\n")); - if (ioctl(screen->respond, TIOCGPGRP, &pgrp) != -1) { - TRACE(("sending SIGWINCH to process group %d\n", pgrp)); - kill_process_group(pgrp, SIGWINCH); - } + if (screen->pid > 1) { + int pgrp; ++++++ xterm-suse.patch ++++++ # from c7753810ca3026190c5da0536ecf86e9b13800d3 # various distribution configuration tweaks # from 7ecf75281e09a29875b61f38bb66920529368050: # improve display of chinese letters (bsc#1089049) diff --git a/UXTerm.ad.1 b/UXTerm.ad index 0eac2dd..2ba471d 100644 --- a/UXTerm.ad.1 +++ b/UXTerm.ad @@ -35,10 +35,20 @@ ! to set resources for UTF-8 mode with corresponding fonts. ! See the uxterm script for an example. +! You need to have efont-unicode.rpm installed in order to use the +! efont-fixed fonts! #include "XTerm" *fontMenu.Label: Unicode Fonts *VT100.utf8: 1 +! always use iso10646-1 fonts and luit for non-UTF-8 locales: +*locale: true + +! don't use the compiled in default of "*" for ximFont because this +! leads to very slow startup times for zh_CN.UTF-8 and zh_HK.UTF-8 locales +! (For details see https://bugzilla.novell.com/show_bug.cgi?id=464930): +*ximFont: fixed + ! This includes "XTerm-color" which includes "XTerm", which defines fonts. ! Why set them here? @@ -60,13 +70,28 @@ ! Making the wide fonts associated with *VT100.font in this file allows uxterm ! to skip that step. It will use the fonts that the XTerm file gives for the ! *VT100.uft8Fonts.font pattern. -*VT100.font2: -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso10646-1 -*VT100.font: -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1 -*VT100.font3: -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1 -*VT100.font4: -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso10646-1 -*VT100.font5: -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1 -*VT100.font6: -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1 -*VT100.font7: -adobe-courier-medium-r-normal--24-240-75-75-m-150-iso10646-1 +*VT100.fontMenu*fontdefault*Label: Default +*VT100.font: -misc-fixed-medium-r-normal-*-18-120-100-100-c-90-iso10646-1 +*VT100.wideFont: -misc-fixed-medium-r-normal-*-18-120-100-100-c-180-iso10646-1 + +*fontMenu*font1.Label: efont 10 pixel +*VT100.font1: -efont-fixed-medium-r-normal--10-100-75-75-c-50-iso10646-1 +*VT100.wideFont1: -efont-fixed-medium-r-normal--10-100-75-75-c-100-iso10646-1 +*fontMenu*font2.Label: efont 12 pixel +*VT100.font2: -efont-fixed-medium-r-normal-*-12-120-75-75-c-60-iso10646-1 +*VT100.wideFont2: -efont-fixed-medium-r-normal-*-12-120-75-75-c-120-iso10646-1 +*fontMenu*font3.Label: efont 14 pixel +*VT100.font3: -efont-fixed-medium-r-normal-*-14-140-75-75-c-70-iso10646-1 +*VT100.wideFont3: -efont-fixed-medium-r-normal-*-14-140-75-75-c-140-iso10646-1 +*fontMenu*font4.Label: efont 16 pixel +*VT100.font4: -efont-fixed-medium-r-normal-*-16-160-75-75-c-80-iso10646-1 +*VT100.wideFont4: -efont-fixed-medium-r-normal-*-16-160-75-75-c-160-iso10646-1 +*fontMenu*font5.Label: misc 18 pixel +*VT100.font5: -misc-fixed-medium-r-normal-*-18-120-100-100-c-90-iso10646-1 +*VT100.wideFont5: -misc-fixed-medium-r-normal-*-18-120-100-100-c-180-iso10646-1 +*fontMenu*font6.Label: efont 24 pixel +*VT100.font6: -efont-fixed-medium-r-normal-*-24-240-75-75-c-120-iso10646-1 +*VT100.wideFont6: -efont-fixed-medium-r-normal-*-24-240-75-75-c-240-iso10646-1 ! Here is an alternate set of fonts with better support for bold: !*VT100.font2: -efont-biwidth-medium-r-normal--10-100-75-75-p-50-iso10646-1 diff --git a/XTerm-col.ad b/XTerm-col.ad --- a/XTerm-col.ad +++ b/XTerm-col.ad @@ -71,25 +71,25 @@ ! These are the 8 ANSI colors and their bright equivalents. Depending on ! other resource settings, xterm may use the bright colors when displaying ! bold text (see the boldColors resource). *VT100*color0: black *VT100*color1: red3 *VT100*color2: green3 *VT100*color3: yellow3 -*VT100*color4: blue2 +*VT100*color4: blue3 *VT100*color5: magenta3 *VT100*color6: cyan3 *VT100*color7: gray90 -*VT100*color8: gray50 +*VT100*color8: gray30 *VT100*color9: red *VT100*color10: green *VT100*color11: yellow -*VT100*color12: rgb:5c/5c/ff +*VT100*color12: blue *VT100*color13: magenta *VT100*color14: cyan *VT100*color15: white ! Disclaimer: there are no standard colors used in terminal emulation. ! ! The choice for color4 and color12 is a tradeoff between contrast, depending ! on whether they are used for text or backgrounds. Note that either color4 or diff --git a/XTerm.ad.1 b/XTerm.ad index dd6ef52..69aac16 100644 --- a/XTerm.ad.1 +++ b/XTerm.ad @@ -105,21 +105,37 @@ *vtMenu*sixelScrolling*Label: Sixel Scrolling *vtMenu*privateColorRegisters*Label: Private Color Registers +! always use iso10646-1 fonts and luit for non-UTF-8 locales: +*locale: checkfont +*localeFilter: /usr/bin/luitx + +! don't use the compiled in default of "*" for ximFont because this +! leads to very slow startup times for zh_CN.UTF-8 and zh_HK.UTF-8 locales +! (For details see https://bugzilla.novell.com/show_bug.cgi?id=464930): +*ximFont: fixed + *fontMenu.Label: VT Fonts *fontMenu*fontdefault*Label: Default -*fontMenu*font1*Label: Unreadable -*VT100.font1: nil2 +*VT100*font: -misc-fixed-medium-r-normal-*-18-120-100-100-c-90-iso10646-1 +*VT100*boldfont: -misc-fixed-bold-r-normal-*-18-120-100-100-c-90-iso10646-1 +*VT100*wideFont: -misc-fixed-medium-r-normal-*-18-120-100-100-c-180-iso10646-1 + +*fontMenu*font1*Label: Unicode Best +*VT100.font1: -misc-fixed-medium-r-normal-*-18-120-100-100-c-90-iso10646-1 +*VT100.wideFont1: -misc-fixed-medium-r-normal-*-18-120-100-100-c-180-iso10646-1 *IconFont: nil2 *fontMenu*font2*Label: Tiny -*VT100.font2: 5x7 +*VT100.font2: -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso10646-1 *fontMenu*font3*Label: Small -*VT100.font3: 6x10 +*VT100.font3: -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso10646-1 *fontMenu*font4*Label: Medium -*VT100.font4: 7x13 +*VT100.font4: -misc-fixed-medium-r-semicondensed-*-13-120-75-75-c-60-iso10646-1 +*VT100.wideFont4: -misc-fixed-medium-r-normal-*-13-120-75-75-c-120-iso10646-1 *fontMenu*font5*Label: Large -*VT100.font5: 9x15 +*VT100.font5: -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1 *fontMenu*font6*Label: Huge -*VT100.font6: 10x20 +*VT100.font6: -misc-fixed-medium-r-normal-*-20-200-75-75-c-100-iso10646-1 +*VT100.wideFont6: -misc-fixed-medium-r-normal-*-20-200-75-75-c-200-iso10646-1 *fontMenu*font7*Label: Enormous !*VT100.font7: 12x24 *VT100.font7: -adobe-courier-medium-r-normal--24-240-75-75-m-150-iso10646-1 @@ -252,6 +268,59 @@ ! Alternatively, !*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+ +!! We want a 8bit clean xterm +*eightBitInput: true +*eightBitOutput: true + +!! Default Settings +*termName: xterm +*pointerShape: top_left_arrow +*scrollKey: true + +!! Newer XTerms can guess the value of the BackarrowKey by +!! reading the terminfo or the pty initial value. +!! We use the terminfo value. +*backarrowKeyIsErase: true +*ptyInitialErase: true +*deleteIsDEL: false + +!! To be compatible with the original X Consortium XTerm. +!! *oldXtermFKeys: true + +!! Some symbol mappings of the keyboard for foreign Motif. Some of these +!! mappings are virtual osfKeySym's. Extend this list if necessary, +!! more information in VirtualBindings(3) and /usr/include/Xm/XmStrDefs.h. +*defaultVirtualBindings: #override \ + Help : osfHelp\n\ + DRemove : osfCut\n\ + Prior : osfPageUp\n\ + Next : osfPageDown\n\ + Select : osfSelect\n\ + Insert : osfPaste\ + +!! If Alt is not Meta use it for emacs line editing of e.g. bash, +!! define Pause key, and ignore DRemove on foreign displays. +*altIsNotMeta: true +*altSendsEscape: true +*metaSendsEscape: true +*VT100.Translations: #override \ + <Key>Pause: string("\033[P") \n\ + <Key>DRemove: ignore() + +*multiScroll: on +*jumpScroll: on +*ScrollBar: on +*Scrollbar*width: 16 +*Scrollbar*height: 16 +*Scrollbar*shadowWidth: 2 +*Scrollbar*borderWidth: 3 +*SaveLines: 2000 + +!! Fix broken charClass, the doubleclick separators +*charClass: 33:48,37:48,43:48,45-47:48,64:48,126:48,95:48 +!! Bug #52655 +*utf8Title: true + ! VT100s and similar terminals recognize escape sequences and control ! characters to which they reply to the host with other escape sequences, ! to provide information. The "resize" program uses this feature. diff --git a/xterm.man b/xterm.man --- a/xterm.man +++ b/xterm.man @@ -4815,19 +4815,23 @@ This option specifies the font to be use in the \*(``OverTheSpot\*('' input method. .IP In \*(``OverTheSpot\*('' preedit type, the preedit (preconversion) string is displayed at the position of the cursor. It is the XIM server's responsibility to display the preedit string. The XIM client must inform the XIM server of the cursor position. For best results, the preedit string must be displayed with a proper font. Therefore, \fI\*n\fP informs the XIM server of the proper font. -The font is be supplied by a "fontset", whose default value is \*(``*\*(''. -This matches every font, the X library automatically chooses fonts with -proper charsets. +The font is to be supplied by a "fontset", whose default value is +"fixed" on openSUSE. The upstream default value is \*(``*\*('' +which matches every font, the X library automatically chooses fonts with +proper charsets. But this can be extremely slow in some locales and +at least for the XIM servers "scim" and "kinput2" it doesn't improve +anything, it just slows down the startup time of xterm. + The \fBximFont\fP resource is provided to override this default font setting. .\" .SS Tek4014 Widget Resources .PP The following resources are specified as part of the \fItek4014\fP widget (class \fITek4014\fP). These are specified by patterns such as \*(``\fB__default_class__.tek4014.\fP\fINAME\fP\*('':