mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-27 04:30:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

input: Remove input_buffer_{save,restore}

Browse Source 
The input buffer is only used for data that really came from another process and
is only visible to os/input.c. Remove the input_buffer_{save,restore} functions,
they are not necessary(Also can result in problems if data comes while the
typeahead is saved).
This commit is contained in:
Thiago de Arruda
2015-02-13 12:05:54 -03:00
parent e17f92eb29
commit d225349dc6
2 changed files with 0 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nvim/getchar.c
View File

@@ -1203,7 +1203,6 @@ void save_typeahead(tasave_T *tp)
readbuf1.bh_first.b_next = NULL; readbuf1.bh_first.b_next = NULL;
tp->save_readbuf2 = readbuf2; tp->save_readbuf2 = readbuf2;
readbuf2.bh_first.b_next = NULL; readbuf2.bh_first.b_next = NULL;
tp->save_inputbuf = input_buffer_save();
} }
/* /*
@@ -1224,7 +1223,6 @@ void restore_typeahead(tasave_T *tp)
readbuf1 = tp->save_readbuf1; readbuf1 = tp->save_readbuf1;
free_buff(&readbuf2); free_buff(&readbuf2);
readbuf2 = tp->save_readbuf2; readbuf2 = tp->save_readbuf2;
input_buffer_restore(tp->save_inputbuf);
} }
/* /*

21
src/nvim/os/input.c
View File

@@ -157,27 +157,6 @@ bool os_isatty(int fd)
return uv_guess_handle(fd) == UV_TTY; return uv_guess_handle(fd) == UV_TTY;
} }
/// Return the contents of the input buffer and make it empty. The returned
/// pointer must be passed to `input_buffer_restore()` later.
String input_buffer_save(void)
{
size_t inbuf_size = rbuffer_pending(input_buffer);
String rv = {
.data = xmemdup(rbuffer_read_ptr(input_buffer), inbuf_size),
.size = inbuf_size
};
rbuffer_consumed(input_buffer, inbuf_size);
return rv;
}
/// Restore the contents of the input buffer and free `str`
void input_buffer_restore(String str)
{
rbuffer_consumed(input_buffer, rbuffer_pending(input_buffer));
rbuffer_write(input_buffer, str.data, str.size);
free(str.data);
}
size_t input_enqueue(String keys) size_t input_enqueue(String keys)
{ {
char *ptr = keys.data, *end = ptr + keys.size; char *ptr = keys.data, *end = ptr + keys.size;