****************************/
static enum tui_layout_type current_layout = UNDEFINED_LAYOUT;
static int term_height, term_width;
-static struct tui_gen_win_info _locator;
-static struct tui_gen_win_info exec_info[2];
-static std::vector<tui_win_info *> source_windows;
+static struct tui_locator_window _locator;
+static std::vector<tui_source_window_base *> source_windows;
static struct tui_win_info *win_with_focus = NULL;
static struct tui_layout_def layout_def = {
SRC_WIN, /* DISPLAY_MODE */
** PUBLIC FUNCTIONS
**********************************/
-int
-tui_win_is_source_type (enum tui_win_type win_type)
-{
- return (win_type == SRC_WIN || win_type == DISASSEM_WIN);
-}
-
int
tui_win_is_auxillary (enum tui_win_type win_type)
{
return (win_type > MAX_MAJOR_WINDOWS);
}
-void
-tui_set_win_highlight (struct tui_win_info *win_info,
- int highlight)
-{
- if (win_info != NULL)
- win_info->is_highlighted = highlight;
-}
-
/******************************************
** ACCESSORS & MUTATORS FOR PRIVATE DATA
******************************************/
/* Accessor for the current source window. Usually there is only one
source window (either source or disassembly), but both can be
displayed at the same time. */
-std::vector<tui_win_info *> &
+std::vector<tui_source_window_base *> &
tui_source_windows ()
{
return source_windows;
void
tui_clear_source_windows_detail ()
{
- for (tui_win_info *win : tui_source_windows ())
+ for (tui_source_window_base *win : tui_source_windows ())
win->clear_detail ();
}
one source window (either source or disassembly), but both can be
displayed at the same time. */
void
-tui_add_to_source_windows (struct tui_win_info *win_info)
+tui_add_to_source_windows (struct tui_source_window_base *win_info)
{
if (source_windows.size () < 2)
source_windows.push_back (win_info);
void
tui_cmd_window::clear_detail ()
{
- wmove (generic.handle, 0, 0);
+ wmove (handle, 0, 0);
}
/* See tui-data.h. */
display_regs = false;
}
-/* Accessor for the source execution info ptr. */
-struct tui_gen_win_info *
-tui_source_exec_info_win_ptr (void)
-{
- return &exec_info[0];
-}
-
-
-/* Accessor for the disassem execution info ptr. */
-struct tui_gen_win_info *
-tui_disassem_exec_info_win_ptr (void)
-{
- return &exec_info[1];
-}
-
-
/* Accessor for the locator win info. Answers a pointer to the static
locator win info struct. */
-struct tui_gen_win_info *
+struct tui_locator_window *
tui_locator_win_info_ptr (void)
{
return &_locator;
struct tui_win_info *
tui_next_win (struct tui_win_info *cur_win)
{
- int type = cur_win->generic.type;
+ int type = cur_win->type;
struct tui_win_info *next_win = NULL;
- if (cur_win->generic.type == CMD_WIN)
+ if (cur_win->type == CMD_WIN)
type = SRC_WIN;
else
- type = cur_win->generic.type + 1;
- while (type != cur_win->generic.type && (next_win == NULL))
+ type = cur_win->type + 1;
+ while (type != cur_win->type && (next_win == NULL))
{
if (tui_win_list[type]
- && tui_win_list[type]->generic.is_visible)
+ && tui_win_list[type]->is_visible)
next_win = tui_win_list[type];
else
{
struct tui_win_info *
tui_prev_win (struct tui_win_info *cur_win)
{
- int type = cur_win->generic.type;
+ int type = cur_win->type;
struct tui_win_info *prev = NULL;
- if (cur_win->generic.type == SRC_WIN)
+ if (cur_win->type == SRC_WIN)
type = CMD_WIN;
else
- type = cur_win->generic.type - 1;
- while (type != cur_win->generic.type && (prev == NULL))
+ type = cur_win->type - 1;
+ while (type != cur_win->type && (prev == NULL))
{
if (tui_win_list[type]
- && tui_win_list[type]->generic.is_visible)
+ && tui_win_list[type]->is_visible)
prev = tui_win_list[type];
else
{
{
if (tui_win_list[i] != 0)
{
- const char *cur_name =
- tui_win_name (&tui_win_list[i]->generic);
+ const char *cur_name = tui_win_list[i]->name ();
if (strlen (name) <= strlen (cur_name)
&& startswith (cur_name, name))
}
-/* Answer the name of the window. */
-const char *
-tui_win_name (const struct tui_gen_win_info *win_info)
-{
- const char *name = NULL;
-
- switch (win_info->type)
- {
- case SRC_WIN:
- name = SRC_NAME;
- break;
- case CMD_WIN:
- name = CMD_NAME;
- break;
- case DISASSEM_WIN:
- name = DISASSEM_NAME;
- break;
- case DATA_WIN:
- name = DATA_NAME;
- break;
- default:
- name = "";
- break;
- }
-
- return name;
-}
-
-
void
tui_initialize_static_data (void)
{
- tui_init_generic_part (tui_source_exec_info_win_ptr ());
- tui_init_generic_part (tui_disassem_exec_info_win_ptr ());
tui_init_generic_part (tui_locator_win_info_ptr ());
}
-struct tui_gen_win_info *
-tui_alloc_generic_win_info (void)
-{
- struct tui_gen_win_info *win = XNEW (struct tui_gen_win_info);
-
- tui_init_generic_part (win);
-
- return win;
-}
-
-
void
tui_init_generic_part (struct tui_gen_win_info *win)
{
win->last_visible_line = 0;
win->handle = NULL;
win->content = NULL;
- win->content_in_use =
- win->is_visible = FALSE;
+ win->content_in_use = FALSE;
+ win->is_visible = false;
win->title = 0;
}
init_content_element (struct tui_win_element *element,
enum tui_win_type type)
{
+ gdb_assert (type != EXEC_INFO_WIN);
+ gdb_assert (type != LOCATOR_WIN);
+
switch (type)
{
case SRC_WIN:
element->which_element.source.has_break = FALSE;
break;
case DATA_WIN:
- tui_init_generic_part (&element->which_element.data_window);
- element->which_element.data_window.type = DATA_ITEM_WIN;
- element->which_element.data_window.content =
+ element->which_element.data_window = new struct tui_gen_win_info (DATA_ITEM_WIN);
+ element->which_element.data_window->content =
tui_alloc_content (1, DATA_ITEM_WIN);
- element->which_element.data_window.content_size = 1;
+ element->which_element.data_window->content_size = 1;
break;
case CMD_WIN:
element->which_element.command.line = NULL;
element->which_element.data.highlight = FALSE;
element->which_element.data.content = NULL;
break;
- case LOCATOR_WIN:
- element->which_element.locator.full_name[0] =
- element->which_element.locator.proc_name[0] = (char) 0;
- element->which_element.locator.line_no = 0;
- element->which_element.locator.addr = 0;
- break;
- case EXEC_INFO_WIN:
- memset(element->which_element.simple_string, ' ',
- sizeof(element->which_element.simple_string));
- break;
default:
break;
}
}
tui_win_info::tui_win_info (enum tui_win_type type)
+ : tui_gen_win_info (type)
{
- generic.type = type;
- tui_init_generic_part (&generic);
}
tui_source_window_base::tui_source_window_base (enum tui_win_type type)
start_line_or_addr.u.addr = 0;
}
-tui_data_window::tui_data_window ()
- : tui_win_info (DATA_WIN)
-{
- data_content = NULL;
- data_content_count = 0;
- regs_content = NULL;
- regs_content_count = 0;
- regs_column_count = 1;
- display_regs = false;
- current_group = 0;
-}
-
-tui_cmd_window::tui_cmd_window ()
- : tui_win_info (CMD_WIN)
-{
-}
-
-struct tui_win_info *
-tui_alloc_win_info (enum tui_win_type type)
-{
- switch (type)
- {
- case SRC_WIN:
- return new tui_source_window ();
-
- case DISASSEM_WIN:
- return new tui_disasm_window ();
-
- case DATA_WIN:
- return new tui_data_window ();
-
- case CMD_WIN:
- return new tui_cmd_window ();
- }
-
- gdb_assert_not_reached (_("Unhandled window type"));
-}
-
-
/* Allocates the content and elements in a block. */
tui_win_content
tui_alloc_content (int num_elements, enum tui_win_type type)
struct tui_win_element *element_block_ptr;
int i;
+ gdb_assert (type != EXEC_INFO_WIN);
+ gdb_assert (type != LOCATOR_WIN);
+
content = XNEWVEC (struct tui_win_element *, num_elements);
/*
return index_start;
}
-tui_source_window_base::~tui_source_window_base ()
+tui_gen_win_info::~tui_gen_win_info ()
{
- xfree (fullname);
- struct tui_gen_win_info *generic_win = execution_info;
- if (generic_win != NULL)
+ if (handle != NULL)
{
- tui_delete_win (generic_win->handle);
- generic_win->handle = NULL;
- tui_free_win_content (generic_win);
+ tui_delete_win (handle);
+ handle = NULL;
+ tui_free_win_content (this);
}
+ xfree (title);
+}
+
+tui_source_window_base::~tui_source_window_base ()
+{
+ xfree (fullname);
+ delete execution_info;
}
tui_data_window::~tui_data_window ()
{
- if (generic.content != NULL)
+ if (content != NULL)
{
tui_free_data_content (regs_content, regs_content_count);
regs_content = NULL;
data_content_count = 0;
regs_column_count = 1;
display_regs = false;
- generic.content = NULL;
- generic.content_size = 0;
+ content = NULL;
+ content_size = 0;
}
}
-tui_win_info::~tui_win_info ()
-{
- if (generic.handle != NULL)
- {
- tui_delete_win (generic.handle);
- generic.handle = NULL;
- tui_free_win_content (&generic);
- }
- if (generic.title)
- xfree (generic.title);
-}
-
-
void
tui_free_all_source_wins_content ()
{
- for (tui_win_info *win_info : tui_source_windows ())
+ for (tui_source_window_base *win_info : tui_source_windows ())
{
- tui_free_win_content (&(win_info->generic));
- tui_source_window_base *base = (tui_source_window_base *) win_info;
- tui_free_win_content (base->execution_info);
+ tui_free_win_content (win_info);
+ tui_free_win_content (win_info->execution_info);
}
}
for (i = 0; i < content_size; i++)
{
struct tui_gen_win_info *generic_win
- = &content[i]->which_element.data_window;
+ = content[i]->which_element.data_window;
if (generic_win != NULL)
{
xfree (element->which_element.source.line);
break;
case DATA_WIN:
+ delete element->which_element.data_window;
xfree (element);
break;
case DATA_ITEM_WIN:
projects / deliverable / binutils-gdb.git / blobdiff