2015-08-21 Patrick Palka <patrick@parcs.ath.cx>
+ * top.h (gdb_in_secondary_prompt_p): Declare.
+ * top.c (gdb_secondary_prompt_depth): Define.
+ (gdb_in_secondary_prompt_p): Define.
+ (gdb_readline_wrapper_cleanup): Decrement
+ gdb_secondary_prompt_depth.
+ (gdb_readline_wrapper): Increment gdb_secondary_prompt_depth.
+ * tui/tui-io.c (tui_getc): Don't clear the prompt line if we
+ are in a secondary prompt.
+
+2015-08-21 Patrick Palka <patrick@parcs.ath.cx>
+
* tui/tui-io.c (tui_getc): Use tui_putc instead of waddch to
emit the newline.
return. */
static void (*saved_after_char_processing_hook) (void);
+
+/* The number of nested readline secondary prompts that are currently
+ active. */
+
+static int gdb_secondary_prompt_depth = 0;
+
+/* See top.h. */
+
+int
+gdb_in_secondary_prompt_p (void)
+{
+ return gdb_secondary_prompt_depth > 0;
+}
+
+
/* This function is called when readline has seen a complete line of
text. */
gdb_readline_wrapper_result = NULL;
gdb_readline_wrapper_done = 0;
+ gdb_secondary_prompt_depth--;
+ gdb_assert (gdb_secondary_prompt_depth >= 0);
after_char_processing_hook = saved_after_char_processing_hook;
saved_after_char_processing_hook = NULL;
cleanup->target_is_async_orig = target_is_async_p ();
+ gdb_secondary_prompt_depth++;
back_to = make_cleanup (gdb_readline_wrapper_cleanup, cleanup);
if (cleanup->target_is_async_orig)
by gdb for its command prompt. */
extern void set_prompt (const char *s);
+/* Return 1 if the current input handler is a secondary prompt, 0 otherwise. */
+
+extern int gdb_in_secondary_prompt_p (void);
+
/* From random places. */
extern int readnow_symbol_files;
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)
+ if (rl_end == 0 && !gdb_in_secondary_prompt_p ())
{
wmove (w, getcury (w), 0);