Hello community, here is the log from the commit of package xterm for openSUSE:Factory checked in at 2012-10-26 17:37:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xterm (Old) and /work/SRC/openSUSE:Factory/.xterm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xterm", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/xterm/xterm.changes 2012-10-16 21:36:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xterm.new/xterm.changes 2012-10-26 17:37:47.000000000 +0200 @@ -1,0 +2,16 @@ +Thu Oct 25 13:47:52 UTC 2012 - [email protected] + +- Patch #285 - 2012/10/23 + * add/adapt FreeBSD ports files for test-building. + * modify minstall.sh to use the patch-number and date in the manpage + footer. + * add check for failure to allocate the fg/bg colors at startup, + e.g., misconfiguration. Work around by setting both to the default + colors (suggested by Scott Bertilson). + * amend change for patch #280 which added modifyKeyboard, to make + modifyOtherKeys work (report by Ailin Nemui). + * add query-colors.pl example for OSC 4. + * correct mis-applied fix for minstall.sh (report by Miroslav + Lichvar). + +------------------------------------------------------------------- Old: ---- xterm-284.tgz xterm-284.tgz.asc New: ---- xterm-285.tgz xterm-285.tgz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xterm.spec ++++++ --- /var/tmp/diff_new_pack.YaTpE9/_old 2012-10-26 17:37:49.000000000 +0200 +++ /var/tmp/diff_new_pack.YaTpE9/_new 2012-10-26 17:37:49.000000000 +0200 @@ -47,7 +47,7 @@ %if 0%{?suse_version} > 1210 Requires: luit %endif -Version: 284 +Version: 285 Release: 0 Summary: The basic X terminal program License: MIT ++++++ xterm-284.tgz -> xterm-285.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-284/MANIFEST new/xterm-285/MANIFEST --- old/xterm-284/MANIFEST 2012-10-11 00:18:21.000000000 +0200 +++ new/xterm-285/MANIFEST 2012-10-24 02:59:18.000000000 +0200 @@ -1,4 +1,4 @@ -MANIFEST for xterm-284, version xterm-284 +MANIFEST for xterm-285, version xterm-285 -------------------------------------------------------------------------------- MANIFEST this file 256colres.h resource-definitions for 256-color mode @@ -152,6 +152,11 @@ package/debian/xterm-dev.docs build-script package/debian/xterm-dev.menu Debian menu-file for xterm-dev package. package/debian/xterm-xres.sed build-script +package/freebsd subdirectory +package/freebsd/Makefile build-script +package/freebsd/pkg-descr build-script +package/freebsd/pkg-message build-script +package/freebsd/pkg-plist build-script package subdirectory package/xterm.spec build-script tektests subdirectory @@ -183,6 +188,7 @@ vttests/dynamic2.sh complete example of dynamic colors vttests/fonts.sh script to demonstrate font-switching sequences vttests/paste64.pl script to test base64-selection option +vttests/query-color.pl demonstrate OSC 4 vttests/query-fonts.pl script to demo/test font-querying vttests/resize.pl translated resize.sh to perl since it is easy to test, and I needed vttests/resize.sh script to demonstrate resizing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-284/charproc.c new/xterm-285/charproc.c --- old/xterm-284/charproc.c 2012-10-09 02:03:26.000000000 +0200 +++ new/xterm-285/charproc.c 2012-10-23 10:44:57.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: charproc.c,v 1.1264 2012/10/09 00:03:26 tom Exp $ */ +/* $XTermId: charproc.c,v 1.1265 2012/10/23 08:44:57 tom Exp $ */ /* * Copyright 1999-2011,2012 by Thomas E. Dickey @@ -6735,38 +6735,66 @@ { char *name; ScrnColors temp; + TScreen *src = TScreenOf(source); + TScreen *dst = TScreenOf(target); - TScreenOf(target)->Tcolors[offset] = TScreenOf(source)->Tcolors[offset]; - TScreenOf(target)->Tcolors[offset].mode = False; + dst->Tcolors[offset] = src->Tcolors[offset]; + dst->Tcolors[offset].mode = False; - if ((name = x_strtrim(TScreenOf(target)->Tcolors[offset].resource)) != 0) - TScreenOf(target)->Tcolors[offset].resource = name; + if ((name = x_strtrim(dst->Tcolors[offset].resource)) != 0) + dst->Tcolors[offset].resource = name; if (name == 0) { - TScreenOf(target)->Tcolors[offset].value = target->dft_foreground; + dst->Tcolors[offset].value = target->dft_foreground; } else if (isDefaultForeground(name)) { - TScreenOf(target)->Tcolors[offset].value = - ((offset == TEXT_FG || offset == TEXT_BG) - ? target->dft_foreground - : TScreenOf(target)->Tcolors[TEXT_FG].value); + dst->Tcolors[offset].value = ((offset == TEXT_FG || offset == TEXT_BG) + ? target->dft_foreground + : dst->Tcolors[TEXT_FG].value); } else if (isDefaultBackground(name)) { - TScreenOf(target)->Tcolors[offset].value = - ((offset == TEXT_FG || offset == TEXT_BG) - ? target->dft_background - : TScreenOf(target)->Tcolors[TEXT_BG].value); + dst->Tcolors[offset].value = ((offset == TEXT_FG || offset == TEXT_BG) + ? target->dft_background + : dst->Tcolors[TEXT_BG].value); } else { memset(&temp, 0, sizeof(temp)); if (AllocateTermColor(target, &temp, offset, name, True)) { if (COLOR_DEFINED(&(temp), offset)) free(temp.names[offset]); - TScreenOf(target)->Tcolors[offset].value = temp.colors[offset]; + dst->Tcolors[offset].value = temp.colors[offset]; + } else if (offset == TEXT_FG || offset == TEXT_BG) { + free(name); + dst->Tcolors[offset].resource = 0; } } - return TScreenOf(target)->Tcolors[offset].value; + return dst->Tcolors[offset].value; +} + +/* + * If one or both of the foreground/background colors cannot be allocated, + * e.g., due to gross misconfiguration, recover by setting both to the + * display's default values. + */ +static void +repairColors(XtermWidget target) +{ + TScreen *screen = TScreenOf(target); + + if (screen->Tcolors[TEXT_FG].resource == 0 || + screen->Tcolors[TEXT_BG].resource == 0) { + xtermWarning("unable to allocate fg/bg colors\n"); + screen->Tcolors[TEXT_FG].resource = x_strdup(XtDefaultForeground); + screen->Tcolors[TEXT_BG].resource = x_strdup(XtDefaultBackground); + if (screen->Tcolors[TEXT_FG].resource == 0 || + screen->Tcolors[TEXT_BG].resource == 0) { + Exit(1); + } + screen->Tcolors[TEXT_FG].value = target->dft_foreground; + screen->Tcolors[TEXT_BG].value = target->dft_background; + } } #else #define fill_Tres(target, source, offset) \ TScreenOf(target)->Tcolors[offset] = TScreenOf(source)->Tcolors[offset] +#define repairColors(target) /* nothing */ #endif #if OPT_WIDE_CHARS @@ -7219,6 +7247,7 @@ init_Tres(TEXT_FG); init_Tres(TEXT_BG); + repairColors(wnew); wnew->old_foreground = T_COLOR(TScreenOf(wnew), TEXT_FG); wnew->old_background = T_COLOR(TScreenOf(wnew), TEXT_BG); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-284/input.c new/xterm-285/input.c --- old/xterm-284/input.c 2012-09-08 01:09:10.000000000 +0200 +++ new/xterm-285/input.c 2012-10-22 22:57:52.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: input.c,v 1.341 2012/09/07 23:09:10 tom Exp $ */ +/* $XTermId: input.c,v 1.342 2012/10/22 20:57:52 tom Exp $ */ /* * Copyright 1999-2011,2012 by Thomas E. Dickey @@ -384,6 +384,9 @@ result = LegacyAllows(8); } } + if (xw->keyboard.modify_now.other_keys != 0) { + result = True; + } return result; } @@ -1988,8 +1991,8 @@ #endif #define SaveMask(name) xw->work.name |= (unsigned) mask;\ - TRACE(("SaveMask(%s) %#x (%#x is%s modifier)\n", \ - #name, \ + TRACE(("SaveMask(%#x -> %s) %#x (%#x is%s modifier)\n", \ + (unsigned) keysym, #name, \ xw->work.name, (unsigned) mask, \ ModifierName((unsigned) mask))); /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-284/koi8rxterm.man new/xterm-285/koi8rxterm.man --- old/xterm-284/koi8rxterm.man 2011-08-16 11:44:32.000000000 +0200 +++ new/xterm-285/koi8rxterm.man 2012-10-24 01:27:24.000000000 +0200 @@ -1,4 +1,4 @@ -.\" $XTermId: koi8rxterm.man,v 1.4 2011/08/16 09:44:32 tom Exp $ +.\" $XTermId: koi8rxterm.man,v 1.5 2012/10/23 23:27:24 tom Exp $ .\" .\" Copyright 2004 Branden Robinson .\" @@ -19,7 +19,7 @@ .\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, .\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER .\" DEALINGS IN THE SOFTWARE. -.TH koi8rxterm 1 "2004-12-19" "Debian Project" +.TH KOI8RXTERM 1 "__app_date__" "__app_version__" "X Window System" .SH NAME koi8rxterm \- X terminal emulator for KOI8-R environments .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-284/minstall.in new/xterm-285/minstall.in --- old/xterm-284/minstall.in 2012-10-14 21:45:07.000000000 +0200 +++ new/xterm-285/minstall.in 2012-10-23 23:05:09.000000000 +0200 @@ -1,5 +1,5 @@ #!/bin/sh -# $XTermId: minstall.in,v 1.10 2012/10/14 19:45:07 tom Exp $ +# $XTermId: minstall.in,v 1.13 2012/10/23 21:05:09 tom Exp $ # ----------------------------------------------------------------------------- # this file is part of xterm # @@ -118,12 +118,18 @@ X_MANSECT=`man X 2>&1 | tr '\012' '\020' | sed -e 's/^[^0123456789]*\([^) ][^) ]*\).*/\1/'` test -z "$X_MANSECT" && X_MANSECT=$suffix +VERSION_H=`echo "$OLD_FILE" | sed -e 's,/[^/]*$,/version.h,'` +PATCH_NUM=`fgrep XTERM_PATCH $VERSION_H|sed -e 's/[^0-9]*//g'` +PATCH_YMD=`fgrep XTERM_DATE $VERSION_H|sed -e 's,[^0-9/.-]*,,g'` + # Provide for renaming in test-builds: APP_Name=`echo "$APP_name" | sed -e s/xterm/Xterm/` sed -e 's%__vendorversion__%"X Window System"%' \ - -e "s%^\.ds N Xterm%.ds n $APP_Name%" \ - -e "s%^\.ds n xterm%.ds N $APP_name%" \ + -e 's%__app_version__%Patch\ \#'$PATCH_NUM% \ + -e 's%__app_date__%'$PATCH_YMD% \ + -e "s%^\.ds N Xterm%.ds N $APP_Name%" \ + -e "s%^\.ds n xterm%.ds n $APP_name%" \ -e s%__default_termname__%@default_TERM@% \ -e s%__default_termid__%@default_termid@% \ -e s%__alt_sends_esc__%@alt_sends_esc@% \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-284/package/debian/changelog new/xterm-285/package/debian/changelog --- old/xterm-284/package/debian/changelog 2012-10-11 00:17:38.000000000 +0200 +++ new/xterm-285/package/debian/changelog 2012-10-15 12:57:41.000000000 +0200 @@ -1,3 +1,9 @@ +xterm-dev (285) unstable; urgency=low + + * Miscellaneous fixes. + + -- Thomas E. Dickey <[email protected]> Mon, 15 Oct 2012 06:57:38 -0400 + xterm-dev (284) unstable; urgency=low * fix documentation errata diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-284/package/freebsd/Makefile new/xterm-285/package/freebsd/Makefile --- old/xterm-284/package/freebsd/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ new/xterm-285/package/freebsd/Makefile 2012-10-24 01:59:46.000000000 +0200 @@ -0,0 +1,98 @@ +# $FreeBSD$ +# This is adapted from the FreeBSD port, installing as "xterm-dev" with +# separate resource- and manpage files. +# copy "xterm-${PORTVERSION}.tgz to the port's distfiles directory +# and "make makesum". + +PORTNAME= xterm +PORTVERSION= 285 +CATEGORIES= x11 +MASTER_SITES= ftp://invisible-island.net/xterm/ \ + CRITICAL +PKGNAMESUFFIX= -dev +EXTRACT_SUFX= .tgz + +MAINTAINER= [email protected] +COMMENT= Terminal emulator for the X Window System (development) + +CONFLICTS= x11iraf-[0-9]* + +USE_XORG= xaw xft +WANT_GNOME= desktopfileutils +GNU_CONFIGURE= yes + +CONFIGURE_ENV+= LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS+= --with-utempter --enable-narrowproto --enable-256-color + +CPPFLAGS+= -I${LOCALBASE}/include + +OPTIONS_DEFINE= WCHAR LUIT DECTERM PCRE GNOME DABBREV TOOLBAR + +TOOLBAR_DESC= Enable support menu/toolbar +DABBREV_DESC= Enable support for dabbrev-expand +DECTERM_DESC= Enable DECterm Locator support +LUIT_DESC= Use LUIT for locale convertion from/to UTF-8 +WCHAR_DESC= Enable wide-character support + +PKG_CLASS= XTermDev + +.include <bsd.port.options.mk> + +CONFIGURE_ARGS+= --program-suffix=${PKGNAMESUFFIX} --with-app-class=${PKG_CLASS} --without-xterm-symlink + +.if ${PORT_OPTIONS:MLUIT} +CONFIGURE_ARGS+= --enable-luit +BUILD_DEPENDS= luit:${PORTSDIR}/x11/luit +.endif + +.if ${PORT_OPTIONS:MWCHAR} +CONFIGURE_ARGS+= --enable-wide-chars +.endif + +.if ${PORT_OPTIONS:MDECTERM} +CONFIGURE_ARGS+= --enable-dec-locator +.endif + +.if ${PORT_OPTIONS:MPCRE} +CONFIGURE_ARGS+= --with-pcre +LIB_DEPENDS= pcre:${PORTSDIR}/devel/pcre +.endif + +.if ${PORT_OPTIONS:MDABBREV} +CONFIGURE_ARGS+= --enable-dabbrev +.endif + +.if ${PORT_OPTIONS:MTOOLBAR} +CONFIGURE_ARGS+= --enable-toolbar +.endif + +.if ${PORT_OPTIONS:MGNOME} +USE_GNOME= desktopfileutils +PLIST_SUB+= GNOME="" +.else +PLIST_SUB+= GNOME="@comment " +.endif + +MAN1= resize${PKGNAMESUFFIX}.1 koi8rxterm${PKGNAMESUFFIX}.1 uxterm${PKGNAMESUFFIX}.1 xterm${PKGNAMESUFFIX}.1 + +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 900004 +LIB_DEPENDS+= utempter:${PORTSDIR}/sysutils/libutempter +.endif + +post-install: +.for f in koi8rxterm resize uxterm xterm + @${CHMOD} ${BINMODE} ${PREFIX}/bin/${f} +.endfor +.if ${PORT_OPTIONS:MGNOME} + @${MKDIR} ${PREFIX}/share/applications/ + @${INSTALL_DATA} ${WRKSRC}/xterm.desktop ${PREFIX}/share/applications/ + @-update-desktop-database +.endif + +.if ${PORT_OPTIONS:MWCHAR} + @${CAT} ${PKGMESSAGE} +.endif + +.include <bsd.port.post.mk> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-284/package/freebsd/pkg-descr new/xterm-285/package/freebsd/pkg-descr --- old/xterm-284/package/freebsd/pkg-descr 1970-01-01 01:00:00.000000000 +0100 +++ new/xterm-285/package/freebsd/pkg-descr 2004-07-24 02:01:19.000000000 +0200 @@ -0,0 +1,10 @@ +The xterm program is the standard terminal emulator for the X +Window System. It provides DEC VT102/VT220 and Tektronix 4014 +compatible terminals for programs that can't use the window +system directly. If the underlying operating system supports +terminal resizing capabilities (for example, the SIGWINCH +signal in systems derived from 4.3bsd), xterm will use the +facilities to notify programs running in the window whenever it +is resized. + +WWW: http://invisible-island.net/xterm/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-284/package/freebsd/pkg-message new/xterm-285/package/freebsd/pkg-message --- old/xterm-284/package/freebsd/pkg-message 1970-01-01 01:00:00.000000000 +0100 +++ new/xterm-285/package/freebsd/pkg-message 2011-02-24 16:39:09.000000000 +0100 @@ -0,0 +1,10 @@ +================================================================================ +You installed xterm with wide chars support. This introduces some limitations +comparing to the plain single chars version: this version of xterm will use +UTF-8 charset for selection buffers, breaking 8-bit copy/paste support unless +you are using UTF-8 or ISO8859-1 locale. If you want 8-bit charset selections to +work as before, use "eightBitSelectTypes" XTerm resource setting. + +For further information refer to the SELECT/PASTE section of xterm(1) manual +page. +================================================================================ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-284/package/freebsd/pkg-plist new/xterm-285/package/freebsd/pkg-plist --- old/xterm-284/package/freebsd/pkg-plist 1970-01-01 01:00:00.000000000 +0100 +++ new/xterm-285/package/freebsd/pkg-plist 2012-10-24 00:47:53.000000000 +0200 @@ -0,0 +1,22 @@ +bin/koi8rxterm-dev +bin/resize-dev +bin/uxterm-dev +bin/xterm-dev +lib/X11/app-defaults/KOI8RXTermDev +lib/X11/app-defaults/KOI8RXTermDev-color +lib/X11/app-defaults/UXTermDev +lib/X11/app-defaults/UXTermDev-color +lib/X11/app-defaults/XTermDev +lib/X11/app-defaults/XTermDev-color +share/applications/xterm-dev.desktop +share/pixmaps/filled-xterm-dev_32x32.xpm +share/pixmaps/filled-xterm-dev_48x48.xpm +share/pixmaps/mini.xterm-dev_32x32.xpm +share/pixmaps/mini.xterm-dev_48x48.xpm +share/pixmaps/xterm-dev-color_32x32.xpm +share/pixmaps/xterm-dev-color_48x48.xpm +share/pixmaps/xterm-dev_32x32.xpm +share/pixmaps/xterm-dev_48x48.xpm +@dirrmtry share/applications +%%GNOME%%@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +%%GNOME%%@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-284/package/xterm.spec new/xterm-285/package/xterm.spec --- old/xterm-284/package/xterm.spec 2012-10-11 00:16:39.000000000 +0200 +++ new/xterm-285/package/xterm.spec 2012-10-15 12:57:12.000000000 +0200 @@ -1,7 +1,7 @@ -# $XTermId: xterm.spec,v 1.37 2012/10/10 22:16:39 tom Exp $ +# $XTermId: xterm.spec,v 1.38 2012/10/15 10:57:12 tom Exp $ Summary: X terminal emulator (development version) Name: xterm-dev -Version: 284 +Version: 285 Release: 1 License: X11 Group: User Interface/X diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-284/resize.man new/xterm-285/resize.man --- old/xterm-284/resize.man 2011-09-11 21:28:54.000000000 +0200 +++ new/xterm-285/resize.man 2012-10-24 01:26:20.000000000 +0200 @@ -1,4 +1,4 @@ -.\" $XTermId: resize.man,v 1.20 2011/09/11 19:28:54 tom Exp $ +.\" $XTermId: resize.man,v 1.21 2012/10/23 23:26:20 tom Exp $ .\" .\" updated by Thomas E. Dickey for XFree86, 1998-2006. .\" @@ -9,7 +9,7 @@ .el .ds `` `` .ie \n(.g .ds '' \(rq .el .ds '' '' -.TH RESIZE 1 __vendorversion__ +.TH RESIZE 1 "__app_date__" "__app_version__" "X Window System" .SH NAME resize \- set environment and terminal settings to current xterm window size .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-284/uxterm.man new/xterm-285/uxterm.man --- old/xterm-284/uxterm.man 2011-08-16 11:44:32.000000000 +0200 +++ new/xterm-285/uxterm.man 2012-10-24 01:25:53.000000000 +0200 @@ -1,4 +1,4 @@ -.\" $XTermId: uxterm.man,v 1.4 2011/08/16 09:44:32 tom Exp $ +.\" $XTermId: uxterm.man,v 1.5 2012/10/23 23:25:53 tom Exp $ .\" .\" Copyright 2001, 2004 Branden Robinson .\" @@ -19,7 +19,7 @@ .\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, .\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER .\" DEALINGS IN THE SOFTWARE. -.TH uxterm 1 "2004-12-19" "Debian Project" +.TH UXTERM 1 "__app_date__" "__app_version__" "X Window System" .SH NAME uxterm \- X terminal emulator for Unicode (UTF-8) environments .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-284/version.h new/xterm-285/version.h --- old/xterm-284/version.h 2012-10-11 00:15:05.000000000 +0200 +++ new/xterm-285/version.h 2012-10-23 12:45:19.000000000 +0200 @@ -1,4 +1,4 @@ -/* $XTermId: version.h,v 1.344 2012/10/10 22:15:05 tom Exp $ */ +/* $XTermId: version.h,v 1.348 2012/10/23 10:45:19 tom Exp $ */ /* * Copyright 1998-2011,2012 by Thomas E. Dickey @@ -36,7 +36,8 @@ * version of X to which this version of xterm has been built. The number in * parentheses is my patch number (Thomas E. Dickey). */ -#define XTERM_PATCH 284 +#define XTERM_PATCH 285 +#define XTERM_DATE 2012-10-23 #ifndef __vendorversion__ #define __vendorversion__ "XTerm" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-284/vttests/query-color.pl new/xterm-285/vttests/query-color.pl --- old/xterm-284/vttests/query-color.pl 1970-01-01 01:00:00.000000000 +0100 +++ new/xterm-285/vttests/query-color.pl 2012-10-22 13:45:58.000000000 +0200 @@ -0,0 +1,168 @@ +#!/usr/bin/perl -w +# $XTermId: query-color.pl,v 1.3 2012/10/22 11:45:58 tom Exp $ +# ----------------------------------------------------------------------------- +# this file is part of xterm +# +# Copyright 2012 by Thomas E. Dickey +# +# All Rights Reserved +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +# IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY +# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name(s) of the above copyright +# holders shall not be used in advertising or otherwise to promote the +# sale, use or other dealings in this Software without prior written +# authorization. +# ----------------------------------------------------------------------------- +# Test the color-query features of xterm using OSC 4. + +# TODO: extend to the OSC 5 colors +# TODO: show result in #rrggbb format. + +use strict; + +use Getopt::Std; +use IO::Handle; + +our ( $opt_s ); +&getopts('s') || die( + "Usage: $0 [options] [color1[-color2]]\n +Options:\n + -s use ^G rather than ST +" +); + +our $ST = $opt_s ? "\007" : "\x1b\\"; + +sub no_reply($) { + open TTY, "+</dev/tty" or die("Cannot open /dev/tty\n"); + autoflush TTY 1; + my $old = `stty -g`; + system "stty raw -echo min 0 time 5"; + + print TTY @_; + close TTY; + system "stty $old"; +} + +sub get_reply($) { + open TTY, "+</dev/tty" or die("Cannot open /dev/tty\n"); + autoflush TTY 1; + my $old = `stty -g`; + system "stty raw -echo min 0 time 5"; + + print TTY @_; + my $reply = <TTY>; + close TTY; + system "stty $old"; + if ( defined $reply ) { + die("^C received\n") if ( "$reply" eq "\003" ); + } + return $reply; +} + +sub visible($) { + my $reply = $_[0]; + my $n; + my $result = ""; + for ( $n = 0 ; $n < length($reply) ; ) { + my $c = substr( $reply, $n, 1 ); + if ( $c =~ /[[:print:]]/ ) { + $result .= $c; + } + else { + my $k = ord substr( $reply, $n, 1 ); + if ( ord $k == 0x1b ) { + $result .= "\\E"; + } + elsif ( $k == 0x7f ) { + $result .= "^?"; + } + elsif ( $k == 32 ) { + $result .= "\\s"; + } + elsif ( $k < 32 ) { + $result .= sprintf( "^%c", $k + 64 ); + } + elsif ( $k > 128 ) { + $result .= sprintf( "\\%03o", $k ); + } + else { + $result .= chr($k); + } + } + $n += 1; + } + + return $result; +} + +sub query_color($) { + my $param = $_[0]; + my $reply; + my $n; + my $st = $opt_s ? qr/\007/ : qr/\x1b\\/; + my $op = 4; + my $osc = qr/\x1b]$op/; + my $match = qr/${osc}.*${st}/; + + $reply = get_reply( "\x1b]$op;" . $param . ";?" . $ST ); + + printf "query{%s}%*s", &visible($param), 3 - length($param), " "; + + if ( defined $reply ) { + printf "%2d ", length($reply); + if ( $reply =~ /${match}/ ) { + + $reply =~ s/^${osc}//; + $reply =~ s/^;//; + $reply =~ s/${st}$//; + } + else { + printf "? "; + } + + printf "{%s}", visible($reply); + } + printf "\n"; +} + +sub query_colors($$) { + my $lo = $_[0]; + my $hi = $_[1]; + my $n; + for ( $n = $lo ; $n <= $hi ; ++$n ) { + query_color($n); + } +} + +if ( $#ARGV >= 0 ) { + while ( $#ARGV >= 0 ) { + if ( $ARGV[0] =~ /-/ ) { + my @args = split /-/, $ARGV[0]; + &query_colors ( $args[0], $args[1] ); + } else { + &query_colors ( $ARGV[0], $ARGV[0] ); + } + shift @ARGV; + } +} else { + &query_colors(0,7); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-284/xterm.log.html new/xterm-285/xterm.log.html --- old/xterm-284/xterm.log.html 2012-10-14 23:43:46.000000000 +0200 +++ new/xterm-285/xterm.log.html 2012-10-24 01:48:43.000000000 +0200 @@ -31,7 +31,7 @@ * sale, use or other dealings in this Software without prior written * * authorization. * ***************************************************************************** - $XTermId: xterm.log.html,v 1.1253 2012/10/14 21:43:46 tom Exp $ + $XTermId: xterm.log.html,v 1.1260 2012/10/23 23:48:43 tom Exp $ --> <html> @@ -70,6 +70,8 @@ the latest version of this file.</p> <ul> + <li><a href="#xterm_285">Patch #285 - 2012/10/23</a></li> + <li><a href="#xterm_284">Patch #284 - 2012/10/14</a></li> <li><a href="#xterm_283">Patch #283 - 2012/10/09</a></li> @@ -851,6 +853,30 @@ <li><a href="#xterm_01">Patch #1 - 1996/1/6</a></li> </ul> + <h1><a name="xterm_285" id="xterm_285">Patch #285 - + 2012/10/23</a></h1> + + <ul> + <li>add/adapt FreeBSD ports files for test-building.</li> + + <li>modify <code>minstall.sh</code> to use the patch-number and + date in the manpage footer.</li> + + <li>add check for failure to allocate the fg/bg colors at + startup, e.g., misconfiguration. Work around by setting both to + the default colors (suggested by Scott Bertilson).</li> + + <li>amend change for <a href="#xterm_280">patch #280</a> which + added <code>modifyKeyboard</code>, to make + <code>modifyOtherKeys</code> work (report by Ailin Nemui).</li> + + <li>add <code>query-colors.pl</code> example for + OSC 4.</li> + + <li>correct mis-applied fix for minstall.sh (report by Miroslav + Lichvar).</li> + </ul> + <h1><a name="xterm_284" id="xterm_284">Patch #284 - 2012/10/14</a></h1> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xterm-284/xterm.man new/xterm-285/xterm.man --- old/xterm-284/xterm.man 2012-10-14 21:47:51.000000000 +0200 +++ new/xterm-285/xterm.man 2012-10-23 13:03:04.000000000 +0200 @@ -1,5 +1,5 @@ '\" t -.\" $XTermId: xterm.man,v 1.548 2012/10/14 19:47:51 tom Exp $ +.\" $XTermId: xterm.man,v 1.549 2012/10/23 11:03:04 tom Exp $ .\" .\" Copyright 1996-2011,2012 by Thomas E. Dickey .\" @@ -84,7 +84,7 @@ .el .ds `` `` .ie \n(.g .ds '' \(rq .el .ds '' '' -.TH XTERM 1 __vendorversion__ +.TH XTERM 1 "__app_date__" "__app_version__" "X Window System" .SH NAME \*n \- terminal emulator for X .SH SYNOPSIS -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
