* tui/tui.c (tui_rl_command_key): Switch to TUI_ONE_COMMAND_MODE
while executing the gdb command. (tui_rl_startup_hook): Do not switch back to TUI_SINGLE_KEY_MODE if we are called from prompt_for_continue. * tui/tui-io.c (tui_redisplay_readline): Likewise.
This commit is contained in:
parent
e840f632eb
commit
9b8d682720
|
@ -1,3 +1,11 @@
|
||||||
|
2012-11-10 Stephane Carrez <Stephane.Carrez@gmail.com>
|
||||||
|
|
||||||
|
* tui/tui.c (tui_rl_command_key): Switch to TUI_ONE_COMMAND_MODE
|
||||||
|
while executing the gdb command.
|
||||||
|
(tui_rl_startup_hook): Do not switch back to TUI_SINGLE_KEY_MODE if we
|
||||||
|
are called from prompt_for_continue.
|
||||||
|
* tui/tui-io.c (tui_redisplay_readline): Likewise.
|
||||||
|
|
||||||
2012-11-10 Stephane Carrez <Stephane.Carrez@gmail.com>
|
2012-11-10 Stephane Carrez <Stephane.Carrez@gmail.com>
|
||||||
|
|
||||||
PR tui/9584
|
PR tui/9584
|
||||||
|
|
|
@ -211,8 +211,11 @@ tui_redisplay_readline (void)
|
||||||
|
|
||||||
/* Detect when we temporarily left SingleKey and now the readline
|
/* Detect when we temporarily left SingleKey and now the readline
|
||||||
edit buffer is empty, automatically restore the SingleKey
|
edit buffer is empty, automatically restore the SingleKey
|
||||||
mode. */
|
mode. The restore must only be done if the command has finished.
|
||||||
if (tui_current_key_mode == TUI_ONE_COMMAND_MODE && rl_end == 0)
|
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
|
||||||
|
&& immediate_quit == 0)
|
||||||
tui_set_key_mode (TUI_SINGLE_KEY_MODE);
|
tui_set_key_mode (TUI_SINGLE_KEY_MODE);
|
||||||
|
|
||||||
if (tui_current_key_mode == TUI_SINGLE_KEY_MODE)
|
if (tui_current_key_mode == TUI_SINGLE_KEY_MODE)
|
||||||
|
|
|
@ -247,6 +247,10 @@ tui_rl_command_key (int count, int key)
|
||||||
in the readline history which turns out to be better. */
|
in the readline history which turns out to be better. */
|
||||||
rl_insert_text (tui_commands[i].cmd);
|
rl_insert_text (tui_commands[i].cmd);
|
||||||
rl_newline (1, '\n');
|
rl_newline (1, '\n');
|
||||||
|
|
||||||
|
/* Switch to gdb command mode while executing the command.
|
||||||
|
This way the gdb's continue prompty will be displayed. */
|
||||||
|
tui_set_key_mode (TUI_ONE_COMMAND_MODE);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -285,7 +289,7 @@ static int
|
||||||
tui_rl_startup_hook (void)
|
tui_rl_startup_hook (void)
|
||||||
{
|
{
|
||||||
rl_already_prompted = 1;
|
rl_already_prompted = 1;
|
||||||
if (tui_current_key_mode != TUI_COMMAND_MODE)
|
if (tui_current_key_mode != TUI_COMMAND_MODE && immediate_quit == 0)
|
||||||
tui_set_key_mode (TUI_SINGLE_KEY_MODE);
|
tui_set_key_mode (TUI_SINGLE_KEY_MODE);
|
||||||
tui_redisplay_readline ();
|
tui_redisplay_readline ();
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue