mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +08:00
0a8fce9a70
* tui/tui-out.c: Include cli-out.h. (tui_table_begin, tui_table_body, tui_table_end, tui_table_header) (tui_begin, tui_end, tui_field_int, tui_field_skip) (tui_field_string, tui_field_fmt, tui_spaces, tui_text) (tui_message, tui_wrap_hint, tui_flush): Delete forward declarations. (struct ui_out_data): Rename to... (struct tui_ui_out_data): ... this. Remove `stream' and `suppress_output' fields, and inherit cli_ui_out_data. (tui_out_data): New typedef. (tui_ui_out_impl): Don't initialize fields staticaly. (tui_table_begin, tui_table_body, tui_table_end, tui_table_header) (tui_begin, tui_end): Delete. (tui_field_int): Adjust to delegate most work to the base type. (tui_field_skip): Delete. (tui_field_string, tui_field_fmt): Adjust comment. Adjust to delegate most work to the base type. (tui_spaces): Delete. (tui_text): Adjust to delegate most work to the base type. (tui_message): Delete. (tui_wrap_hint): Delete. (tui_flush): Delete. (out_field_fmt): Delete. (field_separator): Delete. (tui_out_new): Adjust to initialize the base type. (_initialize_tui_out): Initialize tui_ui_out_impl. * cli-out.c (struct ui_out_data): Moved out to cli-out.h, renamed cli_ui_out_data. (cli_out_data): Adjust. (cli_ui_out_impl): Make extern. (cli_table_header, cli_field_int, cli_field_skip): Use uo_field_string instead of cli_field_string. (cli_redirect): Adjust to use cli_out_data. (cli_out_data_ctor): New. (cli_out_new): Use it. * cli-out.h (struct ui_file): Remove forward declaration. (struct cli_ui_out_data): New, moved from cli-out.c, and renamed. (cli_ui_out_impl): Declare. (cli_out_data_ctor): Declare. * ui-out.c (struct ui_out) <data>: Change type to void pointer. (uo_field_string): No longer static. (ui_out_data): Change return type to void pointer. (ui_out_new): Change `data' parameter type to void pointer. * ui-out.h (struct ui_out_data): Don't forward declare. (ui_out_data): Change return type to void pointer. (ui_out_new): Change `data' parameter type to void pointer. (uo_field_string): Declare.
178 lines
4.2 KiB
C
178 lines
4.2 KiB
C
/* Output generating routines for GDB CLI.
|
|
|
|
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005, 2007, 2008, 2009, 2010
|
|
Free Software Foundation, Inc.
|
|
|
|
Contributed by Cygnus Solutions.
|
|
Written by Fernando Nasser for Cygnus.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include "ui-out.h"
|
|
#include "cli-out.h"
|
|
#include "tui.h"
|
|
#include "gdb_string.h"
|
|
#include "gdb_assert.h"
|
|
|
|
struct tui_ui_out_data
|
|
{
|
|
struct cli_ui_out_data base;
|
|
|
|
int line;
|
|
int start_of_line;
|
|
};
|
|
typedef struct tui_ui_out_data tui_out_data;
|
|
|
|
/* This is the TUI ui-out implementation functions vector. It is
|
|
initialized below in _initialize_tui_out, inheriting the CLI
|
|
version, and overriding a few methods. */
|
|
|
|
static struct ui_out_impl tui_ui_out_impl;
|
|
|
|
/* Output an int field. */
|
|
|
|
static void
|
|
tui_field_int (struct ui_out *uiout,
|
|
int fldno, int width,
|
|
enum ui_align alignment,
|
|
const char *fldname,
|
|
int value)
|
|
{
|
|
tui_out_data *data = ui_out_data (uiout);
|
|
if (data->base.suppress_output)
|
|
return;
|
|
|
|
/* Don't print line number, keep it for later. */
|
|
if (data->start_of_line == 0 && strcmp (fldname, "line") == 0)
|
|
{
|
|
data->start_of_line ++;
|
|
data->line = value;
|
|
return;
|
|
}
|
|
data->start_of_line ++;
|
|
|
|
(*cli_ui_out_impl.field_int) (uiout, fldno,
|
|
width, alignment, fldname, value);
|
|
}
|
|
|
|
/* Other cli_field_* end up here so alignment and field separators are
|
|
both handled by tui_field_string. */
|
|
|
|
static void
|
|
tui_field_string (struct ui_out *uiout,
|
|
int fldno, int width,
|
|
enum ui_align align,
|
|
const char *fldname,
|
|
const char *string)
|
|
{
|
|
tui_out_data *data = ui_out_data (uiout);
|
|
if (data->base.suppress_output)
|
|
return;
|
|
|
|
if (fldname && data->line > 0 && strcmp (fldname, "file") == 0)
|
|
{
|
|
data->start_of_line ++;
|
|
if (data->line > 0)
|
|
{
|
|
tui_show_source (string, data->line);
|
|
}
|
|
return;
|
|
}
|
|
|
|
data->start_of_line++;
|
|
|
|
(*cli_ui_out_impl.field_string) (uiout, fldno,
|
|
width, align,
|
|
fldname, string);
|
|
}
|
|
|
|
/* This is the only field function that does not align. */
|
|
|
|
static void
|
|
tui_field_fmt (struct ui_out *uiout, int fldno,
|
|
int width, enum ui_align align,
|
|
const char *fldname,
|
|
const char *format,
|
|
va_list args)
|
|
{
|
|
tui_out_data *data = ui_out_data (uiout);
|
|
if (data->base.suppress_output)
|
|
return;
|
|
|
|
data->start_of_line++;
|
|
|
|
(*cli_ui_out_impl.field_fmt) (uiout, fldno,
|
|
width, align,
|
|
fldname, format, args);
|
|
}
|
|
|
|
static void
|
|
tui_text (struct ui_out *uiout, const char *string)
|
|
{
|
|
tui_out_data *data = ui_out_data (uiout);
|
|
if (data->base.suppress_output)
|
|
return;
|
|
data->start_of_line ++;
|
|
if (data->line > 0)
|
|
{
|
|
if (strchr (string, '\n') != 0)
|
|
{
|
|
data->line = -1;
|
|
data->start_of_line = 0;
|
|
}
|
|
return;
|
|
}
|
|
if (strchr (string, '\n'))
|
|
data->start_of_line = 0;
|
|
|
|
(*cli_ui_out_impl.text) (uiout, string);
|
|
}
|
|
|
|
struct ui_out *
|
|
tui_out_new (struct ui_file *stream)
|
|
{
|
|
int flags = 0;
|
|
|
|
tui_out_data *data = XMALLOC (tui_out_data);
|
|
|
|
/* Initialize base "class". */
|
|
cli_out_data_ctor (&data->base, stream);
|
|
|
|
/* Initialize our fields. */
|
|
data->line = -1;
|
|
data->start_of_line = 0;
|
|
|
|
return ui_out_new (&tui_ui_out_impl, data, flags);
|
|
}
|
|
|
|
/* Standard gdb initialization hook. */
|
|
|
|
extern void _initialize_tui_out (void);
|
|
|
|
void
|
|
_initialize_tui_out (void)
|
|
{
|
|
/* Inherit the CLI version. */
|
|
tui_ui_out_impl = cli_ui_out_impl;
|
|
|
|
/* Override a few methods. */
|
|
tui_ui_out_impl.field_int = tui_field_int;
|
|
tui_ui_out_impl.field_string = tui_field_string;
|
|
tui_ui_out_impl.field_fmt = tui_field_fmt;
|
|
tui_ui_out_impl.text = tui_text;
|
|
}
|