mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-05-31 10:09:16 +08:00
* utils.c (query): Remove tui hacks; tui must use the query_hook.
* top.c (command_loop): Remove tui insert_mode hacks; don't call tuiCleanUp because this must be made with atexit by tui. * symfile.c (symbol_file_command): Remove call to TUIDO * stack.c (show_and_print_stack_frame_stub): Remove tui check; not necessary when using the selected frame hooks. (print_stack_frame_stub): Likewise. (print_frame_info_base): Likewise. (print_frame_info): Likewise. (up_silently_command): Likewise. (down_silently_command): Likewise. (show_stack_frame): Likewise for TUIDO. (select_frame): Likewise. (select_and_print_frame): Likewise. (stack_publish_stopped_with_no_frame): Remove. (select_and_maybe_print_frame): Remove. * main.c (captured_main): Remove tui_fileopen and tuiInit; tui must use the initialize ui hook. * infrun.c (normal_stop): Remove call to TUIDO; tui must use the selected frame hooks. * event-top.c (command_handler): Remove tui insert_mode hack. * defs.h: Remove TUIDO; Only include tui.h. * breakpoint.c (mention): Remove calls to TUIDO. (delete_breakpoint): Remove tui hacks; tui must install the breakpoint hooks.
This commit is contained in:
22
gdb/utils.c
22
gdb/utils.c
@ -1263,15 +1263,7 @@ query (char *ctlstr,...)
|
||||
wrap_here ("");
|
||||
gdb_flush (gdb_stdout);
|
||||
|
||||
#if defined(TUI)
|
||||
if (!tui_version || cmdWin == tuiWinWithFocus ())
|
||||
#endif
|
||||
answer = fgetc (stdin);
|
||||
#if defined(TUI)
|
||||
else
|
||||
answer = (unsigned char) tuiBufferGetc ();
|
||||
|
||||
#endif
|
||||
answer = fgetc (stdin);
|
||||
clearerr (stdin); /* in case of C-d */
|
||||
if (answer == EOF) /* C-d */
|
||||
{
|
||||
@ -1279,21 +1271,13 @@ query (char *ctlstr,...)
|
||||
break;
|
||||
}
|
||||
/* Eat rest of input line, to EOF or newline */
|
||||
if ((answer != '\n') || (tui_version && answer != '\r'))
|
||||
if (answer != '\n')
|
||||
do
|
||||
{
|
||||
#if defined(TUI)
|
||||
if (!tui_version || cmdWin == tuiWinWithFocus ())
|
||||
#endif
|
||||
ans2 = fgetc (stdin);
|
||||
#if defined(TUI)
|
||||
else
|
||||
ans2 = (unsigned char) tuiBufferGetc ();
|
||||
#endif
|
||||
ans2 = fgetc (stdin);
|
||||
clearerr (stdin);
|
||||
}
|
||||
while (ans2 != EOF && ans2 != '\n' && ans2 != '\r');
|
||||
TUIDO (((TuiOpaqueFuncPtr) tui_vStartNewLines, 1));
|
||||
|
||||
if (answer >= 'a')
|
||||
answer -= 040;
|
||||
|
Reference in New Issue
Block a user