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

@ -568,6 +568,8 @@ struct terminal {
uint32_t bg;
uint32_t table[256];
uint16_t alpha;
uint32_t cursor_fg; /* Text color */
uint32_t cursor_bg; /* cursor color */
uint32_t selection_fg;
uint32_t selection_bg;
bool use_custom_selection;
@ -580,10 +582,6 @@ struct terminal {
int fd;
enum { CURSOR_BLINK_ON, CURSOR_BLINK_OFF } state;
} cursor_blink;
struct {
uint32_t text;
uint32_t cursor;
} cursor_color;
struct {
enum selection_kind kind;