Merge branch 'obsd-master' into master

pull/2851/head
Thomas Adam 2021-08-14 18:01:17 +01:00
commit 22e5fc02c3
1 changed files with 24 additions and 16 deletions

40
input.c
View File

@ -2556,10 +2556,12 @@ input_osc_10(struct input_ctx *ictx, const char *p)
log_debug("bad OSC 10: %s", p); log_debug("bad OSC 10: %s", p);
return; return;
} }
ictx->palette->fg = c; if (ictx->palette != NULL) {
if (wp != NULL) ictx->palette->fg = c;
wp->flags |= PANE_STYLECHANGED; if (wp != NULL)
screen_write_fullredraw(&ictx->ctx); wp->flags |= PANE_STYLECHANGED;
screen_write_fullredraw(&ictx->ctx);
}
} }
/* Handle the OSC 110 sequence for resetting background colour. */ /* Handle the OSC 110 sequence for resetting background colour. */
@ -2570,10 +2572,12 @@ input_osc_110(struct input_ctx *ictx, const char *p)
if (*p != '\0') if (*p != '\0')
return; return;
ictx->palette->fg = 8; if (ictx->palette != NULL) {
if (wp != NULL) ictx->palette->fg = 8;
wp->flags |= PANE_STYLECHANGED; if (wp != NULL)
screen_write_fullredraw(&ictx->ctx); wp->flags |= PANE_STYLECHANGED;
screen_write_fullredraw(&ictx->ctx);
}
} }
/* Handle the OSC 11 sequence for setting and querying background colour. */ /* Handle the OSC 11 sequence for setting and querying background colour. */
@ -2596,10 +2600,12 @@ input_osc_11(struct input_ctx *ictx, const char *p)
log_debug("bad OSC 11: %s", p); log_debug("bad OSC 11: %s", p);
return; return;
} }
ictx->palette->bg = c; if (ictx->palette != NULL) {
if (wp != NULL) ictx->palette->bg = c;
wp->flags |= PANE_STYLECHANGED; if (wp != NULL)
screen_write_fullredraw(&ictx->ctx); wp->flags |= PANE_STYLECHANGED;
screen_write_fullredraw(&ictx->ctx);
}
} }
/* Handle the OSC 111 sequence for resetting background colour. */ /* Handle the OSC 111 sequence for resetting background colour. */
@ -2610,10 +2616,12 @@ input_osc_111(struct input_ctx *ictx, const char *p)
if (*p != '\0') if (*p != '\0')
return; return;
ictx->palette->bg = 8; if (ictx->palette != NULL) {
if (wp != NULL) ictx->palette->bg = 8;
wp->flags |= PANE_STYLECHANGED; if (wp != NULL)
screen_write_fullredraw(&ictx->ctx); wp->flags |= PANE_STYLECHANGED;
screen_write_fullredraw(&ictx->ctx);
}
} }
/* Handle the OSC 52 sequence for setting the clipboard. */ /* Handle the OSC 52 sequence for setting the clipboard. */