2011-09-06 Pedro Alves <pedro@codesourcery.com>

* event-top.h (MAXPROMPTS, struct prompts): Delete.
	(set_async_annotation_level, set_async_prompt, pop_prompt)
	(push_prompt, new_async_prompt): Delete declarations.
	* top.h (get_prompt, set_prompt): Change prototype.
	(get_prefix, set_prefix, get_suffix, set_suffix): Delete
	declarations.
	* top.c (command_loop):
	(top_prompt): New global.
	(get_prefix, set_prefix, get_suffix, ): Delete.
	(get_prompt, set_prompt): Rewrite.
	(show_new_async_prompt): Rename to ...
	(show_prompt): ... this.
	(init_main): Adjust.  Don't handle --annotate=2 here.
	* event-top.c (new_async_prompt): Delete.
	(the_prompts): Delete.
	(more_to_come): Make static.
	(display_gdb_prompt): Use top_level_prompt() to compute the top
	level prompt, and don't notify the before_prompt observers
	directly here.  Always trick readline into not trying to display
	the prompt if sync_execution and displaying the primary prompt.
	If displaying a local/secondary prompt, always show it, even if
	sync_execution is set.
	(change_annotation_level): Delete.
	(top_level_prompt): New, based on change_annotation_level.
	(push_prompt, pop_prompt): Delete.
	(async_disable_stdin): No longer pushes prompt.
	(command_line_handler): No longer pushes or pops prompt.  If more
	input is expected, call display_gdb_prompt with an explicit empty
	prompt.
	(async_stop_sig): Adjust.
	(set_async_annotation_level, set_async_prompt): Delete.
	* python/python.c (before_prompt_hook): Adjust.

gdb/event-top.h

@@ -25,51 +25,6 @@
 
 struct cmd_list_element;
 
-/* Stack for prompts.  Each prompt is composed as a prefix, a prompt
-   and a suffix.  The prompt to be displayed at any given time is the
-   one on top of the stack.  A stack is necessary because of cases in
-   which the execution of a gdb command requires further input from
-   the user, like for instance 'commands' for breakpoints and
-   'actions' for tracepoints.  In these cases, the prompt is '>' and
-   gdb should process input using the asynchronous readline interface
-   and the event loop.  In order to achieve this, we need to save
-   somewhere the state of GDB, i.e. that it is processing user input
-   as part of a command and not as part of the top level command loop.
-   The prompt stack represents part of the saved state.  Another part
-   would be the function that readline would invoke after a whole line
-   of input has ben entered.  This second piece would be something
-   like, for instance, where to return within the code for the actions
-   commands after a line has been read.  This latter portion has not
-   beeen implemented yet.  The need for a 3-part prompt arises from
-   the annotation level.  When this is set to 2, the prompt is
-   actually composed of a prefix, the prompt itself and a suffix.  */
-
-/* At any particular time there will be always at least one prompt on
-   the stack, the one being currently displayed by gdb.  If gdb is
-   using annotation level equal 2, there will be 2 prompts on the
-   stack: the usual one, w/o prefix and suffix (at top - 1), and the
-   'composite' one with prefix and suffix added (at top).  At this
-   time, this is the only use of the prompt stack.  Resetting annotate
-   to 0 or 1, pops the top of the stack, resetting its size to one
-   element.  The MAXPROMPTS limit is safe, for now.  Once other cases
-   are dealt with (like the different prompts used for 'commands' or
-   'actions') this array implementation of the prompt stack may have
-   to change.  */
-
-#define MAXPROMPTS 10
-struct prompts
-  {
-    struct
-      {
-	char *prefix;
-	char *prompt;
-	char *suffix;
-      }
-    prompt_stack[MAXPROMPTS];
-    int top;
-  };
-
-
 /* Exported functions from event-top.c.
    FIXME: these should really go into top.h.  */
 
@@ -79,10 +34,6 @@ void gdb_disable_readline (void);
 extern void async_init_signals (void);
 extern void set_async_editing_command (char *args, int from_tty,
 				       struct cmd_list_element *c);
-extern void set_async_annotation_level (char *args, int from_tty,
-					struct cmd_list_element *c);
-extern void set_async_prompt (char *args, int from_tty,
-			      struct cmd_list_element *c);
 
 /* Signal to catch ^Z typed while reading a command: SIGTSTP or SIGCONT.  */
 #ifndef STOP_SIGNAL
@@ -94,8 +45,6 @@ extern void handle_stop_sig (int sig);
 #endif
 extern void handle_sigint (int sig);
 extern void handle_sigterm (int sig);
-extern void pop_prompt (void);
-extern void push_prompt (char *prefix, char *prompt, char *suffix);
 extern void gdb_readline2 (void *client_data);
 extern void mark_async_signal_handler_wrapper (void *token);
 extern void async_request_quit (void *arg);
@@ -109,7 +58,6 @@ extern void async_enable_stdin (void);
 extern int async_command_editing_p;
 extern int exec_done_display_p;
 extern char *async_annotation_suffix;
-extern char *new_async_prompt;
 extern struct prompts the_prompts;
 extern void (*call_readline) (void *);
 extern void (*input_handler) (char *);