mirror of
https://github.com/neovim/neovim.git
synced 2025-09-13 14:58:18 +00:00
input/job: process ctrl+c and do conversion in the read callback
- Extract `process_interrupts` out of `convert_input` - Instead of waiting for os_breakcheck/os_inchar calls, call `convert_input` and `process_interrupts` directly from the read callback in input.c. - Remove the `settmode` calls from `job_wait`. Now that interrupts are processed in the event loop, there's no need to set the terminal to cooked which introduces other problems(ref 7.4.427)
This commit is contained in:
@@ -116,7 +116,6 @@ int os_inchar(uint8_t *buf, int maxlen, int ms, int tb_change_cnt)
|
||||
return 0;
|
||||
}
|
||||
|
||||
convert_input();
|
||||
// Safe to convert rbuffer_read to int, it will never overflow since
|
||||
// we use relatively small buffers.
|
||||
return (int)rbuffer_read(input_buffer, (char *)buf, (size_t)maxlen);
|
||||
@@ -132,8 +131,8 @@ bool os_char_avail(void)
|
||||
// In cooked mode we should get SIGINT, no need to check.
|
||||
void os_breakcheck(void)
|
||||
{
|
||||
if (curr_tmode == TMODE_RAW && input_poll(0))
|
||||
convert_input();
|
||||
if (curr_tmode == TMODE_RAW)
|
||||
input_poll(0);
|
||||
}
|
||||
|
||||
/// Test whether a file descriptor refers to a terminal.
|
||||
@@ -220,6 +219,8 @@ static void read_cb(RStream *rstream, void *data, bool at_eof)
|
||||
}
|
||||
}
|
||||
|
||||
convert_input();
|
||||
process_interrupts();
|
||||
started_reading = true;
|
||||
}
|
||||
|
||||
@@ -260,7 +261,10 @@ static void convert_input(void)
|
||||
// data points to memory allocated by `string_convert_ext`, free it.
|
||||
free(data);
|
||||
}
|
||||
}
|
||||
|
||||
static void process_interrupts(void)
|
||||
{
|
||||
if (!ctrl_c_interrupts) {
|
||||
return;
|
||||
}
|
||||
@@ -299,10 +303,10 @@ static int push_event_key(uint8_t *buf, int maxlen)
|
||||
// Check if there's pending input
|
||||
static bool input_ready(void)
|
||||
{
|
||||
return typebuf_was_filled || // API call filled typeahead
|
||||
event_has_deferred() || // Events must be processed
|
||||
return typebuf_was_filled || // API call filled typeahead
|
||||
event_has_deferred() || // Events must be processed
|
||||
(!embedded_mode && (
|
||||
rstream_pending(read_stream) > 0 || // Stdin input
|
||||
eof)); // Stdin closed
|
||||
rbuffer_pending(input_buffer) > 0 || // Stdin input
|
||||
eof)); // Stdin closed
|
||||
}
|
||||
|
||||
|
@@ -15,7 +15,6 @@
|
||||
#include "nvim/os/shell.h"
|
||||
#include "nvim/vim.h"
|
||||
#include "nvim/memory.h"
|
||||
#include "nvim/term.h"
|
||||
|
||||
#define EXIT_TIMEOUT 25
|
||||
#define MAX_RUNNING_JOBS 100
|
||||
@@ -277,10 +276,6 @@ void job_stop(Job *job)
|
||||
/// is possible on some OS.
|
||||
int job_wait(Job *job, int ms) FUNC_ATTR_NONNULL_ALL
|
||||
{
|
||||
// switch to cooked so `got_int` will be set if the user interrupts
|
||||
int old_mode = cur_tmode;
|
||||
settmode(TMODE_COOK);
|
||||
|
||||
// Increase refcount to stop the job from being freed before we have a
|
||||
// chance to get the status.
|
||||
job->refcount++;
|
||||
@@ -296,8 +291,6 @@ int job_wait(Job *job, int ms) FUNC_ATTR_NONNULL_ALL
|
||||
event_poll(0);
|
||||
}
|
||||
|
||||
settmode(old_mode);
|
||||
|
||||
if (!--job->refcount) {
|
||||
int status = (int) job->status;
|
||||
// Manually invoke close_cb to free the job resources
|
||||
|
Reference in New Issue
Block a user