#include <ctype.h>
#include "tui/tui.h"
+#include "tui/tui-command.h"
#include "tui/tui-data.h"
-#include "tui/tui-windata.h"
#include "tui/tui-wingeneral.h"
#include "tui/tui-stack.h"
#include "tui/tui-regs.h"
#include "tui/tui-winsource.h"
#include "tui/tui-disasm.h"
#include "tui/tui-layout.h"
+#include "tui/tui-source.h"
#include "gdb_curses.h"
/*******************************
********************************/
static void show_layout (enum tui_layout_type);
static void show_source_or_disasm_and_command (enum tui_layout_type);
-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 show_source_command (void);
static void show_disasm_command (void);
static void show_source_disasm_command (void);
static void extract_display_start_addr (struct gdbarch **, CORE_ADDR *);
+static enum tui_layout_type current_layout = UNDEFINED_LAYOUT;
+
+/* Accessor for the current layout. */
+enum tui_layout_type
+tui_current_layout (void)
+{
+ return current_layout;
+}
+
/***************************************
** DEFINITIONS
***************************************/
-#define LAYOUT_USAGE "Usage: layout prev | next | <layout_name> \n"
-
/* Show the screen layout defined. */
static void
show_layout (enum tui_layout_type layout)
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)
+ /* First make the current layout be invisible. */
+ tui_make_all_invisible ();
+ tui_locator_win_info_ptr ()->make_visible (false);
+ switch (layout)
{
+ case SRC_DATA_COMMAND:
+ case DISASSEM_DATA_COMMAND:
show_data (layout);
tui_refresh_all ();
+ break;
+ /* Now show the new layout. */
+ case SRC_COMMAND:
+ show_source_command ();
+ tui_add_to_source_windows (TUI_SRC_WIN);
+ break;
+ case DISASSEM_COMMAND:
+ show_disasm_command ();
+ tui_add_to_source_windows (TUI_DISASM_WIN);
+ break;
+ case SRC_DISASSEM_COMMAND:
+ show_source_disasm_command ();
+ tui_add_to_source_windows (TUI_SRC_WIN);
+ tui_add_to_source_windows (TUI_DISASM_WIN);
+ break;
+ default:
+ break;
}
- else
- {
- /* 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. */
- case SRC_COMMAND:
- show_source_command ();
- tui_add_to_source_windows (TUI_SRC_WIN);
- break;
- case DISASSEM_COMMAND:
- show_disasm_command ();
- tui_add_to_source_windows (TUI_DISASM_WIN);
- break;
- case SRC_DISASSEM_COMMAND:
- show_source_disasm_command ();
- tui_add_to_source_windows (TUI_SRC_WIN);
- tui_add_to_source_windows (TUI_DISASM_WIN);
- break;
- default:
- break;
- }
- }
+ tui_delete_invisible_windows ();
}
}
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);
{
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.
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.
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.
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;
/* 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
+static int
tui_default_win_height (enum tui_win_type type,
enum tui_layout_type layout)
{
/* Function to set the layout to SRC, ASM, SPLIT, NEXT, PREV, DATA, or
REGS. */
-enum tui_status
-tui_set_layout_by_name (const char *layout_name)
+static void
+tui_layout_command (const char *layout_name, int from_tty)
{
- enum tui_status status = TUI_SUCCESS;
+ int i;
+ enum tui_layout_type new_layout = UNDEFINED_LAYOUT;
+ enum tui_layout_type cur_layout = tui_current_layout ();
- if (layout_name != NULL)
- {
- int i;
- enum tui_layout_type new_layout = UNDEFINED_LAYOUT;
- enum tui_layout_type cur_layout = tui_current_layout ();
+ if (layout_name == NULL)
+ error (_("Usage: layout prev | next | LAYOUT-NAME"));
- std::string copy = layout_name;
- for (i = 0; i < copy.size (); i++)
- copy[i] = toupper (copy[i]);
- const char *buf_ptr = copy.c_str ();
+ 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."));
- status = TUI_FAILURE;
- }
- else
- {
- 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 (cur_layout == SRC_COMMAND
- || cur_layout == SRC_DATA_COMMAND)
- new_layout = SRC_DATA_COMMAND;
- else
- new_layout = DISASSEM_DATA_COMMAND;
- }
- 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;
+ /* First check for ambiguous input. */
+ if (strlen (buf_ptr) <= 1 && *buf_ptr == 'S')
+ error (_("Ambiguous command input."));
- if (status == TUI_SUCCESS)
- {
- /* Make sure the curses mode is enabled. */
- tui_enable ();
- tui_set_layout (new_layout);
- }
- }
+ 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 (cur_layout == SRC_COMMAND
+ || cur_layout == SRC_DATA_COMMAND)
+ new_layout = SRC_DATA_COMMAND;
+ else
+ new_layout = DISASSEM_DATA_COMMAND;
}
+ 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;
+ error (_("Unrecognized layout: %s"), layout_name);
- return status;
+ /* Make sure the curses mode is enabled. */
+ tui_enable ();
+ tui_set_layout (new_layout);
}
}
-static void
-tui_layout_command (const char *arg, int from_tty)
-{
- /* Switch to the selected layout. */
- if (tui_set_layout_by_name (arg) != TUI_SUCCESS)
- warning (_("Invalid layout specified.\n%s"), LAYOUT_USAGE);
-}
-
/* Answer the previous layout to cycle to. */
static enum tui_layout_type
next_layout (void)
return (enum tui_layout_type) new_layout;
}
-
-
-static struct tui_win_info *
-make_command_window (int height, int origin_y)
-{
- struct tui_win_info *result = new tui_cmd_window ();
- result->reset (height, tui_term_width (), 0, origin_y);
- tui_make_window (result, DONT_BOX_WINDOW);
- return result;
-}
-
-
-/* make_source_window().
- */
-static struct tui_win_info *
-make_source_window (int height, int origin_y)
-{
- tui_win_info *result = new tui_source_window ();
- result->reset (height, tui_term_width (), 0, origin_y);
- result->make_visible (true);
- return result;
-}
-
-
-/* make_disasm_window().
- */
-static struct tui_win_info *
-make_disasm_window (int height, int origin_y)
-{
- tui_win_info *result = new tui_disasm_window ();
- result->reset (height, tui_term_width (), 0, origin_y);
- result->make_visible (true);
- return result;
-}
-
-
-static tui_win_info *
-make_data_window (int height, int origin_y)
-{
- tui_win_info *result = new tui_data_window ();
- result->reset (height, tui_term_width (), 0, origin_y);
- result->make_visible (true);
- return result;
-}
-
-
-
/* Show the Source/Command layout. */
static void
show_source_command (void)
static void
show_source_disasm_command (void)
{
- if (tui_current_layout () != SRC_DISASSEM_COMMAND)
- {
- int cmd_height, src_height, asm_height;
+ int cmd_height, src_height, asm_height;
- if (TUI_CMD_WIN != NULL)
- cmd_height = TUI_CMD_WIN->height;
- else
- cmd_height = tui_term_height () / 3;
+ if (TUI_CMD_WIN != NULL)
+ cmd_height = TUI_CMD_WIN->height;
+ else
+ cmd_height = tui_term_height () / 3;
- src_height = (tui_term_height () - cmd_height) / 2;
- asm_height = tui_term_height () - (src_height + cmd_height);
+ src_height = (tui_term_height () - cmd_height) / 2;
+ asm_height = tui_term_height () - (src_height + cmd_height);
- if (TUI_SRC_WIN == NULL)
- tui_win_list[SRC_WIN] = make_source_window (src_height, 0);
- else
- {
- TUI_SRC_WIN->reset (src_height,
- tui_term_width (),
- 0,
- 0);
- tui_make_visible (TUI_SRC_WIN);
- TUI_SRC_WIN->m_has_locator = false;
- }
+ if (TUI_SRC_WIN == NULL)
+ tui_win_list[SRC_WIN] = new tui_source_window ();
+ TUI_SRC_WIN->reset (src_height,
+ tui_term_width (),
+ 0,
+ 0);
+ TUI_SRC_WIN->make_visible (true);
+ TUI_SRC_WIN->m_has_locator = false;
- struct tui_locator_window *locator = tui_locator_win_info_ptr ();
- gdb_assert (locator != nullptr);
+ 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);
- locator->reset (2 /* 1 */ ,
- tui_term_width (),
- 0,
- (src_height + asm_height) - 1);
- }
- else
- {
- locator->reset (2 /* 1 */ ,
- tui_term_width (),
- 0,
- (src_height + asm_height) - 1);
- TUI_DISASM_WIN->m_has_locator = true;
- TUI_DISASM_WIN->reset (asm_height,
- tui_term_width (),
- 0,
- src_height - 1);
- tui_make_visible (TUI_DISASM_WIN);
- }
- 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->height,
- TUI_CMD_WIN->width,
- 0,
- TUI_CMD_WIN->origin.y);
- tui_make_visible (TUI_CMD_WIN);
- }
- tui_set_current_layout_to (SRC_DISASSEM_COMMAND);
- }
+ TUI_SRC_WIN->show_source_content ();
+ if (TUI_DISASM_WIN == NULL)
+ tui_win_list[DISASSEM_WIN] = new tui_disasm_window ();
+ TUI_DISASM_WIN->reset (asm_height,
+ tui_term_width (),
+ 0,
+ src_height - 1);
+ TUI_DISASM_WIN->make_visible (true);
+ locator->reset (2 /* 1 */ ,
+ tui_term_width (),
+ 0,
+ (src_height + asm_height) - 1);
+ TUI_SRC_WIN->m_has_locator = false;
+ TUI_DISASM_WIN->m_has_locator = true;
+ locator->make_visible (true);
+ tui_show_locator_content ();
+ TUI_DISASM_WIN->show_source_content ();
+
+ if (TUI_CMD_WIN == NULL)
+ tui_win_list[CMD_WIN] = new tui_cmd_window ();
+ TUI_CMD_WIN->reset (cmd_height,
+ tui_term_width (),
+ 0,
+ tui_term_height () - cmd_height);
+ /* FIXME tui_cmd_window won't recreate the handle on
+ make_visible, so we need this instead. */
+ tui_make_window (TUI_CMD_WIN);
+ current_layout = SRC_DISASSEM_COMMAND;
}
data_height = total_height / 2;
src_height = total_height - data_height;
- tui_make_all_invisible ();
- tui_make_invisible (locator);
if (tui_win_list[DATA_WIN] == nullptr)
- tui_win_list[DATA_WIN] = make_data_window (data_height, 0);
- else
- tui_win_list[DATA_WIN]->reset (data_height, tui_term_width (), 0, 0);
+ tui_win_list[DATA_WIN] = new tui_data_window ();
+ tui_win_list[DATA_WIN]->reset (data_height, tui_term_width (), 0, 0);
tui_win_list[DATA_WIN]->make_visible (true);
if (new_layout == SRC_DATA_COMMAND)
else
win_type = DISASSEM_WIN;
- tui_source_window_base *base;
if (tui_win_list[win_type] == NULL)
{
if (win_type == SRC_WIN)
- tui_win_list[win_type]
- = make_source_window (src_height, data_height - 1);
+ tui_win_list[win_type] = new tui_source_window ();
else
- tui_win_list[win_type]
- = make_disasm_window (src_height, data_height - 1);
- locator->reset (2 /* 1 */ ,
- tui_term_width (),
- 0,
- total_height - 1);
- base = (tui_source_window_base *) tui_win_list[win_type];
- }
- else
- {
- base = (tui_source_window_base *) tui_win_list[win_type];
- tui_win_list[win_type]->reset (src_height,
- tui_term_width (),
- 0,
- data_height - 1);
- tui_make_visible (tui_win_list[win_type]);
- locator->reset (2 /* 1 */ ,
- tui_term_width (),
- 0,
- total_height - 1);
+ tui_win_list[win_type] = new tui_disasm_window ();
}
+
+ tui_source_window_base *base
+ = (tui_source_window_base *) tui_win_list[win_type];
+ tui_win_list[win_type]->reset (src_height,
+ tui_term_width (),
+ 0,
+ data_height - 1);
+ locator->reset (2 /* 1 */ ,
+ tui_term_width (),
+ 0,
+ total_height - 1);
+ base->make_visible (true);
base->m_has_locator = true;
- tui_make_visible (locator);
+ locator->make_visible (true);
tui_show_locator_content ();
- tui_add_to_source_windows
- ((tui_source_window_base *) tui_win_list[win_type]);
- tui_set_current_layout_to (new_layout);
+ tui_add_to_source_windows (base);
+ TUI_CMD_WIN->make_visible (true);
+ current_layout = new_layout;
}
void
static void
show_source_or_disasm_and_command (enum tui_layout_type layout_type)
{
- if (tui_current_layout () != layout_type)
- {
- 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);
+ struct tui_source_window_base *win_info;
+ int src_height, cmd_height;
+ struct tui_locator_window *locator = tui_locator_win_info_ptr ();
+ gdb_assert (locator != nullptr);
- if (TUI_CMD_WIN != NULL)
- cmd_height = TUI_CMD_WIN->height;
- else
- cmd_height = tui_term_height () / 3;
- src_height = tui_term_height () - cmd_height;
+ if (TUI_CMD_WIN != NULL)
+ cmd_height = TUI_CMD_WIN->height;
+ else
+ cmd_height = tui_term_height () / 3;
+ src_height = tui_term_height () - cmd_height;
- if (layout_type == SRC_COMMAND)
- win_info_ptr = &tui_win_list[SRC_WIN];
- else
- win_info_ptr = &tui_win_list[DISASSEM_WIN];
+ if (layout_type == SRC_COMMAND)
+ {
+ if (tui_win_list[SRC_WIN] == nullptr)
+ tui_win_list[SRC_WIN] = new tui_source_window ();
+ win_info = TUI_SRC_WIN;
+ }
+ else
+ {
+ if (tui_win_list[DISASSEM_WIN] == nullptr)
+ tui_win_list[DISASSEM_WIN] = new tui_disasm_window ();
+ win_info = TUI_DISASM_WIN;
+ }
- tui_source_window_base *base;
- if ((*win_info_ptr) == NULL)
- {
- if (layout_type == SRC_COMMAND)
- *win_info_ptr = make_source_window (src_height - 1, 0);
- else
- *win_info_ptr = make_disasm_window (src_height - 1, 0);
- locator->reset (2 /* 1 */ ,
- tui_term_width (),
- 0,
- src_height - 1);
- base = (tui_source_window_base *) *win_info_ptr;
- }
- else
- {
- base = (tui_source_window_base *) *win_info_ptr;
- locator->reset (2 /* 1 */ ,
- tui_term_width (),
- 0,
- src_height - 1);
- base->m_has_locator = true;
- (*win_info_ptr)->reset (src_height - 1,
- tui_term_width (),
- 0,
- 0);
- tui_make_visible (*win_info_ptr);
- }
+ locator->reset (2 /* 1 */ ,
+ tui_term_width (),
+ 0,
+ src_height - 1);
+ win_info->reset (src_height - 1,
+ tui_term_width (),
+ 0,
+ 0);
+ win_info->make_visible (true);
- 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);
- }
- else
- {
- TUI_CMD_WIN->reset (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);
- }
+ win_info->m_has_locator = true;
+ locator->make_visible (true);
+ tui_show_locator_content ();
+ win_info->show_source_content ();
+
+ if (TUI_CMD_WIN == NULL)
+ tui_win_list[CMD_WIN] = new tui_cmd_window ();
+ TUI_CMD_WIN->reset (cmd_height,
+ tui_term_width (),
+ 0,
+ src_height);
+ /* FIXME tui_cmd_window won't recreate the handle on
+ make_visible, so we need this instead. */
+ tui_make_window (TUI_CMD_WIN);
+ current_layout = layout_type;
}
projects / deliverable / binutils-gdb.git / blobdiff