Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit/xterm/dist initial import of xterm-367
details: https://anonhg.NetBSD.org/xsrc/rev/a1d9d19e2829
branches: trunk
changeset: 10692:a1d9d19e2829
user: mrg <mrg%NetBSD.org@localhost>
date: Tue Apr 27 01:57:00 2021 +0000
description:
initial import of xterm-367
diffstat:
external/mit/xterm/dist/INSTALL | 18 +-
external/mit/xterm/dist/MANIFEST | 2 +-
external/mit/xterm/dist/NEWS | 33 +-
external/mit/xterm/dist/THANKS | 3 +-
external/mit/xterm/dist/Tekproc.c | 17 +-
external/mit/xterm/dist/aclocal.m4 | 47 +-
external/mit/xterm/dist/charproc.c | 143 +-
external/mit/xterm/dist/configure | 6047 +++++++++++----------
external/mit/xterm/dist/configure.in | 18 +-
external/mit/xterm/dist/ctlseqs.ms | 12 +-
external/mit/xterm/dist/ctlseqs.txt | 6 +-
external/mit/xterm/dist/data.h | 8 +-
external/mit/xterm/dist/fontutils.h | 5 +-
external/mit/xterm/dist/graphics.c | 14 +-
external/mit/xterm/dist/graphics_regis.c | 8 +-
external/mit/xterm/dist/html.c | 8 +-
external/mit/xterm/dist/main.c | 27 +-
external/mit/xterm/dist/menu.c | 13 +-
external/mit/xterm/dist/menu.h | 13 +-
external/mit/xterm/dist/package/debian/changelog | 6 +
external/mit/xterm/dist/package/freebsd/Makefile | 4 +-
external/mit/xterm/dist/package/pkgsrc/Makefile | 4 +-
external/mit/xterm/dist/package/xterm.spec | 4 +-
external/mit/xterm/dist/print.c | 15 +-
external/mit/xterm/dist/screen.c | 6 +-
external/mit/xterm/dist/svg.c | 8 +-
external/mit/xterm/dist/terminfo | 97 +-
external/mit/xterm/dist/trace.c | 5 +-
external/mit/xterm/dist/util.c | 21 +-
external/mit/xterm/dist/version.h | 6 +-
external/mit/xterm/dist/vttests/16colors.sh | 37 +-
external/mit/xterm/dist/vttests/8colors.sh | 35 +-
external/mit/xterm/dist/vttests/acolors.sh | 33 +-
external/mit/xterm/dist/vttests/doublechars.sh | 43 +-
external/mit/xterm/dist/vttests/dynamic.sh | 29 +-
external/mit/xterm/dist/vttests/dynamic2.sh | 33 +-
external/mit/xterm/dist/vttests/fonts.sh | 27 +-
external/mit/xterm/dist/vttests/other-sgr.sh | 41 +-
external/mit/xterm/dist/vttests/resize.sh | 59 +-
external/mit/xterm/dist/vttests/title.sh | 27 +-
external/mit/xterm/dist/xterm.appdata.xml | 2 +-
external/mit/xterm/dist/xterm.log.html | 43 +-
external/mit/xterm/dist/xtermcfg.hin | 6 +-
43 files changed, 3575 insertions(+), 3458 deletions(-)
diffs (truncated from 17019 to 300 lines):
diff -r 998dfb2a36fb -r a1d9d19e2829 external/mit/xterm/dist/INSTALL
--- a/external/mit/xterm/dist/INSTALL Tue Apr 27 01:47:39 2021 +0000
+++ b/external/mit/xterm/dist/INSTALL Tue Apr 27 01:57:00 2021 +0000
@@ -1,6 +1,6 @@
--- $XTermId: INSTALL,v 1.185 2020/09/19 16:53:27 tom Exp $
+-- $XTermId: INSTALL,v 1.187 2021/03/24 00:39:41 tom Exp $
-------------------------------------------------------------------------------
--- Copyright 1997-2019,2020 by Thomas E. Dickey
+-- Copyright 1997-2020,2021 by Thomas E. Dickey
--
-- All Rights Reserved
--
@@ -380,6 +380,11 @@
This is normally enabled.
+ --disable-xcursor disable cursorTheme resource
+
+ Do not compile-in code that sets the XCURSOR_THEME environment variable
+ to enable/disable cursor themes.
+
--disable-ziconbeep disable -ziconbeep option
Do not compile-in code that modifies the icon's title and sounds a
@@ -527,13 +532,18 @@
(The "paste64" feature, which fits xterm's protocol better, is
configured by default).
+ --enable-regis-graphics enable support for ReGIS graphics
+
+ Compile-in code to support experimental ReGIS graphics
+
--enable-sco-fkeys enable support for SCO-style function keys
Compile-in code to support SCO-style function keys.
- --enable-regis-graphics enable support for ReGIS graphics
+ --enable-stdnoreturn enable C11 _Noreturn feature for diagnostics
- Compile-in code to support experimental ReGIS graphics
+ Use the C11 _Noreturn keyword if the compiler supports it, rather
+ than the gcc-specific __attribute__((noreturn)).
--enable-toolbar enable pulldown menus on toolbar
diff -r 998dfb2a36fb -r a1d9d19e2829 external/mit/xterm/dist/MANIFEST
--- a/external/mit/xterm/dist/MANIFEST Tue Apr 27 01:47:39 2021 +0000
+++ b/external/mit/xterm/dist/MANIFEST Tue Apr 27 01:57:00 2021 +0000
@@ -1,4 +1,4 @@
-MANIFEST for xterm-366, version xterm-366
+MANIFEST for xterm-367, version xterm-367
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
diff -r 998dfb2a36fb -r a1d9d19e2829 external/mit/xterm/dist/NEWS
--- a/external/mit/xterm/dist/NEWS Tue Apr 27 01:47:39 2021 +0000
+++ b/external/mit/xterm/dist/NEWS Tue Apr 27 01:57:00 2021 +0000
@@ -1,20 +1,23 @@
The NEWS file was generated from xterm.log.html, which serves as the changelog
for xterm.
--------------------------------------------------------------------------------
- Patch #366 - 2021/02/10
+ Patch #367 - 2021/03/26
- * correct a compiler-warning fix in patch #352 which allowed
- sign-extension of coordinate values (report by "CismonX").
- * correct upper-limit for selection buffer, accounting for combining
- characters (report/testcase by Tavis Ormandy).
- * with alwaysHighlight true, xterm does not properly track focus. The
- screen->select FOCUS flag remains always on, which prevents
- bellIsUrgent from working, as the urgent WM_HINT flag is only set
- in setXUrgency() when the window is not focused. Fix this by
- updating screen->select in unselectwindow() regardless of the value
- of always_highlight (patch by Jiri Bohac).
- * improve fix for interaction between SRM and ENQ (report by Grant
- Taylor).
- * build-fix for --with-Xaw3dxft, needed when --with-toolbar is
- omitted (report by Jimmy Olgeni, Emanuel Haupt).
+ * add OSC 22 to allow programs to select different pointer cursor at
+ runtime.
+ * change configuration for no-return functions to use _Noreturn when
+ it is available, because clang --analyze does not properly handle
+ the gcc noreturn attribute.
+ * add cursorTheme resource to provide a way to enable or disable the
+ cursor theme feature.
+ * modified CopyWait event retries to use shorter sleeps, to improve
+ responsiveness (tmux #2556).
+ * improve quoting/escaping in demo-scripts per shellcheck.
+ * add resizeByPixel resource, to permit disabling window manager
+ resizing-hints (patch by Tim Oehl).
+ * corrected printOptsImmediate handling of alternate-screen (report
+ by Abhijit Dasgupta).
+ * update sample terminfo to more closely match ncurses.
+ * add/improve limit-checks for Xlib calls (report by Roman Fiedler).
+ * fix a typo in the help-message (report by Tomas Korbar).
diff -r 998dfb2a36fb -r a1d9d19e2829 external/mit/xterm/dist/THANKS
--- a/external/mit/xterm/dist/THANKS Tue Apr 27 01:47:39 2021 +0000
+++ b/external/mit/xterm/dist/THANKS Tue Apr 27 01:57:00 2021 +0000
@@ -1,4 +1,4 @@
--- $XTermId: THANKS,v 1.30 2021/02/09 01:32:10 tom Exp $
+-- $XTermId: THANKS,v 1.31 2021/03/01 22:00:49 tom Exp $
-- vile:txtmode fk=utf-8
There's no AUTHORS file in this distribution; it would be redundant since
I (Thomas E. Dickey) have done more than 80% of the work on xterm since 1996.
@@ -225,6 +225,7 @@
Thomas Wolff
Thorsten Glaser
Tim Adye
+Tim Oehl
Tim Pope
Tobias Stoeckmann
Todd Eigenschink
diff -r 998dfb2a36fb -r a1d9d19e2829 external/mit/xterm/dist/Tekproc.c
--- a/external/mit/xterm/dist/Tekproc.c Tue Apr 27 01:47:39 2021 +0000
+++ b/external/mit/xterm/dist/Tekproc.c Tue Apr 27 01:57:00 2021 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: Tekproc.c,v 1.241 2021/02/02 00:19:32 tom Exp $ */
+/* $XTermId: Tekproc.c,v 1.243 2021/03/21 22:08:46 tom Exp $ */
/*
* Copyright 2001-2020,2021 by Thomas E. Dickey
@@ -81,7 +81,6 @@
#include <X11/Xatom.h>
#include <X11/Xutil.h>
-#include <X11/cursorfont.h>
#include <X11/Xmu/CharSet.h>
#if OPT_TOOLBAR
@@ -1515,11 +1514,15 @@
min_height = (unsigned) (TEKMINHEIGHT + border);
TRACE(("parsing T_geometry %s\n", NonNull(xw->misc.T_geometry)));
- pr = XParseGeometry(xw->misc.T_geometry,
- &winX,
- &winY,
- &width,
- &height);
+ if (strlen(xw->misc.T_geometry) <= MAX_U_STRING) {
+ pr = XParseGeometry(xw->misc.T_geometry,
+ &winX,
+ &winY,
+ &width,
+ &height);
+ } else {
+ pr = 0;
+ }
/* window-manager hints will do this anyway... */
if (height < min_height) {
diff -r 998dfb2a36fb -r a1d9d19e2829 external/mit/xterm/dist/aclocal.m4
--- a/external/mit/xterm/dist/aclocal.m4 Tue Apr 27 01:47:39 2021 +0000
+++ b/external/mit/xterm/dist/aclocal.m4 Tue Apr 27 01:57:00 2021 +0000
@@ -1,4 +1,4 @@
-dnl $XTermId: aclocal.m4,v 1.485 2021/01/26 23:45:12 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.487 2021/03/23 00:37:21 tom Exp $
dnl
dnl ---------------------------------------------------------------------------
dnl
@@ -266,6 +266,44 @@
])dnl
])])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_C11_NORETURN version: 2 updated: 2021/03/22 20:37:21
+dnl ---------------
+AC_DEFUN([CF_C11_NORETURN],
+[
+AC_MSG_CHECKING(if you want to use C11 _Noreturn feature)
+CF_ARG_ENABLE(stdnoreturn,
+ [ --enable-stdnoreturn enable C11 _Noreturn feature for diagnostics],
+ [enable_stdnoreturn=yes],
+ [enable_stdnoreturn=no])
+AC_MSG_RESULT($enable_stdnoreturn)
+
+if test $enable_stdnoreturn = yes; then
+AC_CACHE_CHECK([for C11 _Noreturn feature], cf_cv_c11_noreturn,
+ [AC_TRY_COMPILE([
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdnoreturn.h>
+static void giveup(void) { exit(0); }
+ ],
+ [if (feof(stdin)) giveup()],
+ cf_cv_c11_noreturn=yes,
+ cf_cv_c11_noreturn=no)
+ ])
+else
+ cf_cv_c11_noreturn=no,
+fi
+
+if test "$cf_cv_c11_noreturn" = yes; then
+ AC_DEFINE(HAVE_STDNORETURN_H, 1)
+ AC_DEFINE_UNQUOTED(STDC_NORETURN,_Noreturn,[Define if C11 _Noreturn keyword is supported])
+ HAVE_STDNORETURN_H=1
+else
+ HAVE_STDNORETURN_H=0
+fi
+
+AC_SUBST(HAVE_STDNORETURN_H)
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_CC_ENV_FLAGS version: 10 updated: 2020/12/31 18:40:20
dnl ---------------
dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
@@ -1082,13 +1120,14 @@
fi
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_GCC_ATTRIBUTES version: 23 updated: 2021/01/03 18:30:50
+dnl CF_GCC_ATTRIBUTES version: 24 updated: 2021/03/20 12:00:25
dnl -----------------
dnl Test for availability of useful gcc __attribute__ directives to quiet
dnl compiler warnings. Though useful, not all are supported -- and contrary
dnl to documentation, unrecognized directives cause older compilers to barf.
AC_DEFUN([CF_GCC_ATTRIBUTES],
[AC_REQUIRE([AC_PROG_FGREP])dnl
+AC_REQUIRE([CF_C11_NORETURN])dnl
if test "$GCC" = yes || test "$GXX" = yes
then
@@ -1125,8 +1164,8 @@
#define GCC_SCANFLIKE(fmt,var) /*nothing*/
#endif
extern void wow(char *,...) GCC_SCANFLIKE(1,2);
-extern void oops(char *,...) GCC_PRINTFLIKE(1,2) GCC_NORETURN;
-extern void foo(void) GCC_NORETURN;
+extern GCC_NORETURN void oops(char *,...) GCC_PRINTFLIKE(1,2);
+extern GCC_NORETURN void foo(void);
int main(int argc GCC_UNUSED, char *argv[[]] GCC_UNUSED) { (void)argc; (void)argv; return 0; }
EOF
cf_printf_attribute=no
diff -r 998dfb2a36fb -r a1d9d19e2829 external/mit/xterm/dist/charproc.c
--- a/external/mit/xterm/dist/charproc.c Tue Apr 27 01:47:39 2021 +0000
+++ b/external/mit/xterm/dist/charproc.c Tue Apr 27 01:57:00 2021 +0000
@@ -1,4 +1,4 @@
-/* $XTermId: charproc.c,v 1.1825 2021/02/10 00:49:52 tom Exp $ */
+/* $XTermId: charproc.c,v 1.1830 2021/03/21 22:45:24 tom Exp $ */
/*
* Copyright 1999-2020,2021 by Thomas E. Dickey
@@ -83,7 +83,6 @@
#include <X11/Xatom.h>
#include <X11/Xutil.h>
-#include <X11/cursorfont.h>
#include <X11/Xmu/Atoms.h>
#include <X11/Xmu/CharSet.h>
#include <X11/Xmu/Converters.h>
@@ -481,6 +480,7 @@
Bres(XtNprinterFormFeed, XtCPrinterFormFeed, SPS.printer_formfeed, False),
Bres(XtNprinterNewLine, XtCPrinterNewLine, SPS.printer_newline, True),
Bres(XtNquietGrab, XtCQuietGrab, screen.quiet_grab, False),
+ Bres(XtNresizeByPixel, XtCResizeByPixel, misc.resizeByPixel, False),
Bres(XtNreverseVideo, XtCReverseVideo, misc.re_verse, False),
Bres(XtNreverseWrap, XtCReverseWrap, misc.reverseWrap, False),
Bres(XtNscrollBar, XtCScrollBar, misc.scrollbar, False),
@@ -2831,8 +2831,8 @@
if (nparam > 0) {
value = zero_if_default(nparam - 1);
SetParam(nparam - 1, (10 * value) + ((int) c - '0'));
- if (GetParam(nparam - 1) > 65535)
- SetParam(nparam - 1, 65535);
+ if (GetParam(nparam - 1) > MAX_I_PARAM)
+ SetParam(nparam - 1, MAX_I_PARAM);
if (sp->parsestate == csi_table)
sp->parsestate = csi2_table;
}
@@ -8188,7 +8188,7 @@
}
}
-#define okDimension(src,dst) ((src <= 32767) \
+#define okDimension(src,dst) ((src <= MAX_U_COORD) \
&& ((dst = (Dimension) src) == src))
static void
@@ -9503,8 +9503,8 @@
#ifndef NO_ACTIVE_ICON
init_Sres(screen.icon_fontname);
- getIconicFont(screen)->fs = XLoadQueryFont(screen->display,
- screen->icon_fontname);
+ getIconicFont(screen)->fs = xtermLoadQueryFont(wnew,
+ screen->icon_fontname);
TRACE(("iconFont '%s' %sloaded successfully\n",
screen->icon_fontname,
getIconicFont(screen)->fs ? "" : "NOT "));
@@ -9522,6 +9522,7 @@
init_Bres(misc.cdXtraScroll);
init_Bres(misc.color_inner_border);
init_Bres(misc.dynamicColors);
+ init_Bres(misc.resizeByPixel);
#if OPT_DEC_CHRSET
for (i = 0; i < NUM_CHRSET; i++) {
@@ -10845,108 +10846,6 @@
}
#endif
}
Home |
Main Index |
Thread Index |
Old Index