v/tmate-ssh-server
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate-ssh-server.git synced 2020-11-18 19:53:51 -08:00
Code Issues Releases Wiki Activity

Handle resetting 256-colours properly when parsing #[default],

Browse Source 
#[fg=default] and #[bg=default] styles.
This commit is contained in:
Nicholas Marriott 2012-12-08 17:05:57 +00:00
parent 8600fe054b
commit 3fa4f691e3
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
screen-write.c
View File

@ -324,6 +324,9 @@ screen_write_parsestyle(
fg = defgc->fg; fg = defgc->fg;
bg = defgc->bg; bg = defgc->bg;
attr = defgc->attr; attr = defgc->attr;
flags &= ~(GRID_FLAG_FG256|GRID_FLAG_BG256);
flags |=
defgc->flags & (GRID_FLAG_FG256|GRID_FLAG_BG256);
} else if (end > 3 && strncasecmp(tmp + 1, "g=", 2) == 0) { } else if (end > 3 && strncasecmp(tmp + 1, "g=", 2) == 0) {
if ((val = colour_fromstring(tmp + 3)) == -1) if ((val = colour_fromstring(tmp + 3)) == -1)
return; return;
@ -335,8 +338,11 @@ screen_write_parsestyle(
} else } else
flags &= ~GRID_FLAG_FG256; flags &= ~GRID_FLAG_FG256;
fg = val; fg = val;
} else } else {
fg = defgc->fg; fg = defgc->fg;
flags &= ~GRID_FLAG_FG256;
flags |= defgc->flags & GRID_FLAG_FG256;
}
} else if (*in == 'b' || *in == 'B') { } else if (*in == 'b' || *in == 'B') {
if (val != 8) { if (val != 8) {
if (val & 0x100) { if (val & 0x100) {
@ -345,8 +351,11 @@ screen_write_parsestyle(
} else } else
flags &= ~GRID_FLAG_BG256; flags &= ~GRID_FLAG_BG256;
bg = val; bg = val;
} else } else {
bg = defgc->bg; bg = defgc->bg;
flags &= ~GRID_FLAG_BG256;
flags |= defgc->flags & GRID_FLAG_BG256;
}
} else } else
return; return;
} else if (end > 2 && strncasecmp(tmp, "no", 2) == 0) { } else if (end > 2 && strncasecmp(tmp, "no", 2) == 0) {