diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/line/cursor.cc | 1 | ||||
| -rw-r--r-- | src/line/input.cc | 12 | ||||
| -rw-r--r-- | src/pipe.cc | 32 | ||||
| -rw-r--r-- | src/self_pipe.cc | 21 | ||||
| -rw-r--r-- | src/signal/sigwinch_handler.cc | 2 | ||||
| -rw-r--r-- | src/util/non_block_input.cc (renamed from src/util/non_block_io.cc) | 2 |
6 files changed, 45 insertions, 25 deletions
diff --git a/src/line/cursor.cc b/src/line/cursor.cc index 81454ae..1baa33c 100644 --- a/src/line/cursor.cc +++ b/src/line/cursor.cc @@ -228,6 +228,7 @@ void T_line_editor::check_window_update() { update_window_size(); clear_below(); + print_override(line_buffer); windows_size_changed = false; } } diff --git a/src/line/input.cc b/src/line/input.cc index b7dbc23..1e7ca38 100644 --- a/src/line/input.cc +++ b/src/line/input.cc @@ -5,6 +5,8 @@ #include <unistd.h> #include "history.h" +#include "util/non_block_input.h" +#include "pipe.h" using namespace std; @@ -25,9 +27,15 @@ string T_line_editor::readline() T_position pos = get_cursor_position(); prompt_pos = pos.col; - char c; - while (read(STDIN_FILENO, &c, 1) == 1) + char c; int src; + while (non_block_read_char(&c, &src) == 1) { + // if signal'd + if (src == self_pipe_fd[0]) + { + check_window_update(); + break; + } if (iscntrl(c)) { //print("control: {}\r\n", static_cast<unsigned char>(c)); diff --git a/src/pipe.cc b/src/pipe.cc new file mode 100644 index 0000000..5baaeae --- /dev/null +++ b/src/pipe.cc @@ -0,0 +1,32 @@ +#include "pipe.h" + +#include <unistd.h> +#include <cstdlib> +#include <fcntl.h> + +#include "error.h" + +namespace ov4 +{ + +void self_pipe_init() +{ + int ret = pipe2(self_pipe_fd, O_NONBLOCK); + if (ret != 0) + { + throw T_error(error_code::FAIL_TO_OPEN_PIPE, "Fail to open self pipe"); + } +} + +/* + * write a byte to self pipe + * NB: you can ONLY determine that signal handler was called + * but CANNOT determine the number of callings, or which signal was called + * because when the pipe is full, nothing will be written + */ +int self_pipe_write() +{ + return write(self_pipe_fd[1], &SELF_PIPE_BYTE, 1); +} + +}
\ No newline at end of file diff --git a/src/self_pipe.cc b/src/self_pipe.cc deleted file mode 100644 index 42e61d8..0000000 --- a/src/self_pipe.cc +++ /dev/null @@ -1,21 +0,0 @@ -#include "pipe.h" - -#include <unistd.h> -#include <cstdlib> -#include <fcntl.h> - -#include "error.h" - -namespace ov4 -{ - -void self_pipe_init() -{ - int ret = pipe2(self_pipe_fd, O_NONBLOCK); - if (ret != 0) - { - throw T_error(error_code::FAIL_TO_OPEN_PIPE, "Fail to open self pipe"); - } -} - -}
\ No newline at end of file diff --git a/src/signal/sigwinch_handler.cc b/src/signal/sigwinch_handler.cc index 4b692ed..20d4550 100644 --- a/src/signal/sigwinch_handler.cc +++ b/src/signal/sigwinch_handler.cc @@ -1,6 +1,6 @@ #include "signal_handler.h" -#include "line/getter.h" +#include "line/line_editor.h" namespace ov4 { diff --git a/src/util/non_block_io.cc b/src/util/non_block_input.cc index 31edbc9..a17daf2 100644 --- a/src/util/non_block_io.cc +++ b/src/util/non_block_input.cc @@ -41,7 +41,7 @@ int non_block_read_char(char *c, int *src) else if (FD_ISSET(STDIN_FILENO, &rset)) { ret = read(STDIN_FILENO, c, 1); - if (src != nullptr) *src = self_pipe_fd[0]; + if (src != nullptr) *src = STDIN_FILENO; } return ret; } |
