Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2026-03-23 12:01:10 +00:00
6 changed files with 67 additions and 26 deletions

View File

@@ -1617,7 +1617,7 @@ input_csi_dispatch(struct input_ctx *ictx)
if (ictx->wp != NULL)
oo = ictx->wp->options;
else
oo = global_options;
oo = global_w_options;
p = options_get_number(oo, "cursor-style");
/* blink for 1,3,5; steady for 0,2,4,6 */
@@ -2522,7 +2522,7 @@ input_handle_decrqss(struct input_ctx *ictx)
if (wp != NULL)
oo = wp->options;
else
oo = global_options;
oo = global_w_options;
opt_ps = options_get_number(oo, "cursor-style");
/* Sanity clamp: valid Ps are 0..6 per DECSCUSR. */
@@ -2562,8 +2562,9 @@ input_dcs_dispatch(struct input_ctx *ictx)
#endif
if (wp == NULL)
return (0);
oo = wp->options;
oo = global_w_options;
else
oo = wp->options;
if (ictx->flags & INPUT_DISCARD) {
log_debug("%s: %zu bytes (discard)", __func__, len);