9753a2f6d7
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.
61 lines
1.8 KiB
C++
61 lines
1.8 KiB
C++
/* TUI support I/O functions.
|
|
|
|
Copyright (C) 1998-2017 Free Software Foundation, Inc.
|
|
|
|
Contributed by Hewlett-Packard Company.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef TUI_IO_H
|
|
#define TUI_IO_H
|
|
|
|
struct ui_out;
|
|
class cli_ui_out;
|
|
|
|
/* Print the string in the curses command window. */
|
|
extern void tui_puts (const char *);
|
|
|
|
/* Print LENGTH characters from the buffer pointed to by BUF to the
|
|
curses command window. */
|
|
extern void tui_write (const char *buf, size_t length);
|
|
|
|
/* Setup the IO for curses or non-curses mode. */
|
|
extern void tui_setup_io (int mode);
|
|
|
|
/* Initialize the IO for gdb in curses mode. */
|
|
extern void tui_initialize_io (void);
|
|
|
|
/* Get a character from the command window. */
|
|
extern int tui_getc (FILE *);
|
|
|
|
/* Readline callback.
|
|
Redisplay the command line with its prompt after readline has
|
|
changed the edited text. */
|
|
extern void tui_redisplay_readline (void);
|
|
|
|
/* Expand TABs into spaces. */
|
|
extern char *tui_expand_tabs (const char *, int);
|
|
|
|
extern struct ui_out *tui_out;
|
|
extern cli_ui_out *tui_old_uiout;
|
|
|
|
extern int key_is_start_sequence (int ch);
|
|
extern int key_is_end_sequence (int ch);
|
|
extern int key_is_backspace (int ch);
|
|
extern int key_is_command_char (int ch);
|
|
|
|
#endif
|