diff options
author | Pedro Alves <palves@redhat.com> | 2017-03-08 00:14:59 +0000 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2017-03-08 00:14:59 +0000 |
commit | 9753a2f6d74dc92d2ad94993a5479ee0edbc6887 (patch) | |
tree | 8249537542c50a6d702920e67170e7c0f51bd770 /gdb/tui/tui-file.c | |
parent | 1a4dd9ddae4ce51724b4e08c6304e7c64f8f916f (diff) | |
download | gdb-9753a2f6d74dc92d2ad94993a5479ee0edbc6887.zip gdb-9753a2f6d74dc92d2ad94993a5479ee0edbc6887.tar.gz gdb-9753a2f6d74dc92d2ad94993a5479ee0edbc6887.tar.bz2 |
Fix PR tui/21216: TUI line breaks regression
Commit d7e747318f4d04 ("Eliminate make_cleanup_ui_file_delete / make
ui_file a class hierarchy") regressed the TUI's command window.
Newlines miss doing a "carriage return", resulting in output like:
~~~~~~~~~~~~~~~~~~
(gdb) helpList of classes of commands:
aliases -- Aliases of other commands
breakpoints -- Making program stop at certain points
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Before the commit mentioned above, the default ui_file->to_write
implementation had a hack that would defer into the ui_file->to_fputs
method. The TUI's ui_file did not implement the to_write method, so
all writes would end up going to the ncurses window via tui_file_fputs
-> tui_puts.
After the commit above, the hack is gone, but the TUI's ui_file still
does not implement the ui_file::write method. Since tui_file inherits
from stdio_file, writing to a tui_file ends up doing fwrite on the
FILE stream the TUI is "associated" with, via stdio_file::write,
instead of writing to the ncurses window.
The fix is to have tui_file override the "write" method.
New test included.
gdb/ChangeLog:
2017-03-08 Pedro Alves <palves@redhat.com>
PR tui/21216
* tui/tui-file.c (tui_file::write): New.
* tui/tui-file.h (tui_file): Override "write".
* tui/tui-io.c (do_tui_putc, update_start_line): New functions,
factored out from ...
(tui_puts): ... here.
(tui_putc): Use them.
(tui_write): New function.
* tui/tui-io.h (tui_write): Declare.
gdb/testsuite/ChangeLog:
2017-03-08 Pedro Alves <palves@redhat.com>
PR tui/21216
* gdb.tui/tui-nl-filtered-output.exp: New file.
Diffstat (limited to 'gdb/tui/tui-file.c')
-rw-r--r-- | gdb/tui/tui-file.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/gdb/tui/tui-file.c b/gdb/tui/tui-file.c index 2f895b7..80a31f8 100644 --- a/gdb/tui/tui-file.c +++ b/gdb/tui/tui-file.c @@ -44,6 +44,16 @@ tui_file::puts (const char *linebuffer) } void +tui_file::write (const char *buf, long length_buf) +{ + tui_write (buf, length_buf); + /* gdb_stdout is buffered, and the caller must gdb_flush it at + appropriate times. Other streams are not so buffered. */ + if (this != gdb_stdout) + tui_refresh_cmd_win (); +} + +void tui_file::flush () { /* gdb_stdout is buffered. Other files are always flushed on |