mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-09 03:16:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(tui/input.c): remove unused multithreading code (#22342)

Browse Source
This commit is contained in:
zeertzjq
2023-02-21 08:01:16 +08:00
committed by GitHub
parent 96b6b27f74
commit 286777c333
2 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/nvim/tui/input.c
View File

@@ -133,8 +133,6 @@ void tinput_init(TermInput *input, Loop *loop)
input->ttimeout = (bool)p_ttimeout; input->ttimeout = (bool)p_ttimeout;
input->ttimeoutlen = p_ttm; input->ttimeoutlen = p_ttm;
input->key_buffer = rbuffer_new(KEY_BUFFER_SIZE); input->key_buffer = rbuffer_new(KEY_BUFFER_SIZE);
uv_mutex_init(&input->key_buffer_mutex);
uv_cond_init(&input->key_buffer_cond);
for (size_t i = 0; i < ARRAY_SIZE(kitty_key_map_entry); i++) { for (size_t i = 0; i < ARRAY_SIZE(kitty_key_map_entry); i++) {
map_put(KittyKey, cstr_t)(&kitty_key_map, kitty_key_map_entry[i].key, map_put(KittyKey, cstr_t)(&kitty_key_map, kitty_key_map_entry[i].key,
@@ -166,8 +164,6 @@ void tinput_destroy(TermInput *input)
{ {
map_destroy(KittyKey, cstr_t)(&kitty_key_map); map_destroy(KittyKey, cstr_t)(&kitty_key_map);
rbuffer_free(input->key_buffer); rbuffer_free(input->key_buffer);
uv_mutex_destroy(&input->key_buffer_mutex);
uv_cond_destroy(&input->key_buffer_cond);
time_watcher_close(&input->timer_handle, NULL); time_watcher_close(&input->timer_handle, NULL);
stream_close(&input->read_stream, NULL, NULL); stream_close(&input->read_stream, NULL, NULL);
termkey_destroy(input->tk); termkey_destroy(input->tk);
@@ -190,9 +186,9 @@ static void tinput_done_event(void **argv)
os_exit(1); os_exit(1);
} }
static void tinput_wait_enqueue(void **argv) /// Send all pending input to Nvim server.
static void tinput_flush(TermInput *input)
{ {
TermInput *input = argv[0];
if (input->paste) { // produce exactly one paste event if (input->paste) { // produce exactly one paste event
const size_t len = rbuffer_size(input->key_buffer); const size_t len = rbuffer_size(input->key_buffer);
String keys = { .data = xmallocz(len), .size = len }; String keys = { .data = xmallocz(len), .size = len };
@@ -222,21 +218,13 @@ static void tinput_wait_enqueue(void **argv)
} }
} }
static void tinput_flush(TermInput *input, bool wait_until_empty)
{
size_t drain_boundary = wait_until_empty ? 0 : 0xff;
do {
tinput_wait_enqueue((void **)&input);
} while (rbuffer_size(input->key_buffer) > drain_boundary);
}
static void tinput_enqueue(TermInput *input, char *buf, size_t size) static void tinput_enqueue(TermInput *input, char *buf, size_t size)
{ {
if (rbuffer_size(input->key_buffer) > if (rbuffer_size(input->key_buffer) >
rbuffer_capacity(input->key_buffer) - 0xff) { rbuffer_capacity(input->key_buffer) - 0xff) {
// don't ever let the buffer get too full or we risk putting incomplete keys // don't ever let the buffer get too full or we risk putting incomplete keys
// into it // into it
tinput_flush(input, false); tinput_flush(input);
} }
rbuffer_write(input->key_buffer, buf, size); rbuffer_write(input->key_buffer, buf, size);
} }
@@ -487,7 +475,7 @@ static void tinput_timer_cb(TimeWatcher *watcher, void *data)
handle_raw_buffer(input, true); handle_raw_buffer(input, true);
} }
tk_getkeys(input, true); tk_getkeys(input, true);
tinput_flush(input, true); tinput_flush(input);
} }
/// Handle focus events. /// Handle focus events.
@@ -535,13 +523,13 @@ static HandleState handle_bracketed_paste(TermInput *input)
if (enable) { if (enable) {
// Flush before starting paste. // Flush before starting paste.
tinput_flush(input, true); tinput_flush(input);
// Paste phase: "first-chunk". // Paste phase: "first-chunk".
input->paste = 1; input->paste = 1;
} else if (input->paste) { } else if (input->paste) {
// Paste phase: "last-chunk". // Paste phase: "last-chunk".
input->paste = input->paste == 2 ? 3 : -1; input->paste = input->paste == 2 ? 3 : -1;
tinput_flush(input, true); tinput_flush(input);
// Paste phase: "disabled". // Paste phase: "disabled".
input->paste = 0; input->paste = 0;
} }
@@ -735,7 +723,7 @@ static void tinput_read_cb(Stream *stream, RBuffer *buf, size_t count_, void *da
} }
handle_raw_buffer(input, false); handle_raw_buffer(input, false);
tinput_flush(input, true); tinput_flush(input);
// An incomplete sequence was found. Leave it in the raw buffer and wait for // An incomplete sequence was found. Leave it in the raw buffer and wait for
// the next input. // the next input.

3
src/nvim/tui/input.h
View File

@@ -23,7 +23,6 @@ typedef struct term_input {
int in_fd; int in_fd;
// Phases: -1=all 0=disabled 1=first-chunk 2=continue 3=last-chunk // Phases: -1=all 0=disabled 1=first-chunk 2=continue 3=last-chunk
int8_t paste; int8_t paste;
bool waiting;
bool ttimeout; bool ttimeout;
int8_t waiting_for_bg_response; int8_t waiting_for_bg_response;
int8_t waiting_for_csiu_response; int8_t waiting_for_csiu_response;
@@ -35,8 +34,6 @@ typedef struct term_input {
Loop *loop; Loop *loop;
Stream read_stream; Stream read_stream;
RBuffer *key_buffer; RBuffer *key_buffer;
uv_mutex_t key_buffer_mutex;
uv_cond_t key_buffer_cond;
TUIData *tui_data; TUIData *tui_data;
} TermInput; } TermInput;