From 689751055235a2a4a84ec48e0c1c0fde08e246a2 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Sun, 11 Jan 2009 23:41:29 +0000 Subject: [PATCH] Codes no longer needed. --- cmd-split-window.c | 4 ++-- tmux.h | 9 +-------- tty-term.c | 21 +-------------------- 3 files changed, 4 insertions(+), 30 deletions(-) diff --git a/cmd-split-window.c b/cmd-split-window.c index 5e9c0693..a2879f41 100644 --- a/cmd-split-window.c +++ b/cmd-split-window.c @@ -1,4 +1,4 @@ -/* $Id: cmd-split-window.c,v 1.1 2009-01-11 23:31:46 nicm Exp $ */ +/* $Id: cmd-split-window.c,v 1.2 2009-01-11 23:41:29 nicm Exp $ */ /* * Copyright (c) 2009 Nicholas Marriott @@ -154,7 +154,7 @@ cmd_split_window_exec(struct cmd *self, struct cmd_ctx *ctx) session_select(s, wl->idx); server_redraw_session(s); } else - server_status_window(s); + server_status_session(s); if (ctx->cmdclient != NULL) server_write_client(ctx->cmdclient, MSG_EXIT, NULL, 0); diff --git a/tmux.h b/tmux.h index 3a0d8b1e..7e3ba3b7 100644 --- a/tmux.h +++ b/tmux.h @@ -1,4 +1,4 @@ -/* $Id: tmux.h,v 1.223 2009-01-11 23:31:46 nicm Exp $ */ +/* $Id: tmux.h,v 1.224 2009-01-11 23:41:29 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -234,21 +234,14 @@ enum tty_code_code { TTYC_COLORS, /* max_colors, Co */ TTYC_CR, /* carriage_return, cr */ TTYC_CSR, /* change_scroll_region, cs */ - TTYC_CUB, /* parm_left_cursor, LE */ - TTYC_CUB1, /* cursor_left, le */ TTYC_CUD, /* parm_down_cursor, DO */ TTYC_CUD1, /* cursor_down, do */ - TTYC_CUF, /* parm_right_cursor, RI */ - TTYC_CUF1, /* cursor_right, nd */ TTYC_CUP, /* cursor_address, cm */ - TTYC_CUU, /* parm_up_cursor, UP */ - TTYC_CUU1, /* cursor_up, up */ TTYC_DCH, /* parm_dch, DC */ TTYC_DCH1, /* delete_character, dc */ TTYC_DIM, /* enter_dim_mode, mh */ TTYC_DL, /* parm_delete_line, DL */ TTYC_DL1, /* delete_line, dl */ - TTYC_ED, /* clr_eos, cd */ TTYC_EL, /* clr_eol, ce */ TTYC_EL1, /* clr_bol, cb */ TTYC_ENACS, /* ena_acs, eA */ diff --git a/tty-term.c b/tty-term.c index e903d8ce..50b8d1f6 100644 --- a/tty-term.c +++ b/tty-term.c @@ -1,4 +1,4 @@ -/* $Id: tty-term.c,v 1.7 2009-01-10 22:28:40 nicm Exp $ */ +/* $Id: tty-term.c,v 1.8 2009-01-11 23:41:29 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott @@ -41,21 +41,14 @@ struct tty_term_code_entry tty_term_codes[NTTYCODE] = { { TTYC_COLORS, TTYCODE_NUMBER, "colors" }, { TTYC_CR, TTYCODE_STRING, "cr" }, { TTYC_CSR, TTYCODE_STRING, "csr" }, - { TTYC_CUB, TTYCODE_STRING, "cub" }, - { TTYC_CUB1, TTYCODE_STRING, "cub1" }, { TTYC_CUD, TTYCODE_STRING, "cud" }, { TTYC_CUD1, TTYCODE_STRING, "cud1" }, - { TTYC_CUF, TTYCODE_STRING, "cuf" }, - { TTYC_CUF1, TTYCODE_STRING, "cuf1" }, { TTYC_CUP, TTYCODE_STRING, "cup" }, - { TTYC_CUU, TTYCODE_STRING, "cuu" }, - { TTYC_CUU1, TTYCODE_STRING, "cuu1" }, { TTYC_DCH, TTYCODE_STRING, "dch" }, { TTYC_DCH1, TTYCODE_STRING, "dch1" }, { TTYC_DIM, TTYCODE_STRING, "dim" }, { TTYC_DL, TTYCODE_STRING, "dl" }, { TTYC_DL1, TTYCODE_STRING, "dl1" }, - { TTYC_ED, TTYCODE_STRING, "ed" }, { TTYC_EL, TTYCODE_STRING, "el" }, { TTYC_EL1, TTYCODE_STRING, "el1" }, { TTYC_ENACS, TTYCODE_STRING, "enacs" }, @@ -268,22 +261,10 @@ tty_term_find(char *name, int fd, char **cause) } /* These can be emulated so one of the two is required. */ - if (!tty_term_has(term, TTYC_CUU1) && !tty_term_has(term, TTYC_CUU)) { - xasprintf(cause, "terminal does not support cuu1 or cuu"); - goto error; - } if (!tty_term_has(term, TTYC_CUD1) && !tty_term_has(term, TTYC_CUD)) { xasprintf(cause, "terminal does not support cud1 or cud"); goto error; } - if (!tty_term_has(term, TTYC_CUF1) && !tty_term_has(term, TTYC_CUF)) { - xasprintf(cause, "terminal does not support cuf1 or cuf"); - goto error; - } - if (!tty_term_has(term, TTYC_CUB1) && !tty_term_has(term, TTYC_CUB)) { - xasprintf(cause, "terminal does not support cub1 or cub"); - goto error; - } if (!tty_term_has(term, TTYC_IL1) && !tty_term_has(term, TTYC_IL)) { xasprintf(cause, "terminal does not support il1 or il"); goto error;