Hello community,
here is the log from the commit of package xterm for openSUSE:Factory checked in at 2013-06-05 13:25:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xterm (Old)
and /work/SRC/openSUSE:Factory/.xterm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xterm"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xterm/xterm.changes 2013-05-02 12:07:44.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xterm.new/xterm.changes 2013-06-05 13:25:10.000000000 +0200
@@ -1,0 +2,27 @@
+Tue May 28 13:01:27 UTC 2013 - pcerny@suse.com
+
+- Patch #293 - 2013/05/27
+ * modify sample xterm.spec to use newer icon
+ * add configure option --with-icon-symlink to work around
+ systems which map icon requests for to a single "xterm" icon,
+ but neglect to install the icon needed for window decorations
+ (report by H Merijn Brand).
+ * improve parameterizing of sample xterm.spec
+ * amend fix for printer from patch #280, removing a reset of the
+ signal handler for SIGCHLD (report by Joe Julian).
+ * set environment variable XTERM_FILTER if a locale-filter is
+ used.
+ * enable DEBUG logic when --enable-trace configure option is
+ given.
+ * improve description of initialFont, set-vt-font and
+ set-tex-text in manpage (Debian #707899).
+ * fix regression from patch #292; selecting a word that ended at
+ the right margin without wrapping would not select the last
+ cell (report by Christian Weisgerber).
+
+-------------------------------------------------------------------
+Thu May 2 17:22:57 UTC 2013 - pcerny@suse.com
+
+- cleanup of spec file and patches
+
+-------------------------------------------------------------------
Old:
----
bug-246573-tentative-patch.diff
bugzilla-293793-do-not-insist-on-iso8859-fonts-for-the-menu.patch
config-guess-sub-update.patch
desktop.diff
libtinfo.diff
p_xterm-settings.diff
p_xterm-sigwinch.diff
xterm-292.tgz
xterm-292.tgz.asc
xterm-disallow-window-and-fonts-ops.patch
New:
----
vttest-config_update_aarch64.patch
xterm-293.tgz
xterm-293.tgz.asc
xterm-allow_iso-utf_fonts_in_menu.patch
xterm-desktop_file_icon.patch
xterm-double_width_fonts.patch
xterm-enable_libtinfo.patch
xterm-forbid_window_and_font_ops.patch
xterm-settings.patch
xterm-sigwinch.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xterm.spec ++++++
--- /var/tmp/diff_new_pack.lHUcHM/_old 2013-06-05 13:25:11.000000000 +0200
+++ /var/tmp/diff_new_pack.lHUcHM/_new 2013-06-05 13:25:11.000000000 +0200
@@ -52,34 +52,34 @@
%if 0%{?suse_version} > 1210
Requires: luit
%endif
-Version: 292
+Version: 293
Release: 0
Summary: The basic X terminal program
License: MIT
Group: System/X11/Utilities
-Source: ftp://invisible-island.net/xterm/%name-%version.tgz
-Source2: ftp://invisible-island.net/xterm/%name-%version.tgz.asc
-Source1: luitx
+Source: ftp://invisible-island.net/xterm/%{name}-%{version}.tgz
+Source1: ftp://invisible-island.net/xterm/%{name}-%{version}.tgz.asc
+Source2: luitx
Source3: Backarrow2Delete
Source4: Backarrow2BackSpace
Source5: README.SuSE
Source6: terminal.png
-%define vttest_version 20120506
-Source7: ftp://invisible-island.net/vttest/vttest-%vttest_version.tgz
-Source10: ftp://invisible-island.net/vttest/vttest-%vttest_version.tgz.asc
-Source11: %name.keyring
+Source11: %{name}.keyring
Source8: 20x20ja.bdf.bz2
Source9: 20x20ko.bdf.bz2
# Snoop for the escape sequence assignment of the keypad
Source20: snooper.tar.bz2
-Patch1: p_xterm-settings.diff
-Patch2: p_xterm-sigwinch.diff
-Patch3: bug-246573-tentative-patch.diff
-Patch4: desktop.diff
-Patch5: xterm-disallow-window-and-fonts-ops.patch
-Patch6: libtinfo.diff
-Patch7: config-guess-sub-update.patch
-Patch293793: bugzilla-293793-do-not-insist-on-iso8859-fonts-for-the-menu.patch
+%define vttest_version 20120506
+Source100: ftp://invisible-island.net/vttest/vttest-%{vttest_version}.tgz
+Source101: ftp://invisible-island.net/vttest/vttest-%{vttest_version}.tgz.asc
+Patch1: %{name}-settings.patch
+Patch2: %{name}-sigwinch.patch
+Patch3: %{name}-double_width_fonts.patch
+Patch4: %{name}-desktop_file_icon.patch
+Patch5: %{name}-forbid_window_and_font_ops.patch
+Patch6: %{name}-enable_libtinfo.patch
+Patch7: %{name}-allow_iso-utf_fonts_in_menu.patch
+Patch101: vttest-config_update_aarch64.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version} > 1220
%reconfigure_fonts_prereq
@@ -90,20 +90,22 @@
%prep
%if 0%{?suse_version} > 1220
-%gpg_verify %{S:2} %{S:10}
+%gpg_verify %{S:1}
+%gpg_verify %{S:101}
%endif
-%setup -q -b7
-%patch1 -p1 -b .xterm-settings
-%patch2 -p0 -b .xterm-sigwinch
+%setup -q -b100
+%patch1 -p1
+%patch2 -p1
%patch3 -p1
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
-%patch293793 -p1
-cp $RPM_SOURCE_DIR/*bdf.bz2 .
-bunzip2 *.bdf.bz2
-cd ../vttest-%vttest_version
-%patch7
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+cp -t . %{S:8} %{S:9}
+bunzip2 %{basename:%{S:8}} %{basename:%{S:9}}
+cd ../vttest-%{vttest_version}
+pwd
+%patch101 -p1
%build
# suse 10.x uses older X11 directory structure
@@ -136,7 +138,7 @@
make %{?_smp_mflags}
-pushd "../vttest-%vttest_version"
+pushd "../vttest-%{vttest_version}"
%configure
make %{?_smp_mflags}
popd
++++++ vttest-config_update_aarch64.patch ++++++
++++ 1248 lines (skipped)
++++++ xterm-292.tgz -> xterm-293.tgz ++++++
++++ 12770 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-292/INSTALL new/xterm-293/INSTALL
--- old/xterm-292/INSTALL 2013-04-17 11:13:09.000000000 +0200
+++ new/xterm-293/INSTALL 2013-05-28 00:19:09.000000000 +0200
@@ -1,4 +1,4 @@
--- $XTermId: INSTALL,v 1.143 2013/04/17 09:13:09 tom Exp $
+-- $XTermId: INSTALL,v 1.147 2013/05/27 22:19:09 tom Exp $
-------------------------------------------------------------------------------
-- Copyright 1997-2012,2013 by Thomas E. Dickey
--
@@ -625,6 +625,19 @@
small sizes. This is used for window decoration, e.g., the
icon at the upper left corner in many window managers.
+ --with-icon-symlink=NAME create symbolic links to icon name (default: NONE)
+
+ This is a workaround for certain systems which translate icon names
+ containing "xterm", e.g., "xterm-color" into the single icon "xterm".
+ The option should also be harmless on a properly configured system.
+
+ If the option is used, its default value is "xterm". For each icon,
+ the makefile will strip the suffix (e.g., ".png"), as well as the part
+ of the filename which denotes the size (e.g., "_32x32" in an xpm file),
+ and constructs a link with that name to the icon.
+
+ If the option is unused, its default value is "NONE" (no link is made).
+
--with-icondir=DIR directory in which to install icon files (default: no)
The X libraries may automatically search these locations:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-292/MANIFEST new/xterm-293/MANIFEST
--- old/xterm-292/MANIFEST 2013-03-27 00:10:33.000000000 +0100
+++ new/xterm-293/MANIFEST 2013-05-09 00:28:46.000000000 +0200
@@ -1,4 +1,4 @@
-MANIFEST for xterm-292, version xterm-292
+MANIFEST for xterm-293, version xterm-293
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-292/button.c new/xterm-293/button.c
--- old/xterm-292/button.c 2013-04-25 03:05:41.000000000 +0200
+++ new/xterm-293/button.c 2013-05-13 00:16:26.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: button.c,v 1.454 2013/04/25 01:05:41 Taketo.Kabe Exp $ */
+/* $XTermId: button.c,v 1.456 2013/05/12 22:16:26 tom Exp $ */
/*
* Copyright 1999-2012,2013 by Thomas E. Dickey
@@ -1652,6 +1652,7 @@
cutbuffer = -1;
break;
}
+ TRACE(("CutBuffer(%d) = %d\n", (int) code, cutbuffer));
return cutbuffer;
}
@@ -1713,10 +1714,10 @@
line = XFetchBuffer(XtDisplay(w), &inbytes, cutbuffer);
nbytes = (unsigned long) inbytes;
- if (nbytes > 0)
+ if (nbytes > 0) {
SelectionReceived(w, NULL, &selection, &type, (XtPointer) line,
&nbytes, &fmt8);
- else if (num_params > 1) {
+ } else if (num_params > 1) {
xtermGetSelection(w, ev_time, params + 1, num_params - 1, NULL);
}
#if OPT_PASTE64
@@ -1724,7 +1725,6 @@
FinishPaste64(xw);
}
#endif
- return;
} else {
struct _SelectionList *list;
@@ -2877,14 +2877,16 @@
class_of(LineData * ld, CELL * cell)
{
CELL temp = *cell;
+ int result = 0;
#if OPT_DEC_CHRSET
if (CSET_DOUBLE(GetLineDblCS(ld))) {
temp.col /= 2;
}
#endif
- assert(temp.col < (int) ld->lineSize);
- return CharacterClass((int) (ld->charData[temp.col]));
+ if (temp.col < (int) ld->lineSize)
+ result = CharacterClass((int) (ld->charData[temp.col]));
+ return result;
}
#if OPT_WIDE_CHARS
@@ -2918,10 +2920,6 @@
result = False;
}
}
- if (cell->col > screen->max_col) {
- /* Clicked on rightmost edge of the screen. Clamp to max_col */
- cell->col = screen->max_col;
- }
return result;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-292/charproc.c new/xterm-293/charproc.c
--- old/xterm-292/charproc.c 2013-04-24 11:07:06.000000000 +0200
+++ new/xterm-293/charproc.c 2013-05-26 23:18:52.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.1287 2013/04/24 09:07:06 tom Exp $ */
+/* $XTermId: charproc.c,v 1.1289 2013/05/26 21:18:52 tom Exp $ */
/*
* Copyright 1999-2012,2013 by Thomas E. Dickey
@@ -3945,15 +3945,13 @@
return;
}
}
-#ifdef DEBUG
- if (debug) {
- fprintf(stderr, "v_write called with %d bytes (%d left over)",
- len, v_bufptr - v_bufstr);
+ if_DEBUG({
+ fprintf(stderr, "v_write called with %d bytes (%ld left over)",
+ len, (long) (v_bufptr - v_bufstr));
if (len > 1 && len < 10)
fprintf(stderr, " \"%.*s\"", len, (const char *) data);
fprintf(stderr, "\n");
- }
-#endif
+ });
#ifdef VMS
if ((1 << f) != pty_mask) {
@@ -3984,11 +3982,10 @@
if (v_bufstr != v_buffer) {
/* there is unused space, move everything down */
/* possibly overlapping memmove here */
-#ifdef DEBUG
- if (debug)
- fprintf(stderr, "moving data down %d\n",
- v_bufstr - v_buffer);
-#endif
+ if_DEBUG({
+ fprintf(stderr, "moving data down %ld\n",
+ (long) (v_bufstr - v_buffer));
+ });
memmove(v_buffer, v_bufstr, (size_t) (v_bufptr - v_bufstr));
v_bufptr -= v_bufstr - v_buffer;
v_bufstr = v_buffer;
@@ -3999,11 +3996,10 @@
unsigned size = (unsigned) (v_bufptr - v_buffer);
v_buffer = TypeRealloc(Char, size + len, v_buffer);
if (v_buffer) {
-#ifdef DEBUG
- if (debug)
+ if_DEBUG({
fprintf(stderr, "expanded buffer to %d\n",
size + len);
-#endif
+ });
v_bufstr = v_buffer;
v_bufptr = v_buffer + size;
v_bufend = v_bufptr + len;
@@ -4054,19 +4050,18 @@
if (riten < 0)
#endif /* VMS */
{
-#ifdef DEBUG
- if (debug)
+ if_DEBUG({
perror("write");
-#endif
+ });
riten = 0;
}
-#ifdef DEBUG
- if (debug)
- fprintf(stderr, "write called with %d, wrote %d\n",
- v_bufptr - v_bufstr <= MAX_PTY_WRITE ?
- v_bufptr - v_bufstr : MAX_PTY_WRITE,
+ if_DEBUG({
+ fprintf(stderr, "write called with %ld, wrote %d\n",
+ ((long) ((v_bufptr - v_bufstr) <= MAX_PTY_WRITE)
+ ? (long) (v_bufptr - v_bufstr)
+ : MAX_PTY_WRITE),
riten);
-#endif
+ });
v_bufstr += riten;
if (v_bufstr >= v_bufptr) /* we wrote it all */
v_bufstr = v_bufptr = v_buffer;
@@ -4086,10 +4081,9 @@
v_bufstr = v_buffer + start;
v_bufptr = v_buffer + size;
v_bufend = v_buffer + allocsize;
-#ifdef DEBUG
- if (debug)
+ if_DEBUG({
fprintf(stderr, "shrunk buffer to %d\n", allocsize);
-#endif
+ });
} else {
/* should we print a warning if couldn't return memory? */
v_buffer = v_bufstr - start; /* restore clobbered pointer */
@@ -6531,10 +6525,7 @@
XEvent * event,
Region region GCC_UNUSED)
{
-#ifdef DEBUG
- if (debug)
- fputs("Expose\n", stderr);
-#endif /* DEBUG */
+ DEBUG_MSG("Expose\n");
if (event->type == Expose)
HandleExposure(term, event);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-292/configure.in new/xterm-293/configure.in
--- old/xterm-292/configure.in 2013-04-21 21:30:21.000000000 +0200
+++ new/xterm-293/configure.in 2013-05-27 15:46:02.000000000 +0200
@@ -1,4 +1,4 @@
-dnl $XTermId: configure.in,v 1.315 2013/04/21 19:30:21 Andres.Perera Exp $
+dnl $XTermId: configure.in,v 1.316 2013/05/27 13:46:02 tom Exp $
dnl
dnl -----------------------------------------------------------------------------
dnl this file is part of xterm
@@ -110,6 +110,7 @@
CF_WITH_APP_CLASS(XTerm)
CF_WITH_APP_DEFAULTS
CF_WITH_ICON_NAME(xterm-color)
+CF_WITH_ICON_SYMLINK(xterm)
CF_WITH_ICON_THEME([icons/$ICON_NAME icons/${ICON_NAME}_48x48],,,icons/${ICON_NAME}_48x48)
CF_DISABLE_DESKTOP(xterm)
CF_WITH_DESKTOP_CATEGORY(xterm,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-292/fontutils.c new/xterm-293/fontutils.c
--- old/xterm-292/fontutils.c 2012-12-31 21:51:54.000000000 +0100
+++ new/xterm-293/fontutils.c 2013-05-15 02:31:56.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: fontutils.c,v 1.386 2012/12/31 20:51:54 tom Exp $ */
+/* $XTermId: fontutils.c,v 1.387 2013/05/15 00:31:56 tom Exp $ */
/*
* Copyright 1998-2011,2012 by Thomas E. Dickey
@@ -1862,7 +1862,7 @@
/*
* Get the faceName/faceDoublesize resource setting. Strip off "xft:", which
- * is not recognized by XftParseName().
+ * is not recognized by XftNameParse().
*/
String
getFaceName(XtermWidget xw, Bool wideName GCC_UNUSED)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-292/main.c new/xterm-293/main.c
--- old/xterm-292/main.c 2013-04-17 10:55:20.000000000 +0200
+++ new/xterm-293/main.c 2013-05-28 00:11:11.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: main.c,v 1.719 2013/04/17 08:55:20 tom Exp $ */
+/* $XTermId: main.c,v 1.727 2013/05/27 22:11:11 tom Exp $ */
/*
* Copyright 2002-2012,2013 by Thomas E. Dickey
@@ -2432,21 +2432,19 @@
x_appendargv(command_to_exec_with_luit, command_to_exec);
}
TRACE_ARGV("luit command", command_to_exec_with_luit);
+ xtermSetenv("XTERM_FILTER", *command_to_exec_with_luit);
}
#endif
-#ifdef DEBUG
- {
+ if_DEBUG({
/* Set up stderr properly. Opening this log file cannot be
done securely by a privileged xterm process (although we try),
so the debug feature is disabled by default. */
char dbglogfile[TIMESTAMP_LEN + 20];
int i = -1;
- if (debug) {
- timestamp_filename(dbglogfile, "xterm.debug.log.");
- if (creat_as(save_ruid, save_rgid, False, dbglogfile, 0600) > 0) {
- i = open(dbglogfile, O_WRONLY | O_TRUNC);
- }
+ timestamp_filename(dbglogfile, "xterm.debug.log.");
+ if (creat_as(save_ruid, save_rgid, False, dbglogfile, 0600) > 0) {
+ i = open(dbglogfile, O_WRONLY | O_TRUNC);
}
if (i >= 0) {
dup2(i, 2);
@@ -2454,8 +2452,7 @@
/* mark this file as close on exec */
(void) fcntl(i, F_SETFD, 1);
}
- }
-#endif /* DEBUG */
+ });
spawnXTerm(term);
@@ -2534,10 +2531,9 @@
: (1 + screen->respond));
#endif /* !VMS */
-#ifdef DEBUG
- if (debug)
- printf("debugging on\n");
-#endif /* DEBUG */
+ if_DEBUG({
+ TRACE(("debugging on pid %d\n", (int) getpid()));
+ });
XSetErrorHandler(xerror);
XSetIOErrorHandler(xioerror);
IceSetIOErrorHandler(ice_error);
@@ -2895,6 +2891,7 @@
static void
hungtty(int i GCC_UNUSED)
{
+ DEBUG_MSG("handle:hungtty\n");
siglongjmp(env, 1);
}
@@ -3192,7 +3189,7 @@
#endif /* TERMIO_STRUCT */
char *shell_path = 0;
- char *ptr, *shname, *shname_minus;
+ char *shname, *shname_minus;
int i;
#if USE_NO_DEV_TTY
int no_dev_tty = False;
@@ -3658,6 +3655,8 @@
#if OPT_PTY_HANDSHAKE /* warning, goes for a long ways */
if (resource.ptyHandshake) {
+ char *ptr;
+
/* close parent's sides of the pipes */
close(cp_pipe[0]);
close(pc_pipe[1]);
@@ -4251,7 +4250,7 @@
#else
if (xw->misc.login_shell &&
(i = open(etc_wtmp, O_WRONLY | O_APPEND)) >= 0) {
- write(i, (char *) &utmp, sizeof(utmp));
+ IGNORE_RC(write(i, (char *) &utmp, sizeof(utmp)));
close(i);
}
#endif
@@ -4283,7 +4282,7 @@
utmp.ut_time = time((time_t *) 0);
lseek(i, (long) (tslot * sizeof(utmp)), 0);
- write(i, (char *) &utmp, sizeof(utmp));
+ IGNORE_RC(write(i, (char *) &utmp, sizeof(utmp)));
close(i);
added_utmp_entry = True;
#if defined(WTMP)
@@ -4298,7 +4297,7 @@
(i = open(_U_LASTLOG, O_WRONLY)) >= 0) {
lseek(i, (long) (screen->uid *
sizeof(utmp)), 0);
- write(i, (char *) &utmp, sizeof(utmp));
+ IGNORE_RC(write(i, (char *) &utmp, sizeof(utmp)));
close(i);
}
#endif /* WTMP or MNX_LASTLOG */
@@ -4341,7 +4340,7 @@
SetUtmpHost(lastlog.ll_host, screen);
lastlog.ll_time = time((time_t *) 0);
if (lseek(i, offset, 0) != (off_t) (-1)) {
- write(i, (char *) &lastlog, size);
+ IGNORE_RC(write(i, (char *) &lastlog, size));
}
close(i);
}
@@ -4759,6 +4758,7 @@
TScreen *screen = TScreenOf(xw);
#ifdef USE_UTEMPTER
+ DEBUG_MSG("handle:Exit USE_UTEMPTER\n");
if (!resource.utmpInhibit && added_utmp_entry) {
TRACE(("...calling removeFromUtmp\n"));
removeFromUtmp();
@@ -4768,6 +4768,7 @@
struct UTMP_STR utmp;
struct UTMP_STR *utptr;
+ DEBUG_MSG("handle:Exit USE_SYSV_UTMP\n");
/* don't do this more than once */
if (xterm_exiting) {
exit(n);
@@ -4821,7 +4822,7 @@
if (xw->misc.login_shell) {
int fd;
if ((fd = open(etc_wtmp, O_WRONLY | O_APPEND)) >= 0) {
- write(fd, utptr, sizeof(*utptr));
+ IGNORE_RC(write(fd, utptr, sizeof(*utptr)));
close(fd);
}
}
@@ -4841,6 +4842,7 @@
int wfd;
struct utmp utmp;
+ DEBUG_MSG("handle:Exit !USE_SYSV_UTMP\n");
if (!resource.utmpInhibit && added_utmp_entry &&
(am_slave < 0 && tslot > 0)) {
#if defined(USE_UTMP_SETGID)
@@ -4850,7 +4852,7 @@
if ((wfd = open(etc_utmp, O_WRONLY)) >= 0) {
memset(&utmp, 0, sizeof(utmp));
lseek(wfd, (long) (tslot * sizeof(utmp)), 0);
- write(wfd, (char *) &utmp, sizeof(utmp));
+ IGNORE_RC(write(wfd, (char *) &utmp, sizeof(utmp)));
close(wfd);
}
#ifdef WTMP
@@ -4860,7 +4862,7 @@
my_pty_name(ttydev),
sizeof(utmp.ut_line));
utmp.ut_time = time((time_t *) 0);
- write(wfd, (char *) &utmp, sizeof(utmp));
+ IGNORE_RC(write(wfd, (char *) &utmp, sizeof(utmp)));
close(wfd);
}
#endif /* WTMP */
@@ -5024,6 +5026,8 @@
int olderrno = errno;
int pid;
+ DEBUG_MSG("handle:reapchild\n");
+
pid = wait(NULL);
#ifdef USE_SYSV_SIGNALS
@@ -5035,10 +5039,7 @@
do {
if (pid == TScreenOf(term)->pid) {
-#ifdef DEBUG
- if (debug)
- fputs("Exiting\n", stderr);
-#endif
+ DEBUG_MSG("Exiting\n");
if (!hold_screen)
need_cleanup = True;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-292/misc.c new/xterm-293/misc.c
--- old/xterm-292/misc.c 2013-02-04 00:18:38.000000000 +0100
+++ new/xterm-293/misc.c 2013-05-26 23:16:20.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: misc.c,v 1.658 2013/02/03 23:18:38 tom Exp $ */
+/* $XTermId: misc.c,v 1.660 2013/05/26 21:16:20 tom Exp $ */
/*
* Copyright 1999-2012,2013 by Thomas E. Dickey
@@ -1874,6 +1874,7 @@
XtermWidget xw = term;
TScreen *screen = TScreenOf(xw);
+ DEBUG_MSG("handle:logpipe\n");
#ifdef SYSV
(void) signal(SIGPIPE, SIG_IGN);
#endif /* SYSV */
@@ -4831,11 +4832,9 @@
void
Panic(const char *s GCC_UNUSED, int a GCC_UNUSED)
{
-#ifdef DEBUG
- if (debug) {
+ if_DEBUG({
xtermWarning(s, a);
- }
-#endif /* DEBUG */
+ });
}
const char *
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-292/package/debian/changelog new/xterm-293/package/debian/changelog
--- old/xterm-292/package/debian/changelog 2013-03-27 00:11:19.000000000 +0100
+++ new/xterm-293/package/debian/changelog 2013-05-09 00:29:24.000000000 +0200
@@ -1,3 +1,9 @@
+xterm-dev (293) unstable; urgency=low
+
+ * Miscellaneous fixes.
+
+ -- Thomas E. Dickey Wed, 08 May 2013 18:29:21 -0400
+
xterm-dev (292) unstable; urgency=low
* Miscellaneous fixes.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-292/package/freebsd/Makefile new/xterm-293/package/freebsd/Makefile
--- old/xterm-292/package/freebsd/Makefile 2013-03-27 00:12:06.000000000 +0100
+++ new/xterm-293/package/freebsd/Makefile 2013-05-09 00:29:47.000000000 +0200
@@ -5,7 +5,7 @@
# and "make makesum".
PORTNAME= xterm
-PORTVERSION= 292
+PORTVERSION= 293
CATEGORIES= x11
MASTER_SITES= ftp://invisible-island.net/xterm/ \
CRITICAL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-292/package/xterm.spec new/xterm-293/package/xterm.spec
--- old/xterm-292/package/xterm.spec 2013-03-27 00:10:40.000000000 +0100
+++ new/xterm-293/package/xterm.spec 2013-05-27 17:17:47.000000000 +0200
@@ -1,7 +1,11 @@
-# $XTermId: xterm.spec,v 1.46 2013/03/26 23:10:40 tom Exp $
+# $XTermId: xterm.spec,v 1.50 2013/05/27 15:17:47 tom Exp $
Summary: X terminal emulator (development version)
-Name: xterm-dev
-Version: 292
+%global my_middle xterm
+%global my_suffix -dev
+%global fullname %{my_middle}%{my_suffix}
+%global my_class XTermDev
+Name: %{fullname}
+Version: 293
Release: 1
License: X11
Group: User Interface/X
@@ -17,30 +21,28 @@
used by DEC VT220 terminals.
This package provides four commands:
- a) xterm, which is the actual terminal emulator
- b) uxterm, which is a wrapper around xterm which sets xterm to use UTF-8
- encoding when the user's locale supports this,
- c) koi8rxterm, a wrapper similar to uxterm for locales that use the
- KOI8-R character set, and
- d) resize.
+ a) %{fullname}, which is the actual terminal emulator
+ b) u%{fullname}, which is a wrapper around %{fullname}
+ which sets %{fullname} to use UTF-8 encoding when
+ the user's locale supports this,
+ c) koi8r%{fullname}, a wrapper similar to u%{fullname}
+ for locales that use the KOI8-R character set, and
+ d) resize%{my_suffix}.
A complete list of control sequences supported by the X terminal emulator
-is provided in /usr/share/doc/xterm.
+is provided in /usr/share/doc/%{fullname}.
-The xterm program uses bitmap images provided by the xbitmaps package.
+The %{fullname} program uses bitmap images provided by the xbitmaps package.
-Those interested in using koi8rxterm will likely want to install the
+Those interested in using koi8r%{fullname} will likely want to install the
xfonts-cyrillic package as well.
-This package is configured to use "xterm-dev" and "XTermDev" for the program
-and its resource class, to avoid conflict with other packages.
+This package is configured to use "%{fullname}" and "%{my_class}"
+for the program and its resource class, to avoid conflict with other packages.
%prep
-%define my_suffix -dev
-%define my_class XTermDev
-
-%define desktop_vendor dickey
+%global desktop_vendor dickey
%define desktop_utils %(if which desktop-file-install 2>&1 >/dev/null ; then echo 1 || echo 0 ; fi)
%define icon_theme %(test -d /usr/share/icons/hicolor && echo 1 || echo 0)
@@ -55,7 +57,7 @@
%define _iconsdir %{_datadir}/icons
%define _pixmapsdir %{_datadir}/pixmaps
-%define my_docdir %{_datadir}/doc/xterm%{my_suffix}
+%define my_docdir %{_datadir}/doc/%{fullname}
# no need for debugging symbols...
%define debug_package %{nil}
@@ -75,6 +77,7 @@
--without-xterm-symlink \
%endif
%if "%{icon_theme}"
+ --with-icon-symlink \
--with-icon-theme \
--with-icondir=%{_iconsdir} \
%endif
@@ -102,6 +105,7 @@
--with-own-terminfo=%{_datadir}/terminfo \
--with-terminal-type=xterm-new \
--with-utempter \
+ --with-icon-name=mini.xterm \
--with-xpm
copy config.status /tmp/
make
@@ -173,9 +177,9 @@
%files
%defattr(-,root,root,-)
-%{_bindir}/koi8rxterm%{my_suffix}
-%{_bindir}/xterm%{my_suffix}
-%{_bindir}/uxterm%{my_suffix}
+%{_bindir}/koi8r%{fullname}
+%{_bindir}/%{fullname}
+%{_bindir}/u%{fullname}
%{_bindir}/resize%{my_suffix}
%{_mandir}/*/*
%{my_docdir}/*
@@ -186,18 +190,28 @@
%endif
%if "%{desktop_utils}"
-%config(missingok) %{_datadir}/applications/%{desktop_vendor}-xterm%{my_suffix}.desktop
-%config(missingok) %{_datadir}/applications/%{desktop_vendor}-uxterm%{my_suffix}.desktop
+%config(missingok) %{_datadir}/applications/%{desktop_vendor}-%{fullname}.desktop
+%config(missingok) %{_datadir}/applications/%{desktop_vendor}-u%{fullname}.desktop
%endif
%if "%{icon_theme}"
-%{_iconsdir}/hicolor/48x48/apps/xterm*.png
-%{_iconsdir}/hicolor/scalable/apps/xterm*.svg
+%{_iconsdir}/hicolor/48x48/apps/%{fullname}*.png
+%{_iconsdir}/hicolor/scalable/apps/%{fullname}*.svg
%endif
-%{_pixmapsdir}/*xterm*.xpm
+%{_pixmapsdir}/*%{fullname}*.xpm
+
+# files added by --with-icon-symlink
+%if "%{icon_theme}"
+%{_iconsdir}/hicolor/xterm.png
+%{_iconsdir}/hicolor/xterm.svg
+%endif
+%{_pixmapsdir}/xterm.xpm
%changelog
+* Mon May 27 2013 Thomas E. Dickey
+- use --with-icon-symlink
+
* Mon Oct 08 2012 Thomas E. Dickey
- added to pixmapsdir
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-292/print.c new/xterm-293/print.c
--- old/xterm-292/print.c 2012-12-31 14:58:16.000000000 +0100
+++ new/xterm-293/print.c 2013-05-27 02:55:47.000000000 +0200
@@ -1,7 +1,7 @@
-/* $XTermId: print.c,v 1.149 2012/12/31 13:58:16 tom Exp $ */
+/* $XTermId: print.c,v 1.150 2013/05/27 00:55:47 tom Exp $ */
/*
- * Copyright 1997-2011,2012 by Thomas E. Dickey
+ * Copyright 1997-2012,2013 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -87,6 +87,7 @@
#endif
if (SPS.fp != 0) {
+ DEBUG_MSG("closePrinter\n");
pclose(SPS.fp);
TRACE(("closed printer, waiting...\n"));
#ifdef VMS /* This is a quick hack, really should use
@@ -94,11 +95,14 @@
and go straight to the queue */
(void) system(pcommand);
#else /* VMS */
- while (nonblocking_wait() > 0) ;
+ while (nonblocking_wait() > 0) {
+ ;
+ }
#endif /* VMS */
SPS.fp = 0;
SPS.isOpen = False;
TRACE(("closed printer\n"));
+ DEBUG_MSG("...closePrinter (done)\n");
}
}
}
@@ -300,6 +304,7 @@
int save_which = screen->whichBuf;
int done_which = 0;
+ DEBUG_MSG("xtermPrintEverything\n");
if (p->print_everything) {
if (p->print_everything & 8) {
printLines(xw, -screen->savedlines, -(screen->topline + 1), p);
@@ -436,8 +441,8 @@
SysError(ERROR_FORK);
if (my_pid == 0) {
+ DEBUG_MSG("charToPrinter: subprocess for printer\n");
TRACE_CLOSE();
- (void) signal(SIGCHLD, SIG_DFL); /* no reapchild! */
close(my_pipe[1]); /* printer is silent */
close(screen->respond);
@@ -455,23 +460,38 @@
SPS.fp = popen(SPS.printer_command, "w");
if (SPS.fp != 0) {
+ DEBUG_MSG("charToPrinter: opened pipe to printer\n");
input = fdopen(my_pipe[0], "r");
clearerr(input);
- while (!ferror(input) && !feof(input)) {
- if ((c = fgetc(input)) == EOF)
+ for (;;) {
+ if (ferror(input)) {
+ DEBUG_MSG("charToPrinter: break on ferror\n");
+ break;
+ } else if (feof(input)) {
+ DEBUG_MSG("charToPrinter: break on feof\n");
break;
+ } else if ((c = fgetc(input)) == EOF) {
+ DEBUG_MSG("charToPrinter: break on EOF\n");
+ break;
+ }
fputc(c, SPS.fp);
if (isForm(c))
fflush(SPS.fp);
}
+ DEBUG_MSG("charToPrinter: calling pclose\n");
pclose(SPS.fp);
}
exit(0);
} else {
close(my_pipe[0]); /* won't read from printer */
- SPS.fp = fdopen(my_pipe[1], "w");
- TRACE(("opened printer from pid %d/%d\n",
- (int) getpid(), (int) my_pid));
+ if ((SPS.fp = fdopen(my_pipe[1], "w")) != 0) {
+ DEBUG_MSG("charToPrinter: opened printer in parent\n");
+ TRACE(("opened printer from pid %d/%d\n",
+ (int) getpid(), (int) my_pid));
+ } else {
+ TRACE(("failed to open printer:%s\n", strerror(errno)));
+ DEBUG_MSG("charToPrinter: could not open in parent\n");
+ }
}
}
#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-292/ptyx.h new/xterm-293/ptyx.h
--- old/xterm-292/ptyx.h 2013-04-24 10:57:46.000000000 +0200
+++ new/xterm-293/ptyx.h 2013-05-28 00:21:32.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: ptyx.h,v 1.764 2013/04/24 08:57:46 tom Exp $ */
+/* $XTermId: ptyx.h,v 1.767 2013/05/27 22:21:32 tom Exp $ */
/*
* Copyright 1999-2012,2013 by Thomas E. Dickey
@@ -2833,6 +2833,18 @@
#define TRACE2(p) /*nothing*/
#endif
+#if OPT_TRACE && !defined(DEBUG)
+#define DEBUG 1
+#endif
+
+#ifdef DEBUG
+#define if_DEBUG(code) if(debug) code
+#else
+#define if_DEBUG(code) /*nothing*/
+#endif
+
+#define DEBUG_MSG(text) if_DEBUG({ IGNORE_RC(write(2, text, sizeof(text) - 1)); })
+
/* *INDENT-ON* */
#endif /* included_ptyx_h */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-292/util.c new/xterm-293/util.c
--- old/xterm-292/util.c 2013-02-04 01:46:58.000000000 +0100
+++ new/xterm-293/util.c 2013-05-09 03:00:59.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: util.c,v 1.600 2013/02/04 00:46:58 tom Exp $ */
+/* $XTermId: util.c,v 1.601 2013/05/09 01:00:59 tom Exp $ */
/*
* Copyright 1999-2012,2013 by Thomas E. Dickey
@@ -4117,7 +4117,6 @@
{
LineData *ld = getLineData(screen, row);
- assert(ld && (col < (int) ld->lineSize));
return ((ld && (col < (int) ld->lineSize))
? ld->charData[col]
: (unsigned) ' ');
@@ -4131,7 +4130,6 @@
{
LineData *ld = getLineData(screen, row);
- assert(ld && (col < (int) ld->lineSize));
if (ld && (col < (int) ld->lineSize)) {
ld->charData[col] = (CharData) ch;
if_OPT_WIDE_CHARS(screen, {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-292/version.h new/xterm-293/version.h
--- old/xterm-292/version.h 2013-04-26 00:53:22.000000000 +0200
+++ new/xterm-293/version.h 2013-05-28 02:02:50.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: version.h,v 1.362 2013/04/25 22:53:22 tom Exp $ */
+/* $XTermId: version.h,v 1.364 2013/05/28 00:02:50 tom Exp $ */
/*
* Copyright 1998-2012,2013 by Thomas E. Dickey
@@ -38,8 +38,8 @@
* version of X to which this version of xterm has been built. The resulting
* number in parentheses is my patch number (Thomas E. Dickey).
*/
-#define XTERM_PATCH 292
-#define XTERM_DATE 2013-04-25
+#define XTERM_PATCH 293
+#define XTERM_DATE 2013-05-27
#ifndef __vendorversion__
#define __vendorversion__ "XTerm"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-292/xterm.log.html new/xterm-293/xterm.log.html
--- old/xterm-292/xterm.log.html 2013-04-26 00:53:40.000000000 +0200
+++ new/xterm-293/xterm.log.html 2013-05-28 02:01:55.000000000 +0200
@@ -1,4 +1,3 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<!--
*****************************************************************************
* this file is part of xterm *
@@ -31,8 +30,9 @@
* sale, use or other dealings in this Software without prior written *
* authorization. *
*****************************************************************************
- $XTermId: xterm.log.html,v 1.1335 2013/04/25 22:53:40 tom Exp $
+ $XTermId: xterm.log.html,v 1.1351 2013/05/28 00:01:55 tom Exp $
-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<html>
<head>
@@ -43,33 +43,34 @@
<link rev="MADE" href="mailto:dickey@invisible-island.net">
<meta http-equiv="Content-Type" content=
"text/html; charset=us-ascii">
- http://invisible-island.net/" target=
- "_top">http://invisible-island.net/</a>http://invisible-island.net/xterm/" target="_top">xterm/</a><br>
- Copyright © 1997-2012,2013 by Thomas E. Dickey</a>
+
+ <p>Copyright © 1997-2012,2013 by Thomas E. Dickey</a></p>
<hr>
<h1>Contents</h1>
- <p>This file contains a list of the changes that I have made for
- xterm, from the notes that I add when submitting a patch.</p>
-
- <p>You should note that other changes have been made as well, by
- other people, to fix bugs and correct ifdef's for portability.
- Until mid-2006, most of these were summarized in the XFree86
- CHANGELOG (found in the unbundled tree,
- xc/programs/Xserver/hw/xfree86). http://invisible-island.net/xterm/xterm.log.html" target=
- "_parent">Here</a> is the latest version of this file.</p>
+ <p>http://invisible-island.net/xterm/xterm.log.html">Here</a> is
+ the latest version of this file.</p>
+
+ <p>It began as a list of the changes that I made for xterm, using
+ the notes that I added when submitting a patch. You should note
+ that other changes were made as well, by other people, to fix
+ bugs and correct ifdef's for portability. Until mid-2006, most of
+ these were summarized in the XFree86 http://cvsweb.xfree86.org/cvsweb/xc/programs/Xserver/hw/xfree86/CHANGELOG">
+ CHANGELOG</a>).</p>
<ul>
+ <li><a href="#xterm_293">Patch #293 - 2013/05/27</a></li>
+
<li><a href="#xterm_292">Patch #292 - 2013/04/25</a></li>
<li><a href="#xterm_291">Patch #291 - 2013/02/26</a></li>
@@ -867,6 +868,39 @@
<li><a href="#xterm_01">Patch #1 - 1996/1/6</a></li>
</ul>
+ <h1><a name="xterm_293" id="xterm_293">Patch #293 -
+ 2013/05/27</a></h1>
+
+ <ul>
+ <li>modify sample xterm.spec to use newer icon</li>
+
+ <li>add configure option <code>--with-icon-symlink</code> to
+ work around systems which map icon requests for to a single
+ "xterm" icon, but neglect to install the icon needed for window
+ decorations (report by H Merijn Brand).</li>
+
+ <li>improve parameterizing of sample xterm.spec</li>
+
+ <li>amend fix for printer from <a href="#xterm_280">patch
+ #280</a>, removing a reset of the signal handler for
+ <code>SIGCHLD</code> (report by Joe Julian).</li>
+
+ <li>set environment variable <code>XTERM_FILTER</code> if a
+ locale-filter is used.</li>
+
+ <li>enable <code>DEBUG</code> logic when
+ <code>--enable-trace</code> configure option is given.</li>
+
+ <li>improve description of <code>initialFont</code>,
+ <code>set-vt-font</code> and <code>set-tex-text</code> in
+ manpage (Debian #707899).</li>
+
+ <li>fix regression from <a href="#xterm_292">patch #292</a>;
+ selecting a word that ended at the right margin without
+ wrapping would not select the last cell (report by Christian
+ Weisgerber).</li>
+ </ul>
+
<h1><a name="xterm_292" id="xterm_292">Patch #292 -
2013/04/25</a></h1>
@@ -1417,7 +1451,8 @@
<li>add configure option <code>--with-icon-theme</code> to tell
xterm whether to install into an icon theme, defaulting to
- "hicolor" (Redhat #755206, #799614 and #804279).</li>
+ "hicolor" (Redhat #755206, Redhat #799614 and Redhat
+ #804279).</li>
<li>change <code>--with-icondir</code> to look for "icons"
directory rather than "pixmaps" by default. Add new option
@@ -2986,7 +3021,8 @@
used the wrong amount for copying to FIFO-lines, and then used
this amount to adjust the current row on the screen. That was
both a visible defect (Debian #541109) as well as a potential
- addressing error (Debian #541132, #541160, and #541236).</li>
+ addressing error (Debian #541132, Debian #541160, and Debian
+ #541236).</li>
<li>add clarification in xterm manual about the various
<code>allow<em>XXX</em>Ops</code> resources, which are disabled
@@ -4544,7 +4580,7 @@
<li>add <code>utf8Title</code> resource and menu entry,
allowing the user to control whether title strings are
interpreted as ISO-8859-1 or UTF-8 encoding (Novell #52655,
- #113206).</li>
+ Novell #113206).</li>
<li>change order of ifdef's for utempter versus platforms in
<code>Imakefile</code> to ensure a proper value for
@@ -4963,8 +4999,7 @@
icon.</li>
<li>fixes to make <code>-geom</code> option work properly with
- the toolbar configuration (Gentoo Bugzilla #90717,
- #91967).</li>
+ the toolbar configuration (Gentoo #90717, Gentoo #91967).</li>
<li>minor improvements to scrollbar layout: ensure that the
scrollbar border is zero if the vt100 border is zero.</li>
@@ -5411,10 +5446,10 @@
with Interix (Windows Services for UNIX) 3.5 using the xlibs
libraries from freedesktop.org (patch by Min Sik Kim).</li>
- <li>amend solution for Debian #252873, #260471 from patch #194</a> by making the cursor not explicitly
- colored if only the foreground color is set, and the cursor is
- on a blank space (Debian #275473).</li>
+ <li>amend solution for Debian #252873, Debian #260471 from
+ <a href="#xterm_194">patch #194</a> by making the cursor not
+ explicitly colored if only the foreground color is set, and the
+ cursor is on a blank space (Debian #275473).</li>
<li>correct logic for send/receive mode (SRM) with regard to
control characters.</li>
@@ -5465,7 +5500,7 @@
<li>change clearing operations so foreground color attribute is
not set. Usually this is benign, but in some cases when the
cursor color is not set explicitly, the cursor would show this
- color (Debian #252873, #260471).</li>
+ color (Debian #252873, Debian #260471).</li>
<li>add extra state (cursor-moved) to guard against deciding
that the cursor did not require repainting after an indexing
@@ -6516,7 +6551,7 @@
(void*)0 isn't true for all platforms (Egbert Eich).</li>
<li>initialise ProgramName in xterm's main before
- referencing it (#5473, Peter Valchev).</li>
+ referencing it (XFree86 #5473, Peter Valchev).</li>
<li>some cleanup of Imakefile ifdef's (Marc La
France).</li>
@@ -7481,7 +7516,9 @@
resize.c</li>
<li>correct manpage typo introduced by X11R6.5 resync.</li>
- </ul>Changes from XFree86 4.0.2:
+ </ul>
+
+ <p>Changes from XFree86 4.0.2:</p>
<ul>
<li>add definition of <code>_POSIX_C_SOURCE</code> for Solaris
@@ -8665,12 +8702,12 @@
Wall).</li>
<li>work around problem observed in XFree86 3.3.5 (patch by
- Alexander V Lukyanov, Mozilla #5419). From the problem report:
+ Alexander V Lukyanov, Redhat #5419). From the problem report:
<blockquote>
- xterm consumes cpu when selecting text with mouse (holding
- down left mouse button) and when a program working under
- the xterm outputs something to stdout.
+ <p>xterm consumes cpu when selecting text with mouse
+ (holding down left mouse button) and when a program working
+ under the xterm outputs something to stdout.</p>
<p>Easy way to reproduce:<br>
<code>while :; do echo aaa; sleep 1; done</code><br>
@@ -9058,9 +9095,9 @@
<li>Two changes from Stephen P Wall. From his description:
<blockquote>
- The first change is simple - I added ESC[3J to erase the
+ <p>The first change is simple - I added ESC[3J to erase the
stored lines above the screen. That's what the changes to
- util.c and ctlseqs.ms are.
+ util.c and ctlseqs.ms are.</p>
<p>The second change is to get the blinking cursor working.
I took out the cursorBlinkTime resource, and put in
@@ -9074,17 +9111,20 @@
From his description:
<blockquote>
- With this patch, selection conversion works properly:
+ <p>With this patch, selection conversion works
+ properly:</p>
<pre>
ISO 8859-1 xterm -> ISO 8859-1 xterm (transferred as STRING);
ISO 8859-1 xterm -> UTF-8 xterm (transferred as STRING);
UTF-8 xterm -> ISO 8859-1 xterm (transferred as STRING);
UTF-8 xterm -> UTF-8 xterm (transferred as UTF-8).
-</pre>It will not work properly if one xterm is in, say, ISO
-8859-2. Actually, for this case xterm breaks the ICCCM routinely
-(sending ISO 8859-2 data as STRING), so I wouldn't worry too much
-about it. I have not changed the behaviour in eight-bit mode in any
-way.
+</pre>
+
+ <p>It will not work properly if one xterm is in, say, ISO
+ 8859-2. Actually, for this case xterm breaks the ICCCM
+ routinely (sending ISO 8859-2 data as STRING), so I
+ wouldn't worry too much about it. I have not changed the
+ behaviour in eight-bit mode in any way.</p>
</blockquote>
</li>
</ul>
@@ -9795,13 +9835,17 @@
suppressed printing the script for $LINES and $COLUMNS.
Solaris' resize utility does this; suppressing the behavior is
unnecessary.</li>
- </ul>I tested the double-sized characters using vttest and the
- xfsft patch. These fonts worked reasonably well:
+ </ul>
+
+ <p>I tested the double-sized characters using vttest and the
+ xfsft patch. These fonts worked reasonably well:</p>
<pre>
-bitstream-courier-medium-r-normal--0-0-0-0-m-0-iso8859-1
9x15
-</pre>The iso8859 font does not include box characters, of course,
-but looks good.
+</pre>
+
+ <p>The iso8859 font does not include box characters, of course,
+ but looks good.</p>
<h1><a name="xterm_88" id="xterm_88">Patch #88 - 1998/10/31 -
XFree86 3.9Nk and 3.3.2h</a></h1>
@@ -9879,7 +9923,9 @@
<li>make word and line selections work even when lines are
wrapped by xterm. Previously, selections were limited to one
screen line.</li>
- </ul>as well as
+ </ul>
+
+ <p>as well as</p>
<ul>
<li>modify logic for line-wrapping to reset the associated flag
@@ -9941,7 +9987,9 @@
<li>limit the row and column values used to report mouse
position.</li>
- </ul>From resync with XFree86 3.9Nb:
+ </ul>
+
+ <p>From resync with XFree86 3.9Nb:</p>
<ul>
<li>add support for the VSTATUS control character (patch by
@@ -9982,7 +10030,9 @@
<li>minor fixes for compiler warnings, including a syntax error
in the AMOEBA ifdef's.</li>
- </ul>From resync with XFree86 3.9Aj:
+ </ul>
+
+ <p>From resync with XFree86 3.9Aj:</p>
<ul>
<li>correction to patch #73, supply missing #else for fallback
@@ -10322,7 +10372,7 @@
<p>From his description:</p>
<blockquote>
- This set of patches is the latest incarnation of patches
+ <p>This set of patches is the latest incarnation of patches
originally written by Ian! D Allen, then of the University of
Waterloo and now of who knows where; I have been carrying them
forward from xterm to xterm ever since about X11R4. What they
@@ -10330,7 +10380,7 @@
output it prepends '*** ' to its icon title and (optionally)
beeps the bell; deiconifying the xterm removes the '*** '. Over
the years I've found this to be incredibly convenient for
- monitoring all sorts of low-activity things.
+ monitoring all sorts of low-activity things.</p>
</blockquote>
<h1><a name="xterm_71" id="xterm_71">Patch #71 - 1998/4/12 -
@@ -10415,17 +10465,19 @@
highlightColor resource. As reported by David Dawes:</p>
<blockquote>
- I've just noticed a problem with with the "inverse" control
+ <p>I've just noticed a problem with with the "inverse" control
sequence (ESC[7m) with the 3.3.2 xterm. What it does is sets
the background black, and the text the usual foreground colour
- rather than simply swapping the foreground/background.
- </blockquote>This appears to be because when I added logic to
- check that the highlightColor was distinct from foreground and
- background colors, I did not add a further check to see that it
- was not black (I would make an explicit check for the resource
- not being set, but see nothing definite in the headers that would
- let me reference an explicitly-undefined Pixel value, though
- there are some implications in xpm.h). But this should work.
+ rather than simply swapping the foreground/background.</p>
+ </blockquote>
+
+ <p>This appears to be because when I added logic to check that
+ the highlightColor was distinct from foreground and background
+ colors, I did not add a further check to see that it was not
+ black (I would make an explicit check for the resource not being
+ set, but see nothing definite in the headers that would let me
+ reference an explicitly-undefined Pixel value, though there are
+ some implications in xpm.h). But this should work.</p>
<h1><a name="xterm_67" id="xterm_67">Patch #67 - 1998/2/23 -
XFree86 3.9Ad and 3.3.1e</a></h1>
@@ -10555,12 +10607,14 @@
if they were in the compiler's default include directories,
even if `--x-includes=DIR' had been used or AC_PATH_XTRA had
found them elsewhere.</li>
- </ul>The problem on HP-UX was that we were linking with -lcurses
+ </ul>
+
+ <p>The problem on HP-UX was that we were linking with -lcurses
rather than -ltermcap due to the second bullet above, and
apparently something in HP-UX curses is broken. This seems very
strange, because the only thing used is tgetent, which should
affect any tty/pty configuration, but I lost interest in tracking
- down the exact problem.
+ down the exact problem.</p>
<h1><a name="xterm_62" id="xterm_62">Patch #62 - 1998/1/23 -
XFree86 3.9Ac</a></h1>
@@ -10738,9 +10792,9 @@
<arfst@luxor.IN-Berlin.DE>, who reported:</p>
<blockquote>
- Setting the following resources xterm (all current versions)
+ <p>Setting the following resources xterm (all current versions)
receives a segmentation fault on <Btn2Up> after
- scrolling:
+ scrolling:</p>
<pre>
*XTerm*VT100*translations: #override \
~Shift~Ctrl<Btn2Up>: insert-selection(PRIMARY, CUT_BUFFER0)\n\
@@ -10757,11 +10811,13 @@
XtermWidget (it can be the ScrollbarWidget). Instead of
accessing the widget's member directly XtDisplay gives the
required pointer in a safe way.</p>
- </blockquote>I noticed that this was not the only instance (by
- reading the code, and testing with his example), and extended the
- solution to check the widget-class to ensure that it is indeed
- xterm's widget class before attempting to use it in the context
- of translations.
+ </blockquote>
+
+ <p>I noticed that this was not the only instance (by reading the
+ code, and testing with his example), and extended the solution to
+ check the widget-class to ensure that it is indeed xterm's widget
+ class before attempting to use it in the context of
+ translations.</p>
<h1><a name="xterm_55" id="xterm_55">Patch #55 - 1997/11/25 -
XFree86 3.9x</a></h1>
@@ -10832,8 +10888,10 @@
<Michael.Schroeder@informatik.uni-erlangen.de>,</li>
<li>Pablo Ariel Kohan <pablo@memco.co.il></li>
- </ul>Some of the changes are interrelated (it was an unusually
- busy week).
+ </ul>
+
+ <p>Some of the changes are interrelated (it was an unusually busy
+ week).</p>
<ul>
<li>change the default resource value for colorMode to true,
@@ -10911,9 +10969,11 @@
<li>correct several instances of unsigned/signed mixed
expressions.</li>
- </ul>I've tested the configure script on Linux, SunOS 4.1.3,
+ </ul>
+
+ <p>I've tested the configure script on Linux, SunOS 4.1.3,
Solaris 2.5.1, IRIX 5.2 and 6.2, AIX 3.2.5 and CLIX 3.1 (all but
- the last run properly as well).
+ the last run properly as well).</p>
<h1><a name="xterm_50" id="xterm_50">Patch #50 - 1997/8/22 -
XFree86 3.9m</a></h1>
@@ -11142,7 +11202,9 @@
<li>minor fixes/clarification of tgetent in terminfo vs termcap
to 'resize'</li>
- </ul>(both changes also modify the configure script)
+ </ul>
+
+ <p>(both changes also modify the configure script)</p>
<h1><a name="xterm_38" id="xterm_38">Patch #38 - 1997/5/22 -
XFree86 3.2Xh</a></h1>
@@ -11158,10 +11220,12 @@
<li>enables/disables the configuration ifdef's for ANSI color
and VT52 emulation.</li>
- </ul>It does not make tests for the things that imake does
- (that's another project), instead it uses a hybrid of the
- autoconf tests for libraries and adds imake's compiler options
- (which are necessary in some cases to get main.c to compile).
+ </ul>
+
+ <p>It does not make tests for the things that imake does (that's
+ another project), instead it uses a hybrid of the autoconf tests
+ for libraries and adds imake's compiler options (which are
+ necessary in some cases to get main.c to compile).</p>
<h1><a name="xterm_37" id="xterm_37">Patch #37 - 1997/5/7 -
XFree86 3.9a</a></h1>
@@ -11218,9 +11282,11 @@
<li>some minor tidying up (e.g., signed/unsigned use bitcpy,
MODE_DECCKM, resetColor, resetCharsets). More is done in patch
#35.</li>
- </ul>I got the description of DECSTR from a vt420 user's manual.
+ </ul>
+
+ <p>I got the description of DECSTR from a vt420 user's manual.
I'll do some testing with vttest to ensure that there's nothing
- else to do than what was documented.
+ else to do than what was documented.</p>
<h1><a name="xterm_33" id="xterm_33">Patch #33 - 1996/11/24 -
XFree86 3.2</a></h1>
@@ -11274,7 +11340,9 @@
<li>change valid-response code in DECRQSS from 0 to 1 (the
manual says 0, but the VT420 terminal I've been testing on says
1).</li>
- </ul>All of these changes are based on vttest 2.6
+ </ul>
+
+ <p>All of these changes are based on vttest 2.6</p>
<p>(Most of the volume in the patch is to add 2 more state tables
for parsing the 2nd/3rd device-attribute controls).</p>
@@ -11292,12 +11360,16 @@
<li>a typo in the termcap (missing '['), from 3.1.2Dj (my
error)</li>
- </ul>Roland also complained that he couldn't use box characters
- with
+ </ul>
+
+ <p>Roland also complained that he couldn't use box characters
+ with</p>
<pre>
-adobe-courier-bold-r-normal--12-120-75-75-m-70-iso8859-1
-</pre>but that's a known xterm limitation (the box characters must
-be part of the font, in the first 32 locations).
+</pre>
+
+ <p>but that's a known xterm limitation (the box characters must
+ be part of the font, in the first 32 locations).</p>
<h1><a name="xterm_27" id="xterm_27">Patch #27 - 1996/8/21 -
XFree86 3.1.2Ek</a></h1>
@@ -12043,9 +12115,11 @@
options</p>
<pre>
-Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wnested-externs
-</pre>(I also compiled with -Wshadow, but while that found some
-things that I wanted to find, there's far too many warnings from
-the X headers to be usable in this context).
+</pre>
+
+ <p>(I also compiled with -Wshadow, but while that found some
+ things that I wanted to find, there's far too many warnings from
+ the X headers to be usable in this context).</p>
<p>The changes:</p>
@@ -12243,8 +12317,10 @@
<pre>
proto.h
xterm.h
-</pre>I expect this to be the biggest patch by far. However
-(barring a misplaced prototype), it shouldn't break anything, since
-the intent of the patch is to provide missing declarations.
+</pre>
+
+ <p>I expect this to be the biggest patch by far. However (barring
+ a misplaced prototype), it shouldn't break anything, since the
+ intent of the patch is to provide missing declarations.</p>
</body>
</html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-292/xterm.man new/xterm-293/xterm.man
--- old/xterm-292/xterm.man 2013-04-24 10:53:38.000000000 +0200
+++ new/xterm-293/xterm.man 2013-05-16 11:57:06.000000000 +0200
@@ -1,5 +1,5 @@
'\" t
-.\" $XTermId: xterm.man,v 1.559 2013/04/24 08:53:38 tom Exp $
+.\" $XTermId: xterm.man,v 1.564 2013/05/16 09:57:06 tom Exp $
.\"
.\" Copyright 1996-2012,2013 by Thomas E. Dickey
.\"
@@ -2737,22 +2737,28 @@
For instance, \fIcat\fP'ing a large file to the screen does this.
.TP 8
.B "font1 (\fPclass\fB Font1)"
-Specifies the name of the first alternative font.
+Specifies the name of the first alternative font,
+corresponding to \*(``Unreadable\*('' in the standard menu.
.TP 8
.B "font2 (\fPclass\fB Font2)"
-Specifies the name of the second alternative font.
+Specifies the name of the second alternative font,
+corresponding to \*(``Tiny\*('' in the standard menu.
.TP 8
.B "font3 (\fPclass\fB Font3)"
-Specifies the name of the third alternative font.
+Specifies the name of the third alternative font,
+corresponding to \*(``Small\*('' in the standard menu.
.TP 8
.B "font4 (\fPclass\fB Font4)"
-Specifies the name of the fourth alternative font.
+Specifies the name of the fourth alternative font,
+corresponding to \*(``Medium\*('' in the standard menu.
.TP 8
.B "font5 (\fPclass\fB Font5)"
-Specifies the name of the fifth alternative font.
+Specifies the name of the fifth alternative font,
+corresponding to \*(``Large\*('' in the standard menu.
.TP 8
.B "font6 (\fPclass\fB Font6)"
-Specifies the name of the sixth alternative font.
+Specifies the name of the sixth alternative font,
+corresponding to \*(``Huge\*('' in the standard menu.
.TP 8
.B "fontDoublesize (\fPclass\fB FontDoublesize)"
Specifies whether \fI\*n\fP should attempt to use font scaling to draw
@@ -3082,6 +3088,11 @@
Alternatively,
you may put those parameter within a shell script to execute the converter,
and set this resource to point to the shell script.
+.IP
+When using a locale-filter, e.g., with the \fI\-e\fP option, or the shell,
+\fI\*n\fP first tries passing control via that filter.
+If it fails, \fI\*n\fP will retry without the locale-filter.
+\fI\*N\fP warns about the failure before retrying.
.TP 8
.B "loginShell (\fPclass\fB LoginShell)"
Specifies whether or not the shell to be run in the window should be started
@@ -4053,13 +4064,16 @@
.PP
The resources that may be specified for the various menus are described in
the documentation for the Athena \fBSimpleMenu\fP widget.
-The name and classes
-of the entries in each of the menus are listed below.
+The name and classes of the entries in each of the menus are listed below.
Resources named \*(``\fBline\fR\fIN\fR\*('' where \fIN\fR is a number
are separators with class \fBSmeLine\fR.
+.PP
+As with all X resource-based widgets,
+the labels mentioned are customary defaults for the application.
.
.PP
-The \fImainMenu\fP has the following entries:
+The \fIMain Options\fP menu (widget name \fImainMenu\fP)
+has the following entries:
.TP 8
.B "toolbar (\fPclass\fB SmeBSB)"
This entry invokes the \fBset-toolbar(toggle)\fP action.
@@ -4145,7 +4159,8 @@
This entry invokes the \fBquit()\fP action.
.
.PP
-The \fIvtMenu\fP has the following entries:
+The \fIVT Options\fP menu (widget name \fIvtMenu\fP)
+has the following entries:
.TP 8
.B "scrollbar (\fPclass\fB SmeBSB)"
This entry invokes the \fBset-scrollbar(toggle)\fP action.
@@ -4227,28 +4242,43 @@
This entry invokes the \fBset-altscreen(toggle)\fP action.
.
.PP
-The \fIfontMenu\fP has the following entries:
+The \fIVT Fonts\fP menu (widget name \fIfontMenu\fP)
+has the following entries:
.TP 8
.B "fontdefault (\fPclass\fB SmeBSB)"
-This entry invokes the \fBset-vt-font(d)\fP action.
+This entry invokes the \fBset-vt-font(d)\fP action,
+setting the font using the \fBfont\fP (default) resource,
+e.g., \*(``Default\*('' in the menu.
.TP 8
.B "font1 (\fPclass\fB SmeBSB)"
-This entry invokes the \fBset-vt-font(1)\fP action.
+This entry invokes the \fBset-vt-font(1)\fP action,
+setting the font using the \fBfont1\fP resource,
+e.g., \*(``Unreadable\*('' in the menu.
.TP 8
.B "font2 (\fPclass\fB SmeBSB)"
-This entry invokes the \fBset-vt-font(2)\fP action.
+This entry invokes the \fBset-vt-font(2)\fP action,
+setting the font using the \fBfont2\fP resource,
+e.g., \*(``Tiny\*('' in the menu.
.TP 8
.B "font3 (\fPclass\fB SmeBSB)"
-This entry invokes the \fBset-vt-font(3)\fP action.
+This entry invokes the \fBset-vt-font(3)\fP action,
+setting the font using the \fBfont3\fP resource,
+e.g., \*(``Small\*('' in the menu.
.TP 8
.B "font4 (\fPclass\fB SmeBSB)"
-This entry invokes the \fBset-vt-font(4)\fP action.
+This entry invokes the \fBset-vt-font(4)\fP action,
+letting the font using the \fBfont4\fP resource,
+e.g., \*(``Medium\*('' in the menu.
.TP 8
.B "font5 (\fPclass\fB SmeBSB)"
-This entry invokes the \fBset-vt-font(5)\fP action.
+This entry invokes the \fBset-vt-font(5)\fP action,
+letting the font using the \fBfont5\fP resource,
+e.g., \*(``Large\*('' in the menu.
.TP 8
.B "font6 (\fPclass\fB SmeBSB)"
-This entry invokes the \fBset-vt-font(6)\fP action.
+This entry invokes the \fBset-vt-font(6)\fP action,
+letting the font using the \fBfont6\fP resource,
+e.g., \*(``Huge\*('' in the menu.
.TP 8
.B "fontescape (\fPclass\fB SmeBSB)"
This entry invokes the \fBset-vt-font(e)\fP action.
@@ -4275,7 +4305,8 @@
This entry invokes the \fBset-utf8-title(s)\fP action.
.
.PP
-The \fItekMenu\fP has the following entries:
+The \fITEK Options\fP menu (widget name \fItekMenu\fP)
+has the following entries:
.TP 8
.B "tektextlarge (\fPclass\fB SmeBSB)"
This entry invokes the \fBset-tek-text(large)\fP action.
@@ -5893,11 +5924,24 @@
It is also invoked by the \fBsunKeyboard\fP entry in \fImainMenu\fP.
.TP 8
.B "set-tek-text(\fIlarge/2/3/small\fP)"
-This action sets font used in the Tektronix window to the value of the
-resources \fBtektextlarge\fP, \fBtektext2\fP, \fBtektext3\fP, and
-\fBtektextsmall\fP according to the argument.
-It is also invoked by the entries
-of the same names as the resources in \fItekMenu\fP.
+This action sets the font used in the Tektronix window to the value of the
+selected resource according to the argument.
+The argument can be either a keyword or single-letter alias,
+as shown in parentheses:
+.RS
+.TP 5
+large (l)
+Use resource \fBfontLarge\fP, same as menu entry \fBtektextlarge\fP.
+.TP 5
+two (2)
+Use resource \fBfont2\fP, same as menu entry \fBtektext2\fP.
+.TP 5
+three (3)
+Use resource \fBfont3\fP, same as menu entry \fBtektext3\fP.
+.TP 5
+small (s)
+Use resource \fBfontSmall\fP, same as menu entry \fBtektextsmall\fP.
+.RE
.TP 8
.B "set-terminal-type(\fItype\fP)"
This action directs output to either the \fIvt\fP or \fItek\fP windows,
@@ -5944,7 +5988,7 @@
\fI\*n\fP was started),
.HP
\fI1\fP through \fI6\fP indicate the fonts
-specified by the \fIfont1\fP through \fIfont6\fP resources,
+specified by the \fBfont1\fP through \fBfont6\fP resources,
.HP
\fIe\fP or \fIE\fP
indicate the normal and bold fonts that have been set through escape codes
@@ -6191,6 +6235,10 @@
WINDOWID
is set to the X window id number of the \fI\*n\fP window.
.TP 5
+XTERM_FILTER
+is set if a locale-filter is used.
+The value is the pathname of the filter.
+.TP 5
XTERM_LOCALE
shows the locale which was used by \fI\*n\fP on startup.
Some shell initialization scripts may set a different locale.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xterm-292/xtermcfg.hin new/xterm-293/xtermcfg.hin
--- old/xterm-292/xtermcfg.hin 2013-04-21 20:58:54.000000000 +0200
+++ new/xterm-293/xtermcfg.hin 2013-05-27 23:05:23.000000000 +0200
@@ -1,4 +1,4 @@
-/* $XTermId: xtermcfg.hin,v 1.198 2013/04/21 18:58:54 Andres.Perera Exp $ */
+/* $XTermId: xtermcfg.hin,v 1.199 2013/05/27 21:05:23 tom Exp $ */
/*
* Copyright 1997-2012,2013 by Thomas E. Dickey
@@ -177,6 +177,7 @@
#undef USE_UTMP_SETGID /* AC_ARG_WITH(utmp-setgid) */
#undef UTMPX_FOR_UTMP /* CF_UTMP */
#undef XRENDERFONT /* CF_X_FREETYPE */
+#undef cc_t /* CF_TYPE_CC_T */
#undef gid_t /* AC_TYPE_UID_T */
#undef mode_t /* AC_TYPE_MODE_T */
#undef off_t /* AC_TYPE_OFF_T */
++++++ xterm-allow_iso-utf_fonts_in_menu.patch ++++++
# allow UTF-8 fonts (iso-10464) as well
diff --git a/XTerm.ad b/XTerm.ad
--- a/XTerm.ad
+++ b/XTerm.ad
@@ -29,17 +29,17 @@
! holders shall not be used in advertising or otherwise to promote the
! sale, use or other dealings in this Software without prior written
! authorization.
! -----------------------------------------------------------------------------
*saveLines: 1024
*SimpleMenu*BackingStore: NotUseful
-*SimpleMenu*menuLabel.font: -adobe-helvetica-bold-r-normal--*-120-*-*-*-*-iso8859-*
+*SimpleMenu*menuLabel.font: -adobe-helvetica-bold-r-normal--*-120-*-*-*-*-iso*-*
*SimpleMenu*menuLabel.vertSpace: 100
*SimpleMenu*HorizontalMargins: 16
*SimpleMenu*Sme.height: 16
*SimpleMenu*Cursor: left_ptr
*mainMenu.Label: Main Options
*mainMenu*toolbar*Label: Toolbar
++++++ xterm-desktop_file_icon.patch ++++++
# use system stock icon for XTerm
diff --git a/xterm.desktop b/xterm.desktop
--- a/xterm.desktop
+++ b/xterm.desktop
@@ -33,10 +33,10 @@
[Desktop Entry]
Name=XTerm
#GenericName=Terminal
Comment=standard terminal emulator for the X window system
Exec=xterm
Terminal=false
Type=Application
Encoding=UTF-8
-Icon=xterm-color_48x48
+Icon=terminal
Categories=System;TerminalEmulator;
++++++ xterm-double_width_fonts.patch ++++++
diff --git a/fontutils.c b/fontutils.c
--- a/fontutils.c
+++ b/fontutils.c
@@ -636,77 +636,29 @@ is_double_width_font(XFontStruct * fs)
{
return ((2 * fs->min_bounds.width) == fs->max_bounds.width);
}
#else
#define is_double_width_font(fs) 0
#endif
#if OPT_WIDE_CHARS && OPT_RENDERFONT && defined(HAVE_TYPE_FCCHAR32)
-#define HALF_WIDTH_TEST_STRING "1234567890"
-/* '1234567890' in Chinese characters in UTF-8 */
-#define FULL_WIDTH_TEST_STRING "\xe4\xb8\x80\xe4\xba\x8c\xe4\xb8\x89" \
- "\xe5\x9b\x9b\xe4\xba\x94" \
- "\xef\xa7\x91\xe4\xb8\x83\xe5\x85\xab" \
- "\xe4\xb9\x9d\xef\xa6\xb2"
-
-/* '1234567890' in Korean script in UTF-8 */
-#define FULL_WIDTH_TEST_STRING2 "\xec\x9d\xbc\xec\x9d\xb4\xec\x82\xbc" \
- "\xec\x82\xac\xec\x98\xa4" \
- "\xec\x9c\xa1\xec\xb9\xa0\xed\x8c\x94" \
- "\xea\xb5\xac\xec\x98\x81"
-
-#define HALF_WIDTH_CHAR1 0x0031 /* '1' */
-#define HALF_WIDTH_CHAR2 0x0057 /* 'W' */
#define FULL_WIDTH_CHAR1 0x4E00 /* CJK Ideograph 'number one' */
#define FULL_WIDTH_CHAR2 0xAC00 /* Korean script syllable 'Ka' */
static Bool
is_double_width_font_xft(Display * dpy, XftFont * font)
{
- XGlyphInfo gi1, gi2;
- FcChar32 c1 = HALF_WIDTH_CHAR1, c2 = HALF_WIDTH_CHAR2;
- String fwstr = FULL_WIDTH_TEST_STRING;
- String hwstr = HALF_WIDTH_TEST_STRING;
-
/* Some Korean fonts don't have Chinese characters at all. */
- if (!XftCharExists(dpy, font, FULL_WIDTH_CHAR1)) {
- if (!XftCharExists(dpy, font, FULL_WIDTH_CHAR2))
- return False; /* Not a CJK font */
- else /* a Korean font without CJK Ideographs */
- fwstr = FULL_WIDTH_TEST_STRING2;
- }
-
- XftTextExtents32(dpy, font, &c1, 1, &gi1);
- XftTextExtents32(dpy, font, &c2, 1, &gi2);
- if (gi1.xOff != gi2.xOff) /* Not a fixed-width font */
- return False;
-
- XftTextExtentsUtf8(dpy,
- font,
- (_Xconst FcChar8 *) hwstr,
- (int) strlen(hwstr),
- &gi1);
- XftTextExtentsUtf8(dpy,
- font,
- (_Xconst FcChar8 *) fwstr,
- (int) strlen(fwstr),
- &gi2);
-
- /*
- * fontconfig and Xft prior to 2.2(?) set the width of half-width
- * characters identical to that of full-width character in CJK double-width
- * (bi-width / monospace) font even though the former is half as wide as
- * the latter. This was fixed sometime before the release of fontconfig
- * 2.2 in early 2003. See
- * http://bugzilla.mozilla.org/show_bug.cgi?id=196312
- * In the meantime, we have to check both possibilities.
- */
- return ((2 * gi1.xOff == gi2.xOff) || (gi1.xOff == gi2.xOff));
+ if (XftCharExists(dpy, font, FULL_WIDTH_CHAR1) ||
+ XftCharExists(dpy, font, FULL_WIDTH_CHAR2))
+ return True; /* CJK font */
+ else
+ return False; /* Not a CJK font */
}
#else
#define is_double_width_font_xft(dpy, xftfont) 0
#endif
#define EmptyFont(fs) (fs != 0 \
&& ((fs)->ascent + (fs)->descent == 0 \
|| (fs)->max_bounds.width == 0))
++++++ xterm-enable_libtinfo.patch ++++++
# check for libtinfo before falling back to ncurses
diff --git a/aclocal.m4 b/aclocal.m4
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -743,20 +743,20 @@ if test "$cf_full_tgetent" = yes ; then
else
cf_test_message="tgetent"
fi
AC_CACHE_CHECK(for $cf_test_message function,cf_cv_lib_tgetent,[
cf_save_LIBS="$LIBS"
cf_cv_lib_tgetent=no
if test "$cf_full_tgetent" = yes ; then
- cf_TERMLIB="otermcap termcap termlib ncurses curses"
+ cf_TERMLIB="otermcap termcap termlib tinfo ncurses curses"
cf_TERMTST="buffer[[0]] == 0"
else
- cf_TERMLIB="termlib ncurses curses"
+ cf_TERMLIB="termlib tinfo ncurses curses"
cf_TERMTST="0"
fi
for cf_termlib in '' $cf_TERMLIB ; do
LIBS="$cf_save_LIBS"
test -n "$cf_termlib" && CF_ADD_LIB($cf_termlib)
AC_TRY_RUN([
/* terminfo implementations ignore the buffer argument, making it useless for
* the xterm application, which uses this information to make a new TERMCAP
diff --git a/configure b/configure
--- a/configure
+++ b/configure
@@ -5579,20 +5579,20 @@ echo "$as_me:5578: checking for $cf_test
echo $ECHO_N "checking for $cf_test_message function... $ECHO_C" >&6
if test "${cf_cv_lib_tgetent+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cf_save_LIBS="$LIBS"
cf_cv_lib_tgetent=no
if test "$cf_full_tgetent" = yes ; then
- cf_TERMLIB="otermcap termcap termlib ncurses curses"
+ cf_TERMLIB="otermcap termcap termlib tinfo ncurses curses"
cf_TERMTST="buffer[0] == 0"
else
- cf_TERMLIB="termlib ncurses curses"
+ cf_TERMLIB="termlib tinfo ncurses curses"
cf_TERMTST="0"
fi
for cf_termlib in '' $cf_TERMLIB ; do
LIBS="$cf_save_LIBS"
test -n "$cf_termlib" && LIBS="-l$cf_termlib $LIBS"
if test "$cross_compiling" = yes; then
echo "cross-compiling, cannot verify if a termcap/tgetent is present in $cf_termlib" 1>&5
else
++++++ xterm-forbid_window_and_font_ops.patch ++++++
# forbid dangerous escape sequences (font loading)
diff --git a/XTerm.ad b/XTerm.ad
--- a/XTerm.ad
+++ b/XTerm.ad
@@ -258,16 +258,21 @@
!*faceSize: 8
! Here is a pattern that is useful for double-clicking on a URL:
!*charClass: 33:48,35:48,37-38:48,43-47:48,58:48,61:48,63-64:48,95:48,126:48
!
! Alternatively,
!*on2Clicks: regex [[:alpha:]]+://([[:alnum:]!#+,./=?@_~-]|(%[[:xdigit:]][[:xdigit:]]))+
+! Security: Disallow operations that might allow raw text being pasted to xterm to
+! execute code.
+*allowWindowOps: false
+*allowFontOps: false
+
!! We want a 8bit clean xterm
*eightBitInput: true
*eightBitOutput: true
!! Default Settings
*termName: xterm
*pointerShape: top_left_arrow
*scrollKey: true
diff --git a/xterm.man b/xterm.man
--- a/xterm.man
+++ b/xterm.man
@@ -1702,17 +1702,17 @@ The default is \*(``false\*(''.
.TP
.B "allowColorOps (\fPclass\fB AllowColorOps)"
Specifies whether control sequences that set/query the dynamic colors should be allowed.
ANSI colors are unaffected by this resource setting.
The default is \*(``true\*(''.
.TP
.B "allowFontOps (\fPclass\fB AllowFontOps)"
Specifies whether control sequences that set/query the font should be allowed.
-The default is \*(``true\*(''.
+The default is \*(``false\*(''.
.TP 5
.B "allowPasteControls (\fPclass\fB AllowPasteControls)"
If true, allow control characters such as BEL and CAN to be pasted.
Formatting characters (tab, newline) are always allowed.
Other C0 control characters are suppressed unless this resource is enabled.
The exact set of control characters (C0 and C1)
depends upon whether UTF-8 encoding is used,
as well as the \fBallowC1Printable\fP resource.
++++++ xterm-settings.patch ++++++
# various distribution configuration tweaks
diff --git a/UXTerm.ad b/UXTerm.ad
--- a/UXTerm.ad
+++ b/UXTerm.ad
@@ -30,21 +30,31 @@
! sale, use or other dealings in this Software without prior written
! authorization.
! -----------------------------------------------------------------------------
! Use
! xterm -class UXTerm
! 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?
!
! Here is a simple description. A technically precise one would be very long.
! When xterm starts up, it uses the
!
! *VT100.font
!
@@ -55,22 +65,39 @@
!
! to obtain a wide font. A "wide" font has more than 256 glyphs. Typical
! wide fonts have 10,000 glyphs. If the original "*VT100.font" is not wide,
! and xterm can load the *VT100.utf8Fonts.font, it will use that.
!
! 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.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
!*VT100.font: -efont-biwidth-medium-r-normal--10-100-75-75-p-50-iso10646-1
!*VT100.font3: -efont-biwidth-medium-r-normal--12-120-75-75-p-60-iso10646-1
!*VT100.font4: -efont-biwidth-medium-r-normal--14-140-75-75-p-70-iso10646-1
!*VT100.font5: -efont-biwidth-medium-r-normal--16-160-75-75-p-80-iso10646-1
!*VT100.font6: -efont-biwidth-medium-r-normal--24-240-75-75-p-120-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 b/XTerm.ad
--- a/XTerm.ad
+++ b/XTerm.ad
@@ -96,31 +96,56 @@
*vtMenu*softreset*Label: Do Soft Reset
*vtMenu*hardreset*Label: Do Full Reset
*vtMenu*clearsavedlines*Label: Reset and Clear Saved Lines
*vtMenu*tekshow*Label: Show Tek Window
*vtMenu*tekmode*Label: Switch to Tek Mode
*vtMenu*vthide*Label: Hide VT Window
*vtMenu*altscreen*Label: Show Alternate Screen
+! 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-semicondensed-*-13-120-75-75-c-60-iso10646-1
+*VT100.wideFont: -misc-fixed-medium-r-normal-*-13-120-75-75-c-120-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
+!*VT100.font1: nil2
+!*VT100.wideFont1:
*IconFont: nil2
*fontMenu*font2*Label: Tiny
-*VT100.font2: 5x7
+!*VT100.font2: 5x7
+*VT100.font2: -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso10646-1
+!*VT100.widefont2:
*fontMenu*font3*Label: Small
-*VT100.font3: 6x10
+!*VT100.font3: 6x10
+*VT100.font3: -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso10646-1
+!*VT100.wideFont3:
*fontMenu*font4*Label: Medium
-*VT100.font4: 7x13
+!*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: 9x15
+*VT100.font5: -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1
+!*VT100.wideFont5:
*fontMenu*font6*Label: Huge
-*VT100.font6: 10x20
+!*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*fontescape*Label: Escape Sequence
*fontMenu*fontsel*Label: Selection
!fontescape and fontsel overridden by application
*fontMenu*allow-bold-fonts*Label: Bold Fonts
*fontMenu*font-linedrawing*Label: Line-Drawing Characters
*fontMenu*font-doublesize*Label: Doublesized Characters
*fontMenu*font-loadable*Label: VT220 Soft Fonts
*fontMenu*font-packed*Label: Packed Font
@@ -130,22 +155,23 @@
*fontMenu*utf8-title*Label: UTF-8 Titles
*fontMenu*allow-color-ops*Label: Allow Color Ops
*fontMenu*allow-font-ops*Label: Allow Font Ops
*fontMenu*allow-tcap-ops*Label: Allow Termcap Ops
*fontMenu*allow-title-ops*Label: Allow Title Ops
*fontMenu*allow-window-ops*Label: Allow Window Ops
-*VT100.utf8Fonts.font2: -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso10646-1
-*VT100.utf8Fonts.font: -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1
-*VT100.utf8Fonts.font3: -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1
-*VT100.utf8Fonts.font4: -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso10646-1
-*VT100.utf8Fonts.font5: -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1
-*VT100.utf8Fonts.font6: -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1
+! upstream configuration, which simply has broken our xterm font configuration completely
+!*VT100.utf8Fonts.font2: -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso10646-1
+!*VT100.utf8Fonts.font: -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1
+!*VT100.utf8Fonts.font3: -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1
+!*VT100.utf8Fonts.font4: -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso10646-1
+!*VT100.utf8Fonts.font5: -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1
+!*VT100.utf8Fonts.font6: -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1
*tekMenu.Label: Tek Options
*tekMenu*tektextlarge*Label: Large Characters
*tekMenu*tektext2*Label: #2 Size Characters
*tekMenu*tektext3*Label: #3 Size Characters
*tekMenu*tektextsmall*Label: Small Characters
*tekMenu*tekpage*Label: PAGE
*tekMenu*tekreset*Label: RESET
@@ -232,16 +258,72 @@
!*faceSize: 8
! Here is a pattern that is useful for double-clicking on a URL:
!*charClass: 33:48,35:48,37-38:48,43-47:48,58:48,61:48,63-64:48,95:48,126:48
!
! 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()
+
+*background: LightYellow2
+*foreground: #000000
+*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.
!
! In addition, xterm recognizes several escape sequences which can be used to
! set fonts, window properties, return settings via escape sequences. Some
! find these useful; others are concerned with the possibility of unexpected
! inputs.
diff --git a/xterm.man b/xterm.man
--- a/xterm.man
+++ b/xterm.man
@@ -4004,19 +4004,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\*('':
.TP 8
++++++ xterm-sigwinch.patch ++++++
diff --git a/screen.c b/screen.c
--- a/screen.c
+++ b/screen.c
@@ -2183,17 +2183,17 @@ ScreenResize(XtermWidget xw,
#ifdef USE_STRUCT_WINSIZE
ts.ws_xpixel = (ttySize_t) width;
ts.ws_ypixel = (ttySize_t) height;
#endif
code = SET_TTYSIZE(screen->respond, ts);
TRACE(("return %d from SET_TTYSIZE %dx%d\n", code, rows, cols));
(void) code;
-#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);
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org