From b72f9bea434f4ed4d8049ca7ec0d041d03bfecd6 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Thu, 23 Jul 2009 12:48:18 +0000 Subject: Sync OpenBSD patchset 162: More tty code tidying: move the saved cursor/region position (from before the screen was updated) out of struct screen and into struct tty_ctx. --- tmux.h | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'tmux.h') diff --git a/tmux.h b/tmux.h index c24bfa40..779b4497 100644 --- a/tmux.h +++ b/tmux.h @@ -1,4 +1,4 @@ -/* $Id: tmux.h,v 1.383 2009-07-23 12:38:01 tcunha Exp $ */ +/* $Id: tmux.h,v 1.384 2009-07-23 12:48:18 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -476,15 +476,9 @@ struct screen { u_int cx; /* cursor x */ u_int cy; /* cursor y */ - u_int old_cx; - u_int old_cy; - u_int rupper; /* scroll region top */ u_int rlower; /* scroll region bottom */ - u_int old_rupper; - u_int old_rlower; - int mode; bitstr_t *tabs; @@ -782,8 +776,19 @@ struct tty_ctx { const struct grid_cell *cell; const struct grid_utf8 *utf8; - u_int num; - void *ptr; + u_int num; + void *ptr; + + /* + * Cursor and region position before the screen was updated - this is + * where the command should be applied; the values in the screen have + * already been updated. + */ + u_int ocx; + u_int ocy; + + u_int orupper; + u_int orlower; }; typedef void tty_cmd_func(struct tty *, struct tty_ctx *); @@ -1031,10 +1036,10 @@ void tty_detect_utf8(struct tty *); void tty_set_title(struct tty *, const char *); void tty_update_mode(struct tty *, int); void tty_draw_line(struct tty *, struct screen *, u_int, u_int, u_int); -void tty_redraw_region(struct tty *, struct window_pane *); int tty_open(struct tty *, char **); void tty_close(struct tty *, int); void tty_free(struct tty *, int); +void tty_write(void (*)(struct tty *, struct tty_ctx *), struct tty_ctx *); void tty_cmd_alignmenttest(struct tty *, struct tty_ctx *); void tty_cmd_cell(struct tty *, struct tty_ctx *); void tty_cmd_clearendofline(struct tty *, struct tty_ctx *); @@ -1072,9 +1077,6 @@ void tty_keys_free(struct tty *); int tty_keys_next(struct tty *, int *, u_char *); /* tty-write.c */ -void tty_write0(struct window_pane *, tty_cmd_func *); -void tty_writenum(struct window_pane *, tty_cmd_func *, u_int); -void tty_writeptr(struct window_pane *, tty_cmd_func *, void *); void tty_write(tty_cmd_func *, struct tty_ctx *); /* options-cmd.c */ -- cgit