Fix from Thomas Henlich for bug in dead key support. I've reproduced the

[sgt/putty] / unix / pterm.1

diff --git a/unix/pterm.1 b/unix/pterm.1
index eb9fc83..4a049ee 100644 (file)
--- a/unix/pterm.1
+++ b/unix/pterm.1
@@ -43,10 +43,10 @@ Chinese, Japanese and Korean text) displayed in the terminal.
 Specify the font to use for bold double-width characters (typically
 Chinese, Japanese and Korean text) Like \fI-fb\fP, this will be
 ignored unless the \fIBoldAsColour\fP resource is set to 0.
 Specify the font to use for bold double-width characters (typically
 Chinese, Japanese and Korean text) Like \fI-fb\fP, this will be
 ignored unless the \fIBoldAsColour\fP resource is set to 0.

-.IP "\fB\-geometry\fP \fIwidth\fPx\fIheight\fP"
-Specify the size of the terminal, in rows and columns of text.
-Unfortunately \fIpterm\fP does not currently support specifying the
-initial position of the window.
+.IP "\fB\-geometry\fP \fIgeometry\fP"
+Specify the size of the terminal, in rows and columns of text. See
+\fIX(7)\fP for more information on the syntax of geometry
+specifications.

 .IP "\fB\-sl\fP \fIlines\fP"
 Specify the number of lines of scrollback to save off the top of the
 terminal.
 .IP "\fB\-sl\fP \fIlines\fP"
 Specify the number of lines of scrollback to save off the top of the
 terminal.


@@ -129,7 +129,7 @@ example:
 
 pterm \-xrm 'ScrollbarOnLeft: 1'
 .IP "\fB\-help\fP, \fB\-\-help\fP"
 
 pterm \-xrm 'ScrollbarOnLeft: 1'
 .IP "\fB\-help\fP, \fB\-\-help\fP"

-Display a message summarizing the available options
+Display a message summarizing the available options.

 .SH X RESOURCES
 \fIpterm\fP can be more completely configured by means of X
 resources. All of these resources are of the form \fIpterm.FOO\fP
 .SH X RESOURCES
 \fIpterm\fP can be more completely configured by means of X
 resources. All of these resources are of the form \fIpterm.FOO\fP


@@ -151,6 +151,10 @@ zero), but the window will stay around if the process exits with a
 non-zero code or on a signal. This enables you to see what went
 wrong if the process suffers an error, but not to have to bother
 closing the window in normal circumstances.
 non-zero code or on a signal. This enables you to see what went
 wrong if the process suffers an error, but not to have to bother
 closing the window in normal circumstances.

+.IP "\fBpterm.WarnOnClose\fP"
+This option should be set to either 0 or 1; the default is 1.
+When set to 1, \fIpterm\fP will ask for confirmation before closing
+its window when you press the close button.

 .IP "\fBpterm.TerminalType\fP"
 This controls the value set in the TERM environment variable inside
 the new terminal. The default is "xterm".
 .IP "\fBpterm.TerminalType\fP"
 This controls the value set in the TERM environment variable inside
 the new terminal. The default is "xterm".


@@ -201,6 +205,22 @@ screen exactly the way they found it.
 This option should be set to either 0 or 1; the default is 0. When
 set to 1, it stops the server from remotely controlling the title of
 the \fIpterm\fP window.
 This option should be set to either 0 or 1; the default is 0. When
 set to 1, it stops the server from remotely controlling the title of
 the \fIpterm\fP window.

+.IP "\fBpterm.NoRemoteQTitle\fP"
+This option should be set to either 0 or 1; the default is 1. When
+set to 1, it stops the server from remotely requesting the title of
+the \fIpterm\fP window.
+
+This feature is a \fBPOTENTIAL SECURITY HAZARD\fP. If a malicious
+application can write data to your terminal (for example, if you
+merely \fIcat\fP a file owned by someone else on the server
+machine), it can change your window title (unless you have disabled
+this using the \fBNoRemoteWinTitle\fP resource) and then use this
+service to have the new window title sent back to the server as if
+typed at the keyboard. This allows an attacker to fake keypresses
+and potentially cause your server-side applications to do things you
+didn't want. Therefore this feature is disabled by default, and we
+recommend you do not turn it on unless you \fBreally\fP know what
+you are doing.

 .IP "\fBpterm.NoDBackspace\fP"
 This option should be set to either 0 or 1; the default is 0. When
 set to 1, it disables the normal action of the Delete (^?) character
 .IP "\fBpterm.NoDBackspace\fP"
 This option should be set to either 0 or 1; the default is 0. When
 set to 1, it disables the normal action of the Delete (^?) character


@@ -450,5 +470,3 @@ resource is equivalent to the \fI\-ls\fP command-line option.
 .SH BUGS
 Most of the X resources have silly names. (Historical reasons from
 PuTTY, mostly.)
 .SH BUGS
 Most of the X resources have silly names. (Historical reasons from
 PuTTY, mostly.)

-
-Character-set switching and Unicode are not yet supported.