diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/line/cursor.cc | 46 | ||||
| -rw-r--r-- | src/line/mode.cc | 44 |
2 files changed, 38 insertions, 52 deletions
diff --git a/src/line/cursor.cc b/src/line/cursor.cc index bd2567e..faa3988 100644 --- a/src/line/cursor.cc +++ b/src/line/cursor.cc @@ -26,10 +26,7 @@ void print_override(const std::string &s) // ESC 7 Save Cursor (DECSC), VT100. print("\x1b" "7"); fflush(stdout); - // move to the "start" of the zone - // should skip prompt zone - print("\r"); fflush(stdout); - print("\x1b[{}C", prompt_pos-1); fflush(stdout); + cursor_skip_prompt(); // erase rest of the line print("\x1b[K"); fflush(stdout); @@ -54,23 +51,9 @@ void move_cursor(char c) switch_history(T_cursor_movement_direction::DOWN); break; case 'C': - // if (get_cursor_real_pos() < line_end_pos) - // { - // // print("\x1b[C"); - // // fflush(stdout); - // // buffer_index_cursor++; - // move_cursor(T_cursor_movement_direction::RIGHT); - // } move_cursor(T_cursor_movement_direction::RIGHT); break; case 'D': - // if (get_cursor_real_pos() > prompt_pos) - // { - // // print("\x1b[D"); - // // fflush(stdout); - // // buffer_index_cursor--; - // move_cursor(T_cursor_movement_direction::LEFT); - // } move_cursor(T_cursor_movement_direction::LEFT); break; default: @@ -87,14 +70,6 @@ void cursor_input_char(char c) if (c != '\b') { line_buffer.insert(buffer_index_cursor, 1, c); - // print("\x1b[C"); fflush(stdout); // move cursor to the right - // buffer_index_cursor++; - // update_line_end_pos(); - // int end_possible_buffer_index = window_size_col-prompt_pos-1; - // buffer_index_display_end = - // (end_possible_buffer_index > (buffer_index_display_end)+1) - // ? (buffer_index_display_end)+1 - // : end_possible_buffer_index; move_cursor(T_cursor_movement_direction::RIGHT); return; @@ -102,9 +77,6 @@ void cursor_input_char(char c) // BACKSPACE line_buffer.erase(buffer_index_cursor, 1); - // print("\x1b[D"); fflush(stdout); // move cursor to the left - // buffer_index_cursor--; - // update_line_end_pos(); // TODO: backspace page move_cursor(T_cursor_movement_direction::LEFT); @@ -186,10 +158,6 @@ void switch_history(T_cursor_movement_direction d) history_index--; reset_editor(); line_buffer = history_vec[history_index]; - // move to the "start" of the zone - // should skip prompt zone - print("\r"); fflush(stdout); - print("\x1b[{}C", prompt_pos-1); fflush(stdout); print_override(line_buffer); } break; @@ -204,10 +172,6 @@ void switch_history(T_cursor_movement_direction d) history_index++; reset_editor(); line_buffer = history_vec[history_index]; - // move to the "start" of the zone - // should skip prompt zone - print("\r"); fflush(stdout); - print("\x1b[{}C", prompt_pos-1); fflush(stdout); print_override(line_buffer); } break; @@ -222,6 +186,14 @@ void reset_editor() line_buffer = ""; buffer_index_cursor = 0; _buffer_index_display_begin = 0; + cursor_skip_prompt(); +} + +void cursor_skip_prompt() +{ + // move to the "start" of the zone + // should skip prompt zone + print("\r\x1b[{}C", prompt_pos-1); fflush(stdout); } } diff --git a/src/line/mode.cc b/src/line/mode.cc index dc9291d..6f59ace 100644 --- a/src/line/mode.cc +++ b/src/line/mode.cc @@ -80,28 +80,34 @@ string readline() char c; while (read(STDIN_FILENO, &c, 1) == 1) { - if (c == 'Q') editor_exit(-1); // TODO: remove - else if (c == 'C') - { - clear_below(); - } - else if (c == 'P') - { - get_cursor_position(); - } - else if (iscntrl(c)) + if (iscntrl(c)) { //print("control: {}\r\n", static_cast<unsigned char>(c)); //fflush(stdout); - if (c == 13) // \n + if (c == 0x0A || c == 0x0D) // \n OR \r { //print("line: {}\r\n", line_buffer); - history_vec[get_last_index()] = line_buffer; + if (line_buffer.empty()) + { + history_index--; + history_vec.pop_back(); + } + else + { + history_vec[get_last_index()] = line_buffer; + } return line_buffer; } + else if (c == 0x03) // control C + { + history_index--; + history_vec.pop_back(); + return ""; + } + // ESC sequence - if (c == '\x1b') + else if (c == '\x1b') { char seq[10]; // eat [ @@ -122,8 +128,16 @@ string readline() print_override(line_buffer); } } - - history_vec[get_last_index()] = line_buffer; + + if (line_buffer.empty()) + { + history_index--; + history_vec.pop_back(); + } + else + { + history_vec[get_last_index()] = line_buffer; + } return line_buffer; } |