xterm: Changes to 'debian-unstable'
Imakefile | 12
MANIFEST | 2
Makefile.in | 4
THANKS | 3
Tekproc.c | 12
aclocal.m4 | 51 +
button.c | 4
charproc.c | 339 ++++++-----
config.guess | 172 ++---
config.sub | 109 ++-
configure | 1415 ++++++++++++++++++++++++-----------------------
ctlseqs.ms | 4
ctlseqs.txt | 2
data.c | 5
data.h | 9
debian/changelog | 7
main.c | 32 -
menu.c | 174 -----
misc.c | 23
os2main.c | 99 +--
package/debian/changelog | 6
package/debian/copyright | 2
package/xterm.spec | 4
ptyx.h | 15
screen.c | 188 ++++++
scrollbar.c | 4
trace.c | 10
util.c | 44 +
version.h | 6
xterm.h | 27
xterm.log.html | 57 +
xterm.man | 58 +
xtermcap.c | 6
33 files changed, 1696 insertions(+), 1209 deletions(-)
New commits:
commit 8132cfa47e21be93330f5edd8058d57ce8e63c16
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Mar 5 17:05:08 2011 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 54463e7..0d3c056 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xterm (269-1) UNRELEASED; urgency=low
+xterm (269-1) unstable; urgency=low
* New upstream release:
- Make the fullscreen feature configurable (Closes: #612978).
- -- Cyril Brulebois <kibi@debian.org> Sat, 05 Mar 2011 17:03:22 +0100
+ -- Cyril Brulebois <kibi@debian.org> Sat, 05 Mar 2011 17:05:05 +0100
xterm (268-1) unstable; urgency=low
commit f67af9e000b0de289355880f1b5ddeabc8af1c9d
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Mar 5 17:04:32 2011 +0100
Bump changelog.
diff --git a/debian/changelog b/debian/changelog
index 5def055..54463e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xterm (269-1) UNRELEASED; urgency=low
+
+ * New upstream release:
+ - Make the fullscreen feature configurable (Closes: #612978).
+
+ -- Cyril Brulebois <kibi@debian.org> Sat, 05 Mar 2011 17:03:22 +0100
+
xterm (268-1) unstable; urgency=low
[ Sven Joachim ]
commit b0a490d98e4f25dd2ed3e3a660098f8fa3116769
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Mar 5 16:52:54 2011 +0100
Import xterm 269
diff --git a/Imakefile b/Imakefile
index 57a7fd0..5bfaba7 100644
--- a/Imakefile
+++ b/Imakefile
@@ -1,4 +1,4 @@
-XCOMM $XTermId: Imakefile,v 1.102 2009/04/27 19:26:34 tom Exp $
+XCOMM $XTermId: Imakefile,v 1.103 2011/02/19 13:09:15 tom Exp $
XCOMM
XCOMM Attention xterm porters
XCOMM
@@ -7,8 +7,6 @@ XCOMM Xterm assumes that bcopy can handle overlapping arguments. If your
XCOMM bcopy (or memcpy) cannot, write a routine called bcopy and link it in
XCOMM or add -Dbcopy=mybcopy to the DEFINES list below.
XCOMM
-XCOMM $XFree86: xc/programs/xterm/Imakefile,v 3.73 2006/04/10 00:34:36 dickey Exp $
-XCOMM
/* Uncomment SCROLLBAR_RIGHT if you want the scroll bar to be on the right */
SCROLLBAR_RIGHT = -DSCROLLBAR_RIGHT
@@ -144,6 +142,14 @@ module.o: ; $(CC) -c defines $(CFLAGS) module.c
OSMAJORVERSION = OSMajorVersion
OSMINORVERSION = OSMinorVersion
+#if defined(NTOArchitecture) || \
+ defined(LinuxArchitecture) || \
+ defined(OpenBSDArchitecture) || \
+ defined(SGIArchitecture) || \
+ defined(SunArchitecture)
+TERMCAPDEFINES=-DUSE_TERMINFO -DHAVE_TIGETSTR
+#endif
+
#if !defined(OS2Architecture) && !defined(__GNU__)
#if defined(UseUtempter)
UTMPDEF = -DUSE_UTEMPTER
diff --git a/MANIFEST b/MANIFEST
index 3b01936..fe2ab6d 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,4 +1,4 @@
-MANIFEST for xterm-268, version xterm-268
+MANIFEST for xterm-269, version xterm-269
--------------------------------------------------------------------------------
MANIFEST this file
256colres.h resource-definitions for 256-color mode
diff --git a/Makefile.in b/Makefile.in
index 2a6a265..e0f8586 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-## $XTermId: Makefile.in,v 1.174 2010/11/24 11:21:01 tom Exp $
+## $XTermId: Makefile.in,v 1.175 2011/02/13 18:17:55 tom Exp $
# -----------------------------------------------------------------------------
# this file is part of xterm
#
@@ -65,7 +65,7 @@ EXTRA_LOADFLAGS = @IMAKE_LOADFLAGS@
CPPFLAGS = -I. -I$(srcdir) -DHAVE_CONFIG_H @CPPFLAGS@ $(EXTRA_CPPFLAGS)
CFLAGS = @CFLAGS@ $(EXTRA_CFLAGS)
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ @EXTRA_LDFLAGS@
LIBS = @LIBS@
prefix = @prefix@
diff --git a/THANKS b/THANKS
index 02cc710..97d533c 100644
--- a/THANKS
+++ b/THANKS
@@ -1,4 +1,4 @@
--- $XTermId: THANKS,v 1.3 2011/01/22 13:22:37 tom Exp $
+-- $XTermId: THANKS,v 1.4 2011/02/11 10:55:53 tom Exp $
-- vile:txtmode fk=8bit
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.
@@ -51,6 +51,7 @@ David Yeo
Denis Zaitsev
Dennis Preiser
Dennis Schneider
+Dimitrios Christidis
Dr Werner Fink
Ed Schouten
Eddy De Greef
diff --git a/Tekproc.c b/Tekproc.c
index d124394..57eaa02 100644
--- a/Tekproc.c
+++ b/Tekproc.c
@@ -1,8 +1,7 @@
-/* $XTermId: Tekproc.c,v 1.185 2011/01/20 10:50:19 tom Exp $ */
+/* $XTermId: Tekproc.c,v 1.188 2011/02/20 00:55:33 tom Exp $ */
/*
- *
- * Copyright 2001-2009,2010 by Thomas E. Dickey
+ * Copyright 2001-2010,2011 by Thomas E. Dickey
*
* All Rights Reserved
*
@@ -398,7 +397,7 @@ TekPtyData(void)
if (Tpushb == 0) {
if ((Tpushb = TypeMallocN(Char, 10)) == NULL
|| (Tline = TypeMallocN(XSegment, MAX_VTX)) == NULL) {
- fprintf(stderr, "%s: Not enough core for Tek mode\n", xterm_name);
+ fprintf(stderr, "%s: Not enough core for Tek mode\n", ProgramName);
if (Tpushb)
free(Tpushb);
Tfailed = True;
@@ -601,7 +600,8 @@ Tekparse(TekWidget tw)
case CASE_BEAM_VEC:
TRACE(("case: beam and vector selector\n"));
/* only line types */
- if ((c &= LINEMASK) != tekscr->cur.linetype) {
+ c = (IChar) (c & LINEMASK);
+ if (c != tekscr->cur.linetype) {
if (nplot > 0)
TekFlush(tw);
if (c <= TEKNUMLINES)
@@ -1572,7 +1572,7 @@ TekRealize(Widget gw,
tekscr->gin_terminator = GIN_TERM_EOT;
else
fprintf(stderr, "%s: illegal GIN terminator setting \"%s\"\n",
- xterm_name, tw->tek.gin_terminator_str);
+ ProgramName, tw->tek.gin_terminator_str);
gcv.graphics_exposures = True; /* default */
gcv.font = tw->tek.Tfont[tekscr->cur.fontsize]->fid;
diff --git a/aclocal.m4 b/aclocal.m4
index e0800dc..c847776 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,8 +1,8 @@
-dnl $XTermId: aclocal.m4,v 1.293 2010/11/19 10:44:13 tom Exp $
+dnl $XTermId: aclocal.m4,v 1.295 2011/02/19 01:30:06 Thierry.Reding Exp $
dnl
dnl ---------------------------------------------------------------------------
dnl
-dnl Copyright 1997-2009,2010 by Thomas E. Dickey
+dnl Copyright 1997-2010,2011 by Thomas E. Dickey
dnl
dnl All Rights Reserved
dnl
@@ -413,7 +413,7 @@ AC_SUBST(SHOW_CC)
AC_SUBST(ECHO_CC)
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_DISABLE_RPATH_HACK version: 1 updated: 2010/04/11 10:54:00
+dnl CF_DISABLE_RPATH_HACK version: 2 updated: 2011/02/13 13:31:33
dnl ---------------------
dnl The rpath-hack makes it simpler to build programs, particularly with the
dnl *BSD ports which may have essential libraries in unusual places. But it
@@ -421,7 +421,7 @@ dnl can interfere with building an executable for the base system. Use this
dnl option in that case.
AC_DEFUN([CF_DISABLE_RPATH_HACK],
[
-AC_MSG_CHECKING(if rpath should be not be set)
+AC_MSG_CHECKING(if rpath-hack should be disabled)
CF_ARG_DISABLE(rpath-hack,
[ --disable-rpath-hack don't add rpath options for additional libraries],
[cf_disable_rpath_hack=yes],
@@ -1356,7 +1356,7 @@ case ".[$]$1" in #(vi
esac
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_PKG_CONFIG version: 3 updated: 2009/01/25 10:55:09
+dnl CF_PKG_CONFIG version: 4 updated: 2011/02/18 20:26:24
dnl -------------
dnl Check for the package-config program, unless disabled by command-line.
AC_DEFUN([CF_PKG_CONFIG],
@@ -1373,7 +1373,7 @@ no) #(vi
PKG_CONFIG=none
;;
yes) #(vi
- AC_PATH_PROG(PKG_CONFIG, pkg-config, none)
+ AC_PATH_TOOL(PKG_CONFIG, pkg-config, none)
;;
*)
PKG_CONFIG=$withval
@@ -1704,7 +1704,7 @@ $1=`echo "$2" | \
-e 's/-[[UD]]'"$3"'\(=[[^ ]]*\)\?[$]//g'`
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_RPATH_HACK version: 8 updated: 2010/04/17 15:38:58
+dnl CF_RPATH_HACK version: 9 updated: 2011/02/13 13:31:33
dnl -------------
AC_DEFUN([CF_RPATH_HACK],
[
@@ -1717,9 +1717,36 @@ if test -n "$LD_RPATH_OPT" ; then
cf_rpath_list="/usr/lib /lib"
if test "$cf_ldd_prog" != no
then
+ cf_rpath_oops=
+
AC_TRY_LINK([#include <stdio.h>],
[printf("Hello");],
- [cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[[ ]]/%/%' -e 's%/[[^/]][[^/]]*$%%' |sort -u`])
+ [cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort -u`
+ cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[[ ]]/%/%' -e 's%/[[^/]][[^/]]*$%%' |sort -u`])
+
+ # If we passed the link-test, but get a "not found" on a given library,
+ # this could be due to inept reconfiguration of gcc to make it only
+ # partly honor /usr/local/lib (or whatever). Sometimes this behavior
+ # is intentional, e.g., installing gcc in /usr/bin and suppressing the
+ # /usr/local libraries.
+ if test -n "$cf_rpath_oops"
+ then
+ for cf_rpath_src in $cf_rpath_oops
+ do
+ for cf_rpath_dir in \
+ /usr/local \
+ /usr/pkg \
+ /opt/sfw
+ do
+ if test -f $cf_rpath_dir/lib/$cf_rpath_src
+ then
+ CF_VERBOSE(...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src)
+ LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib"
+ break
+ fi
+ done
+ done
+ fi
fi
CF_VERBOSE(...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS)
@@ -2980,7 +3007,7 @@ elif test "$cf_x_athena_inc" != default ; then
fi
])
dnl ---------------------------------------------------------------------------
-dnl CF_X_ATHENA_LIBS version: 9 updated: 2010/06/02 05:03:05
+dnl CF_X_ATHENA_LIBS version: 10 updated: 2011/02/13 13:31:33
dnl ----------------
dnl Normally invoked by CF_X_ATHENA, with $1 set to the appropriate flavor of
dnl the Athena widgets, e.g., Xaw, Xaw3d, neXtaw.
@@ -3010,7 +3037,11 @@ do
CF_ADD_LIBS($cf_lib)
AC_MSG_CHECKING(for $cf_test in $cf_lib)
fi
- AC_TRY_LINK([],[$cf_test()],
+ AC_TRY_LINK([
+#include <X11/Intrinsic.h>
+#include <X11/$cf_x_athena_root/SimpleMenu.h>
+],[
+$cf_test((XtAppContext) 0)],
[cf_result=yes],
[cf_result=no])
AC_MSG_RESULT($cf_result)
diff --git a/button.c b/button.c
index b0c3c95..d29be18 100644
--- a/button.c
+++ b/button.c
@@ -1,4 +1,4 @@
-/* $XTermId: button.c,v 1.395 2011/02/09 10:15:46 tom Exp $ */
+/* $XTermId: button.c,v 1.397 2011/02/13 20:09:31 tom Exp $ */
/*
* Copyright 1999-2010,2011 by Thomas E. Dickey
@@ -3834,7 +3834,7 @@ _OwnSelection(XtermWidget xw,
screen->selection_length, cutbuffer));
fprintf(stderr,
"%s: selection too big (%lu bytes), not storing in CUT_BUFFER%d\n",
- xterm_name, screen->selection_length, cutbuffer);
+ ProgramName, screen->selection_length, cutbuffer);
} else {
/* This used to just use the UTF-8 data, which was totally
* broken as not even the corresponding paste code in Xterm
diff --git a/charproc.c b/charproc.c
index d11a221..c9f6506 100644
--- a/charproc.c
+++ b/charproc.c
@@ -1,10 +1,10 @@
-/* $XTermId: charproc.c,v 1.1100 2011/02/09 10:15:36 tom Exp $ */
+/* $XTermId: charproc.c,v 1.1112 2011/02/20 00:50:46 tom Exp $ */
/*
* Copyright 1999-2010,2011 by Thomas E. Dickey
- *
+ *
* All Rights Reserved
- *
+ *
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
@@ -12,10 +12,10 @@
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
- *
+ *
* The above copyright notice and this permission notice shall be included
* in all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -23,35 +23,35 @@
* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
+ *
* Except as contained in this notice, the name(s) of the above copyright
* holders shall not be used in advertising or otherwise to promote the
* sale, use or other dealings in this Software without prior written
* authorization.
- *
- *
+ *
+ *
* Copyright 1988 The Open Group
- *
+ *
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
* the above copyright notice appear in all copies and that both that
* copyright notice and this permission notice appear in supporting
* documentation.
- *
+ *
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
- *
+ *
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
+ *
* Except as contained in this notice, the name of The Open Group shall not be
* used in advertising or otherwise to promote the sale, use or other dealings
* in this Software without prior written authorization from The Open Group.
- *
+ *
*/
/*
* Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
@@ -132,11 +132,6 @@
#include <charclass.h>
#include <xstrings.h>
-typedef struct {
- const char *name;
- int code;
-} FlagList;
-
typedef void (*BitFunc) (unsigned * /* p */ ,
unsigned /* mask */ );
@@ -218,65 +213,7 @@ static void HandleStructNotify PROTO_XT_EV_HANDLER_ARGS;
static String _Font_Selected_ = "yes"; /* string is arbitrary */
-static char defaultTranslations[] =
-"\
- Shift <KeyPress> Prior:scroll-back(1,halfpage) \n\
- Shift <KeyPress> Next:scroll-forw(1,halfpage) \n\
- Shift <KeyPress> Select:select-cursor-start() select-cursor-end(SELECT, CUT_BUFFER0) \n\
- Shift <KeyPress> Insert:insert-selection(SELECT, CUT_BUFFER0) \n\
-"
-#if OPT_MAXIMIZE
-"\
- Alt <Key>Return:fullscreen() \n\
-"
-#endif
-#if OPT_SCROLL_LOCK
-"\
- <KeyRelease> Scroll_Lock:scroll-lock() \n\
-"
-#endif
-#if OPT_SHIFT_FONTS
-"\
- Shift~Ctrl <KeyPress> KP_Add:larger-vt-font() \n\
- Shift Ctrl <KeyPress> KP_Add:smaller-vt-font() \n\
- Shift <KeyPress> KP_Subtract:smaller-vt-font() \n\
-"
-#endif
-"\
- ~Meta <KeyPress>:insert-seven-bit() \n\
- Meta <KeyPress>:insert-eight-bit() \n\
- !Ctrl <Btn1Down>:popup-menu(mainMenu) \n\
- !Lock Ctrl <Btn1Down>:popup-menu(mainMenu) \n\
- !Lock Ctrl @Num_Lock <Btn1Down>:popup-menu(mainMenu) \n\
- ! @Num_Lock Ctrl <Btn1Down>:popup-menu(mainMenu) \n\
- ~Meta <Btn1Down>:select-start() \n\
- ~Meta <Btn1Motion>:select-extend() \n\
- !Ctrl <Btn2Down>:popup-menu(vtMenu) \n\
- !Lock Ctrl <Btn2Down>:popup-menu(vtMenu) \n\
- !Lock Ctrl @Num_Lock <Btn2Down>:popup-menu(vtMenu) \n\
- ! @Num_Lock Ctrl <Btn2Down>:popup-menu(vtMenu) \n\
- ~Ctrl ~Meta <Btn2Down>:ignore() \n\
- Meta <Btn2Down>:clear-saved-lines() \n\
- ~Ctrl ~Meta <Btn2Up>:insert-selection(SELECT, CUT_BUFFER0) \n\
- !Ctrl <Btn3Down>:popup-menu(fontMenu) \n\
- !Lock Ctrl <Btn3Down>:popup-menu(fontMenu) \n\
- !Lock Ctrl @Num_Lock <Btn3Down>:popup-menu(fontMenu) \n\
- ! @Num_Lock Ctrl <Btn3Down>:popup-menu(fontMenu) \n\
- ~Ctrl ~Meta <Btn3Down>:start-extend() \n\
- ~Meta <Btn3Motion>:select-extend() \n\
- Ctrl <Btn4Down>:scroll-back(1,halfpage,m) \n\
- Lock Ctrl <Btn4Down>:scroll-back(1,halfpage,m) \n\
- Lock @Num_Lock Ctrl <Btn4Down>:scroll-back(1,halfpage,m) \n\
- @Num_Lock Ctrl <Btn4Down>:scroll-back(1,halfpage,m) \n\
- <Btn4Down>:scroll-back(5,line,m) \n\
- Ctrl <Btn5Down>:scroll-forw(1,halfpage,m) \n\
- Lock Ctrl <Btn5Down>:scroll-forw(1,halfpage,m) \n\
- Lock @Num_Lock Ctrl <Btn5Down>:scroll-forw(1,halfpage,m) \n\
- @Num_Lock Ctrl <Btn5Down>:scroll-forw(1,halfpage,m) \n\
- <Btn5Down>:scroll-forw(5,line,m) \n\
- <BtnUp>:select-end(SELECT, CUT_BUFFER0) \n\
- <BtnDown>:ignore() \
-"; /* PROCURA added "Meta <Btn2Down>:clear-saved-lines()" */
+static const char *defaultTranslations;
/* *INDENT-OFF* */
static XtActionsRec actionsList[] = {
{ "allow-send-events", HandleAllowSends },
@@ -819,7 +756,7 @@ WidgetClassRec xtermClassRec =
NULL, /* accept_focus */
XtVersion, /* version */
NULL, /* callback_offsets */
- defaultTranslations, /* tm_table */
+ 0, /* tm_table */
XtInheritQueryGeometry, /* query_geometry */
XtInheritDisplayAccelerator, /* display_accelerator */
NULL /* extension */
@@ -3409,7 +3346,7 @@ v_write(int f, const Char * data, unsigned len)
} else {
/* no memory: ignore entire write request */
fprintf(stderr, "%s: cannot allocate buffer space\n",
- xterm_name);
+ ProgramName);
v_buffer = v_bufstr; /* restore clobbered pointer */
}
}
@@ -3898,7 +3835,7 @@ dotext(XtermWidget xw,
}
#else /* ! OPT_WIDE_CHARS */
- for (offset = 0; offset < len; offset += this_col) {
+ for (offset = 0; offset < len; offset += (Cardinal) this_col) {
#if OPT_DEC_CHRSET
LineData *ld = getLineData(screen, screen->cur_row);
#endif
@@ -3914,8 +3851,8 @@ dotext(XtermWidget xw,
}
this_col = 1;
}
- if (offset + this_col > len) {
- this_col = len - offset;
+ if (offset + (Cardinal) this_col > len) {
+ this_col = (int) (len - offset);
}
next_col = screen->cur_col + this_col;
@@ -3926,7 +3863,7 @@ dotext(XtermWidget xw,
* If screen->cur_col is less than next_col, we must have
* hit the right margin - so set the do_wrap flag.
*/
- screen->do_wrap = (screen->cur_col < next_col);
+ screen->do_wrap = (Boolean) (screen->cur_col < next_col);
}
#endif /* OPT_WIDE_CHARS */
@@ -4988,6 +4925,11 @@ window_ops(XtermWidget xw)
RequestMaximize(xw, zero_if_default(1));
}
break;
+ case ewFullscreenWin: /* Fullscreen or restore */
+ if (AllowWindowOps(xw, ewFullscreenWin)) {
+ FullScreen(xw, zero_if_default(1));
+ }
+ break;
#endif
case ewGetWinState: /* Report the window's state */
@@ -5452,6 +5394,10 @@ VTRun(XtermWidget xw)
}
#endif
screen->is_running = True;
+#if OPT_MAXIMIZE
+ if (resource.fullscreen == esTrue || resource.fullscreen == esAlways)
+ FullScreen(term, True);
+#endif
if (!setjmp(VTend))
VTparse(xw);
StopBlinking(screen);
@@ -5954,49 +5900,6 @@ set_flags_from_list(char *target,
}
}
-/*
- * Extend a (normally) boolean resource value by checking for additional values
- * which will be mapped into true/false.
- */
-#if OPT_RENDERFONT
-static int
-extendedBoolean(const char *value, FlagList * table, Cardinal limit)
-{
- int result = -1;
- long check;
- char *next;
- Cardinal n;
-
- if ((x_strcasecmp(value, "true") == 0)
- || (x_strcasecmp(value, "yes") == 0)
- || (x_strcasecmp(value, "on") == 0)) {
- result = True;
- } else if ((x_strcasecmp(value, "false") == 0)
- || (x_strcasecmp(value, "no") == 0)
- || (x_strcasecmp(value, "off") == 0)) {
- result = False;
- } else if ((check = strtol(value, &next, 0)) >= 0 && *next == '\0') {
- if (check >= (long) limit)
- check = True;
- result = (int) check;
- } else {
- for (n = 0; n < limit; ++n) {
- if (x_strcasecmp(value, table[n].name) == 0) {
- result = table[n].code;
- break;
- }
- }
- }
-
- if (result < 0) {
- fprintf(stderr, "Unrecognized keyword: %s\n", value);
- result = False;
- }
-
- return result;
-}
-#endif /* OPT_RENDERFONT */
-
/* ARGSUSED */
static void
VTInitialize(Widget wrequest,
@@ -6048,6 +5951,7 @@ VTInitialize(Widget wrequest,
,DATA(SetWinSizeChars)
#if OPT_MAXIMIZE
,DATA(MaximizeWin)
+ ,DATA(FullscreenWin)
#endif
,DATA(GetWinState)
,DATA(GetWinPosition)
@@ -7029,7 +6933,7 @@ VTRealize(Widget w,
char *use_font = x_strdup(DEFFONT);
fprintf(stderr,
"%s: unable to open font \"%s\", trying \"%s\"....\n",
- xterm_name, myfont->f_n, use_font);
+ ProgramName, myfont->f_n, use_font);
(void) xtermLoadFont(xw,
xtermFontName(use_font),
False,
@@ -7041,7 +6945,7 @@ VTRealize(Widget w,
/* really screwed if we couldn't open default font */
if (!screen->fnts[fNorm].fs) {
fprintf(stderr, "%s: unable to locate a suitable font\n",
- xterm_name);
+ ProgramName);
Exit(1);
}
#if OPT_WIDE_CHARS
@@ -7347,6 +7251,7 @@ VTRealize(Widget w,
screen->fullVwin.sb_info.width = 0;
ScrollBarOn(xw, False);
}
+
return;
}
@@ -7626,7 +7531,7 @@ VTInitI18N(XtermWidget xw)
static void
set_cursor_outline_gc(XtermWidget xw,
- Boolean filled,
+ Bool filled,
Pixel fg,
Pixel bg,
Pixel cc)
@@ -8829,6 +8734,182 @@ set_cursor_gcs(XtermWidget xw)
return changed;
}
+/*
+ * Build up the default translations string, allowing the user to suppress
+ * some of the features.
+ */
+void
+VTInitTranslations(void)
+{
+ /* *INDENT-OFF* */
+ static struct {
+ Boolean wanted;
+ const char *name;
+ const char *value;
+ } table[] = {
+ {
+ False,
+ "default",
+"\
+ Shift <KeyPress> Prior:scroll-back(1,halfpage) \n\
+ Shift <KeyPress> Next:scroll-forw(1,halfpage) \n\
+ Shift <KeyPress> Select:select-cursor-start() select-cursor-end(SELECT, CUT_BUFFER0) \n\
+ Shift <KeyPress> Insert:insert-selection(SELECT, CUT_BUFFER0) \n\
+"
+ },
+#if OPT_MAXIMIZE
+ {
+ False,
+ "fullscreen",
+"\
+ Alt <Key>Return:fullscreen() \n\
+"
+ },
+#endif
+#if OPT_SCROLL_LOCK
+ {
+ False,
+ "scroll-lock",
+"\
+ <KeyRelease> Scroll_Lock:scroll-lock() \n\
+"
+ },
+#endif
+#if OPT_SHIFT_FONTS
+ {
+ False,
+ "shift-fonts",
+"\
+ Shift~Ctrl <KeyPress> KP_Add:larger-vt-font() \n\
+ Shift Ctrl <KeyPress> KP_Add:smaller-vt-font() \n\
+ Shift <KeyPress> KP_Subtract:smaller-vt-font() \n\
+"
+ },
+#endif
+ /* PROCURA added "Meta <Btn2Down>:clear-saved-lines()" */
+ {
+ False,
+ "default",
+"\
+ ~Meta <KeyPress>:insert-seven-bit() \n\
+ Meta <KeyPress>:insert-eight-bit() \n\
+ !Ctrl <Btn1Down>:popup-menu(mainMenu) \n\
+ !Lock Ctrl <Btn1Down>:popup-menu(mainMenu) \n\
+ !Lock Ctrl @Num_Lock <Btn1Down>:popup-menu(mainMenu) \n\
+ ! @Num_Lock Ctrl <Btn1Down>:popup-menu(mainMenu) \n\
+ ~Meta <Btn1Down>:select-start() \n\
+ ~Meta <Btn1Motion>:select-extend() \n\
+ !Ctrl <Btn2Down>:popup-menu(vtMenu) \n\
+ !Lock Ctrl <Btn2Down>:popup-menu(vtMenu) \n\
+ !Lock Ctrl @Num_Lock <Btn2Down>:popup-menu(vtMenu) \n\
+ ! @Num_Lock Ctrl <Btn2Down>:popup-menu(vtMenu) \n\
+ ~Ctrl ~Meta <Btn2Down>:ignore() \n\
+ Meta <Btn2Down>:clear-saved-lines() \n\
+ ~Ctrl ~Meta <Btn2Up>:insert-selection(SELECT, CUT_BUFFER0) \n\
+ !Ctrl <Btn3Down>:popup-menu(fontMenu) \n\
+ !Lock Ctrl <Btn3Down>:popup-menu(fontMenu) \n\
+ !Lock Ctrl @Num_Lock <Btn3Down>:popup-menu(fontMenu) \n\
+ ! @Num_Lock Ctrl <Btn3Down>:popup-menu(fontMenu) \n\
+ ~Ctrl ~Meta <Btn3Down>:start-extend() \n\
+ ~Meta <Btn3Motion>:select-extend() \n\
+"
+ },
+ {
+ False,
+ "wheel-mouse",
+"\
+ Ctrl <Btn4Down>:scroll-back(1,halfpage,m) \n\
+ Lock Ctrl <Btn4Down>:scroll-back(1,halfpage,m) \n\
+ Lock @Num_Lock Ctrl <Btn4Down>:scroll-back(1,halfpage,m) \n\
+ @Num_Lock Ctrl <Btn4Down>:scroll-back(1,halfpage,m) \n\
+ <Btn4Down>:scroll-back(5,line,m) \n\
+ Ctrl <Btn5Down>:scroll-forw(1,halfpage,m) \n\
+ Lock Ctrl <Btn5Down>:scroll-forw(1,halfpage,m) \n\
+ Lock @Num_Lock Ctrl <Btn5Down>:scroll-forw(1,halfpage,m) \n\
+ @Num_Lock Ctrl <Btn5Down>:scroll-forw(1,halfpage,m) \n\
+ <Btn5Down>:scroll-forw(5,line,m) \n\
+"
+ },
+ {
+ False,
+ "default",
+"\
+ <BtnUp>:select-end(SELECT, CUT_BUFFER0) \n\
+ <BtnDown>:ignore() \
+"
+ }
+ };
+ /* *INDENT-ON* */
+
+ size_t needed = 0;
+ char *result = 0;
+
+ int pass;
+ Cardinal item;
+
+ TRACE(("VTInitTranslations\n"));
+ for (item = 0; item < XtNumber(table); ++item) {
+ table[item].wanted = True;
+ }
+#if OPT_MAXIMIZE
+ /*
+ * As a special case, allow for disabling the alt-enter translation if
+ * the resource settings prevent fullscreen from being used. We would
+ * do the same for scroll-lock and shift-fonts if they were application
+ * resources too, rather than in the widget.
+ */
+ if (resource.fullscreen == esNever) {
+ for (item = 0; item < XtNumber(table); ++item) {
+ if (!strcmp(table[item].name, "fullscreen"))
+ table[item].wanted = False;
+ }
+ }
+#endif
+ if (!IsEmpty(resource.omitTranslation)) {
+ char *value;
+ const char *source = resource.omitTranslation;
+
+ while (*source != '\0' && (value = ParseList(&source)) != 0) {
+ size_t len = strlen(value);
+
+ TRACE(("parsed:%s\n", value));
+ for (item = 0; item < XtNumber(table); ++item) {
+ if (strlen(table[item].name) >= len
+ && x_strncasecmp(table[item].name,
+ value,
+ (unsigned) len) == 0) {
+ table[item].wanted = False;
+ TRACE(("omit(%s):\n%s\n", table[item].name, table[item].value));
+ break;
+ }
+ }
+ free(value);
+ }
+ }
+
+ for (pass = 0; pass < 2; ++pass) {
+ needed = 0;
+ for (item = 0; item < XtNumber(table); ++item) {
+ if (table[item].wanted) {
+ if (pass) {
+ strcat(result, table[item].value);
+ } else {
+ needed += strlen(table[item].value) + 1;
+ }
+ }
+ }
+ if (!pass) {
+ result = XtMalloc((Cardinal) needed);
+ *result = '\0';
+ }
+ }
+
+ TRACE(("result:\n%s\n", result));
+
+ defaultTranslations = result;
+ xtermClassRec.core_class.tm_table = result;
+}
+
#ifdef NO_LEAKS
void
noleaks_charproc(void)
diff --git a/config.guess b/config.guess
index c2246a4..bec935b 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
# Free Software Foundation, Inc.
-timestamp='2009-12-30'
+timestamp='2010-09-24'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -92,7 +92,7 @@ if test $# != 0; then
exit 1
fi
-trap 'exit 1' 1 2 15
+trap 'exit 1' HUP INT TERM
# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
# compiler to aid in system detection is discouraged as it requires
@@ -106,7 +106,7 @@ trap 'exit 1' 1 2 15
set_cc_for_build='
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ;
: ${TMPDIR=/tmp} ;
{ tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
@@ -181,7 +181,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
fi
;;
*)
- os=netbsd
+ os=netbsd
;;
esac
# The OS release
@@ -220,11 +220,11 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
exit ;;
alpha:OSF1:*:*)
case $UNAME_RELEASE in
- *4.0)
+ *4.0)
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
;;
- *5.*)
- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ *5.*)
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
;;
esac
# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -296,7 +296,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
echo s390-ibm-zvmoe
exit ;;
*:OS400:*:*)
- echo powerpc-ibm-os400
+ echo powerpc-ibm-os400
exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
@@ -326,8 +326,8 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
sparc) echo sparc-icl-nx7; exit ;;
esac ;;
s390x:SunOS:*:*)
- echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit ;;
+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
@@ -395,23 +395,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
# MiNT. But MiNT is downward compatible to TOS, so this should
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint${UNAME_RELEASE}
exit ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
+ exit ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+ echo m68k-atari-mint${UNAME_RELEASE}
exit ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-milan-mint${UNAME_RELEASE}
+ exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-hades-mint${UNAME_RELEASE}
+ exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
- exit ;;
+ echo m68k-unknown-mint${UNAME_RELEASE}
+ exit ;;
m68k:machten:*:*)
echo m68k-apple-machten${UNAME_RELEASE}
exit ;;
@@ -481,8 +481,8 @@ EOF
echo m88k-motorola-sysv3
exit ;;
AViiON:dgux:*:*)
- # DG/UX returns AViiON for all architectures
- UNAME_PROCESSOR=`/usr/bin/uname -p`
+ # DG/UX returns AViiON for all architectures
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
then
if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -552,7 +552,7 @@ EOF
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[456])
+ *:AIX:*:[4567])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
@@ -595,8 +595,8 @@ EOF
9000/[678][0-9][0-9])
if [ -x /usr/bin/getconf ]; then
sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
- case "${sc_cpu_version}" in
+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+ case "${sc_cpu_version}" in
523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
532) # CPU_PA_RISC2_0
@@ -731,22 +731,22 @@ EOF
exit ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
- exit ;;
+ exit ;;
C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
Reply to: