From 541eaf598c25e0b853ef441b57c9f7d1bbf3450c Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Thu, 27 Nov 2014 12:54:26 -0300 Subject: ui: Remove ui_inchar/ui_char_avail Also: - Remove NO_CONSOLE_INPUT/NO_CONSULE preprocessor conditionals - Remove ctrl_c_interrupts variable, check for mapped_ctrl_c directly in process_interrupts() - Move ui_inchar profiling to input_poll which is where Nvim blocks for input. --- src/nvim/message.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/nvim/message.c') diff --git a/src/nvim/message.c b/src/nvim/message.c index 23feeab173..6b17c00417 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -2702,11 +2702,9 @@ do_dialog ( int c; int i; -#ifndef NO_CONSOLE /* Don't output anything in silent mode ("ex -s") */ if (silent_mode) return dfltbutton; /* return default option */ -#endif oldState = State; -- cgit From 1865b8c1c115b639a4a12b5a9cb287a62a82ac76 Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Thu, 27 Nov 2014 14:10:42 -0300 Subject: ui: Remove ui_delay, ui_breakcheck and ui_set_shellsize These functions only used to call another os_* function, so remove them and replace all occurences in the project. --- src/nvim/message.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/nvim/message.c') diff --git a/src/nvim/message.c b/src/nvim/message.c index 6b17c00417..2c1fe313fe 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -44,6 +44,8 @@ #include "nvim/term.h" #include "nvim/ui.h" #include "nvim/os/os.h" +#include "nvim/os/input.h" +#include "nvim/os/time.h" /* * To be able to scroll back at the "more" and "hit-enter" prompts we need to @@ -877,7 +879,7 @@ void wait_return(int redraw) || c == K_X1MOUSE || c == K_X2MOUSE)) ); - ui_breakcheck(); + os_breakcheck(); /* * Avoid that the mouse-up event causes visual mode to start. */ -- cgit From a3534138a815b6387b8e5f7603c7e2a2b1195d78 Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Thu, 27 Nov 2014 14:48:30 -0300 Subject: ui: Extract mouse.c/mouse.h --- src/nvim/message.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/nvim/message.c') diff --git a/src/nvim/message.c b/src/nvim/message.c index 2c1fe313fe..0c64b694a5 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -43,6 +43,7 @@ #include "nvim/strings.h" #include "nvim/term.h" #include "nvim/ui.h" +#include "nvim/mouse.h" #include "nvim/os/os.h" #include "nvim/os/input.h" #include "nvim/os/time.h" -- cgit From bf6bb27e79f53646309ba075655465919bc2e60c Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Thu, 27 Nov 2014 14:58:04 -0300 Subject: ui: Remove redundant ui.h includes Also move read_error_exit to os/input.c --- src/nvim/message.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src/nvim/message.c') diff --git a/src/nvim/message.c b/src/nvim/message.c index 0c64b694a5..cd0c548fb4 100644 --- a/src/nvim/message.c +++ b/src/nvim/message.c @@ -42,7 +42,6 @@ #include "nvim/screen.h" #include "nvim/strings.h" #include "nvim/term.h" -#include "nvim/ui.h" #include "nvim/mouse.h" #include "nvim/os/os.h" #include "nvim/os/input.h" -- cgit