/* TUI layout window management.
- Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
- Foundation, Inc.
+ Copyright (C) 1998-2019 Free Software Foundation, Inc.
Contributed by Hewlett-Packard Company.
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 2 of the License, or
+ 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,
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, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
+#include "arch-utils.h"
#include "command.h"
#include "symtab.h"
#include "frame.h"
#include "tui/tui-win.h"
#include "tui/tui-winsource.h"
#include "tui/tui-disasm.h"
-
-#ifdef HAVE_NCURSES_H
-#include <ncurses.h>
-#else
-#ifdef HAVE_CURSES_H
-#include <curses.h>
-#endif
-#endif
+#include "tui/tui-layout.h"
+#include "gdb_curses.h"
/*******************************
** Static Local Decls
********************************/
-static void showLayout (enum tui_layout_type);
-static void _initGenWinInfo (struct tui_gen_win_info *, enum tui_win_type, int, int, int, int);
-static void _initAndMakeWin (void **, enum tui_win_type, int, int, int, int, int);
-static void _showSourceOrDisassemAndCommand (enum tui_layout_type);
-static void _makeSourceOrDisassemWindow (struct tui_win_info * *, enum tui_win_type, int, int);
-static void _makeCommandWindow (struct tui_win_info * *, int, int);
-static void _makeSourceWindow (struct tui_win_info * *, int, int);
-static void _makeDisassemWindow (struct tui_win_info * *, int, int);
-static void _makeDataWindow (struct tui_win_info * *, int, int);
-static void _showSourceCommand (void);
-static void _showDisassemCommand (void);
-static void _showSourceDisassemCommand (void);
-static void _showData (enum tui_layout_type);
-static enum tui_layout_type _nextLayout (void);
-static enum tui_layout_type _prevLayout (void);
-static void _tuiLayout_command (char *, int);
-static void _tuiToggleLayout_command (char *, int);
-static void _tuiToggleSplitLayout_command (char *, int);
-static CORE_ADDR _extractDisplayStartAddr (void);
-static void _tuiHandleXDBLayout (struct tui_layout_def *);
+static void show_layout (enum tui_layout_type);
+static tui_gen_win_info *init_and_make_win (tui_gen_win_info *,
+ enum tui_win_type,
+ int, int, int, int,
+ enum tui_box);
+static void show_source_or_disasm_and_command (enum tui_layout_type);
+static struct tui_win_info *make_source_or_disasm_window (enum tui_win_type,
+ int, int);
+static struct tui_win_info *make_command_window (int, int);
+static struct tui_win_info *make_source_window (int, int);
+static struct tui_win_info *make_disasm_window (int, int);
+static void make_data_window (struct tui_win_info **, int, int);
+static void show_source_command (void);
+static void show_disasm_command (void);
+static void show_source_disasm_command (void);
+static void show_data (enum tui_layout_type);
+static enum tui_layout_type next_layout (void);
+static enum tui_layout_type prev_layout (void);
+static void tui_layout_command (const char *, int);
+static void extract_display_start_addr (struct gdbarch **, CORE_ADDR *);
/***************************************
/* Show the screen layout defined. */
static void
-showLayout (enum tui_layout_type layout)
+show_layout (enum tui_layout_type layout)
{
- enum tui_layout_type curLayout = tui_current_layout ();
+ enum tui_layout_type cur_layout = tui_current_layout ();
- if (layout != curLayout)
+ if (layout != cur_layout)
{
- /*
- ** Since the new layout may cause changes in window size, we
- ** should free the content and reallocate on next display of
- ** source/asm
- */
- tui_free_all_source_wins_content ();
+ /* Since the new layout may cause changes in window size, we
+ should free the content and reallocate on next display of
+ source/asm. */
tui_clear_source_windows ();
- if (layout == SRC_DATA_COMMAND || layout == DISASSEM_DATA_COMMAND)
+ if (layout == SRC_DATA_COMMAND
+ || layout == DISASSEM_DATA_COMMAND)
{
- _showData (layout);
+ show_data (layout);
tui_refresh_all (tui_win_list);
}
else
{
- /* First make the current layout be invisible */
+ /* First make the current layout be invisible. */
tui_make_all_invisible ();
tui_make_invisible (tui_locator_win_info_ptr ());
switch (layout)
{
- /* Now show the new layout */
+ /* Now show the new layout. */
case SRC_COMMAND:
- _showSourceCommand ();
+ show_source_command ();
tui_add_to_source_windows (TUI_SRC_WIN);
break;
case DISASSEM_COMMAND:
- _showDisassemCommand ();
+ show_disasm_command ();
tui_add_to_source_windows (TUI_DISASM_WIN);
break;
case SRC_DISASSEM_COMMAND:
- _showSourceDisassemCommand ();
+ show_source_disasm_command ();
tui_add_to_source_windows (TUI_SRC_WIN);
tui_add_to_source_windows (TUI_DISASM_WIN);
break;
/* Function to set the layout to SRC_COMMAND, DISASSEM_COMMAND,
- SRC_DISASSEM_COMMAND, SRC_DATA_COMMAND, or DISASSEM_DATA_COMMAND.
- If the layout is SRC_DATA_COMMAND, DISASSEM_DATA_COMMAND, or
- UNDEFINED_LAYOUT, then the data window is populated according to
- regs_display_type. */
+ SRC_DISASSEM_COMMAND, SRC_DATA_COMMAND, or DISASSEM_DATA_COMMAND. */
enum tui_status
-tui_set_layout (enum tui_layout_type layoutType,
- enum tui_register_display_type regs_display_type)
+tui_set_layout (enum tui_layout_type layout_type)
{
enum tui_status status = TUI_SUCCESS;
- if (layoutType != UNDEFINED_LAYOUT || regs_display_type != TUI_UNDEFINED_REGS)
+ if (layout_type != UNDEFINED_LAYOUT)
{
- enum tui_layout_type curLayout = tui_current_layout (), newLayout = UNDEFINED_LAYOUT;
- int regsPopulate = FALSE;
- CORE_ADDR addr = _extractDisplayStartAddr ();
- struct tui_win_info * newWinWithFocus = (struct tui_win_info *) NULL;
- struct tui_win_info * winWithFocus = tui_win_with_focus ();
- struct tui_layout_def * layoutDef = tui_layout_def ();
+ enum tui_layout_type cur_layout = tui_current_layout (),
+ new_layout = UNDEFINED_LAYOUT;
+ int regs_populate = FALSE;
+ struct gdbarch *gdbarch;
+ CORE_ADDR addr;
+ struct tui_win_info *win_with_focus = tui_win_with_focus ();
+ struct tui_layout_def *layout_def = tui_layout_def ();
+ extract_display_start_addr (&gdbarch, &addr);
- if (layoutType == UNDEFINED_LAYOUT &&
- regs_display_type != TUI_UNDEFINED_REGS)
- {
- if (curLayout == SRC_DISASSEM_COMMAND)
- newLayout = DISASSEM_DATA_COMMAND;
- else if (curLayout == SRC_COMMAND || curLayout == SRC_DATA_COMMAND)
- newLayout = SRC_DATA_COMMAND;
- else if (curLayout == DISASSEM_COMMAND ||
- curLayout == DISASSEM_DATA_COMMAND)
- newLayout = DISASSEM_DATA_COMMAND;
- }
- else
- newLayout = layoutType;
+ new_layout = layout_type;
- regsPopulate = (newLayout == SRC_DATA_COMMAND ||
- newLayout == DISASSEM_DATA_COMMAND ||
- regs_display_type != TUI_UNDEFINED_REGS);
- if (newLayout != curLayout || regs_display_type != TUI_UNDEFINED_REGS)
+ regs_populate = (new_layout == SRC_DATA_COMMAND
+ || new_layout == DISASSEM_DATA_COMMAND);
+ if (new_layout != cur_layout)
{
- if (newLayout != curLayout)
+ show_layout (new_layout);
+
+ /* Now determine where focus should be. */
+ if (win_with_focus != TUI_CMD_WIN)
{
- showLayout (newLayout);
- /*
- ** Now determine where focus should be
- */
- if (winWithFocus != TUI_CMD_WIN)
+ switch (new_layout)
{
- switch (newLayout)
- {
- case SRC_COMMAND:
- tui_set_win_focus_to (TUI_SRC_WIN);
- layoutDef->display_mode = SRC_WIN;
- layoutDef->split = FALSE;
- break;
- case DISASSEM_COMMAND:
- /* the previous layout was not showing
- ** code. this can happen if there is no
- ** source available:
- ** 1. if the source file is in another dir OR
- ** 2. if target was compiled without -g
- ** We still want to show the assembly though!
- */
- addr = tui_get_begin_asm_address ();
- tui_set_win_focus_to (TUI_DISASM_WIN);
- layoutDef->display_mode = DISASSEM_WIN;
- layoutDef->split = FALSE;
- break;
- case SRC_DISASSEM_COMMAND:
- /* the previous layout was not showing
- ** code. this can happen if there is no
- ** source available:
- ** 1. if the source file is in another dir OR
- ** 2. if target was compiled without -g
- ** We still want to show the assembly though!
- */
- addr = tui_get_begin_asm_address ();
- if (winWithFocus == TUI_SRC_WIN)
- tui_set_win_focus_to (TUI_SRC_WIN);
- else
- tui_set_win_focus_to (TUI_DISASM_WIN);
- layoutDef->split = TRUE;
- break;
- case SRC_DATA_COMMAND:
- if (winWithFocus != TUI_DATA_WIN)
- tui_set_win_focus_to (TUI_SRC_WIN);
- else
- tui_set_win_focus_to (TUI_DATA_WIN);
- layoutDef->display_mode = SRC_WIN;
- layoutDef->split = FALSE;
- break;
- case DISASSEM_DATA_COMMAND:
- /* the previous layout was not showing
- ** code. this can happen if there is no
- ** source available:
- ** 1. if the source file is in another dir OR
- ** 2. if target was compiled without -g
- ** We still want to show the assembly though!
- */
- addr = tui_get_begin_asm_address ();
- if (winWithFocus != TUI_DATA_WIN)
- tui_set_win_focus_to (TUI_DISASM_WIN);
- else
- tui_set_win_focus_to (TUI_DATA_WIN);
- layoutDef->display_mode = DISASSEM_WIN;
- layoutDef->split = FALSE;
- break;
- default:
- break;
- }
+ case SRC_COMMAND:
+ tui_set_win_focus_to (TUI_SRC_WIN);
+ layout_def->display_mode = SRC_WIN;
+ break;
+ case DISASSEM_COMMAND:
+ /* The previous layout was not showing code.
+ This can happen if there is no source
+ available:
+
+ 1. if the source file is in another dir OR
+ 2. if target was compiled without -g
+ We still want to show the assembly though! */
+
+ tui_get_begin_asm_address (&gdbarch, &addr);
+ tui_set_win_focus_to (TUI_DISASM_WIN);
+ layout_def->display_mode = DISASSEM_WIN;
+ break;
+ case SRC_DISASSEM_COMMAND:
+ /* The previous layout was not showing code.
+ This can happen if there is no source
+ available:
+
+ 1. if the source file is in another dir OR
+ 2. if target was compiled without -g
+ We still want to show the assembly though! */
+
+ tui_get_begin_asm_address (&gdbarch, &addr);
+ if (win_with_focus == TUI_SRC_WIN)
+ tui_set_win_focus_to (TUI_SRC_WIN);
+ else
+ tui_set_win_focus_to (TUI_DISASM_WIN);
+ break;
+ case SRC_DATA_COMMAND:
+ if (win_with_focus != TUI_DATA_WIN)
+ tui_set_win_focus_to (TUI_SRC_WIN);
+ else
+ tui_set_win_focus_to (TUI_DATA_WIN);
+ layout_def->display_mode = SRC_WIN;
+ break;
+ case DISASSEM_DATA_COMMAND:
+ /* The previous layout was not showing code.
+ This can happen if there is no source
+ available:
+
+ 1. if the source file is in another dir OR
+ 2. if target was compiled without -g
+ We still want to show the assembly though! */
+
+ tui_get_begin_asm_address (&gdbarch, &addr);
+ if (win_with_focus != TUI_DATA_WIN)
+ tui_set_win_focus_to (TUI_DISASM_WIN);
+ else
+ tui_set_win_focus_to (TUI_DATA_WIN);
+ layout_def->display_mode = DISASSEM_WIN;
+ break;
+ default:
+ break;
}
- if (newWinWithFocus != (struct tui_win_info *) NULL)
- tui_set_win_focus_to (newWinWithFocus);
- /*
- ** Now update the window content
- */
- if (!regsPopulate &&
- (newLayout == SRC_DATA_COMMAND ||
- newLayout == DISASSEM_DATA_COMMAND))
- tui_display_all_data ();
-
- tui_update_source_windows_with_addr (addr);
- }
- if (regsPopulate)
- {
- layoutDef->regs_display_type =
- (regs_display_type == TUI_UNDEFINED_REGS ?
- TUI_GENERAL_REGS : regs_display_type);
- tui_show_registers (layoutDef->regs_display_type);
}
+ /*
+ * Now update the window content.
+ */
+ if (!regs_populate
+ && (new_layout == SRC_DATA_COMMAND
+ || new_layout == DISASSEM_DATA_COMMAND))
+ tui_display_all_data ();
+
+ tui_update_source_windows_with_addr (gdbarch, addr);
+
+ if (regs_populate)
+ tui_show_registers (TUI_DATA_WIN->current_group);
}
}
else
void
tui_add_win_to_layout (enum tui_win_type type)
{
- enum tui_layout_type curLayout = tui_current_layout ();
+ enum tui_layout_type cur_layout = tui_current_layout ();
switch (type)
{
case SRC_WIN:
- if (curLayout != SRC_COMMAND &&
- curLayout != SRC_DISASSEM_COMMAND &&
- curLayout != SRC_DATA_COMMAND)
+ if (cur_layout != SRC_COMMAND
+ && cur_layout != SRC_DISASSEM_COMMAND
+ && cur_layout != SRC_DATA_COMMAND)
{
tui_clear_source_windows_detail ();
- if (curLayout == DISASSEM_DATA_COMMAND)
- showLayout (SRC_DATA_COMMAND);
+ if (cur_layout == DISASSEM_DATA_COMMAND)
+ show_layout (SRC_DATA_COMMAND);
else
- showLayout (SRC_COMMAND);
+ show_layout (SRC_COMMAND);
}
break;
case DISASSEM_WIN:
- if (curLayout != DISASSEM_COMMAND &&
- curLayout != SRC_DISASSEM_COMMAND &&
- curLayout != DISASSEM_DATA_COMMAND)
+ if (cur_layout != DISASSEM_COMMAND
+ && cur_layout != SRC_DISASSEM_COMMAND
+ && cur_layout != DISASSEM_DATA_COMMAND)
{
tui_clear_source_windows_detail ();
- if (curLayout == SRC_DATA_COMMAND)
- showLayout (DISASSEM_DATA_COMMAND);
+ if (cur_layout == SRC_DATA_COMMAND)
+ show_layout (DISASSEM_DATA_COMMAND);
else
- showLayout (DISASSEM_COMMAND);
+ show_layout (DISASSEM_COMMAND);
}
break;
case DATA_WIN:
- if (curLayout != SRC_DATA_COMMAND &&
- curLayout != DISASSEM_DATA_COMMAND)
+ if (cur_layout != SRC_DATA_COMMAND
+ && cur_layout != DISASSEM_DATA_COMMAND)
{
- if (curLayout == DISASSEM_COMMAND)
- showLayout (DISASSEM_DATA_COMMAND);
+ if (cur_layout == DISASSEM_COMMAND)
+ show_layout (DISASSEM_DATA_COMMAND);
else
- showLayout (SRC_DATA_COMMAND);
+ show_layout (SRC_DATA_COMMAND);
}
break;
default:
break;
}
-
- return;
-} /* tuiAddWinToLayout */
+}
-/*
- ** tuiDefaultWinHeight().
- ** Answer the height of a window. If it hasn't been created yet,
- ** answer what the height of a window would be based upon its
- ** type and the layout.
- */
+/* Answer the height of a window. If it hasn't been created yet,
+ answer what the height of a window would be based upon its type and
+ the layout. */
int
-tuiDefaultWinHeight (enum tui_win_type type, enum tui_layout_type layout)
+tui_default_win_height (enum tui_win_type type,
+ enum tui_layout_type layout)
{
int h;
- if (tui_win_list[type] != (struct tui_win_info *) NULL)
- h = tui_win_list[type]->generic.height;
+ if (tui_win_list[type] != NULL)
+ h = tui_win_list[type]->height;
else
{
switch (layout)
if (TUI_CMD_WIN == NULL)
h = tui_term_height () / 2;
else
- h = tui_term_height () - TUI_CMD_WIN->generic.height;
+ h = tui_term_height () - TUI_CMD_WIN->height;
break;
case SRC_DISASSEM_COMMAND:
case SRC_DATA_COMMAND:
if (TUI_CMD_WIN == NULL)
h = tui_term_height () / 3;
else
- h = (tui_term_height () - TUI_CMD_WIN->generic.height) / 2;
+ h = (tui_term_height () - TUI_CMD_WIN->height) / 2;
break;
default:
h = 0;
}
return h;
-} /* tuiDefaultWinHeight */
+}
/* Answer the height of a window. If it hasn't been created yet,
{
int h;
- h = tuiDefaultWinHeight (type, layout);
+ h = tui_default_win_height (type, layout);
if (tui_win_list[type] == TUI_CMD_WIN)
h -= 1;
h -= 2;
return h;
-} /* tuiDefaultWinViewportHeight */
+}
+/* Complete possible layout names. TEXT is the complete text entered so
+ far, WORD is the word currently being completed. */
+
+static void
+layout_completer (struct cmd_list_element *ignore,
+ completion_tracker &tracker,
+ const char *text, const char *word)
+{
+ static const char *layout_names [] =
+ { "src", "asm", "split", "regs", "next", "prev", NULL };
+
+ complete_on_enum (tracker, layout_names, text, word);
+}
+
+/* Function to initialize gdb commands, for tui window layout
+ manipulation. */
-/*
- ** _initialize_tuiLayout().
- ** Function to initialize gdb commands, for tui window layout
- ** manipulation.
- */
void
-_initialize_tuiLayout (void)
+_initialize_tui_layout (void)
{
- add_com ("layout", class_tui, _tuiLayout_command,
- "Change the layout of windows.\n\
-Usage: layout prev | next | <layout_name> \n\
+ struct cmd_list_element *cmd;
+
+ cmd = add_com ("layout", class_tui, tui_layout_command, _("\
+Change the layout of windows.\n\
+Usage: layout prev | next | LAYOUT-NAME\n\
Layout names are:\n\
src : Displays source and command windows.\n\
asm : Displays disassembly and command windows.\n\
register window is displayed. If the\n\
source/assembly/command (split) is displayed, \n\
the register window is displayed with \n\
- the window that has current logical focus.\n");
- if (xdb_commands)
- {
- add_com ("td", class_tui, _tuiToggleLayout_command,
- "Toggle between Source/Command and Disassembly/Command layouts.\n");
- add_com ("ts", class_tui, _tuiToggleSplitLayout_command,
- "Toggle between Source/Command or Disassembly/Command and \n\
-Source/Disassembly/Command layouts.\n");
- }
+ the window that has current logical focus."));
+ set_cmd_completer (cmd, layout_completer);
}
**************************/
-/*
- ** _tuiSetLayoutTo()
- ** Function to set the layout to SRC, ASM, SPLIT, NEXT, PREV, DATA, REGS,
- ** $REGS, $GREGS, $FREGS, $SREGS.
- */
+/* Function to set the layout to SRC, ASM, SPLIT, NEXT, PREV, DATA, or
+ REGS. */
enum tui_status
-tui_set_layout_for_display_command (const char *layoutName)
+tui_set_layout_by_name (const char *layout_name)
{
enum tui_status status = TUI_SUCCESS;
- if (layoutName != (char *) NULL)
+ if (layout_name != NULL)
{
- register int i;
- register char *bufPtr;
- enum tui_layout_type newLayout = UNDEFINED_LAYOUT;
- enum tui_register_display_type dpyType = TUI_UNDEFINED_REGS;
- enum tui_layout_type curLayout = tui_current_layout ();
-
- bufPtr = (char *) xstrdup (layoutName);
- for (i = 0; (i < strlen (layoutName)); i++)
- bufPtr[i] = toupper (bufPtr[i]);
-
- /* First check for ambiguous input */
- if (strlen (bufPtr) <= 1 && (*bufPtr == 'S' || *bufPtr == '$'))
+ int i;
+ enum tui_layout_type new_layout = UNDEFINED_LAYOUT;
+ enum tui_layout_type cur_layout = tui_current_layout ();
+
+ std::string copy = layout_name;
+ for (i = 0; i < copy.size (); i++)
+ copy[i] = toupper (copy[i]);
+ const char *buf_ptr = copy.c_str ();
+
+ /* First check for ambiguous input. */
+ if (strlen (buf_ptr) <= 1 && *buf_ptr == 'S')
{
- warning ("Ambiguous command input.\n");
+ warning (_("Ambiguous command input."));
status = TUI_FAILURE;
}
else
{
- if (subset_compare (bufPtr, "SRC"))
- newLayout = SRC_COMMAND;
- else if (subset_compare (bufPtr, "ASM"))
- newLayout = DISASSEM_COMMAND;
- else if (subset_compare (bufPtr, "SPLIT"))
- newLayout = SRC_DISASSEM_COMMAND;
- else if (subset_compare (bufPtr, "REGS") ||
- subset_compare (bufPtr, TUI_GENERAL_SPECIAL_REGS_NAME) ||
- subset_compare (bufPtr, TUI_GENERAL_REGS_NAME) ||
- subset_compare (bufPtr, TUI_FLOAT_REGS_NAME) ||
- subset_compare (bufPtr, TUI_SPECIAL_REGS_NAME))
+ if (subset_compare (buf_ptr, "SRC"))
+ new_layout = SRC_COMMAND;
+ else if (subset_compare (buf_ptr, "ASM"))
+ new_layout = DISASSEM_COMMAND;
+ else if (subset_compare (buf_ptr, "SPLIT"))
+ new_layout = SRC_DISASSEM_COMMAND;
+ else if (subset_compare (buf_ptr, "REGS"))
{
- if (curLayout == SRC_COMMAND || curLayout == SRC_DATA_COMMAND)
- newLayout = SRC_DATA_COMMAND;
+ if (cur_layout == SRC_COMMAND
+ || cur_layout == SRC_DATA_COMMAND)
+ new_layout = SRC_DATA_COMMAND;
else
- newLayout = DISASSEM_DATA_COMMAND;
-
-/* could ifdef out the following code. when compile with -z, there are null
- pointer references that cause a core dump if 'layout regs' is the first
- layout command issued by the user. HP has asked us to hook up this code
- - edie epstein
- */
- if (subset_compare (bufPtr, TUI_FLOAT_REGS_NAME))
- {
- if (TUI_DATA_WIN->detail.data_display_info.regs_display_type !=
- TUI_SFLOAT_REGS &&
- TUI_DATA_WIN->detail.data_display_info.regs_display_type !=
- TUI_DFLOAT_REGS)
- dpyType = TUI_SFLOAT_REGS;
- else
- dpyType =
- TUI_DATA_WIN->detail.data_display_info.regs_display_type;
- }
- else if (subset_compare (bufPtr,
- TUI_GENERAL_SPECIAL_REGS_NAME))
- dpyType = TUI_GENERAL_AND_SPECIAL_REGS;
- else if (subset_compare (bufPtr, TUI_GENERAL_REGS_NAME))
- dpyType = TUI_GENERAL_REGS;
- else if (subset_compare (bufPtr, TUI_SPECIAL_REGS_NAME))
- dpyType = TUI_SPECIAL_REGS;
- else if (TUI_DATA_WIN)
- {
- if (TUI_DATA_WIN->detail.data_display_info.regs_display_type !=
- TUI_UNDEFINED_REGS)
- dpyType =
- TUI_DATA_WIN->detail.data_display_info.regs_display_type;
- else
- dpyType = TUI_GENERAL_REGS;
- }
-
-/* end of potential ifdef
- */
-
-/* if ifdefed out code above, then assume that the user wishes to display the
- general purpose registers
- */
-
-/* dpyType = TUI_GENERAL_REGS;
- */
+ new_layout = DISASSEM_DATA_COMMAND;
}
- else if (subset_compare (bufPtr, "NEXT"))
- newLayout = _nextLayout ();
- else if (subset_compare (bufPtr, "PREV"))
- newLayout = _prevLayout ();
+ else if (subset_compare (buf_ptr, "NEXT"))
+ new_layout = next_layout ();
+ else if (subset_compare (buf_ptr, "PREV"))
+ new_layout = prev_layout ();
else
status = TUI_FAILURE;
- xfree (bufPtr);
- tui_set_layout (newLayout, dpyType);
+ if (status == TUI_SUCCESS)
+ {
+ /* Make sure the curses mode is enabled. */
+ tui_enable ();
+ tui_set_layout (new_layout);
+ }
}
}
else
}
-static CORE_ADDR
-_extractDisplayStartAddr (void)
+static void
+extract_display_start_addr (struct gdbarch **gdbarch_p, CORE_ADDR *addr_p)
{
- enum tui_layout_type curLayout = tui_current_layout ();
+ enum tui_layout_type cur_layout = tui_current_layout ();
+ struct gdbarch *gdbarch = get_current_arch ();
CORE_ADDR addr;
CORE_ADDR pc;
struct symtab_and_line cursal = get_current_source_symtab_and_line ();
- switch (curLayout)
+ switch (cur_layout)
{
case SRC_COMMAND:
case SRC_DATA_COMMAND:
+ gdbarch = TUI_SRC_WIN->gdbarch;
find_line_pc (cursal.symtab,
- TUI_SRC_WIN->detail.source_info.start_line_or_addr.line_no,
+ TUI_SRC_WIN->start_line_or_addr.u.line_no,
&pc);
addr = pc;
break;
case DISASSEM_COMMAND:
case SRC_DISASSEM_COMMAND:
case DISASSEM_DATA_COMMAND:
- addr = TUI_DISASM_WIN->detail.source_info.start_line_or_addr.addr;
+ gdbarch = TUI_DISASM_WIN->gdbarch;
+ addr = TUI_DISASM_WIN->start_line_or_addr.u.addr;
break;
default:
addr = 0;
break;
}
- return addr;
-} /* _extractDisplayStartAddr */
-
-
-static void
-_tuiHandleXDBLayout (struct tui_layout_def * layoutDef)
-{
- if (layoutDef->split)
- {
- tui_set_layout (SRC_DISASSEM_COMMAND, TUI_UNDEFINED_REGS);
- tui_set_win_focus_to (tui_win_list[layoutDef->display_mode]);
- }
- else
- {
- if (layoutDef->display_mode == SRC_WIN)
- tui_set_layout (SRC_COMMAND, TUI_UNDEFINED_REGS);
- else
- tui_set_layout (DISASSEM_DATA_COMMAND, layoutDef->regs_display_type);
- }
-
-
- return;
-} /* _tuiHandleXDBLayout */
-
-
-static void
-_tuiToggleLayout_command (char *arg, int fromTTY)
-{
- struct tui_layout_def * layoutDef = tui_layout_def ();
-
- /* Make sure the curses mode is enabled. */
- tui_enable ();
- if (layoutDef->display_mode == SRC_WIN)
- layoutDef->display_mode = DISASSEM_WIN;
- else
- layoutDef->display_mode = SRC_WIN;
-
- if (!layoutDef->split)
- _tuiHandleXDBLayout (layoutDef);
-
+ *gdbarch_p = gdbarch;
+ *addr_p = addr;
}
static void
-_tuiToggleSplitLayout_command (char *arg, int fromTTY)
+tui_layout_command (const char *arg, int from_tty)
{
- struct tui_layout_def * layoutDef = tui_layout_def ();
-
- /* Make sure the curses mode is enabled. */
- tui_enable ();
- layoutDef->split = (!layoutDef->split);
- _tuiHandleXDBLayout (layoutDef);
-
-}
-
-
-static void
-_tuiLayout_command (char *arg, int fromTTY)
-{
- /* Make sure the curses mode is enabled. */
- tui_enable ();
-
/* Switch to the selected layout. */
- if (tui_set_layout_for_display_command (arg) != TUI_SUCCESS)
- warning ("Invalid layout specified.\n%s", LAYOUT_USAGE);
-
+ if (tui_set_layout_by_name (arg) != TUI_SUCCESS)
+ warning (_("Invalid layout specified.\n%s"), LAYOUT_USAGE);
}
-/*
- ** _nextLayout().
- ** Answer the previous layout to cycle to.
- */
+/* Answer the previous layout to cycle to. */
static enum tui_layout_type
-_nextLayout (void)
+next_layout (void)
{
- enum tui_layout_type newLayout;
+ int new_layout;
- newLayout = tui_current_layout ();
- if (newLayout == UNDEFINED_LAYOUT)
- newLayout = SRC_COMMAND;
+ new_layout = tui_current_layout ();
+ if (new_layout == UNDEFINED_LAYOUT)
+ new_layout = SRC_COMMAND;
else
{
- newLayout++;
- if (newLayout == UNDEFINED_LAYOUT)
- newLayout = SRC_COMMAND;
+ new_layout++;
+ if (new_layout == UNDEFINED_LAYOUT)
+ new_layout = SRC_COMMAND;
}
- return newLayout;
-} /* _nextLayout */
+ return (enum tui_layout_type) new_layout;
+}
-/*
- ** _prevLayout().
- ** Answer the next layout to cycle to.
- */
+/* Answer the next layout to cycle to. */
static enum tui_layout_type
-_prevLayout (void)
+prev_layout (void)
{
- enum tui_layout_type newLayout;
+ int new_layout;
- newLayout = tui_current_layout ();
- if (newLayout == SRC_COMMAND)
- newLayout = DISASSEM_DATA_COMMAND;
+ new_layout = tui_current_layout ();
+ if (new_layout == SRC_COMMAND)
+ new_layout = DISASSEM_DATA_COMMAND;
else
{
- newLayout--;
- if (newLayout == UNDEFINED_LAYOUT)
- newLayout = DISASSEM_DATA_COMMAND;
+ new_layout--;
+ if (new_layout == UNDEFINED_LAYOUT)
+ new_layout = DISASSEM_DATA_COMMAND;
}
- return newLayout;
-} /* _prevLayout */
+ return (enum tui_layout_type) new_layout;
+}
-/*
- ** _makeCommandWindow().
- */
-static void
-_makeCommandWindow (struct tui_win_info * * winInfoPtr, int height, int originY)
+static struct tui_win_info *
+make_command_window (int height, int origin_y)
{
- _initAndMakeWin ((void **) winInfoPtr,
- CMD_WIN,
- height,
- tui_term_width (),
- 0,
- originY,
- DONT_BOX_WINDOW);
-
- (*winInfoPtr)->can_highlight = FALSE;
-
- return;
-} /* _makeCommandWindow */
+ struct tui_win_info *result
+ = (struct tui_win_info *) init_and_make_win (NULL,
+ CMD_WIN,
+ height,
+ tui_term_width (),
+ 0,
+ origin_y,
+ DONT_BOX_WINDOW);
+ return result;
+}
-/*
- ** _makeSourceWindow().
+/* make_source_window().
*/
-static void
-_makeSourceWindow (struct tui_win_info * * winInfoPtr, int height, int originY)
+static struct tui_win_info *
+make_source_window (int height, int origin_y)
{
- _makeSourceOrDisassemWindow (winInfoPtr, SRC_WIN, height, originY);
-
- return;
-} /* _makeSourceWindow */
+ return make_source_or_disasm_window (SRC_WIN, height, origin_y);
+} /* make_source_window */
-/*
- ** _makeDisassemWindow().
+/* make_disasm_window().
*/
-static void
-_makeDisassemWindow (struct tui_win_info * * winInfoPtr, int height, int originY)
+static struct tui_win_info *
+make_disasm_window (int height, int origin_y)
{
- _makeSourceOrDisassemWindow (winInfoPtr, DISASSEM_WIN, height, originY);
-
- return;
-} /* _makeDisassemWindow */
+ return make_source_or_disasm_window (DISASSEM_WIN, height, origin_y);
+} /* make_disasm_window */
-/*
- ** _makeDataWindow().
- */
static void
-_makeDataWindow (struct tui_win_info * * winInfoPtr, int height, int originY)
+make_data_window (struct tui_win_info **win_info_ptr,
+ int height, int origin_y)
{
- _initAndMakeWin ((void **) winInfoPtr,
- DATA_WIN,
- height,
- tui_term_width (),
- 0,
- originY,
- BOX_WINDOW);
-
- return;
-} /* _makeDataWindow */
+ *win_info_ptr
+ = (struct tui_win_info *) init_and_make_win (*win_info_ptr,
+ DATA_WIN,
+ height,
+ tui_term_width (),
+ 0,
+ origin_y,
+ BOX_WINDOW);
+}
-/*
- ** _showSourceCommand().
- ** Show the Source/Command layout
- */
+/* Show the Source/Command layout. */
static void
-_showSourceCommand (void)
+show_source_command (void)
{
- _showSourceOrDisassemAndCommand (SRC_COMMAND);
-
- return;
-} /* _showSourceCommand */
+ show_source_or_disasm_and_command (SRC_COMMAND);
+}
-/*
- ** _showDisassemCommand().
- ** Show the Dissassem/Command layout
- */
+/* Show the Dissassem/Command layout. */
static void
-_showDisassemCommand (void)
+show_disasm_command (void)
{
- _showSourceOrDisassemAndCommand (DISASSEM_COMMAND);
-
- return;
-} /* _showDisassemCommand */
+ show_source_or_disasm_and_command (DISASSEM_COMMAND);
+}
-/*
- ** _showSourceDisassemCommand().
- ** Show the Source/Disassem/Command layout
- */
+/* Show the Source/Disassem/Command layout. */
static void
-_showSourceDisassemCommand (void)
+show_source_disasm_command (void)
{
if (tui_current_layout () != SRC_DISASSEM_COMMAND)
{
- int cmdHeight, srcHeight, asmHeight;
+ int cmd_height, src_height, asm_height;
if (TUI_CMD_WIN != NULL)
- cmdHeight = TUI_CMD_WIN->generic.height;
+ cmd_height = TUI_CMD_WIN->height;
else
- cmdHeight = tui_term_height () / 3;
+ cmd_height = tui_term_height () / 3;
- srcHeight = (tui_term_height () - cmdHeight) / 2;
- asmHeight = tui_term_height () - (srcHeight + cmdHeight);
+ src_height = (tui_term_height () - cmd_height) / 2;
+ asm_height = tui_term_height () - (src_height + cmd_height);
if (TUI_SRC_WIN == NULL)
- _makeSourceWindow (&TUI_SRC_WIN, srcHeight, 0);
+ tui_win_list[SRC_WIN] = make_source_window (src_height, 0);
else
{
- _initGenWinInfo (&TUI_SRC_WIN->generic,
- TUI_SRC_WIN->generic.type,
- srcHeight,
- TUI_SRC_WIN->generic.width,
- TUI_SRC_WIN->detail.source_info.execution_info->width,
- 0);
- TUI_SRC_WIN->can_highlight = TRUE;
- _initGenWinInfo (TUI_SRC_WIN->detail.source_info.execution_info,
- EXEC_INFO_WIN,
- srcHeight,
- 3,
- 0,
- 0);
- tui_make_visible (&TUI_SRC_WIN->generic);
- tui_make_visible (TUI_SRC_WIN->detail.source_info.execution_info);
- TUI_SRC_WIN->detail.source_info.has_locator = FALSE;;
+ TUI_SRC_WIN->reset (TUI_SRC_WIN->type,
+ src_height,
+ TUI_SRC_WIN->width,
+ TUI_SRC_WIN->execution_info->width,
+ 0);
+ TUI_SRC_WIN->execution_info->reset (EXEC_INFO_WIN,
+ src_height,
+ 3,
+ 0,
+ 0);
+ tui_make_visible (TUI_SRC_WIN);
+ tui_make_visible (TUI_SRC_WIN->execution_info);
+ TUI_SRC_WIN->m_has_locator = false;
}
- if (TUI_SRC_WIN != NULL)
- {
- struct tui_gen_win_info * locator = tui_locator_win_info_ptr ();
- tui_show_source_content (TUI_SRC_WIN);
- if (TUI_DISASM_WIN == NULL)
- {
- _makeDisassemWindow (&TUI_DISASM_WIN, asmHeight, srcHeight - 1);
- _initAndMakeWin ((void **) & locator,
- LOCATOR_WIN,
- 2 /* 1 */ ,
- tui_term_width (),
- 0,
- (srcHeight + asmHeight) - 1,
- DONT_BOX_WINDOW);
- }
- else
- {
- _initGenWinInfo (locator,
- LOCATOR_WIN,
- 2 /* 1 */ ,
- tui_term_width (),
- 0,
- (srcHeight + asmHeight) - 1);
- TUI_DISASM_WIN->detail.source_info.has_locator = TRUE;
- _initGenWinInfo (
- &TUI_DISASM_WIN->generic,
- TUI_DISASM_WIN->generic.type,
- asmHeight,
- TUI_DISASM_WIN->generic.width,
- TUI_DISASM_WIN->detail.source_info.execution_info->width,
- srcHeight - 1);
- _initGenWinInfo (TUI_DISASM_WIN->detail.source_info.execution_info,
- EXEC_INFO_WIN,
- asmHeight,
- 3,
- 0,
- srcHeight - 1);
- TUI_DISASM_WIN->can_highlight = TRUE;
- tui_make_visible (&TUI_DISASM_WIN->generic);
- tui_make_visible (TUI_DISASM_WIN->detail.source_info.execution_info);
- }
- if (TUI_DISASM_WIN != NULL)
- {
- TUI_SRC_WIN->detail.source_info.has_locator = FALSE;
- TUI_DISASM_WIN->detail.source_info.has_locator = TRUE;
- tui_make_visible (locator);
- tui_show_locator_content ();
- tui_show_source_content (TUI_DISASM_WIN);
-
- if (TUI_CMD_WIN == NULL)
- _makeCommandWindow (&TUI_CMD_WIN,
- cmdHeight,
- tui_term_height () - cmdHeight);
- else
- {
- _initGenWinInfo (&TUI_CMD_WIN->generic,
- TUI_CMD_WIN->generic.type,
- TUI_CMD_WIN->generic.height,
- TUI_CMD_WIN->generic.width,
- 0,
- TUI_CMD_WIN->generic.origin.y);
- TUI_CMD_WIN->can_highlight = FALSE;
- tui_make_visible (&TUI_CMD_WIN->generic);
- }
- if (TUI_CMD_WIN != NULL)
- tui_refresh_win (&TUI_CMD_WIN->generic);
- }
+ struct tui_locator_window *locator = tui_locator_win_info_ptr ();
+ gdb_assert (locator != nullptr);
+
+ tui_show_source_content (TUI_SRC_WIN);
+ if (TUI_DISASM_WIN == NULL)
+ {
+ tui_win_list[DISASSEM_WIN]
+ = make_disasm_window (asm_height, src_height - 1);
+ init_and_make_win (locator,
+ LOCATOR_WIN,
+ 2 /* 1 */ ,
+ tui_term_width (),
+ 0,
+ (src_height + asm_height) - 1,
+ DONT_BOX_WINDOW);
}
+ else
+ {
+ locator->reset (LOCATOR_WIN,
+ 2 /* 1 */ ,
+ tui_term_width (),
+ 0,
+ (src_height + asm_height) - 1);
+ TUI_DISASM_WIN->m_has_locator = true;
+ TUI_DISASM_WIN->reset (TUI_DISASM_WIN->type,
+ asm_height,
+ TUI_DISASM_WIN->width,
+ TUI_DISASM_WIN->execution_info->width,
+ src_height - 1);
+ TUI_DISASM_WIN->execution_info->reset (EXEC_INFO_WIN,
+ asm_height,
+ 3,
+ 0,
+ src_height - 1);
+ tui_make_visible (TUI_DISASM_WIN);
+ tui_make_visible (TUI_DISASM_WIN->execution_info);
+ }
+ TUI_SRC_WIN->m_has_locator = false;
+ TUI_DISASM_WIN->m_has_locator = true;
+ tui_make_visible (locator);
+ tui_show_locator_content ();
+ tui_show_source_content (TUI_DISASM_WIN);
+
+ if (TUI_CMD_WIN == NULL)
+ tui_win_list[CMD_WIN]
+ = make_command_window (cmd_height, tui_term_height () - cmd_height);
+ else
+ {
+ TUI_CMD_WIN->reset (TUI_CMD_WIN->type,
+ TUI_CMD_WIN->height,
+ TUI_CMD_WIN->width,
+ 0,
+ TUI_CMD_WIN->origin.y);
+ tui_make_visible (TUI_CMD_WIN);
+ }
+ TUI_CMD_WIN->refresh_window ();
tui_set_current_layout_to (SRC_DISASSEM_COMMAND);
}
-
- return;
-} /* _showSourceDisassemCommand */
+}
-/*
- ** _showData().
- ** Show the Source/Data/Command or the Dissassembly/Data/Command layout
- */
+/* Show the Source/Data/Command or the Dissassembly/Data/Command
+ layout. */
static void
-_showData (enum tui_layout_type newLayout)
+show_data (enum tui_layout_type new_layout)
{
- int totalHeight = (tui_term_height () - TUI_CMD_WIN->generic.height);
- int srcHeight, dataHeight;
- enum tui_win_type winType;
- struct tui_gen_win_info * locator = tui_locator_win_info_ptr ();
+ int total_height = (tui_term_height () - TUI_CMD_WIN->height);
+ int src_height, data_height;
+ enum tui_win_type win_type;
+ struct tui_locator_window *locator = tui_locator_win_info_ptr ();
+ gdb_assert (locator != nullptr);
- dataHeight = totalHeight / 2;
- srcHeight = totalHeight - dataHeight;
+ data_height = total_height / 2;
+ src_height = total_height - data_height;
tui_make_all_invisible ();
tui_make_invisible (locator);
- _makeDataWindow (&TUI_DATA_WIN, dataHeight, 0);
- TUI_DATA_WIN->can_highlight = TRUE;
- if (newLayout == SRC_DATA_COMMAND)
- winType = SRC_WIN;
+ make_data_window (&tui_win_list[DATA_WIN], data_height, 0);
+ if (new_layout == SRC_DATA_COMMAND)
+ win_type = SRC_WIN;
else
- winType = DISASSEM_WIN;
- if (tui_win_list[winType] == NULL)
+ win_type = DISASSEM_WIN;
+
+ tui_source_window_base *base;
+ if (tui_win_list[win_type] == NULL)
{
- if (winType == SRC_WIN)
- _makeSourceWindow (&tui_win_list[winType], srcHeight, dataHeight - 1);
+ if (win_type == SRC_WIN)
+ tui_win_list[win_type]
+ = make_source_window (src_height, data_height - 1);
else
- _makeDisassemWindow (&tui_win_list[winType], srcHeight, dataHeight - 1);
- _initAndMakeWin ((void **) & locator,
- LOCATOR_WIN,
- 2 /* 1 */ ,
- tui_term_width (),
- 0,
- totalHeight - 1,
- DONT_BOX_WINDOW);
+ tui_win_list[win_type]
+ = make_disasm_window (src_height, data_height - 1);
+ init_and_make_win (locator,
+ LOCATOR_WIN,
+ 2 /* 1 */ ,
+ tui_term_width (),
+ 0,
+ total_height - 1,
+ DONT_BOX_WINDOW);
+ base = (tui_source_window_base *) tui_win_list[win_type];
}
else
{
- _initGenWinInfo (&tui_win_list[winType]->generic,
- tui_win_list[winType]->generic.type,
- srcHeight,
- tui_win_list[winType]->generic.width,
- tui_win_list[winType]->detail.source_info.execution_info->width,
- dataHeight - 1);
- _initGenWinInfo (tui_win_list[winType]->detail.source_info.execution_info,
- EXEC_INFO_WIN,
- srcHeight,
- 3,
- 0,
- dataHeight - 1);
- tui_make_visible (&tui_win_list[winType]->generic);
- tui_make_visible (tui_win_list[winType]->detail.source_info.execution_info);
- _initGenWinInfo (locator,
- LOCATOR_WIN,
- 2 /* 1 */ ,
- tui_term_width (),
- 0,
- totalHeight - 1);
+ base = (tui_source_window_base *) tui_win_list[win_type];
+ tui_win_list[win_type]->reset (tui_win_list[win_type]->type,
+ src_height,
+ tui_win_list[win_type]->width,
+ base->execution_info->width,
+ data_height - 1);
+ base->execution_info->reset (EXEC_INFO_WIN,
+ src_height,
+ 3,
+ 0,
+ data_height - 1);
+ tui_make_visible (tui_win_list[win_type]);
+ tui_make_visible (base->execution_info);
+ locator->reset (LOCATOR_WIN,
+ 2 /* 1 */ ,
+ tui_term_width (),
+ 0,
+ total_height - 1);
}
- tui_win_list[winType]->detail.source_info.has_locator = TRUE;
+ base->m_has_locator = true;
tui_make_visible (locator);
tui_show_locator_content ();
- tui_add_to_source_windows (tui_win_list[winType]);
- tui_set_current_layout_to (newLayout);
-
- return;
-} /* _showData */
+ tui_add_to_source_windows
+ ((tui_source_window_base *) tui_win_list[win_type]);
+ tui_set_current_layout_to (new_layout);
+}
-/*
- ** _initGenWinInfo().
- */
-static void
-_initGenWinInfo (struct tui_gen_win_info * winInfo, enum tui_win_type type,
- int height, int width, int originX, int originY)
+void
+tui_gen_win_info::reset (enum tui_win_type win_type,
+ int height_, int width_,
+ int origin_x_, int origin_y_)
{
- int h = height;
+ int h = height_;
- winInfo->type = type;
- winInfo->width = width;
- winInfo->height = h;
+ gdb_assert (type == win_type);
+
+ width = width_;
+ height = h;
if (h > 1)
{
- winInfo->viewport_height = h - 1;
- if (winInfo->type != CMD_WIN)
- winInfo->viewport_height--;
+ viewport_height = h - 1;
+ if (type != CMD_WIN)
+ viewport_height--;
}
else
- winInfo->viewport_height = 1;
- winInfo->origin.x = originX;
- winInfo->origin.y = originY;
-
- return;
-} /* _initGenWinInfo */
+ viewport_height = 1;
+ origin.x = origin_x_;
+ origin.y = origin_y_;
+}
-/*
- ** _initAndMakeWin().
+/* init_and_make_win().
*/
-static void
-_initAndMakeWin (void ** winInfoPtr, enum tui_win_type winType,
- int height, int width, int originX, int originY, int boxIt)
+static tui_gen_win_info *
+init_and_make_win (tui_gen_win_info *win_info,
+ enum tui_win_type win_type,
+ int height, int width,
+ int origin_x, int origin_y,
+ enum tui_box box_it)
{
- void *opaqueWinInfo = *winInfoPtr;
- struct tui_gen_win_info * generic;
-
- if (opaqueWinInfo == NULL)
+ if (win_info == NULL)
{
- if (tui_win_is_auxillary (winType))
- opaqueWinInfo = (void *) tui_alloc_generic_win_info ();
- else
- opaqueWinInfo = (void *) tui_alloc_win_info (winType);
- }
- if (tui_win_is_auxillary (winType))
- generic = (struct tui_gen_win_info *) opaqueWinInfo;
- else
- generic = &((struct tui_win_info *) opaqueWinInfo)->generic;
-
- if (opaqueWinInfo != NULL)
- {
- _initGenWinInfo (generic, winType, height, width, originX, originY);
- if (!tui_win_is_auxillary (winType))
+ switch (win_type)
{
- if (generic->type == CMD_WIN)
- ((struct tui_win_info *) opaqueWinInfo)->can_highlight = FALSE;
- else
- ((struct tui_win_info *) opaqueWinInfo)->can_highlight = TRUE;
+ case SRC_WIN:
+ win_info = new tui_source_window ();
+ break;
+
+ case DISASSEM_WIN:
+ win_info = new tui_disasm_window ();
+ break;
+
+ case DATA_WIN:
+ win_info = new tui_data_window ();
+ break;
+
+ case CMD_WIN:
+ win_info = new tui_cmd_window ();
+ break;
+
+ case EXEC_INFO_WIN:
+ win_info = new tui_exec_info_window ();
+ break;
+
+ default:
+ gdb_assert_not_reached (_("unhandled window type"));
}
- tui_make_window (generic, boxIt);
}
- *winInfoPtr = opaqueWinInfo;
+
+ win_info->reset (win_type, height, width, origin_x, origin_y);
+ tui_make_window (win_info, box_it);
+
+ return win_info;
}
-/*
- ** _makeSourceOrDisassemWindow().
- */
-static void
-_makeSourceOrDisassemWindow (struct tui_win_info * * winInfoPtr, enum tui_win_type type,
- int height, int originY)
+static struct tui_win_info *
+make_source_or_disasm_window (enum tui_win_type type,
+ int height, int origin_y)
{
- struct tui_gen_win_info * execution_info = (struct tui_gen_win_info *) NULL;
+ struct tui_exec_info_window *execution_info
+ = (tui_exec_info_window *) init_and_make_win (nullptr,
+ EXEC_INFO_WIN,
+ height,
+ 3,
+ 0,
+ origin_y,
+ DONT_BOX_WINDOW);
+
+ /* Now create the source window. */
+ struct tui_source_window_base *result
+ = ((struct tui_source_window_base *)
+ init_and_make_win (NULL,
+ type,
+ height,
+ tui_term_width () - execution_info->width,
+ execution_info->width,
+ origin_y,
+ BOX_WINDOW));
+ result->execution_info = execution_info;
+ return result;
+}
- /*
- ** Create the exeuction info window.
- */
- if (type == SRC_WIN)
- execution_info = tui_source_exec_info_win_ptr ();
- else
- execution_info = tui_disassem_exec_info_win_ptr ();
- _initAndMakeWin ((void **) & execution_info,
- EXEC_INFO_WIN,
- height,
- 3,
- 0,
- originY,
- DONT_BOX_WINDOW);
- /*
- ** Now create the source window.
- */
- _initAndMakeWin ((void **) winInfoPtr,
- type,
- height,
- tui_term_width () - execution_info->width,
- execution_info->width,
- originY,
- BOX_WINDOW);
-
- (*winInfoPtr)->detail.source_info.execution_info = execution_info;
-
- return;
-} /* _makeSourceOrDisassemWindow */
-
-
-/*
- ** _showSourceOrDisassemAndCommand().
- ** Show the Source/Command or the Disassem layout
- */
+
+/* Show the Source/Command or the Disassem layout. */
static void
-_showSourceOrDisassemAndCommand (enum tui_layout_type layoutType)
+show_source_or_disasm_and_command (enum tui_layout_type layout_type)
{
- if (tui_current_layout () != layoutType)
+ if (tui_current_layout () != layout_type)
{
- struct tui_win_info * *winInfoPtr;
- int srcHeight, cmdHeight;
- struct tui_gen_win_info * locator = tui_locator_win_info_ptr ();
+ struct tui_win_info **win_info_ptr;
+ int src_height, cmd_height;
+ struct tui_locator_window *locator = tui_locator_win_info_ptr ();
+ gdb_assert (locator != nullptr);
if (TUI_CMD_WIN != NULL)
- cmdHeight = TUI_CMD_WIN->generic.height;
+ cmd_height = TUI_CMD_WIN->height;
else
- cmdHeight = tui_term_height () / 3;
- srcHeight = tui_term_height () - cmdHeight;
+ cmd_height = tui_term_height () / 3;
+ src_height = tui_term_height () - cmd_height;
-
- if (layoutType == SRC_COMMAND)
- winInfoPtr = &TUI_SRC_WIN;
+ if (layout_type == SRC_COMMAND)
+ win_info_ptr = &tui_win_list[SRC_WIN];
else
- winInfoPtr = &TUI_DISASM_WIN;
+ win_info_ptr = &tui_win_list[DISASSEM_WIN];
- if ((*winInfoPtr) == NULL)
+ tui_source_window_base *base;
+ if ((*win_info_ptr) == NULL)
{
- if (layoutType == SRC_COMMAND)
- _makeSourceWindow (winInfoPtr, srcHeight - 1, 0);
+ if (layout_type == SRC_COMMAND)
+ *win_info_ptr = make_source_window (src_height - 1, 0);
else
- _makeDisassemWindow (winInfoPtr, srcHeight - 1, 0);
- _initAndMakeWin ((void **) & locator,
- LOCATOR_WIN,
- 2 /* 1 */ ,
- tui_term_width (),
- 0,
- srcHeight - 1,
- DONT_BOX_WINDOW);
+ *win_info_ptr = make_disasm_window (src_height - 1, 0);
+ init_and_make_win (locator,
+ LOCATOR_WIN,
+ 2 /* 1 */ ,
+ tui_term_width (),
+ 0,
+ src_height - 1,
+ DONT_BOX_WINDOW);
+ base = (tui_source_window_base *) *win_info_ptr;
}
else
{
- _initGenWinInfo (locator,
- LOCATOR_WIN,
- 2 /* 1 */ ,
- tui_term_width (),
- 0,
- srcHeight - 1);
- (*winInfoPtr)->detail.source_info.has_locator = TRUE;
- _initGenWinInfo (
- &(*winInfoPtr)->generic,
- (*winInfoPtr)->generic.type,
- srcHeight - 1,
- (*winInfoPtr)->generic.width,
- (*winInfoPtr)->detail.source_info.execution_info->width,
- 0);
- _initGenWinInfo ((*winInfoPtr)->detail.source_info.execution_info,
- EXEC_INFO_WIN,
- srcHeight - 1,
- 3,
- 0,
- 0);
- (*winInfoPtr)->can_highlight = TRUE;
- tui_make_visible (&(*winInfoPtr)->generic);
- tui_make_visible ((*winInfoPtr)->detail.source_info.execution_info);
+ base = (tui_source_window_base *) *win_info_ptr;
+ locator->reset (LOCATOR_WIN,
+ 2 /* 1 */ ,
+ tui_term_width (),
+ 0,
+ src_height - 1);
+ base->m_has_locator = true;
+ (*win_info_ptr)->reset ((*win_info_ptr)->type,
+ src_height - 1,
+ (*win_info_ptr)->width,
+ base->execution_info->width,
+ 0);
+ base->execution_info->reset (EXEC_INFO_WIN,
+ src_height - 1,
+ 3,
+ 0,
+ 0);
+ tui_make_visible (*win_info_ptr);
+ tui_make_visible (base->execution_info);
}
- if ((*winInfoPtr) != NULL)
- {
- (*winInfoPtr)->detail.source_info.has_locator = TRUE;
- tui_make_visible (locator);
- tui_show_locator_content ();
- tui_show_source_content (*winInfoPtr);
- if (TUI_CMD_WIN == NULL)
- {
- _makeCommandWindow (&TUI_CMD_WIN, cmdHeight, srcHeight);
- tui_refresh_win (&TUI_CMD_WIN->generic);
- }
- else
- {
- _initGenWinInfo (&TUI_CMD_WIN->generic,
- TUI_CMD_WIN->generic.type,
- TUI_CMD_WIN->generic.height,
- TUI_CMD_WIN->generic.width,
- TUI_CMD_WIN->generic.origin.x,
- TUI_CMD_WIN->generic.origin.y);
- TUI_CMD_WIN->can_highlight = FALSE;
- tui_make_visible (&TUI_CMD_WIN->generic);
- }
+ base->m_has_locator = true;
+ tui_make_visible (locator);
+ tui_show_locator_content ();
+ tui_show_source_content (base);
+
+ if (TUI_CMD_WIN == NULL)
+ {
+ tui_win_list[CMD_WIN] = make_command_window (cmd_height,
+ src_height);
+ TUI_CMD_WIN->refresh_window ();
}
- tui_set_current_layout_to (layoutType);
+ else
+ {
+ TUI_CMD_WIN->reset (TUI_CMD_WIN->type,
+ TUI_CMD_WIN->height,
+ TUI_CMD_WIN->width,
+ TUI_CMD_WIN->origin.x,
+ TUI_CMD_WIN->origin.y);
+ tui_make_visible (TUI_CMD_WIN);
+ }
+ tui_set_current_layout_to (layout_type);
}
-
- return;
-} /* _showSourceOrDisassemAndCommand */
+}
projects / deliverable / binutils-gdb.git / blobdiff