From 7a9707899700aee77ff2d23bbec954ee131acf15 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Fri, 1 Apr 2022 10:06:30 +0100 Subject: Minor differences from master. --- tmux.h | 5 ++--- tty.c | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tmux.h b/tmux.h index e6c986a9..c76227b4 100644 --- a/tmux.h +++ b/tmux.h @@ -1385,7 +1385,6 @@ struct tty { #define TTY_HAVEDA 0x100 #define TTY_HAVEXDA 0x200 #define TTY_SYNCING 0x400 -#define TTY_NOBLOCK 0x800 int flags; struct tty_term *term; @@ -2867,8 +2866,8 @@ void screen_write_cell(struct screen_write_ctx *, const struct grid_cell *); void screen_write_setselection(struct screen_write_ctx *, u_char *, u_int); void screen_write_rawstring(struct screen_write_ctx *, u_char *, u_int); void screen_write_rawsixel(struct screen_write_ctx *, u_char *, u_int, int); -void screen_write_alternateon(struct screen_write_ctx *, struct grid_cell *, - int); +void screen_write_alternateon(struct screen_write_ctx *, + struct grid_cell *, int); void screen_write_alternateoff(struct screen_write_ctx *, struct grid_cell *, int); diff --git a/tty.c b/tty.c index 266762d1..fbc6cb66 100644 --- a/tty.c +++ b/tty.c @@ -690,7 +690,6 @@ tty_force_cursor_colour(struct tty *tty, int c) static int tty_update_cursor(struct tty *tty, int mode, struct screen *s) { ->>>>>>> master enum screen_cursor_style cstyle; int ccolour, changed, cmode = mode; @@ -2119,8 +2118,8 @@ void tty_cmd_rawsixel(struct tty *tty, const struct tty_ctx *ctx) { if (tty_term_has(tty->term, TTYC_SXL)) { - tty_add(tty, ctx->ptr, ctx->num); tty->flags |= TTY_NOBLOCK; + tty_add(tty, ctx->ptr, ctx->num); if (!ctx->more) tty_invalidate(tty); -- cgit v1.2.3