In a similar vein, updated and with documentation:
diff -r -u putty-0.61-orig/config.c putty-0.61/config.c
--- putty-0.61-orig/config.c 2011-01-14 19:57:00.000000000 +0000
+++ putty-0.61/config.c 2011-09-23 16:19:14.000000000 +0100
@@ -1696,9 +1696,13 @@
ctrl_checkbox(s, "Allow terminal to use xterm 256-colour mode", '2',
HELPCTX(colours_xterm256), dlg_stdcheckbox_handler,
I(offsetof(Config,xterm_256_colour)));
- ctrl_checkbox(s, "Bolded text is a different colour", 'b',
- HELPCTX(colours_bold),
- dlg_stdcheckbox_handler, I(offsetof(Config,bold_colour)));
+ ctrl_radiobuttons(s, "Bolded text distingished by:", 'b', 3,
+ HELPCTX(colours_bold),
+ dlg_stdradiobutton_handler,
+ I(offsetof(Config,bold_colour)),
+ "Colour", I(FORCE_OFF),
+ "Font", I(FORCE_ON),
+ "Both", I(AUTO), NULL);
str = dupprintf("Adjust the precise colours %s displays", appname);
s = ctrl_getset(b, "Window/Colours", "adjust", str);
diff -r -u putty-0.61-orig/unix/gtkwin.c putty-0.61/unix/gtkwin.c
--- putty-0.61-orig/unix/gtkwin.c 2011-05-07 11:57:19.000000000 +0100
+++ putty-0.61/unix/gtkwin.c 2011-09-23 16:19:14.000000000 +0100
@@ -2027,11 +2027,11 @@
nfg = nbg;
nbg = t;
}
- if (inst->cfg.bold_colour && (attr & ATTR_BOLD)) {
+ if ((inst->cfg.bold_colour != FORCE_ON) && (attr & ATTR_BOLD)) {
if (nfg < 16) nfg |= 8;
else if (nfg >= 256) nfg |= 1;
}
- if (inst->cfg.bold_colour && (attr & ATTR_BLINK)) {
+ if ((inst->cfg.bold_colour != FORCE_ON) && (attr & ATTR_BLINK)) {
if (nbg < 16) nbg |= 8;
else if (nbg >= 256) nbg |= 1;
}
@@ -2049,7 +2049,7 @@
widefactor = 1;
}
- if ((attr & ATTR_BOLD) && !inst->cfg.bold_colour) {
+ if ((attr & ATTR_BOLD) && (inst->cfg.bold_colour != FORCE_OFF)) {
bold = 1;
fontid |= 1;
} else {
diff -r -u putty-0.61-orig/doc/config.but putty-0.61/doc/config.but
--- putty-0.61-orig/doc/config.but 2010-12-29 14:11:25.000000000 +0000
+++ putty-0.61/doc/config.but 2011-09-23 16:19:14.000000000 +0100
@@ -1541,20 +1541,21 @@
change your terminal setting. On modern Linux machines, you could
try \cq{xterm-256color}.
-\S{config-boldcolour} \q{Bolded text is a different colour}
+\S{config-boldcolour} \q{Bolded text distinguished by:}
\cfg{winhelp-topic}{colours.bold}
When the server sends a \i{control sequence} indicating that some text
-should be displayed in \i{bold}, PuTTY can handle this two ways. It can
-either change the \i{font} for a bold version, or use the same font in a
-brighter colour. This control lets you choose which.
+should be displayed in \i{bold}, PuTTY can handle this three ways. It can
+either change the \i{font} for a bold version, use the same font in a brighter
+colour, or do both of those things. This control lets you choose which.
-By default the box is checked, so non-bold text is displayed in
+By default the Colour option is selected, so non-bold text is displayed in
light grey and bold text is displayed in bright white (and similarly
-in other colours). If you uncheck the box, bold and non-bold text
+in other colours). If you chose the Font option, bold and non-bold text
will be displayed in the same colour, and instead the font will
-change to indicate the difference.
+change to indicate the difference. If you chose the Both option then both
+of these effects will occur.
\S{config-logpalette} \q{Attempt to use \i{logical palettes}}
@@ -1600,8 +1601,9 @@
\I{ANSI colours}ANSI configurable colours (black, red, green, yellow, blue,
magenta, cyan, and white). You can also modify the precise shades used for
the \i{bold} versions of these colours; these are used to display bold text
-if you have selected \q{Bolded text is a different colour}, and can also be
-used if the server asks specifically to use them. (Note that \q{Default
+if you have selected either the Colour or Both option for
+\q{Bolded text distinguished by}, and can also be used if the server
+asks specifically to use them. (Note that \q{Default
Bold Background} is \e{not} the background colour used for bold text;
it is only used if the server specifically asks for a bold
background.)
diff -r -u putty-0.61-orig/doc/man-ptel.but putty-0.61/doc/man-ptel.but
--- putty-0.61-orig/doc/man-ptel.but 2005-03-19 02:26:58.000000000 +0000
+++ putty-0.61/doc/man-ptel.but 2011-09-23 16:19:14.000000000 +0100
@@ -37,7 +37,7 @@
\dd Specify the font to use for bold text displayed in the terminal. If
the \cw{BoldAsColour} resource is set to 1 (the default), bold text
will be displayed in different colours instead of a different font,
-so this option will be ignored. If \cw{BoldAsColour} is set to 0
+so this option will be ignored. If \cw{BoldAsColour} is set to 0 or 2
and you do not specify a bold font, \cw{puttytel} will overprint the
normal font to make it look bolder.
@@ -50,7 +50,7 @@
\dd Specify the font to use for bold double-width characters
(typically Chinese, Japanese and Korean text). Like \cw{-fb}, this
-will be ignored unless the \cw{BoldAsColour} resource is set to 0.
+will be ignored if the \cw{BoldAsColour} resource is set to 1.
\dt \cw{\-geometry} \e{geometry}
@@ -74,12 +74,12 @@
\dt \cw{\-bfg} \e{colour}
\dd Specify the foreground colour to use for bold text, if the
-\cw{BoldAsColour} resource is set to 1 (the default).
+\cw{BoldAsColour} resource is set to 1 (the default) or 2.
\dt \cw{\-bbg} \e{colour}
\dd Specify the foreground colour to use for bold reverse-video text, if
-the \cw{BoldAsColour} resource is set to 1 (the default). (This
+the \cw{BoldAsColour} resource is set to 1 (the default) or 2. (This
colour is best thought of as the bold version of the background
colour; so it only appears when text is displayed \e{in} the
background colour.)
diff -r -u putty-0.61-orig/doc/man-pter.but putty-0.61/doc/man-pter.but
--- putty-0.61-orig/doc/man-pter.but 2008-04-05 13:26:49.000000000 +0100
+++ putty-0.61/doc/man-pter.but 2011-09-23 16:19:14.000000000 +0100
@@ -57,7 +57,7 @@
\dd Specify the font to use for bold text displayed in the terminal. If
the \cw{BoldAsColour} resource is set to 1 (the default), bold text
will be displayed in different colours instead of a different font,
-so this option will be ignored. If \cw{BoldAsColour} is set to 0
+so this option will be ignored. If \cw{BoldAsColour} is set to 0 or 2
and you do not specify a bold font, \cw{pterm} will overprint the
normal font to make it look bolder.
@@ -70,7 +70,7 @@
\dd Specify the font to use for bold double-width characters
(typically Chinese, Japanese and Korean text). Like \cw{-fb}, this
-will be ignored unless the \cw{BoldAsColour} resource is set to 0.
+will be ignored if the \cw{BoldAsColour} resource is set to 1.
\dt \cw{\-geometry} \e{geometry}
@@ -94,12 +94,12 @@
\dt \cw{\-bfg} \e{colour}
\dd Specify the foreground colour to use for bold text, if the
-\cw{BoldAsColour} resource is set to 1 (the default).
+\cw{BoldAsColour} resource is set to 1 (the default) or 2.
\dt \cw{\-bbg} \e{colour}
\dd Specify the foreground colour to use for bold reverse-video text, if
-the \cw{BoldAsColour} resource is set to 1 (the default). (This
+the \cw{BoldAsColour} resource is set to 1 (the default) or 2. (This
colour is best thought of as the bold version of the background
colour; so it only appears when text is displayed \e{in} the
background colour.)
@@ -498,7 +498,7 @@
\dd This resource is the same as the \cw{\-fb} command-line option: it
controls the font used to display bold text when \cw{BoldAsColour}
-is turned off. The default is unset (the font will be bolded by
+is set to 0 or 2. The default is unset (the font will be bolded by
printing it twice at a one-pixel offset).
\dt \cw{pterm.WideFont}
@@ -529,10 +529,11 @@
\dt \cw{pterm.BoldAsColour}
-\dd This option should be set to either 0 or 1; the default is 1. It
-specifies the default state of auto wrap mode. When set to 1, bold
-text is shown by displaying it in a brighter colour; when set to 0,
-bold text is shown by displaying it in a heavier font.
+\dd This option should be set to 0, 1 or 2; the default is 1. When
+set to 1, bold text is shown by displaying it in a brighter colour;
+when set to 0, bold text is shown by displaying it in a heavier font.
+When set to 2 bold text is shown by displaying it in a brighter
+colour and a heavier font.
\dt \cw{pterm.Colour0}, \cw{pterm.Colour1}, ..., \cw{pterm.Colour21}
diff -r -u putty-0.61-orig/doc/man-putt.but putty-0.61/doc/man-putt.but
--- putty-0.61-orig/doc/man-putt.but 2009-08-10 21:55:19.000000000 +0100
+++ putty-0.61/doc/man-putt.but 2011-09-23 16:19:14.000000000 +0100
@@ -37,8 +37,8 @@
If the \cw{BoldAsColour} resource is set to 1 (the default), bold
text will be displayed in different colours instead of a different
font, so this option will be ignored. If \cw{BoldAsColour} is set to
-0 and you do not specify a bold font, \cw{putty} will overprint the
-normal font to make it look bolder.
+0 or 2 and you do not specify a bold font, \cw{putty} will overprint
+the normal font to make it look bolder.
\dt \cw{\-fw} \e{font-name}
@@ -49,7 +49,7 @@
\dd Specify the font to use for bold double-width characters
(typically Chinese, Japanese and Korean text). Like \cw{-fb}, this
-will be ignored unless the \cw{BoldAsColour} resource is set to 0.
+will be ignored if the \cw{BoldAsColour} resource is set to 1.
\dt \cw{\-geometry} \e{geometry}
@@ -73,12 +73,12 @@
\dt \cw{\-bfg} \e{colour}
\dd Specify the foreground colour to use for bold text, if the
-\cw{BoldAsColour} resource is set to 1 (the default).
+\cw{BoldAsColour} resource is set to 1 (the default) or 2.
\dt \cw{\-bbg} \e{colour}
\dd Specify the foreground colour to use for bold reverse-video
-text, if the \cw{BoldAsColour} resource is set to 1 (the default).
+text, if the \cw{BoldAsColour} resource is set to 1 (the default) or 2.
(This colour is best thought of as the bold version of the
background colour; so it only appears when text is displayed \e{in}
the background colour.)
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
