diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2019-03-18 20:04:40 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2019-03-18 20:04:40 +0200 |
| commit | b17c4cd078e2d1d8951951016815e474fb133780 (patch) | |
| tree | 8aaec3a189c745a909836049105aef5f7a147ed4 /gdb/tui/tui-io.c | |
| parent | 4bd56d18cc9799f283715a96ba61fd4b958b2f71 (diff) | |
| download | gdb-b17c4cd078e2d1d8951951016815e474fb133780.zip gdb-b17c4cd078e2d1d8951951016815e474fb133780.tar.gz gdb-b17c4cd078e2d1d8951951016815e474fb133780.tar.bz2 | |
Fix gdb/TUI behavior in response to [Enter] keypress
gdb/ChangeLog:
2019-03-18 Eli Zaretskii <eliz@gnu.org>
* tui/tui-io.c (gdb_wgetch): Don't echo CR.
(tui_getc): When gdb_wgetch returns a CR, behave the same as when
it returns a newline. This fixes a regression in TUI mode, whereby
the next line is output on the same screen line as the user input.
Diffstat (limited to 'gdb/tui/tui-io.c')
| -rw-r--r-- | gdb/tui/tui-io.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/gdb/tui/tui-io.c b/gdb/tui/tui-io.c index b908773..ad47c82 100644 --- a/gdb/tui/tui-io.c +++ b/gdb/tui/tui-io.c @@ -699,12 +699,6 @@ gdb_wgetch (WINDOW *win) nonl (); int r = wgetch (win); nl (); - /* In nonl mode, if the user types Enter, it will not be echoed - properly. This will result in gdb output appearing immediately - after the command. So, if we read \r, emit a \r now, after nl - mode has been re-entered, so that the output looks correct. */ - if (r == '\r') - puts ("\r"); return r; } @@ -931,7 +925,7 @@ tui_getc (FILE *fp) /* The \n must be echoed because it will not be printed by readline. */ - if (ch == '\n') + if (ch == '\n' || ch == '\r') { /* When hitting return with an empty input, gdb executes the last command. If we emit a newline, this fills up the command window |