Skip to content

WIP: Implement multi-line editing #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 9 commits into from
+223 −56
Closed

WIP: Implement multi-line editing #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
75727c5
Multiline editing
certik Oct 2, 2019
38f6caa
Extend with ' '
certik Oct 3, 2019
f4cb7e2
Fix up rows
certik Oct 3, 2019
ea46529
Throw the exception
certik Oct 3, 2019
e6cbb65
Don't shrink
certik Oct 3, 2019
3d33d01
Simplify new_row
certik Oct 3, 2019
6f9ab8f
up/down arrow
certik Oct 3, 2019
9a35db7
Update
certik Oct 3, 2019
96054d5
Merge branch 'master' into multi
certik Sep 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions examples/menu_window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,11 @@ std::string render(Term::Window &scr, int rows, int cols,
int y = menuy0 + menuheight + 5;
scr.print_str(1, y, "Selected item: " + std::to_string(menupos));
scr.print_str(1, y+1, "Menu width: " + std::to_string(menuwidth));
scr.print_str(1, y+2, "Menu height: " + std::to_string(menuheight));
scr.print_str(1, y+2, "Menu height: " + std::to_string(menuheight),
0, true);
scr.print_str(1, y+3, "Unicode test: Ondřej Čertík, ἐξήκοι");

return scr.render();
return scr.render(1, 1);
}

