RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 01:18:12 +00:00
Code Issues Activity Actions

LibLineEdit + Shell: Handle Termios internally and give a copy if asked

Browse source 
This moves the Termios logic inside LibLineEdit and allows users to
simply forget about the existence of termios if they so choose to :^)
This commit is contained in:
AnotherTest 2020-03-30 22:42:50 +04:30 • committed by Andreas Kling
parent 5062a7d4cd
commit 6f407fff32
3 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Libraries/LibLineEdit/LineEditor.cpp
View file

@ -30,9 +30,7 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <unistd.h> #include <unistd.h>
LineEditor::LineEditor(struct termios termios) LineEditor::LineEditor()
: m_termios(termios)
, m_initialized(true)
{ {
struct winsize ws; struct winsize ws;
if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) < 0) if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) < 0)
@ -41,13 +39,9 @@ LineEditor::LineEditor(struct termios termios)
m_num_columns = ws.ws_col; m_num_columns = ws.ws_col;
} }
LineEditor::LineEditor()
: LineEditor(termios {})
{
}
LineEditor::~LineEditor() LineEditor::~LineEditor()
{ {
tcsetattr(0, TCSANOW, &m_default_termios);
} }
void LineEditor::add_to_history(const String& line) void LineEditor::add_to_history(const String& line)
@ -378,7 +372,7 @@ String LineEditor::get_line(const String& prompt)
do_backspace(); do_backspace();
continue; continue;
} }
if (ch == 0xc) { // ^L if (ch == 0xc) { // ^L
printf("\033[3J\033[H\033[2J"); // Clear screen. printf("\033[3J\033[H\033[2J"); // Clear screen.
fputs(prompt.characters(), stdout); fputs(prompt.characters(), stdout);
for (size_t i = 0; i < m_buffer.size(); ++i) for (size_t i = 0; i < m_buffer.size(); ++i)

15
Libraries/LibLineEdit/LineEditor.h
View file

@ -50,13 +50,19 @@ struct KeyCallback {
class LineEditor { class LineEditor {
public: public:
LineEditor(struct termios);
LineEditor(); LineEditor();
~LineEditor(); ~LineEditor();
void initialize(struct termios termios) void initialize()
{ {
ASSERT(!m_initialized); ASSERT(!m_initialized);
struct termios termios;
tcgetattr(0, &termios);
m_default_termios = termios; // grab a copy to restore
// Because we use our own line discipline which includes echoing,
// we disable ICANON and ECHO.
termios.c_lflag &= ~(ECHO | ICANON);
tcsetattr(0, TCSANOW, &termios);
m_termios = termios; m_termios = termios;
m_initialized = true; m_initialized = true;
} }
@ -85,6 +91,9 @@ public:
void insert(const char); void insert(const char);
void cut_mismatching_chars(String& completion, const String& other, size_t start_compare); void cut_mismatching_chars(String& completion, const String& other, size_t start_compare);
const struct termios& termios() const { return m_termios; }
const struct termios& default_termios() const { return m_default_termios; }
private: private:
void vt_save_cursor(); void vt_save_cursor();
void vt_restore_cursor(); void vt_restore_cursor();
@ -98,7 +107,7 @@ private:
HashMap<char, NonnullOwnPtr<KeyCallback>> m_key_callbacks; HashMap<char, NonnullOwnPtr<KeyCallback>> m_key_callbacks;
// TODO: handle signals internally // TODO: handle signals internally
struct termios m_termios; struct termios m_termios, m_default_termios;
bool m_was_interrupted = false; bool m_was_interrupted = false;
bool m_was_resized = false; bool m_was_resized = false;

11
Shell/main.cpp
View file

@ -1031,14 +1031,11 @@ int main(int argc, char** argv)
g.uid = getuid(); g.uid = getuid();
tcsetpgrp(0, getpgrp()); tcsetpgrp(0, getpgrp());
tcgetattr(0, &g.default_termios);
g.termios = g.default_termios;
// Because we use our own line discipline which includes echoing,
// we disable ICANON and ECHO.
g.termios.c_lflag &= ~(ECHO | ICANON);
tcsetattr(0, TCSANOW, &g.termios);
editor.initialize(g.termios); editor.initialize();
g.termios = editor.termios();
g.default_termios = editor.default_termios();
editor.on_tab_complete_first_token = [&](const String& token) -> Vector<String> { editor.on_tab_complete_first_token = [&](const String& token) -> Vector<String> {
auto match = binary_search(cached_path.data(), cached_path.size(), token, [](const String& token, const String& program) -> int { auto match = binary_search(cached_path.data(), cached_path.size(), token, [](const String& token, const String& program) -> int {
return strncmp(token.characters(), program.characters(), token.length()); return strncmp(token.characters(), program.characters(), token.length());