osc: merge OSC 10/11/12/17/19 handling

10/11/17/19 were already merged, so this patch just stops special
casing 12 (cursor color).

In preparation for XTPUSHCOLORS/XTPOPCOLORS, the cursor colors are
moved from their own struct, into the 'colors' struct.

Also fix a bug where OSC 17/19 queries returned OSC-11 data.
This commit is contained in:
Daniel Eklöf 2024-07-01 17:24:50 +02:00
parent e708d19ea3
commit 5d4a002413
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
4 changed files with 33 additions and 58 deletions

View file

@ -557,13 +557,13 @@ cursor_colors_for_cell(const struct terminal *term, const struct cell *cell,
const pixman_color_t *fg, const pixman_color_t *bg,
pixman_color_t *cursor_color, pixman_color_t *text_color)
{
if (term->cursor_color.cursor >> 31)
*cursor_color = color_hex_to_pixman(term->cursor_color.cursor);
if (term->colors.cursor_bg >> 31)
*cursor_color = color_hex_to_pixman(term->colors.cursor_bg);
else
*cursor_color = *fg;
if (term->cursor_color.text >> 31)
*text_color = color_hex_to_pixman(term->cursor_color.text);
if (term->colors.cursor_fg >> 31)
*text_color = color_hex_to_pixman(term->colors.cursor_fg);
else {
*text_color = *bg;