Copyright 1997,1998 by Thomas E. Dickey
Contents
This file contains a list of the changes that I have made for XFree86 xterm,
from the notes that I add when submitting a patch.
You should note that other changes have been made as well, by other people,
to fix bugs and correct ifdef's for portability. All of these are summarized
in the XFree86 CHANGELOG (found in the unbundled tree,
xc/programs/Xserver/hw/xfree86).
This refines my #85 patch by checking for a case where the font server
returns a bold font that does not quite correspond to the normal font.
When I asked for a bold version of the 6x12 font, the font server
returned a near equivalent where the ascent and descent values did not
match, causing xterm to leave lines across the display.
This patch makes xterm reject that type of mismatch, falling back to the
old font behavior.
This corrects a problem reported by Stefan Dalibor. My table entries for the
printerExtent and printerFormFeed resources used the wrong
types for sizeof, causing the printer to not work properly on some platforms
because the printAttributes resource was overwritten (e.g., Digital Unix with DEC Alpha).
I reviewed all of the resource table entries and fixed a potential problem with
resizeGravity, which was typed as int rather than
XtGravity.
A small fix: when switching to/from the continuous mouse reporting mode,
the event mask was incorrect if xterm was built under X11R5 because the
original data was saved under an ifdef for active-icon.
Some cleanup (I noticed the pixel droppings a few months ago after getting a
new 17" monitor):
- split-out the functions that load/reload fonts for xterm as new
file fontutils.c to extend them to support automatic loading of
bold font corresponding to the normal font. Adapted logic from
EMU 1.3 for this purpose. This fixes most occurrences of pixel
droppings from bold characters.
- modified by renaming variables and adding casts to permit compile
with g++.
- modify headers so they can all be compiled without order
dependencies, and use bracketed rather than quoting includes to allow
compile from separate directory.
- renamed xtermm terminfo entry to xterm-mono, to avoid conflict with
Solaris entry now in ncurses.
Several small fixes and enhancements, including a patch from
Bjorn Helgaas:
- correct initialization of TERMCAP environment variable, which
was frequently set to garbage on non-Linux systems because
"termcap" and "newtc" contained random data from the stack.
- remove the LINEWRAPPED attribute from lines as they are cleared.
Previously, the attribute was set but never cleared.
- make word and line selections work even when lines are wrapped
by xterm. Previously, selections were limited to one screen line.
as well as
- modify logic for line-wrapping to reset the associated flag if
the application deletes a character. This fixes a problem reported
by Bjorn Helgaas where word/line selection would still wrap even
after deleting characters from the first line.
- add kll/kH capabilities to xterm-xfree86 entries in termcap and
terminfo (request by Michael Schroeder).
- shorten descriptions in termcap to make resolved entries all
shorter than 1023 character limit.
- use DECSTR control sequence to shorten initialization and reset
strings in xterm-xfree86 termcap and terminfo.
- use rmul/smul and rmir/smir in xterm-r5 terminfo to match termcap.
- correct typos in initialization and reset strings in xterm-r5
termcap and terminfo.
- disable special translations of key symbols (the backarrow key,
the editing keypad and the keypad "+") when a modifier other than
shift, control or numlock is used. This makes xterm handle the meta
key as expected by people using emacs (reported by Pete Harlan
<harlan@pointofchoice.com> in linux.debian.user newsgroup).
Merge changes through patch #83 with the 3.3.2e version. This follows a
patch by Matthieu Herrb <matthieu@laas.fr> to add checks for nonnull
return from malloc.
Several small fixes and enhancements:
- add configure test to infer if xterm should be installed setuid
based on previously installed xterm (reported by Stephen Marley
and Stefan Dalibor).
- integrate/extend patch by Jason Bacon to implement quasi-continuous
mouse reporting.
- correct control sequences transmitted by function keys F1 to F4
when sunFunctionKeys resource is true (it was still using the
VT100 control sequences).
- modify handling of backarrow key so that the control modifier
toggles the backspace/delete interpretation set by the
backarrowKey resource.
- limit the row and column values used to report mouse position.
From resync with XFree86 3.9Nb:
- add support for the VSTATUS control character (patch by
Robert Earl <rearl@teleport.com>).
Bug fix for patch #81:
- remove an #undef for NBBY, which caused compile problem on FreeBSD
(reported by David Dawes).
More bug fixes:
- fix conflicting ifdef's for TIOCSLTC when building with Linux on
AXP aka DEC Alpha (reported by Robin Cutshaw).
- correction to patch #79, move assignment for *utptr->ut_user = 0;
back into non-SVR4 ifdef in main.c, since this clobbers username on
Solaris 2.5.1 (analysis by Will Day
<willday@rom.oit.gatech.edu>).
- corrected khome/kend in xterm-8bit terminfo description.
- improve cursor color by making it always the reverse of fg/bg
unless the cursorColor resource is set, i.e., to something other than
the default foreground (reported by Vikas Agnihotri and Bram
Moolenaar).
- minor fixes for compiler warnings, including a syntax error in
the AMOEBA ifdef's.
From resync with XFree86 3.9Aj:
- correcton to patch #73, supply missing #else for fallback definitions
of size_t, time_t (Robin Cutshaw <robin@intercore.com>).
This fixes a couple of items leftover or introduced by patch 79:
- take out the logic that suppresses editing-keypad in vt100 mode
(those keys are too valuable to give up for a fine point of
emulation).
- corrected a couple of places in terminfo where I missed using the
vt220-style editing-keypad codes for Find/Select (mapped to Home/End).
- checked termcap file against terminfo, fix several places where it
was inconsistent.
This patch fixes several small bugs:
- use X_EXTRA_LIBS in standalone Makefile.in (patch by Tomas Vanhala).
- add new resource 'oldXtermFKeys' which provides backward compatibility
for F1-F4 control sequences with TOG's xterm.
- determine the server's default foreground/background Pixel values,
needed if the -flipPixels X server option is used (reported by
David Dawes).
- correct logic for F1-F4 function keys so that they generate VT100
compatible escape sequences in VT220 mode, since that is what the
numeric keypad is supposed to do (reported by Ron Johnson, Jr.
<ronjohn@communique.net>).
- modify logic for editing keypad to work more like VT220: don't
pass those codes in VT100-mode unless oldXtermFKeys mode is set.
- correct an interaction with the editing-keypad logic that prevented
backarrow key from sending a 127 for the delete key (the 'remove'
escape sequence was being sent instead).
- use return-value from getutid() rather than the parameter, to work on
systems which do not update the latter (patch by Kevin Buhr
<buhr@mozart.stat.wisc.edu>)
- correct scrollbar border color when toggling to/from secure keyboard
mode (patch by Jeff Uphoff <juphoff@tarsier.cv.nrao.edu>)
- modifications to terminfo file:
- rename description to xterm-xfree86, adding an entry 'xterm'
which is derived from xterm-xfree86 to simplify customization.
- change string for kdch1 from \177 to \E[3~, to address complaints
from Debian developers. (This applies to the key labeled "Delete",
and does not affect the backarrow key).
- add user-strings u6, u7, u8, u9 to entries to make them work with
Daniel Weaver's "tack" program.
- modify xterm-24, xterm-bold, xterm-boldso entries to disentangle them from
explicit dependency upon xterm-xfree86.
- add generic 'xterm-color' entry.
- minor corrections to xterm-xfree86, xterm-8bit, xterm-r5 and
xterm-r6 entries.
Again, most of the bulk of this patch is for ANSI conversion. I used the
IRIX compiler's -wlint option to find the remaining functions that use
K&R syntax (since gcc does not do this properly).
Also, I changed the logic in the print code slightly to close unwanted files
before opening a pipe to the printer. This may help in some configurations
where the line printer hangs until xterm closes the pipe.
Most of the bulk of this patch is to convert the extended C (K&R functions
with prototypes) to ANSI. I verified that on Linux by comparing object
files, to ensure that I did not, for example, interchange parameters in
the function declarations.
The rest of the patch fixes several minor bugs, and adds a few features:
- back-out my use of ncurses "captoinfo -f" option (if/then/else/endif)
formatting, since ncurses did not correctly filter embedded newlines
in terminfo capability strings until _after_ ncurses 4.1, thus
corrupting setf/setb/sgr strings (reported by Darren Hiebert and
others).
- document SGR 8, 28 (invisible/visible), add corresponding
capabilities to terminfo description.
I would also add the 'prot protected capability, but the control
sequences for that would not be recognized or properly ignored by the
older xterm programs.
- modify ChangeGroup to not suppress a null-resource, but treat it as an
empty string (recommended by Stefan Dalibor).
- add printerAutoClose resource to control whether printer is closed
when going offline. More than one person reports problems (on
Solaris 2.6 and Digital Unix 4.0) getting the printer to proceed
unless xterm exits; I think that it is a problem flushing the pipe.
Closing it ought to flush it.
- adapt TOG fix-3 to in HandleKeymapChange and VTInitI18N (but adapt
XtStackAlloc/XtStackFree for clarity, as well as fixing memory leak).
- change calls on FillCurBackground to ClearCurBackground, in effect
using XClearArea rather than XFillRectangle when clearing as a
side-effect of scrolling and insertion (patch by Alexander V
Lukyanov)
- correct some places where insert/delete did not _move_ the color
attributes, using memmove (patch by Alexander V Lukyanov
<lav@long.yar.ru>)
- add ifdef's for __CYGWIN32__, for port to cygnus version B19.1
(patch by Andrew Sumner <andrew_sumner@hotmail.com>).
- remove #define for hpux that turned on USE_SYSV_ENVVARS, since this
causes some applications (such as 'less') to get incorrect $LINES and
$COLUMNS values (reported by Clint Olsen).
- modify behavior for HP-UX, to set the "reserved" process group
controls to _POSIX_VDISABLE so the TIOCSLTC ioctl does not produce an
error (patch by Ben Yoshino <ben@wiliki.eng.hawaii.edu>).
- correct length of underlining, reducing it by one pixel to avoid
leaving a dot when the application does not clear the whole screen
(patch by (Sergei Laskavy <Laskavy@cs.msu.su>).
I noticed this only recently myself (and other people as well); it
depends on the font chosen. A 6x10 font shows it, but the other
fonts (from XTerm.ad) do not. I also see a similar problem with the
emulation of bold fonts.
- add include for Xos.h to xterm.h, to ensure proper definitions
(reported by Holger Veit).
- update config.guess to recognize Unixware 2.1 and 7 (patch by
Mike Hopkirk <hops@sco.com>).
A fix for the print-window function, and some minor cleanup:
- modify logic that closes pipe in the print-window function to not use
pclose, which does not work on all systems, since I did not open the
pipe with popen (reported by Stefan Dalibor).
- correct name of $(EXTRA_LOAD_FLAGS) imake variable (reported
by Stefan Dalibor).
- guard logic in ChangeGroup() function against null pointer
(reported by Stefan Dalibor).
- ensure that menu entry for toggling sunKeyboard resource is
initialized (reported by Branden Robinson <branden@purdue.edu>).
- gcc unused-variable warnings (reported by Bernd Ernesti
<bernd@arresum.inka.de>)
- rename global variable 'buffer' to 'VTbuffer'
This incorporates fixes from several people, as well as some improvements
that I made based on feedback from users:
- add option to standalone configure script, "--with-own-terminfo-dir",
which causes xterm to pass a predefined value of $TERMINFO to the
application. Also use this value in install rule "make install-ti",
for the standalone configure script.
(patch & feedback from Tor Lillqvist <tml@hemuli.tte.vtt.fi>)
- change ifdef's for "hpux" to "__hpux" (patch by Tor Lillqvist). The
imake configuration uses the former, but the latter is predefined by
HP's compilers.
- define USE_SYSV_ENVVARS for HP-UX, curses does not use $TERMCAP (patch
by Tor Lillqvist).
- on HP-UX, use the /dev/ptym/clone device to allocate ptys. Works
both on HP-UX 9 and 10. (patch by Tor Lillqvist).
- modify configure script to obtain the $(EXTRA_LOADFLAGS) value from
imake, needed for compiling under DEC OSF/1 (reported by
Stefan Dalibor)
- modify print-window action so that the printer is closed after
printing a window, unless the printer was already opened (i.e.,
by an application running in the window). This makes the printing
complete without having to exit xterm, since not all systems treat
fflush through a pipe very well (reported by Stefan Dalibor)
- modify printing code so that the ^M's are not printed if the
printAttribute resource is set to zero (request by Stefan Dalibor).
- correct typo in xterm.man, for the default value of printAttribute
(reported by Stefan Dalibor).
- correct printing code so that the alternate character set is
printed, like other attributes, with escape sequences.
- correct termcap description, removing spurious 'm' character from
the 'op' capability (reported by Greg Woods <woods@weird.com>).
- correct trace code so that the initial timestamp is set.
- correct/modify utmp data for the Linux glibc 2 configuration,
so that the ut_line member is set before using it to update wtmp
(patch by Bill Nottingham <wen1@cec.wustl.edu>).
This corrects a couple of recent bugs and adds a new resource:
- modify definition of TRACE_CHILD so that it does not conflict with
ifdef's for USE_USG_PTYS in main.c (reported by Vikas Agnihotri
<VikasA@att.com> and Stefan Dalibor).
- correct ownership of file (actually pipe) written by the print
controls. When undoing the setuid changes in patch #69, I overlooked
this. Now xterm forks a process which resets setuid and routes the
printer data as the real user.
- add a new resource, "printAttributes", which controls whether
color attributes (or any attributes) are sent to the printer.
This patch does the following:
- implements a print-window facility for xterm. Though useful in
itself, I added it as part of some debugging which I am doing.
(Occasionally during an exposure event xterm fails to restore the
proper colors for highlighted text, and printing the screen will
show the internal states nicely).
The print facility now also displays the color information.
(I will probably make this a resource).
- modified the xterm-16color terminfo description to use the setaf and
setab strings, which is a little more efficient (requested by Stephen
Marley).
- reduced some clutter of the ifdef/includes (e.g., stdlib.h, unistd.h,
errno) making the configure script test for these.
I removed the symbols Size_t and Time_t, since they no longer serve
a useful purpose.
- added some debugging traces to show the initial screen size,
and the success/failure of the ioctl calls pass handle window
resizing events to the application (for Clint Olsen).
I also modified the trace code to produce two files since some
of the information is produced by the child process. So now
they are Trace-parent.out and Trace-child.out
- updated configure test for ANSI compiler options to handle a
special case for HP-UX 10.x (reported by Clint Olsen).
This is a patch from Chris Siebenmann <cks@hawkwind.utcs.toronto.edu>,
which I have cleaned up a little, and integrated into the configure script.
From his description:
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 do is add an option so that when an
iconified xterm receives 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.
This patch is a slightly modified version of one by Richard Braakman, which
prevents buffer overflow in the input-method and preedit-type parsing in xterm.
I changed a couple of details to make the code more maintainable, and looked
for similar things - copying into a fixed-size buffer (found none, though I did
spot an unused variable).
This patch corrects some minor bugs in xterm, and fills in some more details
in the VT220 emulation:
- modify Imakefile to use SpecialCObjectRule for menu and data modules,
making xterm build properly if logging is enabled
(patch by Scott Sewall <scott@iprg.nokia.com>).
- restore "ich" capability to terminfo entries, since
Michael Schroeder points out that "ich1"
is the one which is the problem in Solaris vi.
- correct color of cursor, which would disappear on inverse-video
since the initialization did not compare the cursor color against
both foreground and background (reported by Olivier Calle).
- correct abbreviation-test for -version and -help options, making
command-line option -vb work (reported by Stefan Dalibor).
- correct a dependency between ifdef's for OPT_I18N_SUPPORT and
OPT_INPUT_METHOD (reported by Stefan Dalibor).
- split-out character-set translations as new module charsets.c, to
implement VT220 national replacement character sets (a mode where
some of the characters are displayed as specific European glyphs).
This relies on xterm using an ISO 8859-1 font (approach suggested by
Kenneth R. Robinette <zkrr01@mailbox.neosoft.com>).
- correct a missing increment, which made SS2 and SS3 controls
repeat the shifted character.
- add xterm-nrc to terminfo to illustrate the VT220 national
replacement character sets.
- reformat terminfo using new ncurses tic option "-f", which makes
if/then/else/endif expressions easier to read.
This corrects the problem in xterm with utmp, reported by Olivier Calle
<olivier@tc.fluke.com>
as well as some other people after the XFree86 3.3.2 release.
The error was introduced by my patch #53 in XFree86 3.9r (October 1997).
The correction removes the reset of setuid/setgid before the main event loop,
and solves the problem which I had worked around in a different manner: for
some reason, the particular waitpid() call in creat_as() hangs, does not
return when the child process exits. I changed the ifdef's to force the Linux
configuration to use wait() instead. This call appears to work properly on
other platforms such as SunOS and Solaris.
I also added tests in the standalone configure script to check for the
existence of waitpid().
This corrects another problem with the logic for highlightColor resource.
As reported by David Dawes:
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.
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.
This patch does the following:
This fixes the problem reported with failure to build the resize
program (BSDI, OSF/1) due to not having <termcap.h>, by changing the
ifdef to one that would be set only if the file exists (not currently
specified, except by the standalone configure script). We do not really need
to include <termcap.h> to build, but only for a clean compile, since it
may declare the tgetent() prototype.
I also updated the man-page for resize, since I had recently noticed
that it can be used to resize xterm using the "Sun" control sequences
option.
This is a small patch to xterm's 8-bit terminal description. I noticed
while testing ncurses that I had specified the wrong (VT100-style) codes
for the F1-F4. Xterm only uses VT220-style function keys in 8-bit mode.
This fixes the following problems with xterm:
This is another patch from Bjorn Helgaas <helgaas@rsn.hp.com>, which I've
reviewed (and learned some). Following are his notes:
I poked around some more and finally got xterm-62 to build and run
cleanly on HP-UX 10.20. Here are the patches. They look sort of
ugly, so here's a little explanation:
- aclocal.m4: Removed side effects from the AC_CACHE_VAL
commands in CF_FUNC_TGETENT. Previously, LIBS was set inside
AC_CACHE_VAL, which worked fine the first time configure was
run, but failed if there were cached values.
- aclocal.m4: Added temporary setting of LIBS before
AC_TRY_LINK in CF_FUNC_TGETENT. Previously, the last value set
by the AC_TRY_RUN loop was used, so only -lcurses was checked.
- configure.in: Added temporary setting of CPPFLAGS before
AC_CHECK_HEADERS for X11 files. Previously <X11/DECkeysym.h>
and <X11/Xpoll.h> were found only 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.
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.
This is a patch mostly by Bjorn Helgaas <helgaas@dhc.net> (I added the
os2main.c change, and a little of the documentation). From Bjorn's
description:
- If you use the "-hc <color>" option or set the "highlightColor"
resource, text is highlighted by changing only the background color,
rather than using reverse video. I find this easier to read,
especially when selecting multi-colored text, and it is similar to
the way netscape shows selections.
- Most of the code changes are under "#if OPT_HIGHLIGHT_COLOR". The
principal exception is in screen.c, where I added a couple calls to
resetXtermGC(). This seems like it could be a bug even without
the color highlighting changes (though I don't pretend to understand
all the logic).
This patch modifies the reset behavior of xterm slightly:
- change the terminfo entry so that rs1 (one of the strings used by
the 'reset' program) does a hard reset rather than switching
character sets. This is more in accord with other terminal
descriptions.
- modifies the treatment of hard reset by the xterm program to
reset the saved lines.
- corrects hard reset by also resetting user-defined keys (DECUDK).
This fixes some minor bugs and adds new functionality:
- add support for blinking text.
- This does not actually cause the
text to flash, but text with the blink attribute can be displayed
in color, using new resources colorBL and colorBLMode.
- If colors are not used, the blinking text will be displayed as
before (just like bold). The main purpose of this is to make
applications work properly when they assume the emulator supports
blinking text.
- I did this by moving the per-cell LINEWRAPPED flag to a per-line
flag, to make room for the new BLINK flag. There were no per-line
flags, so this changes a lot of logic.
- corrected missing save-cursor logic in the handling of SGR 1048
(the new control sequence I added in patch #54, 1997/10/17).
Reported by Darren Hiebert.
- flush the output of the transparent printing after each line
Reported by Tomas Vanhala <vanhala@ling.helsinki.fi>.
- correct the modes that are affected by save/restore cursor by adding
WRAPAROUND and PROTECTED.
- corrected placement of one of the XSync calls that I added in patch
#51, 1997/9/15, which had the side-effect of writing on the window
border when the xterm was resizing from 132 to 80 columns.
- work around an incompatibility of the XKB definition used in xterm
versus that symbol from IRIX 6.2's imake definitions (by adjusting
the standalone configure script).
My last patch has an off-by-one error in the comparison for argc. Douglas
Kosovic <douglask@dstc.edu.au> showed me where (he got a core dump).
Also, I think this explains Clint Olsen's problem, but the symptoms were more
subtle (EINVAL for a system call if the -display option is omitted).
This patch does the following:
- implement logic to permit xterm to work with proportional fonts.
- Thomas Wolff
<Thomas.Wolff@sietec.de>
requested this (but it isn't exactly what he's asking
for - that's a more involved task).
- I chose to do this by rendering the characters on a fixed pitch,
because it would not be useful for existing applications to display
varying numbers of characters on each line.
- Except that this forces the display to be wider, it works reasonably
well. A couple of special cases (reverse + colorBD, for example)
do not display with proper colors, since the inter-character gaps
are painted with the background.
- added a version number to the program (several people have requested
this).
- make the -version and -help options interpreted before the program
attempts to open the display.
- minor reorganization of the man-page (ordered the options, resources
and translations alphabetically - and eliminated some duplication).
- corrected a misspelled filename in Makefile.in, and added a lint
rule.
- updated the configure script to correct behavior when it cannot
find imake, as well as to fix the IRIX+gcc build (conflict with
/usr/include).
- regenerated the configure script with a newer patch to autoconf
that fixes a problem with environment space vs the configure --help
message.
This patch is mostly concerned with the standalone configure script; a few
minor corrections are added:
- add configure option --disable-tek4014, to allow xterm to be built
without the tek4014 emulation.
- add configure option --with-terminal-type, to allow xterm to be
compiled with default $TERM value other than "xterm" (e.g.,
"xterm-16color") -- requested by Stephen Marley <stephen@memex.com>.
- fix a typo in the configure --help message -- reported by Darren
Hiebert <darren@hmi.com>.
- review diffs between main.c and os2main.c, to make them more alike.
(applies some minor bugfixes to OS/2's version).
- add missing quotes in memmove/bcopy configure test
This patch is based on analysis by Arfst Ludwig <arfst@luxor.IN-Berlin.DE>,
who reported:
Setting the following resources xterm (all current versions) receives a
segmentation fault on <Btn2Up> after scrolling:
*XTerm*VT100*translations: #override \
~Shift~Ctrl<Btn2Up>: insert-selection(PRIMARY, CUT_BUFFER0)\n\
Shift~Ctrl<Btn2Up>: insert-selection(CLIPBOARD, CUT_BUFFER1)\n\
~Shift<BtnUp>: select-end(PRIMARY, CUT_BUFFER0)\n\
Shift<BtnUp>: select-end(CLIPBOARD, CUT_BUFFER1)
(The above resources intention is to be able to paste the latest
selection even if the xterm was cleared.)
And here is how it works (and a fix!): The widget given to the action
handler as first argument is not guaranteed to be a XtermWidget (it can
be the ScrollbarWidget). Instead of accessing the widget's member
directly XtDisplay gives the required pointer in a safe way.
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.
This fixes the segmentation violation noted by Rogier Wolff about a month
ago. He'd set xterm to 400 (rows) by 150 columns, which broke because there
were limited buffers (200 rows) used for juggling data when adding or deleting
lines and for switching between alternate and normal screens. I replaced this
by an allocated buffer.
The bug is simple to test if you set titeInhibit false.
This patch does the following:
- correct a minor placement problem with the right scrollbar.
- implement a new set of control sequences for switching between the
normal and alternate VT100 screens. These work around the older
sequences limitation that required modification of the runtime
$TERMCAP to cooperate with the titeInhibit resource (that can't work
with terminfo). I do this by moving all of the functionality of the
rmcur terminfo capability into the control sequences.
- implement the alternate-screen menu entry
This patch adds a fix and implements a new feature (as well as some minor
typos):
- JCHANDRA@Inf.COM (JCHANDRA) noted that there was still a problem
with the wait call with the logging option. It hung when the logfile
was opened as a command-line option. I fixed this by moving the
StartLogging() call down past the place where I'd reset the setuid
mode. So the logfile is opened as the real user, without having
to fork.
- Michael Rohleder <michael.rohleder@stadt-frankfurt.de> sent
me a patch which implements right-scrollbars for xterm. I used that
as a starting point, renamed the command-line options and reduced
the number of ifdef's.
This patch addresses bugs and requests reported by
- Bob Maynard <rmaynard@montana.com>,
- Clint Olsen <olsenc@ichips.intel.com>,
- JCHANDRA@Inf.COM (JCHANDRA),
- Michael Schroeder <Michael.Schroeder@informatik.uni-erlangen.de>,
- Pablo Ariel Kohan <pablo@memco.co.il>
Some of the changes are interrelated (it was an unusually busy week).
- change the default resource value for colorMode to true, matching
the Xterm.ad file.
- correct behavior of 'ech' control, making the default and 0
parameters erase one character rather than to the end of line
(reported by Michael Schroeder).
- add resource boldColors, command-line options +pc and -pc and
configure-script option to specify behavior of xterm's mapping bold
colors 0 through 7 to colors 8 through 15.
(request by Pablo Ariel Kohan).
- add resource colorAttrMode to specify whether colorULMode and
colorBDMode can override the ANSI colors
(from a problem report by Clint Olsen).
- correct a conflict between colorULMode/colorBDMode versus ANSI
colors, where exposure events would occasionally pick up the
former (e.g., colorBD) rather than ANSI colors. Testing the
colorAttrMode made this apparent, though it has been in the
code since 3.2A (patch #35 in Jan 1997).
- correct two problems with the optional logging support. On Linux
at least, the waitpid call in creat_as hangs when the logging is
toggled from the popup menu. Also, the mktemp template has the wrong
number of X's (since X11R5!). Fixed the waitpid problem by
exploiting the fact that the setuid behavior is reset before the
popup menus are available.
(reported by Jayachandran C.).
- add configure script options for building with the Xaw3d and neXtaw
libraries.
- correct CF_IMAKE_CFLAGS standalone configure script macro, so that it
will pick up $(ALLDEFINES) rather than $(STD_DEFINES). This is
needed to make scrollbars work on Linux, since that uses narrow
prototypes.
(reported by Bob Maynard).
- various minor updates to configure-script macros.
Most of this patch is related to the standalone configure script, though
there are fixes/enhancements as well:
- add a new resource sunKeyboard, with associated command-line
option and menu-toggle that allows using a normal Sun or PC
keyboard to generated the complete DEC-style function keys
and keypad.
- correct a reversed foreground/background test in the control
sequence that replies with the current SGR settings.
- correct, by invoking XSync, a display problem that caused the
program to not properly update newly exposed areas when a font
change or 80/132 resize request was not completely accepted.
- restructured autoconf macros (I made a library of all of the
macros across the complicated configure scripts I'm working on).
- use the autoconf config.guess and config.sub scripts to better
identify the host-os.
- improve the configure script that uses 'imake' as a fallback for
definitions.
- correct several instances of unsigned/signed mixed expressions.
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).
This is a collection of small fixes, and a couple of minor enhancements:
- plug a security hole in the implementation of Media Copy (print)
by invoking setuid just before the main loop.
- add an ifdef'd include for <sys/termio.h> for HP-UX, which allows
the program to process SIGWINCH events (this is a bug in X11R6.3)
- add state-table entries for VT52 emulation to enter/exit keypad
application mode.
- disable the popup-menu entry for 8-bit controls when the terminal-id
is less than 200 (e.g., VT52 or VT100).
- ensure that the popup-menu entry for 8-bit controls is updated when
the application enables/disables this mode, including the response
to a full-reset.
- implement VT300 DECBKM feature: set interpretation of the backarrow
key to either backspace or delete. The initial setting is via
resource; it can also be modified in the main popup menu.
- implement VTxxx KAM (ISO AM), which allows a keyboard to be locked
(i.e., the terminal discards input).
- implement VTxxx SRM, which is used to control local echoing of
input on the terminal.
- add terminfo and termcap entries for xterm-8bit, a variation of
the xterm description that uses 8-bit control characters.
- add fallback definitions for Imakefile to allow it to work on some
X11R5 systems that have no SpecialCObjectRule or ProgramTargetName
macros.
- add .c.o and .c.i rules to standalone Makefile.in
- correct order of -lXmu and -lXext in standalone configure script.
- add configure script options to allow selective disabling of
active-icon, input-method and i18n code (mainly for users with X11R5
or an incomplete X11R6 configuration).
- change menu-indices from #define's to enum values, thereby making
it work better with the ifdef's for logging and active-icon (the
X11R6.3 active-icon code is incorrectly ifdef'd; this corrects an
error introduced by incorporating that code).
- correct minor compile errors in the configuration where active-icon
is not used.
- add configure option to suppress echoing of long compiler commands
- correct spelling of decTerminalID in configure script help message
- use gcc __attribute__((unused)) to quiet warnings about unused
parameters when compiling with -W (to make it simpler to find the
real problems).
This patch implements the VT100/VT220 Media Copy (i.e., print-screen) control
sequences.
This patch does the following (all but the first affect only the standalone
configure script):
This patch does the following
- corrects an indexing error in the doublesize character logic
(button.c) that caused core dump (this was reported by J. Wunsch).
- corrects the logic of ShowCursor when it is painting in a doublesize
cell (charproc.c).
- corrects, according to vttest, the behavior when switching to
doublesize characters and back again (doublechr.c).
- adds cbt (back_tab) to the terminfo description (this was something
that I'd overlooked as applicable to curses optimization last
summer).
- corrects, for the standalone xmc test, the logic for disabling xmc.
This is a patch to provide test-support for some work I'm doing on ncurses. It
does not modify the normal configuration of xterm; the code is compiled if the
standalone configure option "--enable-xmc-glitch" is specified.
This fixes the problem reported with xterm's cursor color versus the background
(the second chunk in this patch) and also removes some duplicate initialization
of the cursor GC's. If the cursor color at startup is the same as the
background, then xterm will use the reverse GC, ignoring the setting of the
colorMode resource.
This implements the first part of the VT100 doublesize characters for xterm,
as well as fixing a handful of bugs:
- the doublesize character support uses the normal font (using scaled
fonts will be another patch) with blanks to simulate doublesize
characters. This patch does most of the global changes that'll be
required. I've hidden most of the details in macros and ifdefs so
it's easy to configure out (part of the patch is a configure option
for that purpose).
- corrected limits in DeleteChar() function -- it's always ignored the
size of the left border and scrollbar. I noticed this when working
on the doublesize characters since the glitch was doubled in size
(i.e., it wrapped some garbage around the right margin).
- corrected 'memmove()' logic, for standalone builds (it referenced a
malloc wrapper from my development library).
- add a check for HideCursor() to prevent repeated screen updates
(which can cause a spurious cursor glitch to appear, e.g., during
scrolling). I noticed this with the 3.2A version (but only a few
weeks ago, when I started working on this patch).
Here's a fix for two problems:
- modify handling of tgetent results in xterm and resize programs to
make them tolerant of missing termcap file, or unknown terminal name.
In this scheme, an explicit "-tn" option will succeed, overriding
the fallback list.
- a nit in the configure script (log extra information to help diagnose
which case of the test-compile of tgetent was used).
Bram Moolenaar reported that the cursor color changed unexpectedly while
scrolling. The cause was that it used the same GC's as the logic that draws
the ANSI colors. The bug only appears if the cursorColor resource isn't set,
and has been present since the initial implementation early last year. (The
same bug also appears in rxvt ;-). Here's a fix.
Some nits found by Darren Hiebert (missing part of install-rule, incorrect
assignment for --enable-color-mode option).
Patch for the configure script's logic for obtaining imake predefined
symbols.
This patch does the following:
- integrate the 16-color change for 'xterm'
- minor fixes/clarification of tgetent in terminfo vs termcap to
'resize'
(both changes also modify the configure script)
This implements a simple configuration script with autoconf (to which I'll
add more options later). It does the following:
- configures xterm to build with X11R5 (at least on SunOS 4.1, Solaris
2.4, possibly IRIX - sorry network was down today, but I did test
an earlier version yesterday).
- enables/disables the configuration ifdefs for ANSI color and VT52
emulation.
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).
This corrects a minor, but annoying error in the vt220 emulation: the DECUDK
is only supposed to be interpreted for _shifted_ function keys.
This corrects something that I overlooked in patch #27 (21-aug-1996), which is
that when trimming the region to be repainted for the highlightSelection
resource of xterm, I still have to paint the background past the highlighted
region. This only happens when I first do a selection in a window that's
partly off-screen, then move the window on-screen.
This patch does the following:
- combines the coding for foreground and background colors into a
single byte, reducing the memory required to store saved-lines in
color. (I'll take back that byte in a following patch to use to
ensure the character-set, so there's no long-term decrease in memory
use).
- modifies the PF1-PF4 coding in termcap/terminfo. Because xterm is
still by default emulating vt100, the function key codes are
vt100-compatible (I overlooked this in patch #31).
I also reformatted the whole terminfo file into a single-column,
for consistency.
- adds an interim xterm-vt220 description to accommodate the old and new
styles of function-keys (though probably it'd be better to drop the
old-style altogether).
This patch does the following:
- implement DECSTR (soft terminal reset). The biggest diff is due to
adding another state table (note that there's only one useful state
here, but it's only 256 bytes rather than 1k as it would have been
before I reduced the size of state entries).
- some minor tidying up (e.g., signed/unsigned use bitcpy, MODE_DECCKM,
resetColor, resetCharsets). More is done in patch #35.
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.
This adds to the reset-fix by Matthieu Herrb <Mathieu.Herrb@mipnet.fr> a
small change to make xterm able to output 8-bit characters in VT100 mode.
Applications that run on real VT100's don't do that anyway, and this feature
should be removed sometime after finishing off the VT220 emulation (VT220's can
do 8-bit characters). That would be a good time to change the default
terminal-id to 220.
This implements the REP (repeat) control for xterm. That isn't part of the DEC
VTxxx series, but is defined in ISO 6429. (Note that the base xterm terminal
description is not changed -- I added a variant, "xterm-rep").
This implements vt52 emulation in xterm (ifdef'd so it can be removed).
I've been using it for testing for the past month or so.
From bug-report by <auroux@clipper.ens.fr> (Denis Auroux), missing reset to
ground state. I checked through the rest of that table and found another,
in the unimplemented MC (screen print).
This patch does the following:
- corrects the restoration of color for bold/underline color mode
- adds a resource 'decTerminalID' to control the reporting level of
xterm (e.g., VT100, VT220).
- uses the new resource to implement/correct the DA1, DA2 and
DECRPTUI reports.
- 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).
All of these changes are based on vttest 2.6
(Most of the volume in the patch is to add 2 more state tables for parsing
the 2nd/3rd device-attribute controls).
This patch corrects the following reported by Roland Rosenfeld
<roland@spinnaker.rhein.de>:
- handle SGR 22, 24 and 25 in combination with colorUL and colorBD
resources. Also noted & fixed reset of colored underline/bold
with SGR 0.
- a typo in the termcap (missing '['), from 3.1.2Dj (my error)
Roland also complained that he couldn't use box characters with
-adobe-courier-bold-r-normal--12-120-75-75-m-70-iso8859-1
but that's a known xterm limitation (the box characters must be part of the
font, in the first 32 locations).
This patch fixes one of my long-term gripes: xterm's selection doesn't clearly
show what's being selected (as per David's request, it's controlled by a
resource, which defaults to the older behavior).
Here's a patch to fix a problem with xterm's cut/paste and another to modify
the appearance of the highlighting while selecting. (The changes are
independent, so you can see if the change to screen.c is desirable).
Here's a correction for two minor bugs that I picked up in testing, plus
some lint (from Solaris 2.5) where NULL was used incorrectly:
- make the second alternate font the same as the first (that's what
vt420 and dtterm do)
- corrected DECSCL report when DECSCL hasn't been set (i.e., don't
return a '60').
This patch does several things. In effect, xterm can (I think) do a reasonably
good job of emulating vt220 and vt320 terminals (as well as it was doing
vt100, at any rate ;-).
It does NOT do:
- soft fonts
- rigel or sixel graphics
Anyway, I:
- added ECH, CPL, CNL, SU, SD, CBT, CHT controls
- added popup-menu for switching between DEC and Sun function keys.
(corrected alignment err wrt logging entry at that point).
- make xterm recognize both 8-bit and 7-bit controls (including
popup menu for switching modes).
- add user-definable function keys (aka DECUDK)
- support concealed text
- support protected text (both ISO compatible and DEC compatible -
that's not the same thing, btw), with SPA, EPA, DECSCA, DECSED,
DECSEL controls.
- implement DECSCL.
I'll be continuing to test this patch for a while, but don't expect to add any
new functionality (it passes all of the current tests I've built in vttest, but
I need to make more tests)..
This removes the blinking cursor I added last week (for performance reasons).
Time-permitting, I'll revisit this after 3.2 is released (there will be more
work after XFree86 3.2, I assume).
I looked more closely at my "double-negative" and realized that I had been
confused by the default color scheme (black on white) in combination with
reverse video. However, I did see that the original_fg and original_bg data
weren't really used - so I removed that logic.
Also:
- during initialization, check if ANSI colors are set with non fg/bg
values, disable color mode if not. This makes xterm tolerant of
applications that allocate the whole color map.
- implemented blinking cursor (default is off)
This patch does the following:
- fixes some minor typography in the control-sequences documentation
(it didn't occur to me til I'd sent the last patch that I could use
ghostview for previewing the troff output ;-)
- adjusts the shell's background color in ReverseVideo so that flicker
in resizing is reduced
- adds an ifdef OPT_ISO_COLORS to allow configuring xterm without
the ISO color support (saves a lot of memory)
- used that ifdef to isolate/modify logic so that if the user doesn't
have the colorMode enabled, then ISO color support is disabled (saving
memory).
(If anyone needs numbers, I had savedLines set to 2000, and found
a reduction from ~700k to ~400k of allocated memory, according to
Purify).
This documents the changes in control sequences for window operations that
I added in my previous patch. I'm testing another patch that allows the
user to use less memory if colors aren't needed.
This patch does the following:
This implements the following:
- escape sequences that act like the CDE dtterm's window operations
(though I have implemented the default width and height -- I've seen
a rather buggy dtterm running that seems to treat width=0 or height=0
literally -- maybe that's a feature, not a bug?)
- minor tweak to the screen-repainting when resizing (I still cannot
entirely get rid of flicker).
- still more fixes to terminfo & termcap (I corrected my error for
the hpa code and added some other stuff by comparing to ncurses'
description and rxvt's).
- a tweak to the patch by Michael Rohleder for the color translation
- re-order attribute codes to allow later implementation of protected
fields (dtterm supposedly does this; it's probably more useful than
blinking or invisible text -- that uses up all of the available bits
without changing the attribute scheme radically).
This patch implements for xterm several minor features from ISO 6429 which are
useful for terminfo applications. The HPA and VPA control sequences allow
cursor movement along a row or column, cutting down a little on the characters
transmitted. The other codes allow resetting specific graphic rendition
attributes without modifying the other attributes.
(now if someone just had time to implement blinking cursors...)
Adam Tla/lka <atlka@pg.gda.pl> told me a couple of weeks ago that I'd missed
some of the background coloring in xterm. I investigated, and found that while
I'd picked up on the clear-to-bottom and clear-to-end-of-line operations, I'd
overlooked the insert/delete lines. Just so I wouldn't overlook any more of
these, I updated a copy of vttest to test ISO colors and bce (background color
erase). This patch introduces a new function, ClearCurBackground, whose calls
replace the direct XClearArea calls that I'd overlooked.
(There's also a few compiler warnings fixed, etc ;-)
This fixes the problem reported by David Dawes, by making the 50msec select
timeout for the Xaw3d arrow scrollbar a resource. (I made it a boolean for a
variety of reasons -- to make it a number, you'd need an additional resource,
to avoid breaking the logic).
This patch brings the termcap and terminfo descriptions for xterm up to date.
I made the following changes:
- reformatted the terminfo description in a single-column (this is ok
for terminfo, and will simplify future patches -- can't do that for
termcap, since it would impact buffer requirements on some systems).
- omitted obsolete features in termcap to save a little space (bs, pt)
- added color capabilities to termcap (ut, Co, NC, op, AB, AF)
- corrected some capabilities (vi, ve)
- added 'st' (set tab)
- reduced function keys in termcap for 'xterm' to 12 because color
capabilities makes that description larger than 1023 characters.
- created new termcap name 'xtermm' (monochrome) to match the terminfo
list, and make that description have 20 function keys.
- added corresponding color capabilities to terminfo (bce, colors,
pairs, op, ncv, setab, setaf)
- corrected corresponding capabilities in terminfo (civis, cnorm,
rmcup, smcup)
- added capabilities (el1, hts)
- in both, corrected home/end keys to match the code correction made
by Thomas Mueller in 3.1.2Bk
=> (I'm still considering modifying the code & description to match
the rxvt program).
This corrects my earlier changes for colors - the inner border of the xterm was
getting painted with the wrong color, since I'd moved the call to set the
background into the logic that tracks SGR information.
This corrects a memory leak in xterm that happens whenever one switches fonts.
This patch corrects the behavior of the ANSI colors in xterm when reverse
video is used, as well as some other lesser sins:
- button.c
- (compiler warnings: shadowing of 'time', redundant cast)
- charproc.c
- renamed screen.colors[] array to screen.Acolors[] to more
easily distinguish the non-ANSI colors from the ANSI colors.
- moved logic of SGR_Save() into VTInitialize, getting rid of
local private variables original_fg and original_bg.
- moved some logic into getXtermForeground and getXtermBackground
from SGR_Foreground, SGR_Background, etc.
- corrected misleading 'row' to 'col' in case for CUF, CUB
sequences.
- ctlseqs.ms
- xterm.man
- (correct a misconception which I'd added that the color0
through color6 resource values apply to non-ANSI colors)
- ptyx.h
- added original_fg, original_bg to TScreen structure.
- scrollbar.c
- (compiler warnings: redundant cast)
- util.c
- new functions getXtermForeground and getXtermBackground replace
the macros GET_FG and GET_BG, with the added functionality of
checking for the reverse-video status of xterm.
- in ReverseVideo, swap the SGR foreground and background colors
also.
I observed an occasional glitch in the xterm's color behavior; a clear to end
of line would get a color that had been used in a program that supposedly reset
colors. I traced this down to the way xterm was modifying colors of GC's on
the fly; it didn't restore the original color of the GC, even though it would
later be used in functions (such as ClearRight) that assumed (my error) that
the GC would have the current foreground or background color.
I fixed this by resetting the GC's colors with a new function 'resetXtermGC()',
and direct calls on SGR_Foreground/SGR_Background, as appropriate and using a
new function 'updatedXtermGC()' to encapsulate the logic that modifies the GC's
color. (I also removed some commented-out code that was trying to do this --
the problem was a little more obscure).
This patch fixes the remaining problems that I had making xterm run with x11r5,
as well as a couple of other bugs. It follows my patch from yesterday, that
added ifdef's for some of the input-method resources.
- corrected ifdef's that suppress the input-method code (doesn't
exist in my x11r5, and xterm works adequately without it).
- corrected fallback definition for 'Select()' macro (oops: I'd
copied the wrong text...)
- moved the declarations for the fd_set variables to data.[ch]
- corrected an ifdef in resize.c (sunos 4.x doesn't have termcap.h)
- corrected (in main.c) some unused/orphaned variables.
This is mostly a documentation patch for xterm. It describes the color control
sequences in more detail, and documents some other features of xterm that
aren't described elsewhere.
I've also added a couple of ifdef's to fix (part of) the problem that I'm
working on (making the program work properly on x11r5, where I'm doing memory
testing -- I have a "good" version from mid-January, but my resync version
doesn't work properly on x11r5). I'm not done with that yet.
I did a (clean) build of 3.1.2n on Linux 1.2.13 (ELF). I've got an S3 card.
This fixes the following in the 3.1.2n xterm:
- initialize cur_foreground, cur_background in charproc.c (Purify
told me they weren't initialized).
- add interpretation of codes 39, 49, to reset background and
foreground to default value (I'm told that ISO 6429 does this; but I
don't have a written reference -- yet -- can anyone help here?).
Anyway, rxvt does it, and it'll solve my remaining color management
problems.
- shadowing of 'time' in menu.c
- 'Cardinal' vs 'int' in scrollbar.c
- several changes to permit compile with X11R5 (the system that I've
got Purify on won't be upgraded to X11R6 for a long time).
I built this version (with a minor nit that I'll patch soon) on SunOS 4.1.3 so
that I can test it some more with Purify.
btw:
the changes made in Xpoll.h won't work on some older systems, because
fd_set isn't a defined type (I've got one machine at least that this
applies to).
This patch does all of the SGR foreground/background fixes (i.e., clearing the
screen after an SGR color is set causes that color to be used in the foreground
and/or background). If the FG_COLOR and/or BG_COLOR flags aren't set, then the
xterm foreground and background default to the window's values. This usage is
consistent with various types of hardware (especially the IBM PC), and is also
used in rxvt.
- charproc.c:
- add/use new macros GET_FG, GET_BG - n/c.
- add/use new functions SGR_Foreground() and SGR_Background()
to set corresponding colors in GC's, and to retain sense of
"original" colors.
=> This makes redundant some of the corresponding logic
in HideCursor to set the foreground and background,
but I left it in since it may be fixing an unrelated
requirement.
- set GC's in LoadNewFont() according to whether the SGR fg/bg
colors are active.
=> This fixes some glitches in the accompanying resize,
that leaves parts of the window in the original
background color.
- screen.c:
- util.c:
- modified ClearRight() so that if either of the SGR fg/bg
colors is set, we don't bzero the attributes and color
arrays, but instead fill them with the appropriate codes.
- modified ClearLeft to use SGR fg/bg colors.
This patch modifies the object code, by replacing indexing expressions with
temporary variables with the full indexing expression. At first glance, this
seems inefficient (it did to me ;-), until remembering comments made in the
compilers newsgroups that trying to "help" the compiler doesn't really work
that well. A good optimizing compiler can do a better job than the programmer
can. (There's a moral in the use of 'register' variables also, but I won't fix
those...).
Anyway, the revised code generates a smaller object...
- charproc.c:
- recode index expressions in ShowCursor() and HideCursor()
using SCRN_BUF_xxxxS macros - changes object.
- replace constant '4' by MAX_PTRS - n/c.
- ptyx.h:
- defined the SCRN_BUF_xxxxS macros in terms of BUF_xxxxS
macros, to pick up references to ScrnBuf data directly, and
added MAX_PTRS symbol to pick up those '4' constants strewn
about the code - n/c.
- screen.c:
- recode index expressions in ScreenWrite() using
SCRN_BUF_xxxxS macros - changes object.
- replace constant '4' by MAX_PTRS - n/c.
- use macros BUF_CHARS, BUF_ATTRS - n/c.
- cast calloc to 'Char *' to fix compiler warning on IRIX - n/c
- scrollbar.c:
- replace constant '4' by MAX_PTRS - n/c.
- cast calloc to 'Char *' to fix compiler warning on IRIX - n/c
When setting up for this phase, I saw that you'd corrected the bug that I found
in ClearLeft. I decided to make this series of patches anyway, since
readability never hurt (and there's the potential for finding another bug while
reviewing this set).
- button.c:
- use SCRN_BUF_xxxxS macros - n/c
- charproc.c:
- use SCRN_BUF_xxxxS macros - n/c
- ptyx.h:
- added four macros: SCRN_BUF_CHARS, SCRN_BUF_ATTRS,
SCRN_BUF_FORES, SCRN_BUF_BACKS to represent the four
arrays that are derived from screen->buf.
- screen.c:
- use SCRN_BUF_xxxxS macros - n/c
- util.c:
- use SCRN_BUF_xxxxS macros - n/c
This is my third (and final cleanup) patch for xterm. It gets rid of the
unused stuff, and converts several functions to static (thereby reducing their
scope).
At this point, the only compile warnings I've got (on Linux) are those about
the select arguments (int vs fd_set type), and a missing declaration for
waitpid. Those both are hard to get right without autoconfigure.
The next patches will address the functional changes...
- Tekproc.c:
- changed several functions to 'static' that aren't used
outside this module -- changes object
- charproc.c:
- changed several functions to 'static' that aren't used
outside this module -- changes object
- deleted unused function unparsefputs -- changes object.
- main.c:
- changed several functions to 'static' that aren't used
outside this module -- changes object
- ifdef'd out unused function 'consolepr()' -- changes object
- removed unused variable 'dummy_tio' -- changes object
- moved variable 'discipline' to quiet unused-warning -- changes object
- main.h:
- deleted unused definition of DEFBORDERWIDTH - n/c
- misc.c:
- changed several functions to 'static' that aren't used
outside this module -- changes object
- provide dummy return statements for xerror and xioerror to
quiet compiler warnings -- changes object
- ptyx.h:
- change sbuf_address and abuf_address to 'Char *' - n/c
- resize.c:
- changed several functions to 'static' that aren't used outside this module
-- changes object
- screen.c:
- remove unnecessary 'Char **' casts - n/c
- util.c:
- changed several functions to 'static' that aren't used outside this module
-- changes object
This is my second patch to xterm. It corrects most of the gcc warnings (except
for some that are due to X header files ;-). I compared objects to keep track
of the changes that don't affect the object code (n/c) versus those that do.
At this point, I'm compiling (fairly) clean with gcc options
-Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wnested-externs
(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).
The changes:
- Tekproc.c:
- parenthesized expression to avoid gcc warning -- n/c.
- corrected nested-extern declaration for Bool
waiting_for_initial_map; ourTopLevelShellArgs, and
number_ourTopLevelShellArgs - n/c
- charproc.c:
- corrected potentially-unintialized variables 'scstype', 'xim',
and 'input_style' -- changes object.
- adjusted logic of VTparse so that gcc won't warn about setjmp
clobbering parsestate -- changes object.
- corrected initialization of 'scstype', which could have been
clobbered by setjmp/longjmp - changes object.
- corrected nested-extern declaration of 'term', 'ProgramName'
- n/c
- cursor.c:
- corrected nested-extern declaration of 'term' -- n/c
- renamed 'term' parameters to avoid gcc -Wshadow warning - n/c
- input.c:
- change interface of StringInput to assume size_t (i.e.,
unsigned) nbytes -- changes object.
- change interface of funcvalue, and sunfuncvalue to use
'KeySym' type instead of 'int' - changes object.
- main.c:
- moved definitions of SIGNAL_T, SIGNAL_RETURN to proto.h - n/c
- corrected missing params of 'do_hangup()' -- changes object
(note: the missing params were not used).
- corrected missing param of 'Error()' -- changes object
- corrected nested-extern 'environ' - n/c
- adjusted assignments to 'tty_got_hung' and 'no_dev_tty' so
that gcc can see they won't be clobbered by the longjmp -
changes object.
- use Size_t type - n/c.
- menu.c:
- removed redundant prototype for 'do_hangup()' -- n/c.
- renamed 'time' parameters to avoid gcc -Wshadow warning - n/c
- menu.h:
- renamed 'time' parameters to avoid gcc -Wshadow warning - n/c
- misc.c:
- corrected definition of 'HandleFocusChange()' -- changes
object
- cast parameters in call to 'TekExpose()' -- n/c
- corrected nested-extern declarations of 'term', 'toplevel',
ProgramName, and 'environ' -- n/c.
- use Size_t type - n/c.
- proto.h:
- moved definition of SIGNAL_T (and SIGNAL_RETURN) here from
main.c, resize.c to allow use of this symbol in prototypes
(mostly in xterm.h).
- added definition 'Size_t' to use as corrected type for
strncpy, malloc sizes - n/c.
- resize.c:
- moved SIGNAL_T definition to proto.h -- n/c.
- use Size_t type - n/c.
- screen.c:
- tabs.c:
- corrected nested-extern declaration of 'term' -- n/c
- util.c:
- corrected/supplied parameters to 'TekExpose()' -- changes
object (note: 'TekExpose()' doesn't use its parameters).
- corrected nested-extern declaration of
'waiting_for_initial_map' -- n/c.
- renamed 'term' parameters to avoid gcc -Wshadow warning - n/c
- xterm.h:
- prototype 'do_hangup()', 'HandleFocusChange()',
'TekExpose()', 'Error()', 'Exit()' - forces changes in
various places.
- adjusted prototypes that pass 'Boolean' arguments to use
'int' (this is the "correct" ANSI approach to extended
compiles; it's worth mentioning that gcc doesn't meet the
ANSI spec here). I used gcc -Wconversion to find these, but
there's a lot of unrelated warnings that are due to setting
NARROWPROTO in the config - n/c.
- renamed 'term' parameters to avoid gcc -Wshadow warning - n/c
This is my first cleanup patch for xterm. It addresses all of the gcc warnings
for -Wall, -Wmissing-prototypes and -Wstrict-prototypes that I can change
without modifying the object code. (I'm compiling this with gcc 2.7.0 for an
aout target, which makes it simple to compare objects. When I do ELF-only,
I've got a tool that compares that sort of thing as well).
Briefly, this patch adds (and uses) two header files in the xterm directory:
proto.h
xterm.h
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.