int main() {
Expand All @@ -46,7 +47,7 @@ int main() {
int h = 10;
int w = 10;
bool on = true;
Term::Window scr(1, 1, cols, rows);
Term::Window scr(cols, rows);
while (on) {
std::cout << render(scr, rows, cols, h, w, pos) << std::flush;
int key = term.read_key();
Expand Down
181 changes: 139 additions & 42 deletions examples/prompt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,71 @@ using Term::cursor_on;
// abstract way, irrespective of where or how it is rendered.
struct Model {
std::string prompt_string; // The string to show as the prompt
std::string input; // The current input string in the prompt
std::vector<std::string> lines; // The current input string in the prompt as
// a vector of lines, without '\n' at the end.
// The current cursor position in the "input" string, starting from (1,1)
size_t cursor_col, cursor_row;
};

std::string render(const Model &m, int prompt_row, int term_cols) {
std::string out;
out = cursor_off();
out += move_cursor(prompt_row, 1) + m.prompt_string + m.input;
size_t last_col = m.prompt_string.size() + m.input.size();
for (size_t i=0; i < term_cols-last_col; i++) {
out.append(" ");
std::string concat(const std::vector<std::string> &lines) {
std::string s;
for (auto &line: lines) {
s.append(line + "\n");
}
out.append(move_cursor(prompt_row+m.cursor_row-1,
m.prompt_string.size() + m.cursor_col));
out.append(cursor_on());
return out;
return s;
}

std::vector<std::string> split(const std::string &s) {
size_t j = 0;
std::vector<std::string> lines;
lines.push_back("");
if (s[s.size()-1] != '\n') throw std::runtime_error("\\n is required");
for (size_t i=0; i<s.size()-1; i++) {
if (s[i] == '\n') {
j++;
lines.push_back("");
} else {
lines[j].push_back(s[i]);
}
}
return lines;
}

char32_t U(const std::string &s) {
std::u32string s2 = Term::utf8_to_utf32(s);
if (s2.size() != 1) throw std::runtime_error("U(s): s not a codepoint.");
return s2[0];
}

void print_left_curly_bracket(Term::Window &scr, int x, int y1, int y2) {
int h = y2-y1+1;
if (h == 1) {
scr.set_char(x, y1, U("]"));
} else {
scr.set_char(x, y1, U("┐"));
for (int j=y1+1; j <= y2-1; j++) {
scr.set_char(x, j, U("│"));
}
scr.set_char(x, y2, U("┘"));
}
}

void render(Term::Window &scr, const Model &m, size_t cols) {
scr.clear();
print_left_curly_bracket(scr, cols, 1, m.lines.size());
scr.print_str(cols-6, m.lines.size(), std::to_string(m.cursor_row) + ","
+ std::to_string(m.cursor_col));
for (size_t j=0; j < m.lines.size(); j++) {
if (j == 0) {
scr.print_str(1, j+1, m.prompt_string);
} else {
for (size_t i=0; i < m.prompt_string.size()-1; i++) {
scr.set_char(i+1, j+1, '.');
}
}
scr.print_str(m.prompt_string.size()+1, j+1, m.lines[j]);
}
scr.set_cursor_pos(m.prompt_string.size() + m.cursor_col, m.cursor_row);
}

std::string prompt(const Terminal &term, const std::string &prompt_string,
Expand All @@ -40,38 +88,46 @@ std::string prompt(const Terminal &term, const std::string &prompt_string,

Model m;
m.prompt_string = prompt_string;
m.lines.push_back("");
m.cursor_col = 1;
m.cursor_row = 1;

// Make a local copy of history that can be modified by the user. All
// changes will be forgotten once a command is submitted.
std::vector<std::string> hist = history;
size_t history_pos = hist.size();
hist.push_back(m.input); // Push back empty input
hist.push_back(concat(m.lines)); // Push back empty input

Term::Window scr(cols, 1);
int key;
std::cout << render(m, row, cols) << std::flush;
render(scr, m, cols);
std::cout << scr.render(1, row) << std::flush;
while ((key = term.read_key()) != Key::ENTER) {
if ( (key >= 'a' && key <= 'z') ||
(key >= 'A' && key <= 'Z') ||
(!iscntrl(key) && key < 128) ) {
std::string before = m.input.substr(0, m.cursor_col-1);
std::string before = m.lines[m.cursor_row-1].substr(0,
m.cursor_col-1);
std::string newchar; newchar.push_back(key);
std::string after = m.input.substr(m.cursor_col-1);
m.input = before + newchar + after;
std::string after = m.lines[m.cursor_row-1].substr(m.cursor_col-1);
m.lines[m.cursor_row-1] = before + newchar + after;
m.cursor_col++;
} else if (key == CTRL_KEY('d')) {
if (m.input.size() == 0) {
m.input.push_back(CTRL_KEY('d'));
break;
if (m.lines.size() == 1 && m.lines[m.cursor_row-1].size() == 0) {
m.lines[m.cursor_row-1].push_back(CTRL_KEY('d'));
std::cout << "\n" << std::flush;
history.push_back(m.lines[0]);
return m.lines[0];
}
} else {
switch (key) {
case Key::BACKSPACE:
if (m.cursor_col > 1) {
std::string before = m.input.substr(0, m.cursor_col-2);
std::string after = m.input.substr(m.cursor_col-1);
m.input = before + after;
std::string before = m.lines[m.cursor_row-1].substr(0,
m.cursor_col-2);
std::string after = m.lines[m.cursor_row-1]
.substr(m.cursor_col-1);
m.lines[m.cursor_row-1] = before + after;
m.cursor_col--;
}
break;
Expand All @@ -81,39 +137,80 @@ std::string prompt(const Terminal &term, const std::string &prompt_string,
}
break;
case Key::ARROW_RIGHT:
if (m.cursor_col <= m.input.size()) {
if (m.cursor_col <= m.lines[m.cursor_row-1].size()) {
m.cursor_col++;
}
break;
case Key::HOME:
m.cursor_col = 1;
break;
case Key::END:
m.cursor_col = m.input.size()+1;
m.cursor_col = m.lines[m.cursor_row-1].size()+1;
break;
case Key::ARROW_UP:
if (history_pos > 0) {
hist[history_pos] = m.input;
history_pos--;
m.input = hist[history_pos];
m.cursor_col = m.input.size()+1;
if (m.cursor_row == 1) {
if (history_pos > 0) {
hist[history_pos] = concat(m.lines);
history_pos--;
m.lines = split(hist[history_pos]);
m.cursor_row = m.lines.size();
if (m.cursor_col>m.lines[m.cursor_row-1].size()+1) {
m.cursor_col = m.lines[m.cursor_row-1].size()+1;
}
if (m.lines.size() > scr.get_h()) {
scr.set_h(m.lines.size());
}
}
} else {
m.cursor_row--;
if (m.cursor_col > m.lines[m.cursor_row-1].size()+1) {
m.cursor_col = m.lines[m.cursor_row-1].size()+1;
}
}
break;
case Key::ARROW_DOWN:
if (history_pos < hist.size()-1) {
hist[history_pos] = m.input;
history_pos++;
m.input = hist[history_pos];
m.cursor_col = m.input.size()+1;
if (m.cursor_row == m.lines.size()) {
if (history_pos < hist.size()-1) {
hist[history_pos] = concat(m.lines);
history_pos++;
m.lines = split(hist[history_pos]);
m.cursor_row = 1;
if (m.cursor_col>m.lines[m.cursor_row-1].size()+1) {
m.cursor_col = m.lines[m.cursor_row-1].size()+1;
}
if (m.lines.size() > scr.get_h()) {
scr.set_h(m.lines.size());
}
}
} else {
m.cursor_row++;
if (m.cursor_col > m.lines[m.cursor_row-1].size()+1) {
m.cursor_col = m.lines[m.cursor_row-1].size()+1;
}
}
break;
case ALT_KEY('n'):
case Key::ALT_ENTER:
std::string before = m.lines[m.cursor_row-1].substr(0,
m.cursor_col-1);
std::string after = m.lines[m.cursor_row-1]
.substr(m.cursor_col-1);
m.lines[m.cursor_row-1] = before;
m.lines.push_back(after);
m.cursor_col = after.size()+1;
m.cursor_row++;
scr.set_h(scr.get_h()+1);
}
}
std::cout << render(m, row, cols) << std::flush;
render(scr, m, cols);
std::cout << scr.render(1, row) << std::flush;
if (row+(int)scr.get_h()-1 > rows) {
row = rows - ((int)scr.get_h()-1);
}
}
std::cout << "\n" << std::flush;
history.push_back(m.input);
return m.input;
history.push_back(concat(m.lines));
return concat(m.lines);
}

int main() {
Expand All @@ -125,21 +222,21 @@ int main() {
std::cout << " * Features:" << std::endl;
std::cout << " - Editing (Keys: Left, Right, Home, End, Backspace)" << std::endl;
std::cout << " - History (Keys: Up, Down)" << std::endl;
std::cout << " - Multi-line editing (use Alt-Enter or Alt-N to add a new line)" << std::endl;
// TODO:
//std::cout << " - Multi-line editing (use Alt-Enter to add a new line)" << std::endl;
//std::cout << " - Syntax highlighting" << std::endl;
std::vector<std::string> history;
while (true) {
std::string answer = prompt(term, "> ", history);
std::string answer = prompt(term, ">>> ", history);
if (answer.size() == 1 && answer[0] == CTRL_KEY('d')) break;
std::cout << "Submitted text: " << answer << std::endl;
}
} catch(const std::runtime_error& re) {
std::cerr << "Runtime error: " << re.what() << std::endl;
return 2;
return 1;
} catch(...) {
std::cerr << "Unknown error." << std::endl;
return 1;
throw;
}
return 0;
}
Loading