/* TUI data manipulation routines.
- Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007
- Free Software Foundation, Inc.
+ Copyright (C) 1998-2018 Free Software Foundation, Inc.
Contributed by Hewlett-Packard Company.
#include "tui/tui.h"
#include "tui/tui-data.h"
#include "tui/tui-wingeneral.h"
-
-#include "gdb_string.h"
#include "gdb_curses.h"
/****************************
** GLOBAL DECLARATIONS
****************************/
-struct tui_win_info *(tui_win_list[MAX_MAJOR_WINDOWS]);
+struct tui_win_info *tui_win_list[MAX_MAJOR_WINDOWS];
/***************************
** Private data
static struct tui_win_info *src_win_list[2];
static struct tui_list source_windows = {src_win_list, 0};
static int default_tab_len = DEFAULT_TAB_LEN;
-static struct tui_win_info *win_with_focus = (struct tui_win_info *) NULL;
+static struct tui_win_info *win_with_focus = NULL;
static struct tui_layout_def layout_def = {
SRC_WIN, /* DISPLAY_MODE */
- FALSE, /* SPLIT */
- TUI_UNDEFINED_REGS, /* REGS_DISPLAY_TYPE */
- TUI_SFLOAT_REGS}; /* FLOAT_REGS_DISPLAY_TYPE */
+ FALSE}; /* SPLIT */
static int win_resized = FALSE;
tui_add_to_source_windows (struct tui_win_info *win_info)
{
if (source_windows.count < 2)
- source_windows.list[source_windows.count++] = (void *) win_info;
+ source_windows.list[source_windows.count++] = win_info;
}
{
case SRC_WIN:
case DISASSEM_WIN:
+ win_info->detail.source_info.gdbarch = NULL;
win_info->detail.source_info.start_line_or_addr.loa = LOA_ADDRESS;
win_info->detail.source_info.start_line_or_addr.u.addr = 0;
win_info->detail.source_info.horizontal_offset = 0;
break;
case CMD_WIN:
- win_info->detail.command_info.cur_line =
- win_info->detail.command_info.curch = 0;
+ wmove (win_info->generic.handle, 0, 0);
break;
case DATA_WIN:
win_info->detail.data_display_info.data_content =
win_info->detail.data_display_info.regs_content =
(tui_win_content) NULL;
win_info->detail.data_display_info.regs_content_count = 0;
- win_info->detail.data_display_info.regs_display_type =
- TUI_UNDEFINED_REGS;
win_info->detail.data_display_info.regs_column_count = 1;
win_info->detail.data_display_info.display_regs = FALSE;
break;
}
-/* Set the origin of the window. */
-void
-set_gen_win_origin (struct tui_gen_win_info *win_info,
- int x, int y)
-{
- win_info->origin.x = x;
- win_info->origin.y = y;
-}
-
-
/*****************************
** OTHER PUBLIC FUNCTIONS
*****************************/
struct tui_win_info *
tui_next_win (struct tui_win_info *cur_win)
{
- enum tui_win_type type = cur_win->generic.type;
- struct tui_win_info *next_win = (struct tui_win_info *) NULL;
+ int type = cur_win->generic.type;
+ struct tui_win_info *next_win = NULL;
if (cur_win->generic.type == CMD_WIN)
type = SRC_WIN;
struct tui_win_info *
tui_prev_win (struct tui_win_info *cur_win)
{
- enum tui_win_type type = cur_win->generic.type;
- struct tui_win_info *prev = (struct tui_win_info *) NULL;
+ int type = cur_win->generic.type;
+ struct tui_win_info *prev = NULL;
if (cur_win->generic.type == SRC_WIN)
type = CMD_WIN;
/* Answer the window represented by name. */
struct tui_win_info *
-tui_partial_win_by_name (char *name)
+tui_partial_win_by_name (const char *name)
{
- struct tui_win_info *win_info = (struct tui_win_info *) NULL;
+ struct tui_win_info *win_info = NULL;
if (name != (char *) NULL)
{
{
if (tui_win_list[i] != 0)
{
- char *cur_name = tui_win_name (&tui_win_list[i]->generic);
+ const char *cur_name =
+ tui_win_name (&tui_win_list[i]->generic);
+
if (strlen (name) <= strlen (cur_name)
- && strncmp (name, cur_name, strlen (name)) == 0)
+ && startswith (cur_name, name))
win_info = tui_win_list[i];
}
i++;
/* Answer the name of the window. */
-char *
-tui_win_name (struct tui_gen_win_info *win_info)
+const char *
+tui_win_name (const struct tui_gen_win_info *win_info)
{
- char *name = (char *) NULL;
+ const char *name = NULL;
switch (win_info->type)
{
struct tui_gen_win_info *
tui_alloc_generic_win_info (void)
{
- struct tui_gen_win_info *win;
+ struct tui_gen_win_info *win = XNEW (struct tui_gen_win_info);
- if ((win = XMALLOC (struct tui_gen_win_info)) != NULL)
+ if (win != NULL)
tui_init_generic_part (win);
return win;
win->viewport_height =
win->content_size =
win->last_visible_line = 0;
- win->handle = (WINDOW *) NULL;
+ win->handle = NULL;
win->content = NULL;
win->content_in_use =
win->is_visible = FALSE;
/* init_content_element().
*/
-void
+static void
init_content_element (struct tui_win_element *element,
enum tui_win_type type)
{
{
case SRC_WIN:
case DISASSEM_WIN:
- element->which_element.source.line = (char *) NULL;
+ element->which_element.source.line = NULL;
element->which_element.source.line_or_addr.loa = LOA_LINE;
element->which_element.source.line_or_addr.u.line_no = 0;
element->which_element.source.is_exec_point = FALSE;
case DATA_WIN:
tui_init_generic_part (&element->which_element.data_window);
element->which_element.data_window.type = DATA_ITEM_WIN;
- ((struct tui_gen_win_info *) & element->which_element.data_window)->content =
- (void **) tui_alloc_content (1, DATA_ITEM_WIN);
- ((struct tui_gen_win_info *)
- & element->which_element.data_window)->content_size = 1;
+ element->which_element.data_window.content =
+ tui_alloc_content (1, DATA_ITEM_WIN);
+ element->which_element.data_window.content_size = 1;
break;
case CMD_WIN:
- element->which_element.command.line = (char *) NULL;
+ element->which_element.command.line = NULL;
break;
case DATA_ITEM_WIN:
- element->which_element.data.name = (char *) NULL;
+ element->which_element.data.name = NULL;
element->which_element.data.type = TUI_REGISTER;
element->which_element.data.item_no = UNDEFINED_ITEM;
element->which_element.data.value = NULL;
element->which_element.data.highlight = FALSE;
- element->which_element.data.content = (char*) NULL;
+ element->which_element.data.content = NULL;
break;
case LOCATOR_WIN:
- element->which_element.locator.file_name[0] =
+ 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;
}
}
-void
+static void
init_win_info (struct tui_win_info *win_info)
{
tui_init_generic_part (&win_info->generic);
{
case SRC_WIN:
case DISASSEM_WIN:
- win_info->detail.source_info.execution_info = (struct tui_gen_win_info *) NULL;
+ win_info->detail.source_info.execution_info
+ = (struct tui_gen_win_info *) NULL;
win_info->detail.source_info.has_locator = FALSE;
win_info->detail.source_info.horizontal_offset = 0;
+ win_info->detail.source_info.gdbarch = NULL;
win_info->detail.source_info.start_line_or_addr.loa = LOA_ADDRESS;
win_info->detail.source_info.start_line_or_addr.u.addr = 0;
- win_info->detail.source_info.filename = 0;
+ win_info->detail.source_info.fullname = NULL;
break;
case DATA_WIN:
win_info->detail.data_display_info.data_content = (tui_win_content) NULL;
win_info->detail.data_display_info.data_content_count = 0;
win_info->detail.data_display_info.regs_content = (tui_win_content) NULL;
win_info->detail.data_display_info.regs_content_count = 0;
- win_info->detail.data_display_info.regs_display_type =
- TUI_UNDEFINED_REGS;
win_info->detail.data_display_info.regs_column_count = 1;
win_info->detail.data_display_info.display_regs = FALSE;
win_info->detail.data_display_info.current_group = 0;
break;
case CMD_WIN:
- win_info->detail.command_info.cur_line = 0;
- win_info->detail.command_info.curch = 0;
break;
default:
win_info->detail.opaque = NULL;
struct tui_win_info *
tui_alloc_win_info (enum tui_win_type type)
{
- struct tui_win_info *win_info;
+ struct tui_win_info *win_info = XNEW (struct tui_win_info);
- win_info = XMALLOC (struct tui_win_info);
if (win_info != NULL)
{
win_info->generic.type = type;
tui_alloc_content (int num_elements, enum tui_win_type type)
{
tui_win_content content;
- char *element_block_ptr;
+ struct tui_win_element *element_block_ptr;
int i;
- content = xmalloc (sizeof (struct tui_win_element *) *num_elements);
- if (content != NULL)
+ content = XNEWVEC (struct tui_win_element *, num_elements);
+
+ /*
+ * All windows, except the data window, can allocate the
+ * elements in a chunk. The data window cannot because items
+ * can be added/removed from the data display by the user at any
+ * time.
+ */
+ if (type != DATA_WIN)
{
- /*
- * All windows, except the data window, can allocate the
- * elements in a chunk. The data window cannot because items
- * can be added/removed from the data display by the user at any
- * time.
- */
- if (type != DATA_WIN)
+ element_block_ptr = XNEWVEC (struct tui_win_element, num_elements);
+ for (i = 0; i < num_elements; i++)
{
- element_block_ptr =
- xmalloc (sizeof (struct tui_win_element) * num_elements);
- if (element_block_ptr != NULL)
- {
- for (i = 0; i < num_elements; i++)
- {
- content[i] = (struct tui_win_element *) element_block_ptr;
- init_content_element (content[i], type);
- element_block_ptr += sizeof (struct tui_win_element);
- }
- }
- else
- {
- xfree (content);
- content = (tui_win_content) NULL;
- }
+ content[i] = element_block_ptr;
+ init_content_element (content[i], type);
+ element_block_ptr++;
}
}
if (win_info->content == NULL)
{
- win_info->content = (void **) tui_alloc_content (num_elements, win_info->type);
+ win_info->content = tui_alloc_content (num_elements, win_info->type);
index_start = 0;
}
else
{
for (i = index_start; (i < num_elements + index_start); i++)
{
- if ((element_ptr = XMALLOC (struct tui_win_element)) != NULL)
+ element_ptr = XNEW (struct tui_win_element);
+ if (element_ptr != NULL)
{
- win_info->content[i] = (void *) element_ptr;
+ win_info->content[i] = element_ptr;
init_content_element (element_ptr, win_info->type);
win_info->content_size++;
}
if (generic_win != (struct tui_gen_win_info *) NULL)
{
tui_delete_win (generic_win->handle);
- generic_win->handle = (WINDOW *) NULL;
+ generic_win->handle = NULL;
generic_win->is_visible = FALSE;
}
- if (win_info->detail.source_info.filename)
+ if (win_info->detail.source_info.fullname)
{
- xfree (win_info->detail.source_info.filename);
- win_info->detail.source_info.filename = 0;
+ xfree (win_info->detail.source_info.fullname);
+ win_info->detail.source_info.fullname = NULL;
}
generic_win = win_info->detail.source_info.execution_info;
if (generic_win != (struct tui_gen_win_info *) NULL)
{
tui_delete_win (generic_win->handle);
- generic_win->handle = (WINDOW *) NULL;
+ generic_win->handle = NULL;
generic_win->is_visible = FALSE;
}
break;
if (win_info->generic.handle != (WINDOW *) NULL)
{
tui_delete_win (win_info->generic.handle);
- win_info->generic.handle = (WINDOW *) NULL;
+ win_info->generic.handle = NULL;
win_info->generic.is_visible = FALSE;
}
}
{
case SRC_WIN:
case DISASSEM_WIN:
- generic_win = tui_locator_win_info_ptr ();
- if (generic_win != (struct tui_gen_win_info *) NULL)
- {
- tui_delete_win (generic_win->handle);
- generic_win->handle = (WINDOW *) NULL;
- }
- tui_free_win_content (generic_win);
- if (win_info->detail.source_info.filename)
+ if (win_info->detail.source_info.fullname)
{
- xfree (win_info->detail.source_info.filename);
- win_info->detail.source_info.filename = 0;
+ xfree (win_info->detail.source_info.fullname);
+ win_info->detail.source_info.fullname = NULL;
}
generic_win = win_info->detail.source_info.execution_info;
if (generic_win != (struct tui_gen_win_info *) NULL)
{
tui_delete_win (generic_win->handle);
- generic_win->handle = (WINDOW *) NULL;
+ generic_win->handle = NULL;
tui_free_win_content (generic_win);
}
break;
win_info->detail.data_display_info.data_content =
(tui_win_content) NULL;
win_info->detail.data_display_info.data_content_count = 0;
- win_info->detail.data_display_info.regs_display_type =
- TUI_UNDEFINED_REGS;
win_info->detail.data_display_info.regs_column_count = 1;
win_info->detail.data_display_info.display_regs = FALSE;
win_info->generic.content = NULL;
if (win_info->generic.handle != (WINDOW *) NULL)
{
tui_delete_win (win_info->generic.handle);
- win_info->generic.handle = (WINDOW *) NULL;
+ win_info->generic.handle = NULL;
tui_free_win_content (&win_info->generic);
}
if (win_info->generic.title)
element. */
for (i = 0; i < content_size; i++)
{
- struct tui_gen_win_info *generic_win = &content[i]->which_element.data_window;
+ struct tui_gen_win_info *generic_win
+ = &content[i]->which_element.data_window;
if (generic_win != (struct tui_gen_win_info *) NULL)
{
tui_delete_win (generic_win->handle);
- generic_win->handle = (WINDOW *) NULL;
+ generic_win->handle = NULL;
generic_win->is_visible = FALSE;
}
}
element. */
for (i = 0; i < content_size; i++)
{
- struct tui_gen_win_info *generic_win = &content[i]->which_element.data_window;
+ struct tui_gen_win_info *generic_win
+ = &content[i]->which_element.data_window;
if (generic_win != (struct tui_gen_win_info *) NULL)
{
tui_delete_win (generic_win->handle);
- generic_win->handle = (WINDOW *) NULL;
+ generic_win->handle = NULL;
tui_free_win_content (generic_win);
}
}