/* Output generating routines for GDB CLI.
- Copyright (C) 1999, 2000, 2002, 2003, 2005, 2007, 2008, 2009, 2010
- Free Software Foundation, Inc.
+ Copyright (C) 1999-2016 Free Software Foundation, Inc.
Contributed by Cygnus Solutions.
Written by Fernando Nasser for Cygnus.
#include "defs.h"
#include "ui-out.h"
#include "cli-out.h"
-#include "gdb_string.h"
-#include "gdb_assert.h"
+#include "completer.h"
#include "vec.h"
+#include "readline/readline.h"
typedef struct cli_ui_out_data cli_out_data;
-
/* Prototypes for local functions */
static void cli_text (struct ui_out *uiout, const char *string);
const char *fldname,
const char *format,...) ATTRIBUTE_PRINTF (4, 5);
+/* The destructor. */
+
+static void
+cli_uiout_dtor (struct ui_out *ui_out)
+{
+ cli_out_data *data = (cli_out_data *) ui_out_data (ui_out);
+
+ VEC_free (ui_filep, data->streams);
+ xfree (data);
+}
+
/* These are the CLI output functions */
/* Mark beginning of a table */
int nr_rows,
const char *tblid)
{
- cli_out_data *data = ui_out_data (uiout);
+ cli_out_data *data = (cli_out_data *) ui_out_data (uiout);
if (nr_rows == 0)
data->suppress_output = 1;
static void
cli_table_body (struct ui_out *uiout)
{
- cli_out_data *data = ui_out_data (uiout);
+ cli_out_data *data = (cli_out_data *) ui_out_data (uiout);
if (data->suppress_output)
return;
static void
cli_table_end (struct ui_out *uiout)
{
- cli_out_data *data = ui_out_data (uiout);
+ cli_out_data *data = (cli_out_data *) ui_out_data (uiout);
data->suppress_output = 0;
}
const char *col_name,
const char *colhdr)
{
- cli_out_data *data = ui_out_data (uiout);
+ cli_out_data *data = (cli_out_data *) ui_out_data (uiout);
if (data->suppress_output)
return;
int level,
const char *id)
{
- cli_out_data *data = ui_out_data (uiout);
+ cli_out_data *data = (cli_out_data *) ui_out_data (uiout);
if (data->suppress_output)
return;
enum ui_out_type type,
int level)
{
- cli_out_data *data = ui_out_data (uiout);
+ cli_out_data *data = (cli_out_data *) ui_out_data (uiout);
if (data->suppress_output)
return;
const char *fldname, int value)
{
char buffer[20]; /* FIXME: how many chars long a %d can become? */
- cli_out_data *data = ui_out_data (uiout);
+ cli_out_data *data = (cli_out_data *) ui_out_data (uiout);
if (data->suppress_output)
return;
- sprintf (buffer, "%d", value);
+ xsnprintf (buffer, sizeof (buffer), "%d", value);
/* Always go through the function pointer (virtual function call).
We may have been extended. */
enum ui_align alignment,
const char *fldname)
{
- cli_out_data *data = ui_out_data (uiout);
+ cli_out_data *data = (cli_out_data *) ui_out_data (uiout);
if (data->suppress_output)
return;
{
int before = 0;
int after = 0;
- cli_out_data *data = ui_out_data (uiout);
+ cli_out_data *data = (cli_out_data *) ui_out_data (uiout);
if (data->suppress_output)
return;
const char *format,
va_list args)
{
- cli_out_data *data = ui_out_data (uiout);
+ cli_out_data *data = (cli_out_data *) ui_out_data (uiout);
struct ui_file *stream;
if (data->suppress_output)
static void
cli_spaces (struct ui_out *uiout, int numspaces)
{
- cli_out_data *data = ui_out_data (uiout);
+ cli_out_data *data = (cli_out_data *) ui_out_data (uiout);
struct ui_file *stream;
if (data->suppress_output)
static void
cli_text (struct ui_out *uiout, const char *string)
{
- cli_out_data *data = ui_out_data (uiout);
+ cli_out_data *data = (cli_out_data *) ui_out_data (uiout);
struct ui_file *stream;
if (data->suppress_output)
cli_message (struct ui_out *uiout, int verbosity,
const char *format, va_list args)
{
- cli_out_data *data = ui_out_data (uiout);
+ cli_out_data *data = (cli_out_data *) ui_out_data (uiout);
if (data->suppress_output)
return;
}
static void
-cli_wrap_hint (struct ui_out *uiout, char *identstring)
+cli_wrap_hint (struct ui_out *uiout, const char *identstring)
{
- cli_out_data *data = ui_out_data (uiout);
+ cli_out_data *data = (cli_out_data *) ui_out_data (uiout);
if (data->suppress_output)
return;
static void
cli_flush (struct ui_out *uiout)
{
- cli_out_data *data = ui_out_data (uiout);
+ cli_out_data *data = (cli_out_data *) ui_out_data (uiout);
struct ui_file *stream = VEC_last (ui_filep, data->streams);
gdb_flush (stream);
static int
cli_redirect (struct ui_out *uiout, struct ui_file *outstream)
{
- cli_out_data *data = ui_out_data (uiout);
+ cli_out_data *data = (cli_out_data *) ui_out_data (uiout);
if (outstream != NULL)
VEC_safe_push (ui_filep, data->streams, outstream);
const char *fldname,
const char *format,...)
{
- cli_out_data *data = ui_out_data (uiout);
+ cli_out_data *data = (cli_out_data *) ui_out_data (uiout);
struct ui_file *stream = VEC_last (ui_filep, data->streams);
va_list args;
static void
field_separator (void)
{
- cli_out_data *data = ui_out_data (uiout);
+ cli_out_data *data = (cli_out_data *) ui_out_data (current_uiout);
struct ui_file *stream = VEC_last (ui_filep, data->streams);
fputc_filtered (' ', stream);
/* This is the CLI ui-out implementation functions vector */
-/* FIXME: This can be initialized dynamically after default is set to
- handle initial output in main.c */
-
-struct ui_out_impl cli_ui_out_impl =
+const struct ui_out_impl cli_ui_out_impl =
{
cli_table_begin,
cli_table_body,
cli_wrap_hint,
cli_flush,
cli_redirect,
+ cli_uiout_dtor,
0, /* Does not need MI hacks (i.e. needs CLI hacks). */
};
cli_out_new (struct ui_file *stream)
{
int flags = ui_source_list;
- cli_out_data *data = XMALLOC (cli_out_data);
+ cli_out_data *data = XNEW (cli_out_data);
cli_out_data_ctor (data, stream);
return ui_out_new (&cli_ui_out_impl, data, flags);
struct ui_file *
cli_out_set_stream (struct ui_out *uiout, struct ui_file *stream)
{
- cli_out_data *data = ui_out_data (uiout);
+ cli_out_data *data = (cli_out_data *) ui_out_data (uiout);
struct ui_file *old;
old = VEC_pop (ui_filep, data->streams);
return old;
}
+\f
+/* CLI interface to display tab-completion matches. */
+
+/* CLI version of displayer.crlf. */
+
+static void
+cli_mld_crlf (const struct match_list_displayer *displayer)
+{
+ rl_crlf ();
+}
+
+/* CLI version of displayer.putch. */
+
+static void
+cli_mld_putch (const struct match_list_displayer *displayer, int ch)
+{
+ putc (ch, rl_outstream);
+}
+
+/* CLI version of displayer.puts. */
+
+static void
+cli_mld_puts (const struct match_list_displayer *displayer, const char *s)
+{
+ fputs (s, rl_outstream);
+}
+
+/* CLI version of displayer.flush. */
+
+static void
+cli_mld_flush (const struct match_list_displayer *displayer)
+{
+ fflush (rl_outstream);
+}
+
+EXTERN_C void _rl_erase_entire_line (void);
+
+/* CLI version of displayer.erase_entire_line. */
+
+static void
+cli_mld_erase_entire_line (const struct match_list_displayer *displayer)
+{
+ _rl_erase_entire_line ();
+}
+
+/* CLI version of displayer.beep. */
+
+static void
+cli_mld_beep (const struct match_list_displayer *displayer)
+{
+ rl_ding ();
+}
+
+/* CLI version of displayer.read_key. */
+
+static int
+cli_mld_read_key (const struct match_list_displayer *displayer)
+{
+ return rl_read_key ();
+}
+
+/* CLI version of rl_completion_display_matches_hook.
+ See gdb_display_match_list for a description of the arguments. */
+
+void
+cli_display_match_list (char **matches, int len, int max)
+{
+ struct match_list_displayer displayer;
+
+ rl_get_screen_size (&displayer.height, &displayer.width);
+ displayer.crlf = cli_mld_crlf;
+ displayer.putch = cli_mld_putch;
+ displayer.puts = cli_mld_puts;
+ displayer.flush = cli_mld_flush;
+ displayer.erase_entire_line = cli_mld_erase_entire_line;
+ displayer.beep = cli_mld_beep;
+ displayer.read_key = cli_mld_read_key;
+
+ gdb_display_match_list (matches, len, max, &displayer);
+ rl_forced_update_display ();
+}