mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-10 01:48:00 +00:00
6f4083e682
If the cursor is on the rightmost column of the terminal and term->wrapnext is set, and the user asks to erase from the current position to the end of (at least) the line, what should happen? PuTTY's previous behaviour was to ignore term->wrapnext, and do the same thing we would have done without it: erase from the current physical cursor position to EOL inclusive, i.e. blank the character cell we just printed. But this is unfortunate if a program writes an interleaving of printing characters and ESC[K, which I recently found out is what gcc does in its colour-highlighted error messages: if the last printed char just before an ESC[K pushes the cursor into the deferred-wrap state, then the ESC[K blanks that character, and then we wrap to the next line. So one character of the error message ends up missing. xfce4-terminal and gnome-terminal take the approach in this situation of regarding the cursor position as _right_ at the end of the line, so no character cells get cleared at all, and the error message displays as intended. I think that's more sensible, so I've switched to doing the same thing. (xterm has different behaviour again: it blanks the character cell and also clears its analogue of the wrapnext flag. So in _their_ handling of this sequence of output, one character of the error message is still missing, but it looks as if it's been _omitted_ rather than replaced by a space.) Secondly, in the course of fixing that, I looked at the check_boundary call in erase_lots, which is supposed to ensure that if a wide CJK character straddles the boundary between what's being erased and what isn't, then both halves of the character are deleted. I had to modify that anyway because I was moving that very boundary, and in doing so, I noticed that even according to the previous behaviour, it had an off-by-one error. In the case where you send ESC[1K (meaning erase up to and including the cursor position), the call to check_boundary was performed on the _left_ edge of the cursor's character cell, when it should have been the right edge. So you could end up with an erase_char in the left half (i.e. a space) and still have the magic value UCSWIDE in the right half, causing the terminal to think you had a double-width U+0020 on the screen, which isn't supposed to be able to happen. |
||
|---|---|---|
| charset | ||
| contrib | ||
| doc | ||
| icons | ||
| test | ||
| unix | ||
| windows | ||
| .gitignore | ||
| agentf.c | ||
| aqsync.c | ||
| be_all_s.c | ||
| be_all.c | ||
| be_misc.c | ||
| be_none.c | ||
| be_nos_s.c | ||
| be_nossh.c | ||
| be_ssh.c | ||
| Buildscr | ||
| Buildscr.cv | ||
| callback.c | ||
| cgtest.c | ||
| CHECKLST.txt | ||
| cmdgen.c | ||
| cmdline.c | ||
| conf.c | ||
| config.c | ||
| configure.ac | ||
| cproxy.c | ||
| defs.h | ||
| dialog.c | ||
| dialog.h | ||
| ecc.c | ||
| ecc.h | ||
| errsock.c | ||
| fuzzterm.c | ||
| import.c | ||
| LATEST.VER | ||
| ldisc.c | ||
| ldisc.h | ||
| LICENCE | ||
| licence.pl | ||
| logging.c | ||
| mainchan.c | ||
| marshal.c | ||
| marshal.h | ||
| memory.c | ||
| minibidi.c | ||
| misc.c | ||
| misc.h | ||
| miscucs.c | ||
| mkauto.sh | ||
| mkfiles.pl | ||
| mksrcarc.sh | ||
| mkunxarc.sh | ||
| mpint_i.h | ||
| mpint.c | ||
| mpint.h | ||
| network.h | ||
| nocmdline.c | ||
| nocproxy.c | ||
| nogss.c | ||
| noprint.c | ||
| noshare.c | ||
| noterm.c | ||
| notiming.c | ||
| nullplug.c | ||
| pageant.c | ||
| pageant.h | ||
| pgssapi.c | ||
| pgssapi.h | ||
| pinger.c | ||
| portfwd.c | ||
| pproxy.c | ||
| proxy.c | ||
| proxy.h | ||
| pscp.c | ||
| psftp.c | ||
| psftp.h | ||
| psftpcommon.c | ||
| putty.h | ||
| puttymem.h | ||
| puttyps.h | ||
| raw.c | ||
| README | ||
| Recipe | ||
| release.pl | ||
| resource.h | ||
| rlogin.c | ||
| scpserver.c | ||
| sercfg.c | ||
| sesschan.c | ||
| sessprep.c | ||
| settings.c | ||
| sftp.c | ||
| sftp.h | ||
| sftpcommon.c | ||
| sftpserver.c | ||
| sign.sh | ||
| ssh1bpp.c | ||
| ssh1censor.c | ||
| ssh1connection-client.c | ||
| ssh1connection-server.c | ||
| ssh1connection.c | ||
| ssh1connection.h | ||
| ssh1login-server.c | ||
| ssh1login.c | ||
| ssh2bpp-bare.c | ||
| ssh2bpp.c | ||
| ssh2censor.c | ||
| ssh2connection-client.c | ||
| ssh2connection-server.c | ||
| ssh2connection.c | ||
| ssh2connection.h | ||
| ssh2kex-client.c | ||
| ssh2kex-server.c | ||
| ssh2transhk.c | ||
| ssh2transport.c | ||
| ssh2transport.h | ||
| ssh2userauth-server.c | ||
| ssh2userauth.c | ||
| ssh.c | ||
| ssh.h | ||
| sshaes.c | ||
| ssharcf.c | ||
| sshauxcrypt.c | ||
| sshbcrypt.c | ||
| sshblowf.c | ||
| sshblowf.h | ||
| sshbpp.h | ||
| sshccp.c | ||
| sshchan.h | ||
| sshcommon.c | ||
| sshcr.h | ||
| sshcrc.c | ||
| sshcrcda.c | ||
| sshdes.c | ||
| sshdh.c | ||
| sshdss.c | ||
| sshdssg.c | ||
| sshecc.c | ||
| sshecdsag.c | ||
| sshgss.h | ||
| sshgssc.c | ||
| sshgssc.h | ||
| sshhmac.c | ||
| sshmac.c | ||
| sshmd5.c | ||
| sshnogss.c | ||
| sshppl.h | ||
| sshprime.c | ||
| sshprng.c | ||
| sshpubk.c | ||
| sshrand.c | ||
| sshrsa.c | ||
| sshrsag.c | ||
| sshserver.c | ||
| sshserver.h | ||
| sshsh256.c | ||
| sshsh512.c | ||
| sshsha.c | ||
| sshshare.c | ||
| sshsignals.h | ||
| sshttymodes.h | ||
| sshverstring.c | ||
| sshzlib.c | ||
| storage.h | ||
| stripctrl.c | ||
| telnet.c | ||
| terminal.c | ||
| terminal.h | ||
| testback.c | ||
| testcrypt.c | ||
| testcrypt.h | ||
| testsc.c | ||
| testzlib.c | ||
| time.c | ||
| timing.c | ||
| tree234.c | ||
| tree234.h | ||
| utils.c | ||
| version.c | ||
| version.h | ||
| wcwidth.c | ||
| wildcard.c | ||
| x11fwd.c | ||
This is the README for the source archive of PuTTY, a free Windows
and Unix Telnet and SSH client.
If you want to rebuild PuTTY from source, we provide a variety of
Makefiles and equivalents. (If you have fetched the source from
Git, you'll have to generate the Makefiles yourself -- see
below.)
There are various compile-time directives that you can use to
disable or modify certain features; it may be necessary to do this
in some environments. They are documented in `Recipe', and in
comments in many of the generated Makefiles.
For building on Windows:
- windows/Makefile.vc is for command-line builds on MS Visual C++
systems. Change into the `windows' subdirectory and type `nmake
-f Makefile.vc' to build all the PuTTY binaries.
As of 2017, we successfully compile PuTTY with both Visual Studio
7 (2003) and Visual Studio 14 (2015), so our guess is that it will
probably build with versions in between those as well.
(The binaries from Visual Studio 14 are only compatible with
Windows XP and up. Binaries from Visual Studio 7 ought to work
with anything from Windows 95 onward.)
- Inside the windows/MSVC subdirectory are MS Visual Studio project
files for doing GUI-based builds of the various PuTTY utilities.
These have been tested on Visual Studio 7 and 10.
You should be able to build each PuTTY utility by loading the
corresponding .dsp file in Visual Studio. For example,
MSVC/putty/putty.dsp builds PuTTY itself, MSVC/plink/plink.dsp
builds Plink, and so on.
- windows/Makefile.mgw is for MinGW / Cygwin installations. Type
`make -f Makefile.mgw' while in the `windows' subdirectory to
build all the PuTTY binaries.
MinGW and friends can lag behind other toolchains in their support
for the Windows API. Compile-time levers are provided to exclude
some features; the defaults are set appropriately for the
'mingw-w64' cross-compiler provided with Ubuntu 14.04. If you are
using an older toolchain, you may need to exclude more features;
alternatively, you may find that upgrading to a recent version of
the 'w32api' package helps.
- windows/Makefile.lcc is for lcc-win32. Type `make -f
Makefile.lcc' while in the `windows' subdirectory. (You will
probably need to specify COMPAT=-DNO_MULTIMON.)
- Inside the windows/DEVCPP subdirectory are Dev-C++ project
files for doing GUI-based builds of the various PuTTY utilities.
The PuTTY team actively use Makefile.vc (with VC7/10) and Makefile.mgw
(with mingw32), so we'll probably notice problems with those
toolchains fairly quickly. Please report any problems with the other
toolchains mentioned above.
For building on Unix:
- unix/configure is for Unix and GTK. If you don't have GTK, you
should still be able to build the command-line utilities (PSCP,
PSFTP, Plink, PuTTYgen) using this script. To use it, change into
the `unix' subdirectory, run `./configure' and then `make'. Or you
can do the same in the top-level directory (we provide a little
wrapper that invokes configure one level down), which is more like
a normal Unix source archive but doesn't do so well at keeping the
per-platform stuff in each platform's subdirectory; it's up to you.
- unix/Makefile.gtk and unix/Makefile.ux are for non-autoconfigured
builds. These makefiles expect you to change into the `unix'
subdirectory, then run `make -f Makefile.gtk' or `make -f
Makefile.ux' respectively. Makefile.gtk builds all the programs but
relies on Gtk, whereas Makefile.ux builds only the command-line
utilities and has no Gtk dependence.
- For the graphical utilities, any of Gtk+-1.2, Gtk+-2.0, and Gtk+-3.0
should be supported. If you have more than one installed, you can
manually specify which one you want by giving the option
'--with-gtk=N' to the configure script where N is 1, 2, or 3.
(The default is the newest available, of course.) In the absence
of any Gtk version, the configure script will automatically
construct a Makefile which builds only the command-line utilities;
you can manually create this condition by giving configure the
option '--without-gtk'.
- pterm would like to be setuid or setgid, as appropriate, to permit
it to write records of user logins to /var/run/utmp and
/var/log/wtmp. (Of course it will not use this privilege for
anything else, and in particular it will drop all privileges before
starting up complex subsystems like GTK.) By default the makefile
will not attempt to add privileges to the pterm executable at 'make
install' time, but you can ask it to do so by running configure
with the option '--enable-setuid=USER' or '--enable-setgid=GROUP'.
- The Unix Makefiles have an `install' target. Note that by default
it tries to install `man' pages; if you have fetched the source via
Git then you will need to have built these using Halibut
first - see below.
- It's also possible to build the Windows version of PuTTY to run
on Unix by using Winelib. To do this, change to the `windows'
directory and run `make -f Makefile.mgw CC=winegcc RC=wrc'.
All of the Makefiles are generated automatically from the file
`Recipe' by the Perl script `mkfiles.pl' (except for the Unix one,
which is generated by the `configure' script; mkfiles.pl only
generates the input to automake). Additions and corrections to Recipe,
mkfiles.pl and/or configure.ac are much more useful than additions and
corrections to the actual Makefiles, Makefile.am or Makefile.in.
The Unix `configure' script and its various requirements are generated
by the shell script `mkauto.sh', which requires GNU Autoconf, GNU
Automake, and Gtk; if you've got the source from Git rather
than using one of our source snapshots, you'll need to run this
yourself. The input file to Automake is generated by mkfiles.pl along
with all the rest of the makefiles, so you will need to run mkfiles.pl
and then mkauto.sh.
Documentation (in various formats including Windows Help and Unix
`man' pages) is built from the Halibut (`.but') files in the `doc'
subdirectory using `doc/Makefile'. If you aren't using one of our
source snapshots, you'll need to do this yourself. Halibut can be
found at <https://www.chiark.greenend.org.uk/~sgtatham/halibut/>.
The PuTTY home web site is
https://www.chiark.greenend.org.uk/~sgtatham/putty/
If you want to send bug reports or feature requests, please read the
Feedback section of the web site before doing so. Sending one-line
reports saying `it doesn't work' will waste your time as much as
ours.
See the file LICENCE for the licence conditions.