* tuiWin.c, tuiWin.h, tui.c, tui.h, tuiCommand.c: Add FSF copyright.
tuiCommand.h, tuiIO.c, tuiIO.h, tuiData.h, tuiData.c: Likewise.
tuiDataWin.c, tuiDataWin.h, tuiDisassem.c, tuiDisassem.h: Likewise.
tuiGeneralWin.c, tuiGeneralWin.h, tuiLayout.c, tuiLayout.h: Likewise.
tuiRegs.c, tuiRegs.h, tuiSource.c, tuiSource.h: Likewise.
tuiSouceWin.c, tuiSourceWin.h, tuiStack.c, tuiStack.h: Likewise.
2001-07-14 21:01:25 +02:00
|
|
|
/* TUI layout window management.
|
2002-03-01 07:19:28 +01:00
|
|
|
|
2004-01-19 17:06:04 +01:00
|
|
|
Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
|
|
|
|
Foundation, Inc.
|
2002-03-01 07:19:28 +01:00
|
|
|
|
* tuiWin.c, tuiWin.h, tui.c, tui.h, tuiCommand.c: Add FSF copyright.
tuiCommand.h, tuiIO.c, tuiIO.h, tuiData.h, tuiData.c: Likewise.
tuiDataWin.c, tuiDataWin.h, tuiDisassem.c, tuiDisassem.h: Likewise.
tuiGeneralWin.c, tuiGeneralWin.h, tuiLayout.c, tuiLayout.h: Likewise.
tuiRegs.c, tuiRegs.h, tuiSource.c, tuiSource.h: Likewise.
tuiSouceWin.c, tuiSourceWin.h, tuiStack.c, tuiStack.h: Likewise.
2001-07-14 21:01:25 +02:00
|
|
|
Contributed by Hewlett-Packard Company.
|
1999-04-16 03:35:26 +02:00
|
|
|
|
* tuiWin.c, tuiWin.h, tui.c, tui.h, tuiCommand.c: Add FSF copyright.
tuiCommand.h, tuiIO.c, tuiIO.h, tuiData.h, tuiData.c: Likewise.
tuiDataWin.c, tuiDataWin.h, tuiDisassem.c, tuiDisassem.h: Likewise.
tuiGeneralWin.c, tuiGeneralWin.h, tuiLayout.c, tuiLayout.h: Likewise.
tuiRegs.c, tuiRegs.h, tuiSource.c, tuiSource.h: Likewise.
tuiSouceWin.c, tuiSourceWin.h, tuiStack.c, tuiStack.h: Likewise.
2001-07-14 21:01:25 +02:00
|
|
|
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 2 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, write to the Free Software
|
|
|
|
Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
Boston, MA 02111-1307, USA. */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
#include "defs.h"
|
|
|
|
#include "command.h"
|
|
|
|
#include "symtab.h"
|
|
|
|
#include "frame.h"
|
2002-09-30 02:52:27 +02:00
|
|
|
#include "source.h"
|
2001-07-18 00:22:40 +02:00
|
|
|
#include <ctype.h>
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2004-01-19 05:31:53 +01:00
|
|
|
#include "tui/tui.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-win.h"
|
|
|
|
#include "tui/tui-winsource.h"
|
|
|
|
#include "tui/tui-disasm.h"
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2004-02-10 Andrew Cagney <cagney@redhat.com>
* defs.h: Do not include "tui.h".
* gdb_curses.h: New file.
* tui/tui-hooks.h: New file.
* tui/tui.h (tui_update_all_exec_infos): Delete declaration.
(tui_install_hooks, tui_remove_hooks): Delete declarations.
(tui_initialize_io): Delete declaration.
(tui_initialize_readline: Delete redundant declaration.
(struct tui_point): Delete definition.
* tui/tui-data.h (struct tui_point): Define.
* cli/cli-decode.c [TUI]: Include "tui/tui.h".
* utils.c: Include "tui/tui.h".
* tui/tui-data.h: Include "tui/tui.h" and "gdb_curses.h".
* printcmd.c [TUI]: Include "tui/tui.h".
* cli/cli-cmds.c [TUI]: Include "tui/tui.h".
* tui/tui-command.c: Include "gdb_curses.h".
* tui/tui.c, tui/tui-winsource.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-windata.c, tui/tui-win.c, tui/tui-stack.c: Ditto.
* tui/tui-source.c, tui/tui-regs.c, tui/tui-layout.c: Ditto.
* tui/tui-io.c, tui/tui-disasm.c, tui/tui-data.c: : Ditto.
* tui/tui-hooks.c: Include "tui-hooks.h" and "gdb_curses.h".
* Makefile.in: Update all dependencies.
(tui_hooks_h, gdb_curses_h): Define.
(SUBDIR_TUI_CFLAGS): Remove -I${srcdir}/tui.
2004-02-10 20:08:19 +01:00
|
|
|
#include "gdb_curses.h"
|
2003-06-22 17:21:39 +02:00
|
|
|
|
1999-04-16 03:35:26 +02:00
|
|
|
/*******************************
|
|
|
|
** Static Local Decls
|
|
|
|
********************************/
|
2004-02-08 01:05:16 +01:00
|
|
|
static void show_layout (enum tui_layout_type);
|
|
|
|
static void init_gen_win_info (struct tui_gen_win_info *, enum tui_win_type, int, int, int, int);
|
|
|
|
static void init_and_make_win (void **, enum tui_win_type, int, int, int, int, int);
|
|
|
|
static void show_source_or_disasm_and_command (enum tui_layout_type);
|
|
|
|
static void make_source_or_disasm_window (struct tui_win_info * *, enum tui_win_type, int, int);
|
|
|
|
static void make_command_window (struct tui_win_info * *, int, int);
|
|
|
|
static void make_source_window (struct tui_win_info * *, int, int);
|
|
|
|
static void make_disasm_window (struct tui_win_info * *, 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 (char *, int);
|
|
|
|
static void tui_toggle_layout_command (char *, int);
|
|
|
|
static void tui_toggle_split_layout_command (char *, int);
|
|
|
|
static CORE_ADDR extract_display_start_addr (void);
|
|
|
|
static void tui_handle_xdb_layout (struct tui_layout_def *);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
/***************************************
|
|
|
|
** DEFINITIONS
|
|
|
|
***************************************/
|
|
|
|
|
|
|
|
#define LAYOUT_USAGE "Usage: layout prev | next | <layout_name> \n"
|
|
|
|
|
2002-08-24 17:25:25 +02:00
|
|
|
/* Show the screen layout defined. */
|
|
|
|
static void
|
2004-02-08 01:05:16 +01:00
|
|
|
show_layout (enum tui_layout_type layout)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
enum tui_layout_type cur_layout = tui_current_layout ();
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
if (layout != cur_layout)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
/*
|
1999-07-07 22:19:36 +02:00
|
|
|
** Since the new layout may cause changes in window size, we
|
|
|
|
** should free the content and reallocate on next display of
|
|
|
|
** source/asm
|
|
|
|
*/
|
2004-02-07 05:40:36 +01:00
|
|
|
tui_free_all_source_wins_content ();
|
|
|
|
tui_clear_source_windows ();
|
1999-04-16 03:35:26 +02:00
|
|
|
if (layout == SRC_DATA_COMMAND || layout == DISASSEM_DATA_COMMAND)
|
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
show_data (layout);
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
tui_refresh_all (tui_win_list);
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* First make the current layout be invisible */
|
2004-02-07 00:55:34 +01:00
|
|
|
tui_make_all_invisible ();
|
2004-02-07 05:40:36 +01:00
|
|
|
tui_make_invisible (tui_locator_win_info_ptr ());
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
switch (layout)
|
|
|
|
{
|
|
|
|
/* Now show the new layout */
|
|
|
|
case SRC_COMMAND:
|
2004-02-08 01:05:16 +01:00
|
|
|
show_source_command ();
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
tui_add_to_source_windows (TUI_SRC_WIN);
|
1999-04-16 03:35:26 +02:00
|
|
|
break;
|
|
|
|
case DISASSEM_COMMAND:
|
2004-02-08 01:05:16 +01:00
|
|
|
show_disasm_command ();
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
tui_add_to_source_windows (TUI_DISASM_WIN);
|
1999-04-16 03:35:26 +02:00
|
|
|
break;
|
|
|
|
case SRC_DISASSEM_COMMAND:
|
2004-02-08 01:05:16 +01:00
|
|
|
show_source_disasm_command ();
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
tui_add_to_source_windows (TUI_SRC_WIN);
|
|
|
|
tui_add_to_source_windows (TUI_DISASM_WIN);
|
1999-04-16 03:35:26 +02:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2002-08-24 14:28:33 +02:00
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
2004-01-24 00:25:17 +01:00
|
|
|
/* 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
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
regs_display_type. */
|
2004-01-24 00:25:17 +01:00
|
|
|
enum tui_status
|
2004-02-08 01:05:16 +01:00
|
|
|
tui_set_layout (enum tui_layout_type layout_type,
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
enum tui_register_display_type regs_display_type)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h (Opaque, OpaquePtr OpaqueList): Delete definition.
(TuiPoint, TuiPointPtr): Ditto.
(TuiStatus, TuiStatusPtr): Ditto.
(TuiWinType, TuiWinTypePtr): Ditto.
(struct tui_point): Rename _TuiPoint.
(tui_get_low_disassembly_address): Rename
tuiGetLowDisassemblyAddress.
(tui_update_all_exec_infos): Rename tuiUpdateAllExecInfos.
(tuiFree): Delete declaration.
(OpaqueFuncPtr, TuiOpaqueFuncPtr): Delete definitions.
(TuiVoidFuncPtr, TuiIntFuncPtr): Delete definitions.
* tui/tui.c (tuiFree): Delete function.
* cli/cli-cmds.c (disassemble_command): Update references.
* tui/tui-data.c, tui/tui-data.h, tui/tui-disasm.c: Ditto.
* tui/tui-layout.c, tui/tui-regs.c, tui/tui-source.c: Ditto.
* tui/tui-stack.c, tui/tui-win.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c: Ditto.
2004-02-07 18:46:14 +01:00
|
|
|
enum tui_status status = TUI_SUCCESS;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
if (layout_type != UNDEFINED_LAYOUT || regs_display_type != TUI_UNDEFINED_REGS)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
enum tui_layout_type cur_layout = tui_current_layout (), new_layout = UNDEFINED_LAYOUT;
|
|
|
|
int regs_populate = FALSE;
|
|
|
|
CORE_ADDR addr = extract_display_start_addr ();
|
|
|
|
struct tui_win_info * new_win_with_focus = (struct tui_win_info *) NULL;
|
|
|
|
struct tui_win_info * win_with_focus = tui_win_with_focus ();
|
|
|
|
struct tui_layout_def * layout_def = tui_layout_def ();
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
if (layout_type == UNDEFINED_LAYOUT &&
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
regs_display_type != TUI_UNDEFINED_REGS)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
if (cur_layout == SRC_DISASSEM_COMMAND)
|
|
|
|
new_layout = DISASSEM_DATA_COMMAND;
|
|
|
|
else if (cur_layout == SRC_COMMAND || cur_layout == SRC_DATA_COMMAND)
|
|
|
|
new_layout = SRC_DATA_COMMAND;
|
|
|
|
else if (cur_layout == DISASSEM_COMMAND ||
|
|
|
|
cur_layout == DISASSEM_DATA_COMMAND)
|
|
|
|
new_layout = DISASSEM_DATA_COMMAND;
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
|
|
|
else
|
2004-02-08 01:05:16 +01:00
|
|
|
new_layout = layout_type;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
regs_populate = (new_layout == SRC_DATA_COMMAND ||
|
|
|
|
new_layout == DISASSEM_DATA_COMMAND ||
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
regs_display_type != TUI_UNDEFINED_REGS);
|
2004-02-08 01:05:16 +01:00
|
|
|
if (new_layout != cur_layout || regs_display_type != TUI_UNDEFINED_REGS)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
if (new_layout != cur_layout)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
show_layout (new_layout);
|
1999-04-16 03:35:26 +02:00
|
|
|
/*
|
1999-07-07 22:19:36 +02:00
|
|
|
** Now determine where focus should be
|
|
|
|
*/
|
2004-02-08 01:05:16 +01:00
|
|
|
if (win_with_focus != TUI_CMD_WIN)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
switch (new_layout)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
case SRC_COMMAND:
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
tui_set_win_focus_to (TUI_SRC_WIN);
|
2004-02-08 01:05:16 +01:00
|
|
|
layout_def->display_mode = SRC_WIN;
|
|
|
|
layout_def->split = FALSE;
|
1999-04-16 03:35:26 +02:00
|
|
|
break;
|
|
|
|
case DISASSEM_COMMAND:
|
|
|
|
/* the previous layout was not showing
|
1999-07-07 22:19:36 +02:00
|
|
|
** 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!
|
|
|
|
*/
|
2004-01-20 22:56:22 +01:00
|
|
|
addr = tui_get_begin_asm_address ();
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
tui_set_win_focus_to (TUI_DISASM_WIN);
|
2004-02-08 01:05:16 +01:00
|
|
|
layout_def->display_mode = DISASSEM_WIN;
|
|
|
|
layout_def->split = FALSE;
|
1999-04-16 03:35:26 +02:00
|
|
|
break;
|
|
|
|
case SRC_DISASSEM_COMMAND:
|
|
|
|
/* the previous layout was not showing
|
1999-07-07 22:19:36 +02:00
|
|
|
** 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!
|
|
|
|
*/
|
2004-01-20 22:56:22 +01:00
|
|
|
addr = tui_get_begin_asm_address ();
|
2004-02-08 01:05:16 +01:00
|
|
|
if (win_with_focus == TUI_SRC_WIN)
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
tui_set_win_focus_to (TUI_SRC_WIN);
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
tui_set_win_focus_to (TUI_DISASM_WIN);
|
2004-02-08 01:05:16 +01:00
|
|
|
layout_def->split = TRUE;
|
1999-04-16 03:35:26 +02:00
|
|
|
break;
|
|
|
|
case SRC_DATA_COMMAND:
|
2004-02-08 01:05:16 +01:00
|
|
|
if (win_with_focus != TUI_DATA_WIN)
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
tui_set_win_focus_to (TUI_SRC_WIN);
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
tui_set_win_focus_to (TUI_DATA_WIN);
|
2004-02-08 01:05:16 +01:00
|
|
|
layout_def->display_mode = SRC_WIN;
|
|
|
|
layout_def->split = FALSE;
|
1999-04-16 03:35:26 +02:00
|
|
|
break;
|
|
|
|
case DISASSEM_DATA_COMMAND:
|
|
|
|
/* the previous layout was not showing
|
1999-07-07 22:19:36 +02:00
|
|
|
** 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!
|
|
|
|
*/
|
2004-01-20 22:56:22 +01:00
|
|
|
addr = tui_get_begin_asm_address ();
|
2004-02-08 01:05:16 +01:00
|
|
|
if (win_with_focus != TUI_DATA_WIN)
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
tui_set_win_focus_to (TUI_DISASM_WIN);
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
tui_set_win_focus_to (TUI_DATA_WIN);
|
2004-02-08 01:05:16 +01:00
|
|
|
layout_def->display_mode = DISASSEM_WIN;
|
|
|
|
layout_def->split = FALSE;
|
1999-04-16 03:35:26 +02:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2004-02-08 01:05:16 +01:00
|
|
|
if (new_win_with_focus != (struct tui_win_info *) NULL)
|
|
|
|
tui_set_win_focus_to (new_win_with_focus);
|
1999-04-16 03:35:26 +02:00
|
|
|
/*
|
1999-07-07 22:19:36 +02:00
|
|
|
** Now update the window content
|
|
|
|
*/
|
2004-02-08 01:05:16 +01:00
|
|
|
if (!regs_populate &&
|
|
|
|
(new_layout == SRC_DATA_COMMAND ||
|
|
|
|
new_layout == DISASSEM_DATA_COMMAND))
|
2004-02-07 01:23:56 +01:00
|
|
|
tui_display_all_data ();
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2004-02-06 23:42:18 +01:00
|
|
|
tui_update_source_windows_with_addr (addr);
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
2004-02-08 01:05:16 +01:00
|
|
|
if (regs_populate)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
layout_def->regs_display_type =
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
(regs_display_type == TUI_UNDEFINED_REGS ?
|
|
|
|
TUI_GENERAL_REGS : regs_display_type);
|
2004-02-08 01:05:16 +01:00
|
|
|
tui_show_registers (layout_def->regs_display_type);
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
status = TUI_FAILURE;
|
|
|
|
|
|
|
|
return status;
|
2002-08-24 14:28:33 +02:00
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2004-01-24 00:25:17 +01:00
|
|
|
/* Add the specified window to the layout in a logical way. This
|
|
|
|
means setting up the most logical layout given the window to be
|
|
|
|
added. */
|
1999-04-16 03:35:26 +02:00
|
|
|
void
|
2004-01-24 00:25:17 +01:00
|
|
|
tui_add_win_to_layout (enum tui_win_type type)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
enum tui_layout_type cur_layout = tui_current_layout ();
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
switch (type)
|
|
|
|
{
|
|
|
|
case SRC_WIN:
|
2004-02-08 01:05:16 +01:00
|
|
|
if (cur_layout != SRC_COMMAND &&
|
|
|
|
cur_layout != SRC_DISASSEM_COMMAND &&
|
|
|
|
cur_layout != SRC_DATA_COMMAND)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-07 05:40:36 +01:00
|
|
|
tui_clear_source_windows_detail ();
|
2004-02-08 01:05:16 +01:00
|
|
|
if (cur_layout == DISASSEM_DATA_COMMAND)
|
|
|
|
show_layout (SRC_DATA_COMMAND);
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
2004-02-08 01:05:16 +01:00
|
|
|
show_layout (SRC_COMMAND);
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case DISASSEM_WIN:
|
2004-02-08 01:05:16 +01:00
|
|
|
if (cur_layout != DISASSEM_COMMAND &&
|
|
|
|
cur_layout != SRC_DISASSEM_COMMAND &&
|
|
|
|
cur_layout != DISASSEM_DATA_COMMAND)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-07 05:40:36 +01:00
|
|
|
tui_clear_source_windows_detail ();
|
2004-02-08 01:05:16 +01:00
|
|
|
if (cur_layout == SRC_DATA_COMMAND)
|
|
|
|
show_layout (DISASSEM_DATA_COMMAND);
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
2004-02-08 01:05:16 +01:00
|
|
|
show_layout (DISASSEM_COMMAND);
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case DATA_WIN:
|
2004-02-08 01:05:16 +01:00
|
|
|
if (cur_layout != SRC_DATA_COMMAND &&
|
|
|
|
cur_layout != DISASSEM_DATA_COMMAND)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
if (cur_layout == DISASSEM_COMMAND)
|
|
|
|
show_layout (DISASSEM_DATA_COMMAND);
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
2004-02-08 01:05:16 +01:00
|
|
|
show_layout (SRC_DATA_COMMAND);
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2004-02-08 01:05:16 +01:00
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
/* 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. */
|
1999-04-16 03:35:26 +02:00
|
|
|
int
|
2004-02-08 01:05:16 +01:00
|
|
|
tui_default_win_height (enum tui_win_type type, enum tui_layout_type layout)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
int h;
|
|
|
|
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
if (tui_win_list[type] != (struct tui_win_info *) NULL)
|
|
|
|
h = tui_win_list[type]->generic.height;
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
|
|
|
{
|
|
|
|
switch (layout)
|
|
|
|
{
|
|
|
|
case SRC_COMMAND:
|
|
|
|
case DISASSEM_COMMAND:
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
if (TUI_CMD_WIN == NULL)
|
2004-02-07 05:40:36 +01:00
|
|
|
h = tui_term_height () / 2;
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
h = tui_term_height () - TUI_CMD_WIN->generic.height;
|
1999-04-16 03:35:26 +02:00
|
|
|
break;
|
|
|
|
case SRC_DISASSEM_COMMAND:
|
|
|
|
case SRC_DATA_COMMAND:
|
|
|
|
case DISASSEM_DATA_COMMAND:
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
if (TUI_CMD_WIN == NULL)
|
2004-02-07 05:40:36 +01:00
|
|
|
h = tui_term_height () / 3;
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
h = (tui_term_height () - TUI_CMD_WIN->generic.height) / 2;
|
1999-04-16 03:35:26 +02:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
h = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return h;
|
2004-02-08 01:05:16 +01:00
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
2004-01-24 00:25:17 +01:00
|
|
|
/* 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. */
|
1999-04-16 03:35:26 +02:00
|
|
|
int
|
2004-01-24 00:25:17 +01:00
|
|
|
tui_default_win_viewport_height (enum tui_win_type type,
|
|
|
|
enum tui_layout_type layout)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
int h;
|
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
h = tui_default_win_height (type, layout);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
if (tui_win_list[type] == TUI_CMD_WIN)
|
1999-04-16 03:35:26 +02:00
|
|
|
h -= 1;
|
|
|
|
else
|
|
|
|
h -= 2;
|
|
|
|
|
|
|
|
return h;
|
2004-02-08 01:05:16 +01:00
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
/* Function to initialize gdb commands, for tui window layout
|
|
|
|
manipulation. */
|
1999-04-16 03:35:26 +02:00
|
|
|
void
|
2004-02-08 01:05:16 +01:00
|
|
|
_initialize_tui_layout (void)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
add_com ("layout", class_tui, tui_layout_command,
|
2001-07-20 00:47:46 +02:00
|
|
|
"Change the layout of windows.\n\
|
1999-04-16 03:35:26 +02:00
|
|
|
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\
|
|
|
|
split : Displays source, disassembly and command windows.\n\
|
|
|
|
regs : Displays register window. If existing layout\n\
|
|
|
|
is source/command or assembly/command, the \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");
|
2001-07-20 00:47:46 +02:00
|
|
|
if (xdb_commands)
|
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
add_com ("td", class_tui, tui_toggle_layout_command,
|
2001-07-20 00:47:46 +02:00
|
|
|
"Toggle between Source/Command and Disassembly/Command layouts.\n");
|
2004-02-08 01:05:16 +01:00
|
|
|
add_com ("ts", class_tui, tui_toggle_split_layout_command,
|
2001-07-20 00:47:46 +02:00
|
|
|
"Toggle between Source/Command or Disassembly/Command and \n\
|
1999-04-16 03:35:26 +02:00
|
|
|
Source/Disassembly/Command layouts.\n");
|
|
|
|
}
|
2001-07-20 00:47:46 +02:00
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
/*************************
|
|
|
|
** STATIC LOCAL FUNCTIONS
|
|
|
|
**************************/
|
|
|
|
|
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
/* Function to set the layout to SRC, ASM, SPLIT, NEXT, PREV, DATA,
|
|
|
|
REGS, $REGS, $GREGS, $FREGS, $SREGS. */
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h (Opaque, OpaquePtr OpaqueList): Delete definition.
(TuiPoint, TuiPointPtr): Ditto.
(TuiStatus, TuiStatusPtr): Ditto.
(TuiWinType, TuiWinTypePtr): Ditto.
(struct tui_point): Rename _TuiPoint.
(tui_get_low_disassembly_address): Rename
tuiGetLowDisassemblyAddress.
(tui_update_all_exec_infos): Rename tuiUpdateAllExecInfos.
(tuiFree): Delete declaration.
(OpaqueFuncPtr, TuiOpaqueFuncPtr): Delete definitions.
(TuiVoidFuncPtr, TuiIntFuncPtr): Delete definitions.
* tui/tui.c (tuiFree): Delete function.
* cli/cli-cmds.c (disassemble_command): Update references.
* tui/tui-data.c, tui/tui-data.h, tui/tui-disasm.c: Ditto.
* tui/tui-layout.c, tui/tui-regs.c, tui/tui-source.c: Ditto.
* tui/tui-stack.c, tui/tui-win.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c: Ditto.
2004-02-07 18:46:14 +01:00
|
|
|
enum tui_status
|
2004-02-08 01:05:16 +01:00
|
|
|
tui_set_layout_for_display_command (const char *layout_name)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h (Opaque, OpaquePtr OpaqueList): Delete definition.
(TuiPoint, TuiPointPtr): Ditto.
(TuiStatus, TuiStatusPtr): Ditto.
(TuiWinType, TuiWinTypePtr): Ditto.
(struct tui_point): Rename _TuiPoint.
(tui_get_low_disassembly_address): Rename
tuiGetLowDisassemblyAddress.
(tui_update_all_exec_infos): Rename tuiUpdateAllExecInfos.
(tuiFree): Delete declaration.
(OpaqueFuncPtr, TuiOpaqueFuncPtr): Delete definitions.
(TuiVoidFuncPtr, TuiIntFuncPtr): Delete definitions.
* tui/tui.c (tuiFree): Delete function.
* cli/cli-cmds.c (disassemble_command): Update references.
* tui/tui-data.c, tui/tui-data.h, tui/tui-disasm.c: Ditto.
* tui/tui-layout.c, tui/tui-regs.c, tui/tui-source.c: Ditto.
* tui/tui-stack.c, tui/tui-win.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c: Ditto.
2004-02-07 18:46:14 +01:00
|
|
|
enum tui_status status = TUI_SUCCESS;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
if (layout_name != (char *) NULL)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 02:32:26 +01:00
|
|
|
int i;
|
|
|
|
char *buf_ptr;
|
2004-02-08 01:05:16 +01:00
|
|
|
enum tui_layout_type new_layout = UNDEFINED_LAYOUT;
|
|
|
|
enum tui_register_display_type dpy_type = TUI_UNDEFINED_REGS;
|
|
|
|
enum tui_layout_type cur_layout = tui_current_layout ();
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
buf_ptr = (char *) xstrdup (layout_name);
|
|
|
|
for (i = 0; (i < strlen (layout_name)); i++)
|
|
|
|
buf_ptr[i] = toupper (buf_ptr[i]);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
/* First check for ambiguous input */
|
2004-02-08 01:05:16 +01:00
|
|
|
if (strlen (buf_ptr) <= 1 && (*buf_ptr == 'S' || *buf_ptr == '$'))
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
warning ("Ambiguous command input.\n");
|
|
|
|
status = TUI_FAILURE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
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") ||
|
|
|
|
subset_compare (buf_ptr, TUI_GENERAL_SPECIAL_REGS_NAME) ||
|
|
|
|
subset_compare (buf_ptr, TUI_GENERAL_REGS_NAME) ||
|
|
|
|
subset_compare (buf_ptr, TUI_FLOAT_REGS_NAME) ||
|
|
|
|
subset_compare (buf_ptr, TUI_SPECIAL_REGS_NAME))
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
if (cur_layout == SRC_COMMAND || cur_layout == SRC_DATA_COMMAND)
|
|
|
|
new_layout = SRC_DATA_COMMAND;
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
2004-02-08 01:05:16 +01:00
|
|
|
new_layout = DISASSEM_DATA_COMMAND;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
/* 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
|
|
|
|
*/
|
2004-02-08 01:05:16 +01:00
|
|
|
if (subset_compare (buf_ptr, TUI_FLOAT_REGS_NAME))
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
if (TUI_DATA_WIN->detail.data_display_info.regs_display_type !=
|
1999-04-16 03:35:26 +02:00
|
|
|
TUI_SFLOAT_REGS &&
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
TUI_DATA_WIN->detail.data_display_info.regs_display_type !=
|
1999-04-16 03:35:26 +02:00
|
|
|
TUI_DFLOAT_REGS)
|
2004-02-08 01:05:16 +01:00
|
|
|
dpy_type = TUI_SFLOAT_REGS;
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
2004-02-08 01:05:16 +01:00
|
|
|
dpy_type =
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
TUI_DATA_WIN->detail.data_display_info.regs_display_type;
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
2004-02-08 01:05:16 +01:00
|
|
|
else if (subset_compare (buf_ptr,
|
1999-04-16 03:35:26 +02:00
|
|
|
TUI_GENERAL_SPECIAL_REGS_NAME))
|
2004-02-08 01:05:16 +01:00
|
|
|
dpy_type = TUI_GENERAL_AND_SPECIAL_REGS;
|
|
|
|
else if (subset_compare (buf_ptr, TUI_GENERAL_REGS_NAME))
|
|
|
|
dpy_type = TUI_GENERAL_REGS;
|
|
|
|
else if (subset_compare (buf_ptr, TUI_SPECIAL_REGS_NAME))
|
|
|
|
dpy_type = TUI_SPECIAL_REGS;
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
else if (TUI_DATA_WIN)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
if (TUI_DATA_WIN->detail.data_display_info.regs_display_type !=
|
1999-04-16 03:35:26 +02:00
|
|
|
TUI_UNDEFINED_REGS)
|
2004-02-08 01:05:16 +01:00
|
|
|
dpy_type =
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
TUI_DATA_WIN->detail.data_display_info.regs_display_type;
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
2004-02-08 01:05:16 +01:00
|
|
|
dpy_type = TUI_GENERAL_REGS;
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* end of potential ifdef
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* if ifdefed out code above, then assume that the user wishes to display the
|
|
|
|
general purpose registers
|
|
|
|
*/
|
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
/* dpy_type = TUI_GENERAL_REGS;
|
1999-04-16 03:35:26 +02:00
|
|
|
*/
|
|
|
|
}
|
2004-02-08 01:05:16 +01:00
|
|
|
else if (subset_compare (buf_ptr, "NEXT"))
|
|
|
|
new_layout = next_layout ();
|
|
|
|
else if (subset_compare (buf_ptr, "PREV"))
|
|
|
|
new_layout = prev_layout ();
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
|
|
|
status = TUI_FAILURE;
|
2004-02-08 01:05:16 +01:00
|
|
|
xfree (buf_ptr);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
tui_set_layout (new_layout, dpy_type);
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
status = TUI_FAILURE;
|
|
|
|
|
|
|
|
return status;
|
2001-07-19 00:03:22 +02:00
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
2001-07-18 22:59:00 +02:00
|
|
|
static CORE_ADDR
|
2004-02-08 01:05:16 +01:00
|
|
|
extract_display_start_addr (void)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
enum tui_layout_type cur_layout = tui_current_layout ();
|
2001-07-18 22:59:00 +02:00
|
|
|
CORE_ADDR addr;
|
2001-07-18 00:22:40 +02:00
|
|
|
CORE_ADDR pc;
|
2002-09-30 02:52:27 +02:00
|
|
|
struct symtab_and_line cursal = get_current_source_symtab_and_line ();
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
switch (cur_layout)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
case SRC_COMMAND:
|
|
|
|
case SRC_DATA_COMMAND:
|
2002-09-30 02:52:27 +02:00
|
|
|
find_line_pc (cursal.symtab,
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
TUI_SRC_WIN->detail.source_info.start_line_or_addr.line_no,
|
2001-07-18 00:22:40 +02:00
|
|
|
&pc);
|
2001-07-18 22:59:00 +02:00
|
|
|
addr = pc;
|
1999-04-16 03:35:26 +02:00
|
|
|
break;
|
|
|
|
case DISASSEM_COMMAND:
|
|
|
|
case SRC_DISASSEM_COMMAND:
|
|
|
|
case DISASSEM_DATA_COMMAND:
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
addr = TUI_DISASM_WIN->detail.source_info.start_line_or_addr.addr;
|
1999-04-16 03:35:26 +02:00
|
|
|
break;
|
|
|
|
default:
|
2001-07-18 22:59:00 +02:00
|
|
|
addr = 0;
|
1999-04-16 03:35:26 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return addr;
|
2004-02-08 01:05:16 +01:00
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
static void
|
2004-02-08 01:05:16 +01:00
|
|
|
tui_handle_xdb_layout (struct tui_layout_def * layout_def)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
if (layout_def->split)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-01-24 00:25:17 +01:00
|
|
|
tui_set_layout (SRC_DISASSEM_COMMAND, TUI_UNDEFINED_REGS);
|
2004-02-08 01:05:16 +01:00
|
|
|
tui_set_win_focus_to (tui_win_list[layout_def->display_mode]);
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
if (layout_def->display_mode == SRC_WIN)
|
2004-01-24 00:25:17 +01:00
|
|
|
tui_set_layout (SRC_COMMAND, TUI_UNDEFINED_REGS);
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
2004-02-08 01:05:16 +01:00
|
|
|
tui_set_layout (DISASSEM_DATA_COMMAND, layout_def->regs_display_type);
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
2004-02-08 01:05:16 +01:00
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
static void
|
2004-02-08 01:05:16 +01:00
|
|
|
tui_toggle_layout_command (char *arg, int from_tty)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
struct tui_layout_def * layout_def = tui_layout_def ();
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2001-07-21 00:26:54 +02:00
|
|
|
/* Make sure the curses mode is enabled. */
|
|
|
|
tui_enable ();
|
2004-02-08 01:05:16 +01:00
|
|
|
if (layout_def->display_mode == SRC_WIN)
|
|
|
|
layout_def->display_mode = DISASSEM_WIN;
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
2004-02-08 01:05:16 +01:00
|
|
|
layout_def->display_mode = SRC_WIN;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
if (!layout_def->split)
|
|
|
|
tui_handle_xdb_layout (layout_def);
|
2001-07-19 00:03:22 +02:00
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
static void
|
2004-02-08 01:05:16 +01:00
|
|
|
tui_toggle_split_layout_command (char *arg, int from_tty)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
struct tui_layout_def * layout_def = tui_layout_def ();
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2001-07-21 00:26:54 +02:00
|
|
|
/* Make sure the curses mode is enabled. */
|
|
|
|
tui_enable ();
|
2004-02-08 01:05:16 +01:00
|
|
|
layout_def->split = (!layout_def->split);
|
|
|
|
tui_handle_xdb_layout (layout_def);
|
2001-07-19 00:03:22 +02:00
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
static void
|
2004-02-08 01:05:16 +01:00
|
|
|
tui_layout_command (char *arg, int from_tty)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2001-07-21 00:26:54 +02:00
|
|
|
/* Make sure the curses mode is enabled. */
|
|
|
|
tui_enable ();
|
|
|
|
|
|
|
|
/* Switch to the selected layout. */
|
2004-01-24 00:25:17 +01:00
|
|
|
if (tui_set_layout_for_display_command (arg) != TUI_SUCCESS)
|
2001-07-18 00:22:40 +02:00
|
|
|
warning ("Invalid layout specified.\n%s", LAYOUT_USAGE);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2001-07-19 00:03:22 +02:00
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
/* Answer the previous layout to cycle to. */
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui-data.h (tui_win_element): Rename TuiWinElement.
(tui_exec_info_content): Rename TuiExecInfoContent.
(TuiGenWinInfo, TuiGenWinInfoPtr): Delete definitions.
(TuiWinInfo, TuiWinInfoPtr): Ditto.
(TuiScrollDirection, TuiScrollDirectionPtr): Ditto.
(TuiList, TuiListPtr): Ditto.
(TuiLayoutType, TuiLayoutTypePtr): Ditto.
(TuiDataType, TuiDataTypePtr): Ditto.
(TuiRegisterDisplayType, TuiRegisterDisplayTypePtr): Ditto.
(TuiLineOrAddress, TuiLineOrAddressPtr): Ditto.
(TuiLayoutDef, TuiLayoutDefPtr): Ditto.
(TuiSourceElement, TuiSourceElementPtr): Ditto.
(TuiDataElement, TuiDataElementPtr): Ditto.
(TuiWinElement, TuiWinElementPtr): Ditto.
(TuiDataInfo, TuiDataInfoPtr): Ditto.
(TuiCommandElement, TuiCommandElementPtr): Ditto.
(TuiLocatorElement, TuiLocatorElementPtr): Ditto.
(TuiWhichElement, TuiWhichElementPtr): Ditto.
(TuiSourceInfo, TuiSourceInfoPtr): Ditto.
(TuiCommandInfo, TuiCommandInfoPtr): Ditto.
* tui/tui-command.c, tui/tui-data.c: Update references.
* tui/tui-data.h, tui/tui-disasm.c, tui/tui-layout.c: Ditto.
* tui/tui-regs.c, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 17:31:22 +01:00
|
|
|
static enum tui_layout_type
|
2004-02-08 01:05:16 +01:00
|
|
|
next_layout (void)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
enum tui_layout_type new_layout;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
new_layout = tui_current_layout ();
|
|
|
|
if (new_layout == UNDEFINED_LAYOUT)
|
|
|
|
new_layout = SRC_COMMAND;
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
new_layout++;
|
|
|
|
if (new_layout == UNDEFINED_LAYOUT)
|
|
|
|
new_layout = SRC_COMMAND;
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
return new_layout;
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
/* Answer the next layout to cycle to. */
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui-data.h (tui_win_element): Rename TuiWinElement.
(tui_exec_info_content): Rename TuiExecInfoContent.
(TuiGenWinInfo, TuiGenWinInfoPtr): Delete definitions.
(TuiWinInfo, TuiWinInfoPtr): Ditto.
(TuiScrollDirection, TuiScrollDirectionPtr): Ditto.
(TuiList, TuiListPtr): Ditto.
(TuiLayoutType, TuiLayoutTypePtr): Ditto.
(TuiDataType, TuiDataTypePtr): Ditto.
(TuiRegisterDisplayType, TuiRegisterDisplayTypePtr): Ditto.
(TuiLineOrAddress, TuiLineOrAddressPtr): Ditto.
(TuiLayoutDef, TuiLayoutDefPtr): Ditto.
(TuiSourceElement, TuiSourceElementPtr): Ditto.
(TuiDataElement, TuiDataElementPtr): Ditto.
(TuiWinElement, TuiWinElementPtr): Ditto.
(TuiDataInfo, TuiDataInfoPtr): Ditto.
(TuiCommandElement, TuiCommandElementPtr): Ditto.
(TuiLocatorElement, TuiLocatorElementPtr): Ditto.
(TuiWhichElement, TuiWhichElementPtr): Ditto.
(TuiSourceInfo, TuiSourceInfoPtr): Ditto.
(TuiCommandInfo, TuiCommandInfoPtr): Ditto.
* tui/tui-command.c, tui/tui-data.c: Update references.
* tui/tui-data.h, tui/tui-disasm.c, tui/tui-layout.c: Ditto.
* tui/tui-regs.c, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 17:31:22 +01:00
|
|
|
static enum tui_layout_type
|
2004-02-08 01:05:16 +01:00
|
|
|
prev_layout (void)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
enum tui_layout_type new_layout;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
new_layout = tui_current_layout ();
|
|
|
|
if (new_layout == SRC_COMMAND)
|
|
|
|
new_layout = DISASSEM_DATA_COMMAND;
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
new_layout--;
|
|
|
|
if (new_layout == UNDEFINED_LAYOUT)
|
|
|
|
new_layout = DISASSEM_DATA_COMMAND;
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
return new_layout;
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
2004-02-08 01:05:16 +01:00
|
|
|
make_command_window (struct tui_win_info * * win_info_ptr, int height, int origin_y)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
init_and_make_win ((void **) win_info_ptr,
|
1999-04-16 03:35:26 +02:00
|
|
|
CMD_WIN,
|
|
|
|
height,
|
2004-02-07 05:40:36 +01:00
|
|
|
tui_term_width (),
|
1999-04-16 03:35:26 +02:00
|
|
|
0,
|
2004-02-08 01:05:16 +01:00
|
|
|
origin_y,
|
1999-04-16 03:35:26 +02:00
|
|
|
DONT_BOX_WINDOW);
|
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
(*win_info_ptr)->can_highlight = FALSE;
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
/*
|
2004-02-08 01:05:16 +01:00
|
|
|
** make_source_window().
|
1999-07-07 22:19:36 +02:00
|
|
|
*/
|
1999-04-16 03:35:26 +02:00
|
|
|
static void
|
2004-02-08 01:05:16 +01:00
|
|
|
make_source_window (struct tui_win_info * * win_info_ptr, int height, int origin_y)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
make_source_or_disasm_window (win_info_ptr, SRC_WIN, height, origin_y);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
return;
|
2004-02-08 01:05:16 +01:00
|
|
|
} /* make_source_window */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
/*
|
2004-02-08 01:05:16 +01:00
|
|
|
** make_disasm_window().
|
1999-07-07 22:19:36 +02:00
|
|
|
*/
|
1999-04-16 03:35:26 +02:00
|
|
|
static void
|
2004-02-08 01:05:16 +01:00
|
|
|
make_disasm_window (struct tui_win_info * * win_info_ptr, int height, int origin_y)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
make_source_or_disasm_window (win_info_ptr, DISASSEM_WIN, height, origin_y);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
return;
|
2004-02-08 01:05:16 +01:00
|
|
|
} /* make_disasm_window */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
static void
|
2004-02-08 01:05:16 +01:00
|
|
|
make_data_window (struct tui_win_info * * win_info_ptr, int height, int origin_y)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
init_and_make_win ((void **) win_info_ptr,
|
1999-04-16 03:35:26 +02:00
|
|
|
DATA_WIN,
|
|
|
|
height,
|
2004-02-07 05:40:36 +01:00
|
|
|
tui_term_width (),
|
1999-04-16 03:35:26 +02:00
|
|
|
0,
|
2004-02-08 01:05:16 +01:00
|
|
|
origin_y,
|
1999-04-16 03:35:26 +02:00
|
|
|
BOX_WINDOW);
|
2004-02-08 01:05:16 +01:00
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
/* Show the Source/Command layout. */
|
1999-04-16 03:35:26 +02:00
|
|
|
static void
|
2004-02-08 01:05:16 +01:00
|
|
|
show_source_command (void)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
show_source_or_disasm_and_command (SRC_COMMAND);
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
/* Show the Dissassem/Command layout. */
|
1999-04-16 03:35:26 +02:00
|
|
|
static void
|
2004-02-08 01:05:16 +01:00
|
|
|
show_disasm_command (void)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
show_source_or_disasm_and_command (DISASSEM_COMMAND);
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
/* Show the Source/Disassem/Command layout. */
|
1999-04-16 03:35:26 +02:00
|
|
|
static void
|
2004-02-08 01:05:16 +01:00
|
|
|
show_source_disasm_command (void)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-07 05:40:36 +01:00
|
|
|
if (tui_current_layout () != SRC_DISASSEM_COMMAND)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
int cmd_height, src_height, asm_height;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
if (TUI_CMD_WIN != NULL)
|
2004-02-08 01:05:16 +01:00
|
|
|
cmd_height = TUI_CMD_WIN->generic.height;
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
2004-02-08 01:05:16 +01:00
|
|
|
cmd_height = tui_term_height () / 3;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
src_height = (tui_term_height () - cmd_height) / 2;
|
|
|
|
asm_height = tui_term_height () - (src_height + cmd_height);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
if (TUI_SRC_WIN == NULL)
|
2004-02-08 01:05:16 +01:00
|
|
|
make_source_window (&TUI_SRC_WIN, src_height, 0);
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
init_gen_win_info (&TUI_SRC_WIN->generic,
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
TUI_SRC_WIN->generic.type,
|
2004-02-08 01:05:16 +01:00
|
|
|
src_height,
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
TUI_SRC_WIN->generic.width,
|
|
|
|
TUI_SRC_WIN->detail.source_info.execution_info->width,
|
1999-04-16 03:35:26 +02:00
|
|
|
0);
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
TUI_SRC_WIN->can_highlight = TRUE;
|
2004-02-08 01:05:16 +01:00
|
|
|
init_gen_win_info (TUI_SRC_WIN->detail.source_info.execution_info,
|
1999-04-16 03:35:26 +02:00
|
|
|
EXEC_INFO_WIN,
|
2004-02-08 01:05:16 +01:00
|
|
|
src_height,
|
1999-04-16 03:35:26 +02:00
|
|
|
3,
|
|
|
|
0,
|
|
|
|
0);
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
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;;
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
if (TUI_SRC_WIN != NULL)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui-data.h (tui_win_element): Rename TuiWinElement.
(tui_exec_info_content): Rename TuiExecInfoContent.
(TuiGenWinInfo, TuiGenWinInfoPtr): Delete definitions.
(TuiWinInfo, TuiWinInfoPtr): Ditto.
(TuiScrollDirection, TuiScrollDirectionPtr): Ditto.
(TuiList, TuiListPtr): Ditto.
(TuiLayoutType, TuiLayoutTypePtr): Ditto.
(TuiDataType, TuiDataTypePtr): Ditto.
(TuiRegisterDisplayType, TuiRegisterDisplayTypePtr): Ditto.
(TuiLineOrAddress, TuiLineOrAddressPtr): Ditto.
(TuiLayoutDef, TuiLayoutDefPtr): Ditto.
(TuiSourceElement, TuiSourceElementPtr): Ditto.
(TuiDataElement, TuiDataElementPtr): Ditto.
(TuiWinElement, TuiWinElementPtr): Ditto.
(TuiDataInfo, TuiDataInfoPtr): Ditto.
(TuiCommandElement, TuiCommandElementPtr): Ditto.
(TuiLocatorElement, TuiLocatorElementPtr): Ditto.
(TuiWhichElement, TuiWhichElementPtr): Ditto.
(TuiSourceInfo, TuiSourceInfoPtr): Ditto.
(TuiCommandInfo, TuiCommandInfoPtr): Ditto.
* tui/tui-command.c, tui/tui-data.c: Update references.
* tui/tui-data.h, tui/tui-disasm.c, tui/tui-layout.c: Ditto.
* tui/tui-regs.c, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 17:31:22 +01:00
|
|
|
struct tui_gen_win_info * locator = tui_locator_win_info_ptr ();
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
tui_show_source_content (TUI_SRC_WIN);
|
|
|
|
if (TUI_DISASM_WIN == NULL)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
make_disasm_window (&TUI_DISASM_WIN, asm_height, src_height - 1);
|
|
|
|
init_and_make_win ((void **) & locator,
|
1999-04-16 03:35:26 +02:00
|
|
|
LOCATOR_WIN,
|
|
|
|
2 /* 1 */ ,
|
2004-02-07 05:40:36 +01:00
|
|
|
tui_term_width (),
|
1999-04-16 03:35:26 +02:00
|
|
|
0,
|
2004-02-08 01:05:16 +01:00
|
|
|
(src_height + asm_height) - 1,
|
1999-04-16 03:35:26 +02:00
|
|
|
DONT_BOX_WINDOW);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
init_gen_win_info (locator,
|
1999-04-16 03:35:26 +02:00
|
|
|
LOCATOR_WIN,
|
|
|
|
2 /* 1 */ ,
|
2004-02-07 05:40:36 +01:00
|
|
|
tui_term_width (),
|
1999-04-16 03:35:26 +02:00
|
|
|
0,
|
2004-02-08 01:05:16 +01:00
|
|
|
(src_height + asm_height) - 1);
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
TUI_DISASM_WIN->detail.source_info.has_locator = TRUE;
|
2004-02-08 01:05:16 +01:00
|
|
|
init_gen_win_info (
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
&TUI_DISASM_WIN->generic,
|
|
|
|
TUI_DISASM_WIN->generic.type,
|
2004-02-08 01:05:16 +01:00
|
|
|
asm_height,
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
TUI_DISASM_WIN->generic.width,
|
|
|
|
TUI_DISASM_WIN->detail.source_info.execution_info->width,
|
2004-02-08 01:05:16 +01:00
|
|
|
src_height - 1);
|
|
|
|
init_gen_win_info (TUI_DISASM_WIN->detail.source_info.execution_info,
|
1999-04-16 03:35:26 +02:00
|
|
|
EXEC_INFO_WIN,
|
2004-02-08 01:05:16 +01:00
|
|
|
asm_height,
|
1999-04-16 03:35:26 +02:00
|
|
|
3,
|
|
|
|
0,
|
2004-02-08 01:05:16 +01:00
|
|
|
src_height - 1);
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
TUI_DISASM_WIN->can_highlight = TRUE;
|
|
|
|
tui_make_visible (&TUI_DISASM_WIN->generic);
|
|
|
|
tui_make_visible (TUI_DISASM_WIN->detail.source_info.execution_info);
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
if (TUI_DISASM_WIN != NULL)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
TUI_SRC_WIN->detail.source_info.has_locator = FALSE;
|
|
|
|
TUI_DISASM_WIN->detail.source_info.has_locator = TRUE;
|
2004-02-07 00:55:34 +01:00
|
|
|
tui_make_visible (locator);
|
2004-01-29 00:16:50 +01:00
|
|
|
tui_show_locator_content ();
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
tui_show_source_content (TUI_DISASM_WIN);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
if (TUI_CMD_WIN == NULL)
|
2004-02-08 01:05:16 +01:00
|
|
|
make_command_window (&TUI_CMD_WIN,
|
|
|
|
cmd_height,
|
|
|
|
tui_term_height () - cmd_height);
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
init_gen_win_info (&TUI_CMD_WIN->generic,
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
TUI_CMD_WIN->generic.type,
|
|
|
|
TUI_CMD_WIN->generic.height,
|
|
|
|
TUI_CMD_WIN->generic.width,
|
1999-04-16 03:35:26 +02:00
|
|
|
0,
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
TUI_CMD_WIN->generic.origin.y);
|
|
|
|
TUI_CMD_WIN->can_highlight = FALSE;
|
|
|
|
tui_make_visible (&TUI_CMD_WIN->generic);
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
if (TUI_CMD_WIN != NULL)
|
|
|
|
tui_refresh_win (&TUI_CMD_WIN->generic);
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
|
|
|
}
|
2004-02-07 05:40:36 +01:00
|
|
|
tui_set_current_layout_to (SRC_DISASSEM_COMMAND);
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
2004-02-08 01:05:16 +01:00
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
/* Show the Source/Data/Command or the Dissassembly/Data/Command
|
|
|
|
layout. */
|
1999-04-16 03:35:26 +02:00
|
|
|
static void
|
2004-02-08 01:05:16 +01:00
|
|
|
show_data (enum tui_layout_type new_layout)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
int total_height = (tui_term_height () - TUI_CMD_WIN->generic.height);
|
|
|
|
int src_height, data_height;
|
|
|
|
enum tui_win_type win_type;
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui-data.h (tui_win_element): Rename TuiWinElement.
(tui_exec_info_content): Rename TuiExecInfoContent.
(TuiGenWinInfo, TuiGenWinInfoPtr): Delete definitions.
(TuiWinInfo, TuiWinInfoPtr): Ditto.
(TuiScrollDirection, TuiScrollDirectionPtr): Ditto.
(TuiList, TuiListPtr): Ditto.
(TuiLayoutType, TuiLayoutTypePtr): Ditto.
(TuiDataType, TuiDataTypePtr): Ditto.
(TuiRegisterDisplayType, TuiRegisterDisplayTypePtr): Ditto.
(TuiLineOrAddress, TuiLineOrAddressPtr): Ditto.
(TuiLayoutDef, TuiLayoutDefPtr): Ditto.
(TuiSourceElement, TuiSourceElementPtr): Ditto.
(TuiDataElement, TuiDataElementPtr): Ditto.
(TuiWinElement, TuiWinElementPtr): Ditto.
(TuiDataInfo, TuiDataInfoPtr): Ditto.
(TuiCommandElement, TuiCommandElementPtr): Ditto.
(TuiLocatorElement, TuiLocatorElementPtr): Ditto.
(TuiWhichElement, TuiWhichElementPtr): Ditto.
(TuiSourceInfo, TuiSourceInfoPtr): Ditto.
(TuiCommandInfo, TuiCommandInfoPtr): Ditto.
* tui/tui-command.c, tui/tui-data.c: Update references.
* tui/tui-data.h, tui/tui-disasm.c, tui/tui-layout.c: Ditto.
* tui/tui-regs.c, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 17:31:22 +01:00
|
|
|
struct tui_gen_win_info * locator = tui_locator_win_info_ptr ();
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
data_height = total_height / 2;
|
|
|
|
src_height = total_height - data_height;
|
2004-02-07 00:55:34 +01:00
|
|
|
tui_make_all_invisible ();
|
|
|
|
tui_make_invisible (locator);
|
2004-02-08 01:05:16 +01:00
|
|
|
make_data_window (&TUI_DATA_WIN, data_height, 0);
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
TUI_DATA_WIN->can_highlight = TRUE;
|
2004-02-08 01:05:16 +01:00
|
|
|
if (new_layout == SRC_DATA_COMMAND)
|
|
|
|
win_type = SRC_WIN;
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
2004-02-08 01:05:16 +01:00
|
|
|
win_type = DISASSEM_WIN;
|
|
|
|
if (tui_win_list[win_type] == NULL)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
if (win_type == SRC_WIN)
|
|
|
|
make_source_window (&tui_win_list[win_type], src_height, data_height - 1);
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
2004-02-08 01:05:16 +01:00
|
|
|
make_disasm_window (&tui_win_list[win_type], src_height, data_height - 1);
|
|
|
|
init_and_make_win ((void **) & locator,
|
1999-04-16 03:35:26 +02:00
|
|
|
LOCATOR_WIN,
|
|
|
|
2 /* 1 */ ,
|
2004-02-07 05:40:36 +01:00
|
|
|
tui_term_width (),
|
1999-04-16 03:35:26 +02:00
|
|
|
0,
|
2004-02-08 01:05:16 +01:00
|
|
|
total_height - 1,
|
1999-04-16 03:35:26 +02:00
|
|
|
DONT_BOX_WINDOW);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
init_gen_win_info (&tui_win_list[win_type]->generic,
|
|
|
|
tui_win_list[win_type]->generic.type,
|
|
|
|
src_height,
|
|
|
|
tui_win_list[win_type]->generic.width,
|
|
|
|
tui_win_list[win_type]->detail.source_info.execution_info->width,
|
|
|
|
data_height - 1);
|
|
|
|
init_gen_win_info (tui_win_list[win_type]->detail.source_info.execution_info,
|
1999-04-16 03:35:26 +02:00
|
|
|
EXEC_INFO_WIN,
|
2004-02-08 01:05:16 +01:00
|
|
|
src_height,
|
1999-04-16 03:35:26 +02:00
|
|
|
3,
|
|
|
|
0,
|
2004-02-08 01:05:16 +01:00
|
|
|
data_height - 1);
|
|
|
|
tui_make_visible (&tui_win_list[win_type]->generic);
|
|
|
|
tui_make_visible (tui_win_list[win_type]->detail.source_info.execution_info);
|
|
|
|
init_gen_win_info (locator,
|
1999-04-16 03:35:26 +02:00
|
|
|
LOCATOR_WIN,
|
|
|
|
2 /* 1 */ ,
|
2004-02-07 05:40:36 +01:00
|
|
|
tui_term_width (),
|
1999-04-16 03:35:26 +02:00
|
|
|
0,
|
2004-02-08 01:05:16 +01:00
|
|
|
total_height - 1);
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
2004-02-08 01:05:16 +01:00
|
|
|
tui_win_list[win_type]->detail.source_info.has_locator = TRUE;
|
2004-02-07 00:55:34 +01:00
|
|
|
tui_make_visible (locator);
|
2004-01-29 00:16:50 +01:00
|
|
|
tui_show_locator_content ();
|
2004-02-08 01:05:16 +01:00
|
|
|
tui_add_to_source_windows (tui_win_list[win_type]);
|
|
|
|
tui_set_current_layout_to (new_layout);
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
/*
|
2004-02-08 01:05:16 +01:00
|
|
|
** init_gen_win_info().
|
1999-07-07 22:19:36 +02:00
|
|
|
*/
|
1999-04-16 03:35:26 +02:00
|
|
|
static void
|
2004-02-08 01:05:16 +01:00
|
|
|
init_gen_win_info (struct tui_gen_win_info * win_info, enum tui_win_type type,
|
|
|
|
int height, int width, int origin_x, int origin_y)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
int h = height;
|
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
win_info->type = type;
|
|
|
|
win_info->width = width;
|
|
|
|
win_info->height = h;
|
1999-04-16 03:35:26 +02:00
|
|
|
if (h > 1)
|
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
win_info->viewport_height = h - 1;
|
|
|
|
if (win_info->type != CMD_WIN)
|
|
|
|
win_info->viewport_height--;
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
|
|
|
else
|
2004-02-08 01:05:16 +01:00
|
|
|
win_info->viewport_height = 1;
|
|
|
|
win_info->origin.x = origin_x;
|
|
|
|
win_info->origin.y = origin_y;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
return;
|
2004-02-08 01:05:16 +01:00
|
|
|
} /* init_gen_win_info */
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
/*
|
2004-02-08 01:05:16 +01:00
|
|
|
** init_and_make_win().
|
1999-07-07 22:19:36 +02:00
|
|
|
*/
|
1999-04-16 03:35:26 +02:00
|
|
|
static void
|
2004-02-08 01:05:16 +01:00
|
|
|
init_and_make_win (void ** win_info_ptr, enum tui_win_type win_type,
|
|
|
|
int height, int width, int origin_x, int origin_y, int box_it)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
void *opaque_win_info = *win_info_ptr;
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui-data.h (tui_win_element): Rename TuiWinElement.
(tui_exec_info_content): Rename TuiExecInfoContent.
(TuiGenWinInfo, TuiGenWinInfoPtr): Delete definitions.
(TuiWinInfo, TuiWinInfoPtr): Ditto.
(TuiScrollDirection, TuiScrollDirectionPtr): Ditto.
(TuiList, TuiListPtr): Ditto.
(TuiLayoutType, TuiLayoutTypePtr): Ditto.
(TuiDataType, TuiDataTypePtr): Ditto.
(TuiRegisterDisplayType, TuiRegisterDisplayTypePtr): Ditto.
(TuiLineOrAddress, TuiLineOrAddressPtr): Ditto.
(TuiLayoutDef, TuiLayoutDefPtr): Ditto.
(TuiSourceElement, TuiSourceElementPtr): Ditto.
(TuiDataElement, TuiDataElementPtr): Ditto.
(TuiWinElement, TuiWinElementPtr): Ditto.
(TuiDataInfo, TuiDataInfoPtr): Ditto.
(TuiCommandElement, TuiCommandElementPtr): Ditto.
(TuiLocatorElement, TuiLocatorElementPtr): Ditto.
(TuiWhichElement, TuiWhichElementPtr): Ditto.
(TuiSourceInfo, TuiSourceInfoPtr): Ditto.
(TuiCommandInfo, TuiCommandInfoPtr): Ditto.
* tui/tui-command.c, tui/tui-data.c: Update references.
* tui/tui-data.h, tui/tui-disasm.c, tui/tui-layout.c: Ditto.
* tui/tui-regs.c, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 17:31:22 +01:00
|
|
|
struct tui_gen_win_info * generic;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
if (opaque_win_info == NULL)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
if (tui_win_is_auxillary (win_type))
|
|
|
|
opaque_win_info = (void *) tui_alloc_generic_win_info ();
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
2004-02-08 01:05:16 +01:00
|
|
|
opaque_win_info = (void *) tui_alloc_win_info (win_type);
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
2004-02-08 01:05:16 +01:00
|
|
|
if (tui_win_is_auxillary (win_type))
|
|
|
|
generic = (struct tui_gen_win_info *) opaque_win_info;
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
2004-02-08 01:05:16 +01:00
|
|
|
generic = &((struct tui_win_info *) opaque_win_info)->generic;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
if (opaque_win_info != NULL)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
init_gen_win_info (generic, win_type, height, width, origin_x, origin_y);
|
|
|
|
if (!tui_win_is_auxillary (win_type))
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
|
|
|
if (generic->type == CMD_WIN)
|
2004-02-08 01:05:16 +01:00
|
|
|
((struct tui_win_info *) opaque_win_info)->can_highlight = FALSE;
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
2004-02-08 01:05:16 +01:00
|
|
|
((struct tui_win_info *) opaque_win_info)->can_highlight = TRUE;
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
2004-02-08 01:05:16 +01:00
|
|
|
tui_make_window (generic, box_it);
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
2004-02-08 01:05:16 +01:00
|
|
|
*win_info_ptr = opaque_win_info;
|
2002-08-24 14:28:33 +02:00
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
|
|
|
static void
|
2004-02-08 01:05:16 +01:00
|
|
|
make_source_or_disasm_window (struct tui_win_info * * win_info_ptr, enum tui_win_type type,
|
|
|
|
int height, int origin_y)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
struct tui_gen_win_info * execution_info = (struct tui_gen_win_info *) NULL;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
/*
|
1999-07-07 22:19:36 +02:00
|
|
|
** Create the exeuction info window.
|
|
|
|
*/
|
1999-04-16 03:35:26 +02:00
|
|
|
if (type == SRC_WIN)
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
execution_info = tui_source_exec_info_win_ptr ();
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
execution_info = tui_disassem_exec_info_win_ptr ();
|
2004-02-08 01:05:16 +01:00
|
|
|
init_and_make_win ((void **) & execution_info,
|
1999-04-16 03:35:26 +02:00
|
|
|
EXEC_INFO_WIN,
|
|
|
|
height,
|
|
|
|
3,
|
|
|
|
0,
|
2004-02-08 01:05:16 +01:00
|
|
|
origin_y,
|
1999-04-16 03:35:26 +02:00
|
|
|
DONT_BOX_WINDOW);
|
|
|
|
/*
|
1999-07-07 22:19:36 +02:00
|
|
|
** Now create the source window.
|
|
|
|
*/
|
2004-02-08 01:05:16 +01:00
|
|
|
init_and_make_win ((void **) win_info_ptr,
|
1999-04-16 03:35:26 +02:00
|
|
|
type,
|
|
|
|
height,
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
tui_term_width () - execution_info->width,
|
|
|
|
execution_info->width,
|
2004-02-08 01:05:16 +01:00
|
|
|
origin_y,
|
1999-04-16 03:35:26 +02:00
|
|
|
BOX_WINDOW);
|
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
(*win_info_ptr)->detail.source_info.execution_info = execution_info;
|
|
|
|
}
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
/* Show the Source/Command or the Disassem layout. */
|
1999-04-16 03:35:26 +02:00
|
|
|
static void
|
2004-02-08 01:05:16 +01:00
|
|
|
show_source_or_disasm_and_command (enum tui_layout_type layout_type)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
if (tui_current_layout () != layout_type)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
struct tui_win_info * *win_info_ptr;
|
|
|
|
int src_height, cmd_height;
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui-data.h (tui_win_element): Rename TuiWinElement.
(tui_exec_info_content): Rename TuiExecInfoContent.
(TuiGenWinInfo, TuiGenWinInfoPtr): Delete definitions.
(TuiWinInfo, TuiWinInfoPtr): Ditto.
(TuiScrollDirection, TuiScrollDirectionPtr): Ditto.
(TuiList, TuiListPtr): Ditto.
(TuiLayoutType, TuiLayoutTypePtr): Ditto.
(TuiDataType, TuiDataTypePtr): Ditto.
(TuiRegisterDisplayType, TuiRegisterDisplayTypePtr): Ditto.
(TuiLineOrAddress, TuiLineOrAddressPtr): Ditto.
(TuiLayoutDef, TuiLayoutDefPtr): Ditto.
(TuiSourceElement, TuiSourceElementPtr): Ditto.
(TuiDataElement, TuiDataElementPtr): Ditto.
(TuiWinElement, TuiWinElementPtr): Ditto.
(TuiDataInfo, TuiDataInfoPtr): Ditto.
(TuiCommandElement, TuiCommandElementPtr): Ditto.
(TuiLocatorElement, TuiLocatorElementPtr): Ditto.
(TuiWhichElement, TuiWhichElementPtr): Ditto.
(TuiSourceInfo, TuiSourceInfoPtr): Ditto.
(TuiCommandInfo, TuiCommandInfoPtr): Ditto.
* tui/tui-command.c, tui/tui-data.c: Update references.
* tui/tui-data.h, tui/tui-disasm.c, tui/tui-layout.c: Ditto.
* tui/tui-regs.c, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 17:31:22 +01:00
|
|
|
struct tui_gen_win_info * locator = tui_locator_win_info_ptr ();
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
if (TUI_CMD_WIN != NULL)
|
2004-02-08 01:05:16 +01:00
|
|
|
cmd_height = TUI_CMD_WIN->generic.height;
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
2004-02-08 01:05:16 +01:00
|
|
|
cmd_height = tui_term_height () / 3;
|
|
|
|
src_height = tui_term_height () - cmd_height;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
if (layout_type == SRC_COMMAND)
|
|
|
|
win_info_ptr = &TUI_SRC_WIN;
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
2004-02-08 01:05:16 +01:00
|
|
|
win_info_ptr = &TUI_DISASM_WIN;
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2004-02-08 01:05:16 +01:00
|
|
|
if ((*win_info_ptr) == NULL)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
if (layout_type == SRC_COMMAND)
|
|
|
|
make_source_window (win_info_ptr, src_height - 1, 0);
|
1999-04-16 03:35:26 +02:00
|
|
|
else
|
2004-02-08 01:05:16 +01:00
|
|
|
make_disasm_window (win_info_ptr, src_height - 1, 0);
|
|
|
|
init_and_make_win ((void **) & locator,
|
1999-04-16 03:35:26 +02:00
|
|
|
LOCATOR_WIN,
|
|
|
|
2 /* 1 */ ,
|
2004-02-07 05:40:36 +01:00
|
|
|
tui_term_width (),
|
1999-04-16 03:35:26 +02:00
|
|
|
0,
|
2004-02-08 01:05:16 +01:00
|
|
|
src_height - 1,
|
1999-04-16 03:35:26 +02:00
|
|
|
DONT_BOX_WINDOW);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
init_gen_win_info (locator,
|
1999-04-16 03:35:26 +02:00
|
|
|
LOCATOR_WIN,
|
|
|
|
2 /* 1 */ ,
|
2004-02-07 05:40:36 +01:00
|
|
|
tui_term_width (),
|
1999-04-16 03:35:26 +02:00
|
|
|
0,
|
2004-02-08 01:05:16 +01:00
|
|
|
src_height - 1);
|
|
|
|
(*win_info_ptr)->detail.source_info.has_locator = TRUE;
|
|
|
|
init_gen_win_info (
|
|
|
|
&(*win_info_ptr)->generic,
|
|
|
|
(*win_info_ptr)->generic.type,
|
|
|
|
src_height - 1,
|
|
|
|
(*win_info_ptr)->generic.width,
|
|
|
|
(*win_info_ptr)->detail.source_info.execution_info->width,
|
1999-04-16 03:35:26 +02:00
|
|
|
0);
|
2004-02-08 01:05:16 +01:00
|
|
|
init_gen_win_info ((*win_info_ptr)->detail.source_info.execution_info,
|
1999-04-16 03:35:26 +02:00
|
|
|
EXEC_INFO_WIN,
|
2004-02-08 01:05:16 +01:00
|
|
|
src_height - 1,
|
1999-04-16 03:35:26 +02:00
|
|
|
3,
|
|
|
|
0,
|
|
|
|
0);
|
2004-02-08 01:05:16 +01:00
|
|
|
(*win_info_ptr)->can_highlight = TRUE;
|
|
|
|
tui_make_visible (&(*win_info_ptr)->generic);
|
|
|
|
tui_make_visible ((*win_info_ptr)->detail.source_info.execution_info);
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
2004-02-08 01:05:16 +01:00
|
|
|
if ((*win_info_ptr) != NULL)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
(*win_info_ptr)->detail.source_info.has_locator = TRUE;
|
2004-02-07 00:55:34 +01:00
|
|
|
tui_make_visible (locator);
|
2004-01-29 00:16:50 +01:00
|
|
|
tui_show_locator_content ();
|
2004-02-08 01:05:16 +01:00
|
|
|
tui_show_source_content (*win_info_ptr);
|
1999-04-16 03:35:26 +02:00
|
|
|
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
if (TUI_CMD_WIN == NULL)
|
1999-04-16 03:35:26 +02:00
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
make_command_window (&TUI_CMD_WIN, cmd_height, src_height);
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
tui_refresh_win (&TUI_CMD_WIN->generic);
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2004-02-08 01:05:16 +01:00
|
|
|
init_gen_win_info (&TUI_CMD_WIN->generic,
|
2004-02-07 Andrew Cagney <cagney@redhat.com>
* tui/tui.h: Do not include <stdarg.h>, <string.h>, and
"ansidecl.h". Do not undef "reg" and "chtype". Fix case of
fields and variables.
* tui/tui-wingeneral.h (m_beVisible): Delete macro.
(m_beInvisible): Delete macro.
* tui/tui-data.h: Fix case case fields and variables.
(m_genWinPtrIsNull): Delete macro.
(tui_win_list): Rename winList.
(TUI_SRC_WIN): Rename srcWin.
(TUI_DISASM_WIN): Rename disassemWin.
(TUI_DATA_WIN): Rename dataWin.
(TUI_CMD_WIN): Rename cmdWin.
(m_genWinPtrNotNull): Delete macro.
(m_winPtrIsNull): Delete macro.
(m_winPtrNotNull): Delete macro.
(tui_win_is_source_type): Replace m_winIsSourceType
(tui_win_is_auxillary): Replace m_winIsAuzillary.
(tui_win_has_locator): Replace m_hasLocator.
(tui_set_win_highlight): Replace m_setWinHighlightOn and
m_setWinHighlightOff.
* tui/tui-data.c: Update references.
(tui_win_is_source_type, tui_set_win_highlight): New functions.
(tui_win_has_locator, tui_win_is_auxillary): New functions.
* tui/tui-command.c, tui/tui-disasm.c: Update references.
* tui/tui-io.c, tui/tui-layout.c, tui/tui-regs.c: Ditto.
* tui/tui-regs.h, tui/tui-source.c, tui/tui-stack.c: Ditto.
* tui/tui-win.c, tui/tui-windata.c, tui/tui-wingeneral.c: Ditto.
* tui/tui-winsource.c, tui/tui.c: Ditto.
2004-02-07 21:57:02 +01:00
|
|
|
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);
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
|
|
|
}
|
2004-02-08 01:05:16 +01:00
|
|
|
tui_set_current_layout_to (layout_type);
|
1999-04-16 03:35:26 +02:00
|
|
|
}
|
2004-02-08 01:05:16 +01:00
|
|
|
}
|