nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-03 20:42:48 -05:00
Code Issues Projects Releases Wiki Activity

Introduce a third setting for the 'bold as colour' mode, which lets

Browse Source 
you both brighten the colour _and_ bold the font at the same time.
(Fixes 'bold-font-colour' and Debian #193352.)

[originally from svn r9559]
This commit is contained in:
Simon Tatham
2012-06-09 15:09:22 +00:00
parent a46aac386b
commit bc6e0952ef
10 changed files with 70 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
unix/gtkwin.c
View File

@ -104,14 +104,14 @@ struct gui_data {
guint32 input_event_time; /* Timestamp of the most recent input event. */
int reconfiguring;
/* Cached things out of conf that we refer to a lot */
int bold_colour;
int bold_style;
int window_border;
int cursor_type;
};
static void cache_conf_values(struct gui_data *inst)
{
inst->bold_colour = conf_get_int(inst->conf, CONF_bold_colour);
inst->bold_style = conf_get_int(inst->conf, CONF_bold_style);
inst->window_border = conf_get_int(inst->conf, CONF_window_border);
inst->cursor_type = conf_get_int(inst->conf, CONF_cursor_type);
}
@ -2061,11 +2061,11 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
nfg = nbg;
nbg = t;
}
if (inst->bold_colour && (attr & ATTR_BOLD)) {
if ((inst->bold_style & 2) && (attr & ATTR_BOLD)) {
if (nfg < 16) nfg |= 8;
else if (nfg >= 256) nfg |= 1;
}
if (inst->bold_colour && (attr & ATTR_BLINK)) {
if ((inst->bold_style & 2) && (attr & ATTR_BLINK)) {
if (nbg < 16) nbg |= 8;
else if (nbg >= 256) nbg |= 1;
}
@ -2083,7 +2083,7 @@ void do_text_internal(Context ctx, int x, int y, wchar_t *text, int len,
widefactor = 1;
}
if ((attr & ATTR_BOLD) && !inst->bold_colour) {
if ((attr & ATTR_BOLD) && (inst->bold_style & 1)) {
bold = 1;
fontid |= 1;
} else {