diff options
| author | Pedro Alves <palves@redhat.com> | 2016-06-21 01:11:51 +0100 |
|---|---|---|
| committer | Pedro Alves <palves@redhat.com> | 2016-06-21 01:11:51 +0100 |
| commit | dbf30ca3f5fec91671b37592f1a6644a2c36f67a (patch) | |
| tree | 73f8bfedce01e0127c2f7794eacc6d24943d9304 /gdb/tui | |
| parent | b2d86570b316c347384c4ba9bb3933ed5e807fca (diff) | |
Make gdb_in_secondary_prompt_p() be per UI
gdb/ChangeLog:
2016-06-21 Pedro Alves <palves@redhat.com>
* top.c (gdb_secondary_prompt_depth): Delete.
(gdb_in_secondary_prompt_p): Add ui parameter. Use it.
(gdb_readline_wrapper_cleanup, gdb_readline_wrapper): Adjust to
per-UI gdb_secondary_prompt_depth.
* top.h (struct ui) <secondary_prompt_depth>: New field.
Diffstat (limited to 'gdb/tui')
| -rw-r--r-- | gdb/tui/tui-io.c | 4 | ||||
| -rw-r--r-- | gdb/tui/tui.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gdb/tui/tui-io.c b/gdb/tui/tui-io.c index 6f2d8924a8..ed79b44414 100644 --- a/gdb/tui/tui-io.c +++ b/gdb/tui/tui-io.c @@ -212,7 +212,7 @@ tui_redisplay_readline (void) The command could call prompt_for_continue and we must not restore SingleKey so that the prompt and normal keymap are used. */ if (tui_current_key_mode == TUI_ONE_COMMAND_MODE && rl_end == 0 - && !gdb_in_secondary_prompt_p ()) + && !gdb_in_secondary_prompt_p (current_ui)) tui_set_key_mode (TUI_SINGLE_KEY_MODE); if (tui_current_key_mode == TUI_SINGLE_KEY_MODE) @@ -585,7 +585,7 @@ tui_getc (FILE *fp) with empty lines with gdb prompt at beginning. Instead of that, stay on the same line but provide a visual effect to show the user we recognized the command. */ - if (rl_end == 0 && !gdb_in_secondary_prompt_p ()) + if (rl_end == 0 && !gdb_in_secondary_prompt_p (current_ui)) { wmove (w, getcury (w), 0); diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c index e1160d2aa8..7c3e70497a 100644 --- a/gdb/tui/tui.c +++ b/gdb/tui/tui.c @@ -304,7 +304,7 @@ tui_rl_startup_hook (void) { rl_already_prompted = 1; if (tui_current_key_mode != TUI_COMMAND_MODE - && !gdb_in_secondary_prompt_p ()) + && !gdb_in_secondary_prompt_p (current_ui)) tui_set_key_mode (TUI_SINGLE_KEY_MODE); tui_redisplay_readline (); return 0; |