aboutsummaryrefslogtreecommitdiff
path: root/src/ui.c
diff options
context:
space:
mode:
authorThiago de Arruda <tpadilha84@gmail.com>2014-04-01 08:54:31 -0300
committerThiago de Arruda <tpadilha84@gmail.com>2014-04-01 09:46:29 -0300
commit774f668c43c14c6c6593264a1c8c9a0275b19037 (patch)
tree176395e37139e68c3a40f9271b9cfa04722c0ff1 /src/ui.c
parent40879af7bdd1633f3d22f0d1da9a24992cf3e2b2 (diff)
downloadrneovim-774f668c43c14c6c6593264a1c8c9a0275b19037.tar.gz
rneovim-774f668c43c14c6c6593264a1c8c9a0275b19037.tar.bz2
rneovim-774f668c43c14c6c6593264a1c8c9a0275b19037.zip
Move signal handling to libuv event loop
This removes all signal handling code from os_unix.c to os/signal.c. Now signal handling is done like this: - Watchers for signals are registered with libuv default event loop - `event_poll` continuously calls `poll_uv_loop` to produce events until it receives user input, SIGINT or a timeout - Any signals received in `poll_uv_loop` will push events to a queue that is drained and processed by `event_poll` Signals aren't handled directly in the libuv callback to avoid recursion in the event loop(which isn't supported by libuv). The same principle will apply to other events in the future: Push to a queue from a libuv callback and drain it from `event_poll`
Diffstat (limited to 'src/ui.c')
-rw-r--r--src/ui.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ui.c b/src/ui.c
index 653d4df159..685b44ed28 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -34,6 +34,7 @@
#include "os_unix.h"
#include "os/time.h"
#include "os/input.h"
+#include "os/signal.h"
#include "screen.h"
#include "term.h"
#include "window.h"
@@ -145,7 +146,7 @@ ui_inchar (
/* If we are going to wait for some time or block... */
if (wtime == -1 || wtime > 100L) {
/* ... allow signals to kill us. */
- (void)vim_handle_signal(SIGNAL_UNBLOCK);
+ signal_accept_deadly();
/* ... there is no need for CTRL-C to interrupt something, don't let
* it set got_int when it was mapped. */
@@ -161,7 +162,7 @@ ui_inchar (
if (wtime == -1 || wtime > 100L)
/* block SIGHUP et al. */
- (void)vim_handle_signal(SIGNAL_BLOCK);
+ signal_reject_deadly();
ctrl_c_interrupts = TRUE;