Skip to content
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

On h.quit() terminal settings are same as when neuron.hoc was imported. #3259

Merged
merged 8 commits into from
Dec 3, 2024
Merged

On h.quit() terminal settings are same as when neuron.hoc was imported. #3259

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7dd6e6c
GUI h.quit() leaves terminal in raw state under thread sanitizer.
nrnhines Nov 29, 2024
dd7514a
save stdin terminal settings on import hoc and restore on h.quit()
nrnhines Nov 29, 2024
1c58958
linux or darwin
nrnhines Nov 29, 2024
cea45e5
#if defined(__linux__) || defined(DARWIN)
nrnhines Nov 30, 2024
c8c5b7b
Merge branch 'master' into hines/set-terminal-sane
nrnhines Nov 30, 2024
d6c8d70
Print tcgetatt/tcsetattr error messages only if STDIN is a tty.
nrnhines Dec 2, 2024
8ed8314
Merge branch 'master' into hines/set-terminal-sane
nrnhines Dec 2, 2024
6309927
Merge branch 'master' into hines/set-terminal-sane
nrnhines Dec 2, 2024
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
4 changes: 2 additions & 2 deletions src/nrnpython/inithoc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,13 +222,13 @@
static struct termios original_termios;

static void save_original_terminal_settings() {
if (tcgetattr(STDIN_FILENO, &original_termios) == -1) {
if (tcgetattr(STDIN_FILENO, &original_termios) == -1 && isatty(STDIN_FILENO)) {
std::cerr << "Error getting original terminal attributes\n";
nrnhines marked this conversation as resolved.
Show resolved Hide resolved
}
}

static void restore_original_terminal_settings() {
if (tcsetattr(STDIN_FILENO, TCSANOW, &original_termios) == -1) {
if (tcsetattr(STDIN_FILENO, TCSANOW, &original_termios) == -1 && isatty(STDIN_FILENO)) {

Check warning on line 231 in src/nrnpython/inithoc.cpp

View check run for this annotation

Codecov / codecov/patch

src/nrnpython/inithoc.cpp#L231 

Added line #L231 was not covered by tests
std::cerr << "Error restoring terminal attributes\n";
}
}
Expand Down
Loading