From e0e41b30c61922e099a067ac5c137e745699a1aa Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Fri, 13 Feb 2015 12:06:01 -0300 Subject: ui: Remove/adapt some old code for a big UI refactor - Remove abstract_ui global, now it is always active - Remove some terminal handling code - Remove unused functions - Remove HAVE_TGETENT/TERMINFO/TERMIOS/IOCTL #ifdefs - Remove tgetent/terminfo from version.c - Remove curses/terminfo dependencies - Only start/stop termcap when starting/exiting the program - msg_use_printf will return true if there are no attached UIs( messages will be written to stdout) - Remove `ex_winpos`(implement `:winpos` with `ex_ni`) --- src/nvim/os/signal.c | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) (limited to 'src/nvim/os/signal.c') diff --git a/src/nvim/os/signal.c b/src/nvim/os/signal.c index d074ace884..df21bed446 100644 --- a/src/nvim/os/signal.c +++ b/src/nvim/os/signal.c @@ -20,7 +20,7 @@ KMEMPOOL_INIT(SignalEventPool, int, SignalEventFreer) kmempool_t(SignalEventPool) *signal_event_pool = NULL; -static uv_signal_t sint, spipe, shup, squit, sterm, swinch; +static uv_signal_t spipe, shup, squit, sterm; #ifdef SIGPWR static uv_signal_t spwr; #endif @@ -30,24 +30,18 @@ static bool rejecting_deadly; #ifdef INCLUDE_GENERATED_DECLARATIONS # include "os/signal.c.generated.h" #endif + void signal_init(void) { signal_event_pool = kmp_init(SignalEventPool); - uv_signal_init(uv_default_loop(), &sint); uv_signal_init(uv_default_loop(), &spipe); uv_signal_init(uv_default_loop(), &shup); uv_signal_init(uv_default_loop(), &squit); uv_signal_init(uv_default_loop(), &sterm); - uv_signal_init(uv_default_loop(), &swinch); - uv_signal_start(&sint, signal_cb, SIGINT); uv_signal_start(&spipe, signal_cb, SIGPIPE); uv_signal_start(&shup, signal_cb, SIGHUP); uv_signal_start(&squit, signal_cb, SIGQUIT); uv_signal_start(&sterm, signal_cb, SIGTERM); - if (!abstract_ui) { - // TODO(tarruda): There must be an API function for resizing window - uv_signal_start(&swinch, signal_cb, SIGWINCH); - } #ifdef SIGPWR uv_signal_init(uv_default_loop(), &spwr); uv_signal_start(&spwr, signal_cb, SIGPWR); @@ -57,12 +51,10 @@ void signal_init(void) void signal_teardown(void) { signal_stop(); - uv_close((uv_handle_t *)&sint, NULL); uv_close((uv_handle_t *)&spipe, NULL); uv_close((uv_handle_t *)&shup, NULL); uv_close((uv_handle_t *)&squit, NULL); uv_close((uv_handle_t *)&sterm, NULL); - uv_close((uv_handle_t *)&swinch, NULL); #ifdef SIGPWR uv_close((uv_handle_t *)&spwr, NULL); #endif @@ -70,12 +62,10 @@ void signal_teardown(void) void signal_stop(void) { - uv_signal_stop(&sint); uv_signal_stop(&spipe); uv_signal_stop(&shup); uv_signal_stop(&squit); uv_signal_stop(&sterm); - uv_signal_stop(&swinch); #ifdef SIGPWR uv_signal_stop(&spwr); #endif @@ -94,16 +84,12 @@ void signal_accept_deadly(void) static char * signal_name(int signum) { switch (signum) { - case SIGINT: - return "SIGINT"; #ifdef SIGPWR case SIGPWR: return "SIGPWR"; #endif case SIGPIPE: return "SIGPIPE"; - case SIGWINCH: - return "SIGWINCH"; case SIGTERM: return "SIGTERM"; case SIGQUIT: @@ -148,9 +134,6 @@ static void on_signal_event(Event event) kmp_free(SignalEventPool, signal_event_pool, event.data); switch (signum) { - case SIGINT: - got_int = true; - break; #ifdef SIGPWR case SIGPWR: // Signal of a power failure(eg batteries low), flush the swap files to @@ -161,9 +144,6 @@ static void on_signal_event(Event event) case SIGPIPE: // Ignore break; - case SIGWINCH: - shell_resized(); - break; case SIGTERM: case SIGQUIT: case SIGHUP: -- cgit