From 3baba1e7bc6698e6bc9f1d37fce88b30d6274bc9 Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Mon, 16 Feb 2015 23:47:56 -0300 Subject: refactor: Remove term modules and termcap options - Removed term.c, term.h and term_defs.h - Tests for T_* values were removed. screen.c was simplified as a consequence(the best strategy for drawing is implemented in the UI layer) - Redraw functions now call ui.c functions directly. Updates are flushed with `ui_flush()` - Removed all termcap options(they now return empty strings for compatibility) - &term/&ttybuiltin options return a constant value(nvim) - &t_Co is still available, but it mirrors t_colors directly - Remove cursor tracking from screen.c and the `screen_start` function. Now the UI is expected to maintain cursor state across any call, and reset it when resized. - Remove unused code --- src/nvim/normal.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/nvim/normal.c') diff --git a/src/nvim/normal.c b/src/nvim/normal.c index 8c7deaa243..3906226b2e 100644 --- a/src/nvim/normal.c +++ b/src/nvim/normal.c @@ -57,7 +57,6 @@ #include "nvim/strings.h" #include "nvim/syntax.h" #include "nvim/tag.h" -#include "nvim/term.h" #include "nvim/ui.h" #include "nvim/mouse.h" #include "nvim/undo.h" @@ -427,7 +426,7 @@ normal_cmd ( int c; bool ctrl_w = false; /* got CTRL-W command */ int old_col = curwin->w_curswant; - bool need_flushbuf; /* need to call out_flush() */ + bool need_flushbuf; /* need to call ui_flush() */ pos_T old_pos; /* cursor position before command */ int mapped_len; static int old_mapped_len = 0; @@ -869,7 +868,7 @@ getcount: * mappings. */ if (need_flushbuf) - out_flush(); + ui_flush(); if (ca.cmdchar != K_IGNORE) did_cursorhold = false; @@ -987,8 +986,8 @@ getcount: free(kmsg); } setcursor(); - cursor_on(); - out_flush(); + ui_cursor_on(); + ui_flush(); if (msg_scroll || emsg_on_display) os_delay(1000L, true); /* wait at least one second */ os_delay(3000L, false); /* wait up to three seconds */ @@ -3002,7 +3001,7 @@ static void display_showcmd(void) { int len; - cursor_off(); + ui_cursor_off(); len = (int)STRLEN(showcmd_buf); if (len == 0) -- cgit