nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 01:48:00 +00:00
Code Issues Projects Releases Wiki Activity

Move the `translation of line drawing characters when pasting'

Browse Source 
option from the Selection panel to the Translation panel (where it
fits at least as well). This frees a line in the Selection panel
which I'm about to use for an additional mouse handling option.

[originally from svn r3564]
This commit is contained in:
Simon Tatham 2003-11-20 18:33:22 +00:00
parent 890582d297
commit 5ff8c668e4
3 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config.c
View File

@ -1149,7 +1149,7 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
'r', 100, HELPCTX(translation_codepage), 'r', 100, HELPCTX(translation_codepage),
codepage_handler, P(NULL), P(NULL)); codepage_handler, P(NULL), P(NULL));
str = dupprintf("Adjust how %s displays line drawing characters", appname); str = dupprintf("Adjust how %s handles line drawing characters", appname);
s = ctrl_getset(b, "Window/Translation", "linedraw", str); s = ctrl_getset(b, "Window/Translation", "linedraw", str);
sfree(str); sfree(str);
ctrl_radiobuttons(s, "Handling of line drawing characters:", NO_SHORTCUT,1, ctrl_radiobuttons(s, "Handling of line drawing characters:", NO_SHORTCUT,1,
@ -1159,18 +1159,15 @@ void setup_config_box(struct controlbox *b, struct sesslist *sesslist,
"Use Unicode line drawing code points",'u',I(VT_UNICODE), "Use Unicode line drawing code points",'u',I(VT_UNICODE),
"Poor man's line drawing (+, - and |)",'p',I(VT_POORMAN), "Poor man's line drawing (+, - and |)",'p',I(VT_POORMAN),
NULL); NULL);
ctrl_checkbox(s, "Copy and paste line drawing characters as lqqqk",'d',
HELPCTX(selection_linedraw),
dlg_stdcheckbox_handler, I(offsetof(Config,rawcnp)));
/* /*
* The Window/Selection panel. * The Window/Selection panel.
*/ */
ctrl_settitle(b, "Window/Selection", "Options controlling copy and paste"); ctrl_settitle(b, "Window/Selection", "Options controlling copy and paste");
s = ctrl_getset(b, "Window/Selection", "trans",
"Translation of pasted characters");
ctrl_checkbox(s, "Paste VT100 line drawing chars as lqqqk",'d',
HELPCTX(selection_linedraw),
dlg_stdcheckbox_handler, I(offsetof(Config,rawcnp)));
s = ctrl_getset(b, "Window/Selection", "mouse", s = ctrl_getset(b, "Window/Selection", "mouse",
"Control use of mouse"); "Control use of mouse");
ctrl_checkbox(s, "Shift overrides application's use of mouse", 'p', ctrl_checkbox(s, "Shift overrides application's use of mouse", 'p',

28
doc/config.but
View File

@ -1,4 +1,4 @@
\versionid $Id: config.but,v 1.71 2003/10/08 21:39:54 jacob Exp $ \versionid $Id: config.but,v 1.72 2003/11/20 18:33:22 simon Exp $
\C{config} Configuring PuTTY \C{config} Configuring PuTTY
@ -1142,12 +1142,7 @@ You should use this option if none of the other options works.
in Unicode. For good Unicode-supporting fonts this is probably the in Unicode. For good Unicode-supporting fonts this is probably the
most reliable and functional option. most reliable and functional option.
\H{config-selection} The Selection panel \S{config-linedrawpaste} Controlling copy and paste of line drawing
The Selection panel allows you to control the way copy and paste
work in the PuTTY window.
\S{config-linedrawpaste} Controlling the pasting of line drawing
characters characters
\cfg{winhelp-topic}{selection.linedraw} \cfg{winhelp-topic}{selection.linedraw}
@ -1156,18 +1151,23 @@ By default, when you copy and paste a piece of the PuTTY screen that
contains VT100 line and box drawing characters, PuTTY will paste contains VT100 line and box drawing characters, PuTTY will paste
them in the form they appear on the screen: either Unicode line them in the form they appear on the screen: either Unicode line
drawing code points, or the \q{poor man's} line-drawing characters drawing code points, or the \q{poor man's} line-drawing characters
\c{+}, \c{-} and \c{|}. The checkbox \q{Paste VT100 line drawing \c{+}, \c{-} and \c{|}. The checkbox \q{Copy and paste VT100 line
chars as lqqqk} disables this feature, so line-drawing characters drawing chars as lqqqk} disables this feature, so line-drawing
will be pasted as the ASCII characters that were printed to produce characters will be pasted as the ASCII characters that were printed
them. This will typically mean they come out mostly as \c{q} and to produce them. This will typically mean they come out mostly as
\c{x}, with a scattering of \c{jklmntuvw} at the corners. This might \c{q} and \c{x}, with a scattering of \c{jklmntuvw} at the corners.
be useful if you were trying to recreate the same box layout in This might be useful if you were trying to recreate the same box
another program, for example. layout in another program, for example.
Note that this option only applies to line-drawing characters which Note that this option only applies to line-drawing characters which
\e{were} printed by using the VT100 mechanism. Line-drawing \e{were} printed by using the VT100 mechanism. Line-drawing
characters displayed using Unicode will paste as Unicode always. characters displayed using Unicode will paste as Unicode always.
\H{config-selection} The Selection panel
The Selection panel allows you to control the way copy and paste
work in the PuTTY window.
\S{config-rtfpaste} Pasting in Rich Text Format \S{config-rtfpaste} Pasting in Rich Text Format
\cfg{winhelp-topic}{selection.rtf} \cfg{winhelp-topic}{selection.rtf}

4
wincfg.c
View File

@ -233,8 +233,8 @@ void win_setup_config_box(struct controlbox *b, HWND *hwndp, int has_help,
/* /*
* RTF paste is Windows-specific. * RTF paste is Windows-specific.
*/ */
s = ctrl_getset(b, "Window/Selection", "trans", s = ctrl_getset(b, "Window/Selection", "format",
"Translation of pasted characters"); "Formatting of pasted characters");
ctrl_checkbox(s, "Paste to clipboard in RTF as well as plain text", 'f', ctrl_checkbox(s, "Paste to clipboard in RTF as well as plain text", 'f',
HELPCTX(selection_rtf), HELPCTX(selection_rtf),
dlg_stdcheckbox_handler, I(offsetof(Config,rtf_paste))); dlg_stdcheckbox_handler, I(offsetof(Config,rtf_paste)));