diff options
author | ridiculousfish <corydoras@ridiculousfish.com> | 2013-04-03 13:49:58 -0700 |
---|---|---|
committer | ridiculousfish <corydoras@ridiculousfish.com> | 2013-04-03 13:49:58 -0700 |
commit | 1543d02f96bdf96a067e96742577ea740dda4d89 (patch) | |
tree | 455d72f7cc027ab3dde815662222675331b2261f /input_common.cpp | |
parent | 11a444e914820bd8dc9a0f2e87e2585137af713b (diff) |
Add callbacks that get invoked before the next call to select(), which will allow for a nice fix to https://github.com/fish-shell/fish-shell/issues/608. Eliminate the poll handler, and replace it with this mechanism.
Diffstat (limited to 'input_common.cpp')
-rw-r--r-- | input_common.cpp | 42 |
1 files changed, 30 insertions, 12 deletions
diff --git a/input_common.cpp b/input_common.cpp index 084bc4dc..ef979c3c 100644 --- a/input_common.cpp +++ b/input_common.cpp @@ -39,6 +39,12 @@ Implementation file for the low level input library /** Characters that have been read and returned by the sequence matching code */ static std::stack<wint_t, std::list<wint_t> > lookahead_list; +/* Queue of pairs of (function pointer, argument) to be invoked */ +typedef std::pair<void (*)(void *), void *> callback_info_t; +typedef std::queue<callback_info_t, std::list<callback_info_t> > callback_queue_t; +static callback_queue_t callback_queue; +static void input_flush_callbacks(void); + static bool has_lookahead(void) { return ! lookahead_list.empty(); @@ -64,20 +70,11 @@ static wint_t lookahead_top(void) /** Callback function for handling interrupts on reading */ static int (*interrupt_handler)(); -/** Callback function to be invoked before reading each byte */ -static void (*poll_handler)(); - - void input_common_init(int (*ih)()) { interrupt_handler = ih; } -void input_common_set_poll_callback(void (*handler)(void)) -{ - poll_handler = handler; -} - void input_common_destroy() { @@ -95,9 +92,8 @@ static wint_t readb() do { - /* Invoke any poll handler */ - if (poll_handler) - poll_handler(); + /* Flush callbacks */ + input_flush_callbacks(); fd_set fdset; int fd_max=0; @@ -280,3 +276,25 @@ void input_common_unreadch(wint_t ch) lookahead_push(ch); } +void input_common_add_callback(void (*callback)(void *), void *arg) +{ + ASSERT_IS_MAIN_THREAD(); + callback_queue.push(callback_info_t(callback, arg)); +} + +static void input_flush_callbacks(void) +{ + /* Nothing to do if nothing to do */ + if (callback_queue.empty()) + return; + + /* We move the queue into a local variable, so that events queued up during a callback don't get fired until next round. */ + callback_queue_t local_queue; + std::swap(local_queue, callback_queue); + while (! local_queue.empty()) + { + const callback_info_t &callback = local_queue.front(); + callback.first(callback.second); //cute + local_queue.pop(); + } +} |