* 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 19:01:25 +00:00
|
|
|
/* TUI window generic functions.
|
2002-03-01 06:19:28 +00:00
|
|
|
|
2004-01-19 16:06:04 +00:00
|
|
|
Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
|
|
|
|
Foundation, Inc.
|
2002-03-01 06:19:28 +00: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 19:01:25 +00:00
|
|
|
Contributed by Hewlett-Packard Company.
|
1999-04-16 01:35:26 +00: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 19:01:25 +00: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. */
|
|
|
|
|
|
|
|
/* This module contains procedures for handling tui window functions
|
|
|
|
like resize, scrolling, scrolling, changing focus, etc.
|
|
|
|
|
|
|
|
Author: Susan B. Macchia */
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
#include "defs.h"
|
|
|
|
#include "command.h"
|
|
|
|
#include "symtab.h"
|
|
|
|
#include "breakpoint.h"
|
|
|
|
#include "frame.h"
|
2001-07-19 22:47:46 +00:00
|
|
|
#include "cli/cli-cmds.h"
|
2002-08-24 16:43:08 +00:00
|
|
|
#include "top.h"
|
2002-09-30 00:52:27 +00:00
|
|
|
#include "source.h"
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-01-19 04:31:53 +00:00
|
|
|
#include "tui/tui.h"
|
|
|
|
#include "tui/tui-data.h"
|
|
|
|
#include "tui/tui-wingeneral.h"
|
|
|
|
#include "tui/tui-stack.h"
|
|
|
|
#include "tui/tui-regs.h"
|
|
|
|
#include "tui/tui-disasm.h"
|
|
|
|
#include "tui/tui-source.h"
|
|
|
|
#include "tui/tui-winsource.h"
|
|
|
|
#include "tui/tui-windata.h"
|
1999-04-16 01:35:26 +00: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 19:08:19 +00:00
|
|
|
#include "gdb_curses.h"
|
2003-06-22 15:21:39 +00:00
|
|
|
|
2004-02-08 01:32:26 +00:00
|
|
|
#include "gdb_string.h"
|
2003-06-22 15:21:39 +00:00
|
|
|
#include <ctype.h>
|
2004-02-28 Andrew Cagney <cagney@redhat.com>
* utils.c: Use "", instead of <>, to include readline.
tui/tui-win.c, tui/tui.c, tui/tui-hooks.c: Ditto.
* tracepoint.c, top.c, symmisc.c, symfile.c: Ditto.
* source.c, solib.c, exec.c, event-top.c: Ditto.
* corelow.c, completer.c, cli/cli-setshow.c: Ditto.
* cli/cli-dump.c, cli/cli-cmds.c: Ditto.
* Makefile.in: Update all dependencies.
(readline_tilde_h, readline_history_h): Define.
(readline_headers): Delete.
2004-02-28 18:04:37 +00:00
|
|
|
#include "readline/readline.h"
|
2003-06-22 15:21:39 +00:00
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
/*******************************
|
|
|
|
** Static Local Decls
|
|
|
|
********************************/
|
2004-02-08 00:05:16 +00:00
|
|
|
static void make_visible_with_new_height (struct tui_win_info *);
|
|
|
|
static void make_invisible_and_set_new_height (struct tui_win_info *, int);
|
|
|
|
static enum tui_status tui_adjust_win_heights (struct tui_win_info *, int);
|
|
|
|
static int new_height_ok (struct tui_win_info *, int);
|
|
|
|
static void tui_set_tab_width_command (char *, int);
|
|
|
|
static void tui_refresh_all_command (char *, int);
|
|
|
|
static void tui_set_win_height_command (char *, int);
|
|
|
|
static void tui_xdb_set_win_height_command (char *, int);
|
|
|
|
static void tui_all_windows_info (char *, int);
|
|
|
|
static void tui_set_focus_command (char *, int);
|
|
|
|
static void tui_scroll_forward_command (char *, int);
|
|
|
|
static void tui_scroll_backward_command (char *, int);
|
|
|
|
static void tui_scroll_left_command (char *, int);
|
|
|
|
static void tui_scroll_right_command (char *, int);
|
|
|
|
static void parse_scrolling_args (char *, struct tui_win_info * *, int *);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
|
|
|
/***************************************
|
|
|
|
** DEFINITIONS
|
|
|
|
***************************************/
|
|
|
|
#define WIN_HEIGHT_USAGE "Usage: winheight <win_name> [+ | -] <#lines>\n"
|
|
|
|
#define XDBWIN_HEIGHT_USAGE "Usage: w <#lines>\n"
|
|
|
|
#define FOCUS_USAGE "Usage: focus {<win> | next | prev}\n"
|
|
|
|
|
|
|
|
/***************************************
|
|
|
|
** PUBLIC FUNCTIONS
|
|
|
|
***************************************/
|
|
|
|
|
2002-10-25 19:46:04 +00:00
|
|
|
#ifndef ACS_LRCORNER
|
|
|
|
# define ACS_LRCORNER '+'
|
|
|
|
#endif
|
|
|
|
#ifndef ACS_LLCORNER
|
|
|
|
# define ACS_LLCORNER '+'
|
|
|
|
#endif
|
|
|
|
#ifndef ACS_ULCORNER
|
|
|
|
# define ACS_ULCORNER '+'
|
|
|
|
#endif
|
|
|
|
#ifndef ACS_URCORNER
|
|
|
|
# define ACS_URCORNER '+'
|
|
|
|
#endif
|
|
|
|
#ifndef ACS_HLINE
|
|
|
|
# define ACS_HLINE '-'
|
|
|
|
#endif
|
|
|
|
#ifndef ACS_VLINE
|
|
|
|
# define ACS_VLINE '|'
|
|
|
|
#endif
|
|
|
|
|
2001-07-21 19:44:38 +00:00
|
|
|
/* Possible values for tui-border-kind variable. */
|
|
|
|
static const char *tui_border_kind_enums[] = {
|
|
|
|
"space",
|
|
|
|
"ascii",
|
|
|
|
"acs",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Possible values for tui-border-mode and tui-active-border-mode. */
|
|
|
|
static const char *tui_border_mode_enums[] = {
|
|
|
|
"normal",
|
|
|
|
"standout",
|
|
|
|
"reverse",
|
|
|
|
"half",
|
|
|
|
"half-standout",
|
|
|
|
"bold",
|
|
|
|
"bold-standout",
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
|
|
|
|
struct tui_translate
|
|
|
|
{
|
|
|
|
const char *name;
|
|
|
|
int value;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Translation table for border-mode variables.
|
|
|
|
The list of values must be terminated by a NULL.
|
|
|
|
After the NULL value, an entry defines the default. */
|
|
|
|
struct tui_translate tui_border_mode_translate[] = {
|
|
|
|
{ "normal", A_NORMAL },
|
|
|
|
{ "standout", A_STANDOUT },
|
|
|
|
{ "reverse", A_REVERSE },
|
|
|
|
{ "half", A_DIM },
|
|
|
|
{ "half-standout", A_DIM | A_STANDOUT },
|
|
|
|
{ "bold", A_BOLD },
|
|
|
|
{ "bold-standout", A_BOLD | A_STANDOUT },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ "normal", A_NORMAL }
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Translation tables for border-kind, one for each border
|
|
|
|
character (see wborder, border curses operations).
|
|
|
|
-1 is used to indicate the ACS because ACS characters
|
|
|
|
are determined at run time by curses (depends on terminal). */
|
|
|
|
struct tui_translate tui_border_kind_translate_vline[] = {
|
|
|
|
{ "space", ' ' },
|
|
|
|
{ "ascii", '|' },
|
|
|
|
{ "acs", -1 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ "ascii", '|' }
|
|
|
|
};
|
|
|
|
|
|
|
|
struct tui_translate tui_border_kind_translate_hline[] = {
|
|
|
|
{ "space", ' ' },
|
|
|
|
{ "ascii", '-' },
|
|
|
|
{ "acs", -1 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ "ascii", '-' }
|
|
|
|
};
|
|
|
|
|
|
|
|
struct tui_translate tui_border_kind_translate_ulcorner[] = {
|
|
|
|
{ "space", ' ' },
|
|
|
|
{ "ascii", '+' },
|
|
|
|
{ "acs", -1 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ "ascii", '+' }
|
|
|
|
};
|
|
|
|
|
|
|
|
struct tui_translate tui_border_kind_translate_urcorner[] = {
|
|
|
|
{ "space", ' ' },
|
|
|
|
{ "ascii", '+' },
|
|
|
|
{ "acs", -1 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ "ascii", '+' }
|
|
|
|
};
|
|
|
|
|
|
|
|
struct tui_translate tui_border_kind_translate_llcorner[] = {
|
|
|
|
{ "space", ' ' },
|
|
|
|
{ "ascii", '+' },
|
|
|
|
{ "acs", -1 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ "ascii", '+' }
|
|
|
|
};
|
|
|
|
|
|
|
|
struct tui_translate tui_border_kind_translate_lrcorner[] = {
|
|
|
|
{ "space", ' ' },
|
|
|
|
{ "ascii", '+' },
|
|
|
|
{ "acs", -1 },
|
|
|
|
{ 0, 0 },
|
|
|
|
{ "ascii", '+' }
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/* Tui configuration variables controlled with set/show command. */
|
|
|
|
const char *tui_active_border_mode = "bold-standout";
|
|
|
|
const char *tui_border_mode = "normal";
|
|
|
|
const char *tui_border_kind = "acs";
|
|
|
|
|
|
|
|
/* Tui internal configuration variables. These variables are
|
|
|
|
updated by tui_update_variables to reflect the tui configuration
|
|
|
|
variables. */
|
|
|
|
chtype tui_border_vline;
|
|
|
|
chtype tui_border_hline;
|
|
|
|
chtype tui_border_ulcorner;
|
|
|
|
chtype tui_border_urcorner;
|
|
|
|
chtype tui_border_llcorner;
|
|
|
|
chtype tui_border_lrcorner;
|
|
|
|
|
|
|
|
int tui_border_attrs;
|
|
|
|
int tui_active_border_attrs;
|
|
|
|
|
|
|
|
/* Identify the item in the translation table.
|
|
|
|
When the item is not recognized, use the default entry. */
|
|
|
|
static struct tui_translate *
|
|
|
|
translate (const char *name, struct tui_translate *table)
|
|
|
|
{
|
|
|
|
while (table->name)
|
|
|
|
{
|
|
|
|
if (name && strcmp (table->name, name) == 0)
|
|
|
|
return table;
|
|
|
|
table++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Not found, return default entry. */
|
|
|
|
table++;
|
|
|
|
return table;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Update the tui internal configuration according to gdb settings.
|
|
|
|
Returns 1 if the configuration has changed and the screen should
|
|
|
|
be redrawn. */
|
|
|
|
int
|
2004-02-08 01:32:26 +00:00
|
|
|
tui_update_variables (void)
|
2001-07-21 19:44:38 +00:00
|
|
|
{
|
|
|
|
int need_redraw = 0;
|
|
|
|
struct tui_translate *entry;
|
|
|
|
|
|
|
|
entry = translate (tui_border_mode, tui_border_mode_translate);
|
|
|
|
if (tui_border_attrs != entry->value)
|
|
|
|
{
|
|
|
|
tui_border_attrs = entry->value;
|
|
|
|
need_redraw = 1;
|
|
|
|
}
|
|
|
|
entry = translate (tui_active_border_mode, tui_border_mode_translate);
|
|
|
|
if (tui_active_border_attrs != entry->value)
|
|
|
|
{
|
|
|
|
tui_active_border_attrs = entry->value;
|
|
|
|
need_redraw = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If one corner changes, all characters are changed.
|
|
|
|
Only check the first one. The ACS characters are determined at
|
|
|
|
run time by curses terminal management. */
|
|
|
|
entry = translate (tui_border_kind, tui_border_kind_translate_lrcorner);
|
|
|
|
if (tui_border_lrcorner != (chtype) entry->value)
|
|
|
|
{
|
|
|
|
tui_border_lrcorner = (entry->value < 0) ? ACS_LRCORNER : entry->value;
|
|
|
|
need_redraw = 1;
|
|
|
|
}
|
|
|
|
entry = translate (tui_border_kind, tui_border_kind_translate_llcorner);
|
|
|
|
tui_border_llcorner = (entry->value < 0) ? ACS_LLCORNER : entry->value;
|
|
|
|
|
|
|
|
entry = translate (tui_border_kind, tui_border_kind_translate_ulcorner);
|
|
|
|
tui_border_ulcorner = (entry->value < 0) ? ACS_ULCORNER : entry->value;
|
|
|
|
|
|
|
|
entry = translate (tui_border_kind, tui_border_kind_translate_urcorner);
|
|
|
|
tui_border_urcorner = (entry->value < 0) ? ACS_URCORNER : entry->value;
|
|
|
|
|
|
|
|
entry = translate (tui_border_kind, tui_border_kind_translate_hline);
|
|
|
|
tui_border_hline = (entry->value < 0) ? ACS_HLINE : entry->value;
|
|
|
|
|
|
|
|
entry = translate (tui_border_kind, tui_border_kind_translate_vline);
|
|
|
|
tui_border_vline = (entry->value < 0) ? ACS_VLINE : entry->value;
|
|
|
|
|
|
|
|
return need_redraw;
|
|
|
|
}
|
|
|
|
|
2001-07-28 19:30:54 +00:00
|
|
|
static void
|
|
|
|
set_tui_cmd (char *args, int from_tty)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
show_tui_cmd (char *args, int from_tty)
|
|
|
|
{
|
|
|
|
}
|
2001-07-21 19:44:38 +00:00
|
|
|
|
2004-03-13 14:14:01 +00:00
|
|
|
static struct cmd_list_element *tuilist;
|
|
|
|
|
|
|
|
static void
|
|
|
|
tui_command (char *args, int from_tty)
|
|
|
|
{
|
|
|
|
printf_unfiltered ("\"tui\" must be followed by the name of a "
|
|
|
|
"tui command.\n");
|
|
|
|
help_list (tuilist, "tui ", -1, gdb_stdout);
|
|
|
|
}
|
|
|
|
|
|
|
|
struct cmd_list_element **
|
2004-07-17 14:24:07 +00:00
|
|
|
tui_get_cmd_list (void)
|
2004-03-13 14:14:01 +00:00
|
|
|
{
|
|
|
|
if (tuilist == 0)
|
|
|
|
add_prefix_cmd ("tui", class_tui, tui_command,
|
|
|
|
"Text User Interface commands.",
|
|
|
|
&tuilist, "tui ", 0, &cmdlist);
|
|
|
|
return &tuilist;
|
|
|
|
}
|
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
/* Function to initialize gdb commands, for tui window manipulation. */
|
1999-04-16 01:35:26 +00:00
|
|
|
void
|
2004-02-08 00:05:16 +00:00
|
|
|
_initialize_tui_win (void)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2001-07-21 19:44:38 +00:00
|
|
|
struct cmd_list_element *c;
|
2001-07-28 19:30:54 +00:00
|
|
|
static struct cmd_list_element *tui_setlist;
|
|
|
|
static struct cmd_list_element *tui_showlist;
|
2001-07-21 19:44:38 +00:00
|
|
|
|
2001-07-19 22:47:46 +00:00
|
|
|
/* Define the classes of commands.
|
|
|
|
They will appear in the help list in the reverse of this order. */
|
2001-07-28 19:30:54 +00:00
|
|
|
add_prefix_cmd ("tui", class_tui, set_tui_cmd,
|
|
|
|
"TUI configuration variables",
|
|
|
|
&tui_setlist, "set tui ",
|
|
|
|
0/*allow-unknown*/, &setlist);
|
|
|
|
add_prefix_cmd ("tui", class_tui, show_tui_cmd,
|
|
|
|
"TUI configuration variables",
|
|
|
|
&tui_showlist, "show tui ",
|
|
|
|
0/*allow-unknown*/, &showlist);
|
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
add_com ("refresh", class_tui, tui_refresh_all_command,
|
2001-07-19 22:47:46 +00:00
|
|
|
"Refresh the terminal display.\n");
|
|
|
|
if (xdb_commands)
|
|
|
|
add_com_alias ("U", "refresh", class_tui, 0);
|
2004-02-08 00:05:16 +00:00
|
|
|
add_com ("tabset", class_tui, tui_set_tab_width_command,
|
2001-07-19 22:47:46 +00:00
|
|
|
"Set the width (in characters) of tab stops.\n\
|
1999-04-16 01:35:26 +00:00
|
|
|
Usage: tabset <n>\n");
|
2004-02-08 00:05:16 +00:00
|
|
|
add_com ("winheight", class_tui, tui_set_win_height_command,
|
2001-07-19 22:47:46 +00:00
|
|
|
"Set the height of a specified window.\n\
|
1999-04-16 01:35:26 +00:00
|
|
|
Usage: winheight <win_name> [+ | -] <#lines>\n\
|
|
|
|
Window names are:\n\
|
|
|
|
src : the source window\n\
|
|
|
|
cmd : the command window\n\
|
|
|
|
asm : the disassembly window\n\
|
|
|
|
regs : the register display\n");
|
2001-07-19 22:47:46 +00:00
|
|
|
add_com_alias ("wh", "winheight", class_tui, 0);
|
2004-02-08 00:05:16 +00:00
|
|
|
add_info ("win", tui_all_windows_info,
|
2001-07-19 22:47:46 +00:00
|
|
|
"List of all displayed windows.\n");
|
2004-02-08 00:05:16 +00:00
|
|
|
add_com ("focus", class_tui, tui_set_focus_command,
|
2001-07-19 22:47:46 +00:00
|
|
|
"Set focus to named window or next/prev window.\n\
|
1999-04-16 01:35:26 +00:00
|
|
|
Usage: focus {<win> | next | prev}\n\
|
|
|
|
Valid Window names are:\n\
|
|
|
|
src : the source window\n\
|
|
|
|
asm : the disassembly window\n\
|
|
|
|
regs : the register display\n\
|
|
|
|
cmd : the command window\n");
|
2001-07-19 22:47:46 +00:00
|
|
|
add_com_alias ("fs", "focus", class_tui, 0);
|
2004-02-08 00:05:16 +00:00
|
|
|
add_com ("+", class_tui, tui_scroll_forward_command,
|
2001-07-19 22:47:46 +00:00
|
|
|
"Scroll window forward.\nUsage: + [win] [n]\n");
|
2004-02-08 00:05:16 +00:00
|
|
|
add_com ("-", class_tui, tui_scroll_backward_command,
|
2001-07-19 22:47:46 +00:00
|
|
|
"Scroll window backward.\nUsage: - [win] [n]\n");
|
2004-02-08 00:05:16 +00:00
|
|
|
add_com ("<", class_tui, tui_scroll_left_command,
|
2001-07-19 22:47:46 +00:00
|
|
|
"Scroll window forward.\nUsage: < [win] [n]\n");
|
2004-02-08 00:05:16 +00:00
|
|
|
add_com (">", class_tui, tui_scroll_right_command,
|
2001-07-19 22:47:46 +00:00
|
|
|
"Scroll window backward.\nUsage: > [win] [n]\n");
|
|
|
|
if (xdb_commands)
|
2004-02-08 00:05:16 +00:00
|
|
|
add_com ("w", class_xdb, tui_xdb_set_win_height_command,
|
2001-07-19 22:47:46 +00:00
|
|
|
"XDB compatibility command for setting the height of a command window.\n\
|
1999-04-16 01:35:26 +00:00
|
|
|
Usage: w <#lines>\n");
|
2001-07-21 19:44:38 +00:00
|
|
|
|
|
|
|
/* Define the tui control variables. */
|
|
|
|
c = add_set_enum_cmd
|
2001-07-28 19:30:54 +00:00
|
|
|
("border-kind", no_class,
|
2001-07-23 21:13:57 +00:00
|
|
|
tui_border_kind_enums, &tui_border_kind,
|
2001-07-21 19:44:38 +00:00
|
|
|
"Set the kind of border for TUI windows.\n"
|
|
|
|
"This variable controls the border of TUI windows:\n"
|
|
|
|
"space use a white space\n"
|
|
|
|
"ascii use ascii characters + - | for the border\n"
|
|
|
|
"acs use the Alternate Character Set\n",
|
2001-07-28 19:30:54 +00:00
|
|
|
&tui_setlist);
|
2004-07-26 14:53:06 +00:00
|
|
|
deprecated_add_show_from_set (c, &tui_showlist);
|
2001-07-21 19:44:38 +00:00
|
|
|
|
|
|
|
c = add_set_enum_cmd
|
2001-07-28 19:30:54 +00:00
|
|
|
("border-mode", no_class,
|
2001-07-23 21:13:57 +00:00
|
|
|
tui_border_mode_enums, &tui_border_mode,
|
2001-07-21 19:44:38 +00:00
|
|
|
"Set the attribute mode to use for the TUI window borders.\n"
|
|
|
|
"This variable controls the attributes to use for the window borders:\n"
|
|
|
|
"normal normal display\n"
|
|
|
|
"standout use highlight mode of terminal\n"
|
|
|
|
"reverse use reverse video mode\n"
|
|
|
|
"half use half bright\n"
|
|
|
|
"half-standout use half bright and standout mode\n"
|
|
|
|
"bold use extra bright or bold\n"
|
|
|
|
"bold-standout use extra bright or bold with standout mode\n",
|
2001-07-28 19:30:54 +00:00
|
|
|
&tui_setlist);
|
2004-07-26 14:53:06 +00:00
|
|
|
deprecated_add_show_from_set (c, &tui_showlist);
|
2001-07-21 19:44:38 +00:00
|
|
|
|
|
|
|
c = add_set_enum_cmd
|
2001-07-28 19:30:54 +00:00
|
|
|
("active-border-mode", no_class,
|
2001-07-23 21:13:57 +00:00
|
|
|
tui_border_mode_enums, &tui_active_border_mode,
|
2001-07-21 19:44:38 +00:00
|
|
|
"Set the attribute mode to use for the active TUI window border.\n"
|
|
|
|
"This variable controls the attributes to use for the active window border:\n"
|
|
|
|
"normal normal display\n"
|
|
|
|
"standout use highlight mode of terminal\n"
|
|
|
|
"reverse use reverse video mode\n"
|
|
|
|
"half use half bright\n"
|
|
|
|
"half-standout use half bright and standout mode\n"
|
|
|
|
"bold use extra bright or bold\n"
|
|
|
|
"bold-standout use extra bright or bold with standout mode\n",
|
2001-07-28 19:30:54 +00:00
|
|
|
&tui_setlist);
|
2004-07-26 14:53:06 +00:00
|
|
|
deprecated_add_show_from_set (c, &tui_showlist);
|
2001-07-19 22:47:46 +00:00
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2002-08-24 16:43:08 +00:00
|
|
|
/* Update gdb's knowledge of the terminal size. */
|
|
|
|
void
|
2004-02-08 01:32:26 +00:00
|
|
|
tui_update_gdb_sizes (void)
|
2002-08-24 16:43:08 +00:00
|
|
|
{
|
|
|
|
char cmd[50];
|
Import of readline 4.3.
Non-readline modified files:
src/gdb/ChangeLog src/gdb/defs.h src/gdb/cli/cli-cmds.c
src/gdb/cli/cli-setshow.c src/gdb/tui/ChangeLog
src/gdb/tui/tuiWin.c
In readline directory:
* compat.c, mbutil.c, misc.c, rlmbutil.h, rltypedefs.h,
text.c, doc/history.0, doc/history.3, support/wcwidth.c,
examples/readlinebuf.h, examples/rlcat.c: New files.
* CHANGELOG, CHANGES, INSTALL, MANIFEST, Makefile.in, README,
aclocal.m4, ansi_stdlib.h, bind.c, callback.c, chardefs.h,
complete.c, config.h.in, configure, configure.in, display.c,
emacs_keymap.c, funmap.c, histexpand.c, histfile.c, histlib.h,
history.c, history.h, histsearch.c, input.c, isearch.c,
keymaps.c, keymaps.h, kill.c, macro.c, nls.c, parens.c,
posixdir.h, readline.c, readline.h, rlconf.h, rldefs.h,
rlprivate.h, rlshell.h, rlstdc.h, rltty.c, savestring.c,
search.c, shell.c, signals.c, terminal.c, tilde.c, tilde.h,
undo.c, util.c, vi_keymap.c, vi_mode.c, xmalloc.c, xmalloc.h,
doc/Makefile.in, doc/hist.texinfo, doc/hstech.texinfo,
doc/hsuser.texinfo, doc/manvers.texinfo, doc/readline.3,
doc/rlman.texinfo, doc/rltech.texinfo, doc/rluser.texinfo
doc/rluserman.texinfo, doc/texi2dvi, doc/texi2html,
shlib/Makefile.in, support/install.sh, support/mkdirs,
support/mkdist, support/shlib-install, support/shobj-conf,
examples/Inputrc, examples/Makefile.in, examples/fileman.c,
examples/histexamp.c, examples/manexamp.c, examples/rl.c,
examples/rlfe.c, examples/rltest.c, examples/rlversion.c:
Modified files.
2002-12-08 22:31:39 +00:00
|
|
|
int screenheight, screenwidth;
|
2002-08-24 16:43:08 +00:00
|
|
|
|
Import of readline 4.3.
Non-readline modified files:
src/gdb/ChangeLog src/gdb/defs.h src/gdb/cli/cli-cmds.c
src/gdb/cli/cli-setshow.c src/gdb/tui/ChangeLog
src/gdb/tui/tuiWin.c
In readline directory:
* compat.c, mbutil.c, misc.c, rlmbutil.h, rltypedefs.h,
text.c, doc/history.0, doc/history.3, support/wcwidth.c,
examples/readlinebuf.h, examples/rlcat.c: New files.
* CHANGELOG, CHANGES, INSTALL, MANIFEST, Makefile.in, README,
aclocal.m4, ansi_stdlib.h, bind.c, callback.c, chardefs.h,
complete.c, config.h.in, configure, configure.in, display.c,
emacs_keymap.c, funmap.c, histexpand.c, histfile.c, histlib.h,
history.c, history.h, histsearch.c, input.c, isearch.c,
keymaps.c, keymaps.h, kill.c, macro.c, nls.c, parens.c,
posixdir.h, readline.c, readline.h, rlconf.h, rldefs.h,
rlprivate.h, rlshell.h, rlstdc.h, rltty.c, savestring.c,
search.c, shell.c, signals.c, terminal.c, tilde.c, tilde.h,
undo.c, util.c, vi_keymap.c, vi_mode.c, xmalloc.c, xmalloc.h,
doc/Makefile.in, doc/hist.texinfo, doc/hstech.texinfo,
doc/hsuser.texinfo, doc/manvers.texinfo, doc/readline.3,
doc/rlman.texinfo, doc/rltech.texinfo, doc/rluser.texinfo
doc/rluserman.texinfo, doc/texi2dvi, doc/texi2html,
shlib/Makefile.in, support/install.sh, support/mkdirs,
support/mkdist, support/shlib-install, support/shobj-conf,
examples/Inputrc, examples/Makefile.in, examples/fileman.c,
examples/histexamp.c, examples/manexamp.c, examples/rl.c,
examples/rlfe.c, examples/rltest.c, examples/rlversion.c:
Modified files.
2002-12-08 22:31:39 +00:00
|
|
|
rl_get_screen_size (&screenheight, &screenwidth);
|
2002-08-24 16:43:08 +00:00
|
|
|
/* Set to TUI command window dimension or use readline values. */
|
|
|
|
sprintf (cmd, "set width %d",
|
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 20:57:02 +00:00
|
|
|
tui_active ? TUI_CMD_WIN->generic.width : screenwidth);
|
2002-08-24 16:43:08 +00:00
|
|
|
execute_command (cmd, 0);
|
|
|
|
sprintf (cmd, "set height %d",
|
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 20:57:02 +00:00
|
|
|
tui_active ? TUI_CMD_WIN->generic.height : screenheight);
|
2002-08-24 16:43:08 +00:00
|
|
|
execute_command (cmd, 0);
|
|
|
|
}
|
|
|
|
|
1999-04-16 01:35:26 +00: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 20:57:02 +00:00
|
|
|
/* Set the logical focus to win_info. */
|
1999-04-16 01:35:26 +00:00
|
|
|
void
|
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 20:57:02 +00:00
|
|
|
tui_set_win_focus_to (struct tui_win_info * win_info)
|
1999-04-16 01:35:26 +00: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 20:57:02 +00:00
|
|
|
if (win_info != NULL)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
struct tui_win_info * win_with_focus = tui_win_with_focus ();
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
if (win_with_focus != NULL
|
|
|
|
&& win_with_focus->generic.type != CMD_WIN)
|
|
|
|
tui_unhighlight_win (win_with_focus);
|
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 20:57:02 +00:00
|
|
|
tui_set_win_with_focus (win_info);
|
|
|
|
if (win_info->generic.type != CMD_WIN)
|
|
|
|
tui_highlight_win (win_info);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
2004-02-08 00:05:16 +00:00
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
|
|
|
void
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_scroll_forward (struct tui_win_info * win_to_scroll, int num_to_scroll)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
if (win_to_scroll != TUI_CMD_WIN)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
int _num_to_scroll = num_to_scroll;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
if (num_to_scroll == 0)
|
|
|
|
_num_to_scroll = win_to_scroll->generic.height - 3;
|
1999-04-16 01:35:26 +00:00
|
|
|
/*
|
1999-07-07 20:19:36 +00:00
|
|
|
** If we are scrolling the source or disassembly window, do a
|
|
|
|
** "psuedo" scroll since not all of the source is in memory,
|
2004-02-08 00:05:16 +00:00
|
|
|
** only what is in the viewport. If win_to_scroll is the
|
1999-07-07 20:19:36 +00:00
|
|
|
** command window do nothing since the term should handle it.
|
|
|
|
*/
|
2004-02-08 00:05:16 +00:00
|
|
|
if (win_to_scroll == TUI_SRC_WIN)
|
|
|
|
tui_vertical_source_scroll (FORWARD_SCROLL, _num_to_scroll);
|
|
|
|
else if (win_to_scroll == TUI_DISASM_WIN)
|
|
|
|
tui_vertical_disassem_scroll (FORWARD_SCROLL, _num_to_scroll);
|
|
|
|
else if (win_to_scroll == TUI_DATA_WIN)
|
|
|
|
tui_vertical_data_scroll (FORWARD_SCROLL, _num_to_scroll);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
2004-02-07 01:02:54 +00:00
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
void
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_scroll_backward (struct tui_win_info * win_to_scroll, int num_to_scroll)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
if (win_to_scroll != TUI_CMD_WIN)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
int _num_to_scroll = num_to_scroll;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
if (num_to_scroll == 0)
|
|
|
|
_num_to_scroll = win_to_scroll->generic.height - 3;
|
1999-04-16 01:35:26 +00:00
|
|
|
/*
|
1999-07-07 20:19:36 +00:00
|
|
|
** If we are scrolling the source or disassembly window, do a
|
|
|
|
** "psuedo" scroll since not all of the source is in memory,
|
2004-02-08 00:05:16 +00:00
|
|
|
** only what is in the viewport. If win_to_scroll is the
|
1999-07-07 20:19:36 +00:00
|
|
|
** command window do nothing since the term should handle it.
|
|
|
|
*/
|
2004-02-08 00:05:16 +00:00
|
|
|
if (win_to_scroll == TUI_SRC_WIN)
|
|
|
|
tui_vertical_source_scroll (BACKWARD_SCROLL, _num_to_scroll);
|
|
|
|
else if (win_to_scroll == TUI_DISASM_WIN)
|
|
|
|
tui_vertical_disassem_scroll (BACKWARD_SCROLL, _num_to_scroll);
|
|
|
|
else if (win_to_scroll == TUI_DATA_WIN)
|
|
|
|
tui_vertical_data_scroll (BACKWARD_SCROLL, _num_to_scroll);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
2004-02-07 01:02:54 +00:00
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
|
|
|
void
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_scroll_left (struct tui_win_info * win_to_scroll, int num_to_scroll)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
if (win_to_scroll != TUI_CMD_WIN)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
int _num_to_scroll = num_to_scroll;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
if (_num_to_scroll == 0)
|
|
|
|
_num_to_scroll = 1;
|
1999-04-16 01:35:26 +00:00
|
|
|
/*
|
1999-07-07 20:19:36 +00:00
|
|
|
** If we are scrolling the source or disassembly window, do a
|
|
|
|
** "psuedo" scroll since not all of the source is in memory,
|
2004-02-08 00:05:16 +00:00
|
|
|
** only what is in the viewport. If win_to_scroll is the
|
1999-07-07 20:19:36 +00:00
|
|
|
** command window do nothing since the term should handle it.
|
|
|
|
*/
|
2004-02-08 00:05:16 +00:00
|
|
|
if (win_to_scroll == TUI_SRC_WIN || win_to_scroll == TUI_DISASM_WIN)
|
|
|
|
tui_horizontal_source_scroll (win_to_scroll, LEFT_SCROLL, _num_to_scroll);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
2004-02-07 01:02:54 +00:00
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
|
|
|
void
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_scroll_right (struct tui_win_info * win_to_scroll, int num_to_scroll)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
if (win_to_scroll != TUI_CMD_WIN)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
int _num_to_scroll = num_to_scroll;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
if (_num_to_scroll == 0)
|
|
|
|
_num_to_scroll = 1;
|
1999-04-16 01:35:26 +00:00
|
|
|
/*
|
1999-07-07 20:19:36 +00:00
|
|
|
** If we are scrolling the source or disassembly window, do a
|
|
|
|
** "psuedo" scroll since not all of the source is in memory,
|
2004-02-08 00:05:16 +00:00
|
|
|
** only what is in the viewport. If win_to_scroll is the
|
1999-07-07 20:19:36 +00:00
|
|
|
** command window do nothing since the term should handle it.
|
|
|
|
*/
|
2004-02-08 00:05:16 +00:00
|
|
|
if (win_to_scroll == TUI_SRC_WIN || win_to_scroll == TUI_DISASM_WIN)
|
|
|
|
tui_horizontal_source_scroll (win_to_scroll, RIGHT_SCROLL, _num_to_scroll);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
2004-02-07 01:02:54 +00:00
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
2004-02-07 01:02:54 +00:00
|
|
|
/* Scroll a window. Arguments are passed through a va_list. */
|
1999-04-16 01:35:26 +00:00
|
|
|
void
|
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 16:31:22 +00:00
|
|
|
tui_scroll (enum tui_scroll_direction direction,
|
2004-02-08 00:05:16 +00:00
|
|
|
struct tui_win_info * win_to_scroll,
|
|
|
|
int num_to_scroll)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
switch (direction)
|
|
|
|
{
|
|
|
|
case FORWARD_SCROLL:
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_scroll_forward (win_to_scroll, num_to_scroll);
|
1999-04-16 01:35:26 +00:00
|
|
|
break;
|
|
|
|
case BACKWARD_SCROLL:
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_scroll_backward (win_to_scroll, num_to_scroll);
|
1999-04-16 01:35:26 +00:00
|
|
|
break;
|
|
|
|
case LEFT_SCROLL:
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_scroll_left (win_to_scroll, num_to_scroll);
|
1999-04-16 01:35:26 +00:00
|
|
|
break;
|
|
|
|
case RIGHT_SCROLL:
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_scroll_right (win_to_scroll, num_to_scroll);
|
1999-04-16 01:35:26 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2001-07-18 22:03:22 +00:00
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
|
|
|
void
|
2004-02-07 01:02:54 +00:00
|
|
|
tui_refresh_all_win (void)
|
1999-04-16 01:35:26 +00: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 17:46:14 +00:00
|
|
|
enum tui_win_type type;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2001-07-21 20:57:17 +00:00
|
|
|
clearok (curscr, TRUE);
|
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 20:57:02 +00:00
|
|
|
tui_refresh_all (tui_win_list);
|
1999-04-16 01:35:26 +00:00
|
|
|
for (type = SRC_WIN; type < MAX_MAJOR_WINDOWS; 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 20:57:02 +00:00
|
|
|
if (tui_win_list[type] && tui_win_list[type]->generic.is_visible)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
switch (type)
|
|
|
|
{
|
|
|
|
case SRC_WIN:
|
|
|
|
case DISASSEM_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 20:57:02 +00:00
|
|
|
tui_show_source_content (tui_win_list[type]);
|
|
|
|
tui_check_and_display_highlight_if_needed (tui_win_list[type]);
|
|
|
|
tui_erase_exec_info_content (tui_win_list[type]);
|
|
|
|
tui_update_exec_info (tui_win_list[type]);
|
1999-04-16 01:35:26 +00:00
|
|
|
break;
|
|
|
|
case DATA_WIN:
|
2004-02-07 00:23:56 +00:00
|
|
|
tui_refresh_data_win ();
|
1999-04-16 01:35:26 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2004-01-28 23:16:50 +00:00
|
|
|
tui_show_locator_content ();
|
2002-08-24 12:28:33 +00:00
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
/* Resize all the windows based on the the terminal size. This
|
|
|
|
function gets called from within the readline sinwinch handler. */
|
1999-04-16 01:35:26 +00:00
|
|
|
void
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_resize_all (void)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
int height_diff, width_diff;
|
Import of readline 4.3.
Non-readline modified files:
src/gdb/ChangeLog src/gdb/defs.h src/gdb/cli/cli-cmds.c
src/gdb/cli/cli-setshow.c src/gdb/tui/ChangeLog
src/gdb/tui/tuiWin.c
In readline directory:
* compat.c, mbutil.c, misc.c, rlmbutil.h, rltypedefs.h,
text.c, doc/history.0, doc/history.3, support/wcwidth.c,
examples/readlinebuf.h, examples/rlcat.c: New files.
* CHANGELOG, CHANGES, INSTALL, MANIFEST, Makefile.in, README,
aclocal.m4, ansi_stdlib.h, bind.c, callback.c, chardefs.h,
complete.c, config.h.in, configure, configure.in, display.c,
emacs_keymap.c, funmap.c, histexpand.c, histfile.c, histlib.h,
history.c, history.h, histsearch.c, input.c, isearch.c,
keymaps.c, keymaps.h, kill.c, macro.c, nls.c, parens.c,
posixdir.h, readline.c, readline.h, rlconf.h, rldefs.h,
rlprivate.h, rlshell.h, rlstdc.h, rltty.c, savestring.c,
search.c, shell.c, signals.c, terminal.c, tilde.c, tilde.h,
undo.c, util.c, vi_keymap.c, vi_mode.c, xmalloc.c, xmalloc.h,
doc/Makefile.in, doc/hist.texinfo, doc/hstech.texinfo,
doc/hsuser.texinfo, doc/manvers.texinfo, doc/readline.3,
doc/rlman.texinfo, doc/rltech.texinfo, doc/rluser.texinfo
doc/rluserman.texinfo, doc/texi2dvi, doc/texi2html,
shlib/Makefile.in, support/install.sh, support/mkdirs,
support/mkdist, support/shlib-install, support/shobj-conf,
examples/Inputrc, examples/Makefile.in, examples/fileman.c,
examples/histexamp.c, examples/manexamp.c, examples/rl.c,
examples/rlfe.c, examples/rltest.c, examples/rlversion.c:
Modified files.
2002-12-08 22:31:39 +00:00
|
|
|
int screenheight, screenwidth;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
Import of readline 4.3.
Non-readline modified files:
src/gdb/ChangeLog src/gdb/defs.h src/gdb/cli/cli-cmds.c
src/gdb/cli/cli-setshow.c src/gdb/tui/ChangeLog
src/gdb/tui/tuiWin.c
In readline directory:
* compat.c, mbutil.c, misc.c, rlmbutil.h, rltypedefs.h,
text.c, doc/history.0, doc/history.3, support/wcwidth.c,
examples/readlinebuf.h, examples/rlcat.c: New files.
* CHANGELOG, CHANGES, INSTALL, MANIFEST, Makefile.in, README,
aclocal.m4, ansi_stdlib.h, bind.c, callback.c, chardefs.h,
complete.c, config.h.in, configure, configure.in, display.c,
emacs_keymap.c, funmap.c, histexpand.c, histfile.c, histlib.h,
history.c, history.h, histsearch.c, input.c, isearch.c,
keymaps.c, keymaps.h, kill.c, macro.c, nls.c, parens.c,
posixdir.h, readline.c, readline.h, rlconf.h, rldefs.h,
rlprivate.h, rlshell.h, rlstdc.h, rltty.c, savestring.c,
search.c, shell.c, signals.c, terminal.c, tilde.c, tilde.h,
undo.c, util.c, vi_keymap.c, vi_mode.c, xmalloc.c, xmalloc.h,
doc/Makefile.in, doc/hist.texinfo, doc/hstech.texinfo,
doc/hsuser.texinfo, doc/manvers.texinfo, doc/readline.3,
doc/rlman.texinfo, doc/rltech.texinfo, doc/rluser.texinfo
doc/rluserman.texinfo, doc/texi2dvi, doc/texi2html,
shlib/Makefile.in, support/install.sh, support/mkdirs,
support/mkdist, support/shlib-install, support/shobj-conf,
examples/Inputrc, examples/Makefile.in, examples/fileman.c,
examples/histexamp.c, examples/manexamp.c, examples/rl.c,
examples/rlfe.c, examples/rltest.c, examples/rlversion.c:
Modified files.
2002-12-08 22:31:39 +00:00
|
|
|
rl_get_screen_size (&screenheight, &screenwidth);
|
2004-02-08 00:05:16 +00:00
|
|
|
width_diff = screenwidth - tui_term_width ();
|
|
|
|
height_diff = screenheight - tui_term_height ();
|
|
|
|
if (height_diff || width_diff)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
enum tui_layout_type cur_layout = tui_current_layout ();
|
|
|
|
struct tui_win_info * win_with_focus = tui_win_with_focus ();
|
|
|
|
struct tui_win_info *first_win;
|
|
|
|
struct tui_win_info *second_win;
|
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 16:31:22 +00:00
|
|
|
struct tui_gen_win_info * locator = tui_locator_win_info_ptr ();
|
2004-02-08 00:05:16 +00:00
|
|
|
enum tui_win_type win_type;
|
|
|
|
int new_height, split_diff, cmd_split_diff, num_wins_displayed = 2;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-03-13 14:14:01 +00:00
|
|
|
#ifdef HAVE_RESIZE_TERM
|
|
|
|
resize_term (screenheight, screenwidth);
|
|
|
|
#endif
|
1999-04-16 01:35:26 +00:00
|
|
|
/* turn keypad off while we resize */
|
2004-02-08 00:05:16 +00:00
|
|
|
if (win_with_focus != TUI_CMD_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 20:57:02 +00:00
|
|
|
keypad (TUI_CMD_WIN->generic.handle, FALSE);
|
2002-08-24 16:43:08 +00:00
|
|
|
tui_update_gdb_sizes ();
|
2004-02-07 04:40:36 +00:00
|
|
|
tui_set_term_height_to (screenheight);
|
|
|
|
tui_set_term_width_to (screenwidth);
|
2004-02-08 00:05:16 +00:00
|
|
|
if (cur_layout == SRC_DISASSEM_COMMAND ||
|
|
|
|
cur_layout == SRC_DATA_COMMAND || cur_layout == DISASSEM_DATA_COMMAND)
|
|
|
|
num_wins_displayed++;
|
|
|
|
split_diff = height_diff / num_wins_displayed;
|
|
|
|
cmd_split_diff = split_diff;
|
|
|
|
if (height_diff % num_wins_displayed)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
if (height_diff < 0)
|
|
|
|
cmd_split_diff--;
|
1999-04-16 01:35:26 +00:00
|
|
|
else
|
2004-02-08 00:05:16 +00:00
|
|
|
cmd_split_diff++;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
/* now adjust each window */
|
|
|
|
clear ();
|
|
|
|
refresh ();
|
2004-02-08 00:05:16 +00:00
|
|
|
switch (cur_layout)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
case SRC_COMMAND:
|
|
|
|
case DISASSEM_COMMAND:
|
2004-02-08 00:05:16 +00:00
|
|
|
first_win = (struct tui_win_info *) (tui_source_windows ())->list[0];
|
|
|
|
first_win->generic.width += width_diff;
|
|
|
|
locator->width += width_diff;
|
1999-04-16 01:35:26 +00:00
|
|
|
/* check for invalid heights */
|
2004-02-08 00:05:16 +00:00
|
|
|
if (height_diff == 0)
|
|
|
|
new_height = first_win->generic.height;
|
|
|
|
else if ((first_win->generic.height + split_diff) >=
|
1999-04-16 01:35:26 +00:00
|
|
|
(screenheight - MIN_CMD_WIN_HEIGHT - 1))
|
2004-02-08 00:05:16 +00:00
|
|
|
new_height = screenheight - MIN_CMD_WIN_HEIGHT - 1;
|
|
|
|
else if ((first_win->generic.height + split_diff) <= 0)
|
|
|
|
new_height = MIN_WIN_HEIGHT;
|
1999-04-16 01:35:26 +00:00
|
|
|
else
|
2004-02-08 00:05:16 +00:00
|
|
|
new_height = first_win->generic.height + split_diff;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
make_invisible_and_set_new_height (first_win, new_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 20:57:02 +00:00
|
|
|
TUI_CMD_WIN->generic.origin.y = locator->origin.y + 1;
|
2004-02-08 00:05:16 +00:00
|
|
|
TUI_CMD_WIN->generic.width += width_diff;
|
|
|
|
new_height = screenheight - TUI_CMD_WIN->generic.origin.y;
|
|
|
|
make_invisible_and_set_new_height (TUI_CMD_WIN, new_height);
|
|
|
|
make_visible_with_new_height (first_win);
|
|
|
|
make_visible_with_new_height (TUI_CMD_WIN);
|
|
|
|
if (first_win->generic.content_size <= 0)
|
|
|
|
tui_erase_source_content (first_win, EMPTY_SOURCE_PROMPT);
|
1999-04-16 01:35:26 +00:00
|
|
|
break;
|
|
|
|
default:
|
2004-02-08 00:05:16 +00:00
|
|
|
if (cur_layout == SRC_DISASSEM_COMMAND)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
first_win = TUI_SRC_WIN;
|
|
|
|
first_win->generic.width += width_diff;
|
|
|
|
second_win = TUI_DISASM_WIN;
|
|
|
|
second_win->generic.width += width_diff;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
first_win = TUI_DATA_WIN;
|
|
|
|
first_win->generic.width += width_diff;
|
|
|
|
second_win = (struct tui_win_info *) (tui_source_windows ())->list[0];
|
|
|
|
second_win->generic.width += width_diff;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
/* Change the first window's height/width */
|
|
|
|
/* check for invalid heights */
|
2004-02-08 00:05:16 +00:00
|
|
|
if (height_diff == 0)
|
|
|
|
new_height = first_win->generic.height;
|
|
|
|
else if ((first_win->generic.height +
|
|
|
|
second_win->generic.height + (split_diff * 2)) >=
|
1999-04-16 01:35:26 +00:00
|
|
|
(screenheight - MIN_CMD_WIN_HEIGHT - 1))
|
2004-02-08 00:05:16 +00:00
|
|
|
new_height = (screenheight - MIN_CMD_WIN_HEIGHT - 1) / 2;
|
|
|
|
else if ((first_win->generic.height + split_diff) <= 0)
|
|
|
|
new_height = MIN_WIN_HEIGHT;
|
1999-04-16 01:35:26 +00:00
|
|
|
else
|
2004-02-08 00:05:16 +00:00
|
|
|
new_height = first_win->generic.height + split_diff;
|
|
|
|
make_invisible_and_set_new_height (first_win, new_height);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
locator->width += width_diff;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
/* Change the second window's height/width */
|
|
|
|
/* check for invalid heights */
|
2004-02-08 00:05:16 +00:00
|
|
|
if (height_diff == 0)
|
|
|
|
new_height = second_win->generic.height;
|
|
|
|
else if ((first_win->generic.height +
|
|
|
|
second_win->generic.height + (split_diff * 2)) >=
|
1999-04-16 01:35:26 +00:00
|
|
|
(screenheight - MIN_CMD_WIN_HEIGHT - 1))
|
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
new_height = screenheight - MIN_CMD_WIN_HEIGHT - 1;
|
|
|
|
if (new_height % 2)
|
|
|
|
new_height = (new_height / 2) + 1;
|
1999-04-16 01:35:26 +00:00
|
|
|
else
|
2004-02-08 00:05:16 +00:00
|
|
|
new_height /= 2;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
2004-02-08 00:05:16 +00:00
|
|
|
else if ((second_win->generic.height + split_diff) <= 0)
|
|
|
|
new_height = MIN_WIN_HEIGHT;
|
1999-04-16 01:35:26 +00:00
|
|
|
else
|
2004-02-08 00:05:16 +00:00
|
|
|
new_height = second_win->generic.height + split_diff;
|
|
|
|
second_win->generic.origin.y = first_win->generic.height - 1;
|
|
|
|
make_invisible_and_set_new_height (second_win, new_height);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
/* Change the command window's height/width */
|
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 20:57:02 +00:00
|
|
|
TUI_CMD_WIN->generic.origin.y = locator->origin.y + 1;
|
2004-02-08 00:05:16 +00:00
|
|
|
make_invisible_and_set_new_height (
|
|
|
|
TUI_CMD_WIN, TUI_CMD_WIN->generic.height + cmd_split_diff);
|
|
|
|
make_visible_with_new_height (first_win);
|
|
|
|
make_visible_with_new_height (second_win);
|
|
|
|
make_visible_with_new_height (TUI_CMD_WIN);
|
|
|
|
if (first_win->generic.content_size <= 0)
|
|
|
|
tui_erase_source_content (first_win, EMPTY_SOURCE_PROMPT);
|
|
|
|
if (second_win->generic.content_size <= 0)
|
|
|
|
tui_erase_source_content (second_win, EMPTY_SOURCE_PROMPT);
|
1999-04-16 01:35:26 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
/*
|
1999-07-07 20:19:36 +00:00
|
|
|
** Now remove all invisible windows, and their content so that they get
|
|
|
|
** created again when called for with the new size
|
|
|
|
*/
|
2004-02-08 00:05:16 +00:00
|
|
|
for (win_type = SRC_WIN; (win_type < MAX_MAJOR_WINDOWS); win_type++)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
if (win_type != CMD_WIN && (tui_win_list[win_type] != NULL)
|
|
|
|
&& !tui_win_list[win_type]->generic.is_visible)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_free_window (tui_win_list[win_type]);
|
|
|
|
tui_win_list[win_type] = (struct tui_win_info *) NULL;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
}
|
2004-02-07 04:40:36 +00:00
|
|
|
tui_set_win_resized_to (TRUE);
|
1999-04-16 01:35:26 +00:00
|
|
|
/* turn keypad back on, unless focus is in the command window */
|
2004-02-08 00:05:16 +00:00
|
|
|
if (win_with_focus != TUI_CMD_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 20:57:02 +00:00
|
|
|
keypad (TUI_CMD_WIN->generic.handle, TRUE);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
2004-02-08 00:05:16 +00:00
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
/* SIGWINCH signal handler for the tui. This signal handler is always
|
|
|
|
called, even when the readline package clears signals because it is
|
|
|
|
set as the old_sigwinch() (TUI only). */
|
1999-04-16 01:35:26 +00:00
|
|
|
void
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_sigwinch_handler (int signal)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
/*
|
1999-07-07 20:19:36 +00:00
|
|
|
** Say that a resize was done so that the readline can do it
|
|
|
|
** later when appropriate.
|
|
|
|
*/
|
2004-02-07 04:40:36 +00:00
|
|
|
tui_set_win_resized_to (TRUE);
|
2004-02-08 00:05:16 +00:00
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*************************
|
|
|
|
** STATIC LOCAL FUNCTIONS
|
|
|
|
**************************/
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_scroll_forward_command (char *arg, int from_tty)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
int num_to_scroll = 1;
|
|
|
|
struct tui_win_info * win_to_scroll;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2001-07-20 22:22:08 +00:00
|
|
|
/* Make sure the curses mode is enabled. */
|
|
|
|
tui_enable ();
|
1999-04-16 01:35:26 +00:00
|
|
|
if (arg == (char *) NULL)
|
2004-02-08 00:05:16 +00:00
|
|
|
parse_scrolling_args (arg, &win_to_scroll, (int *) NULL);
|
1999-04-16 01:35:26 +00:00
|
|
|
else
|
2004-02-08 00:05:16 +00:00
|
|
|
parse_scrolling_args (arg, &win_to_scroll, &num_to_scroll);
|
|
|
|
tui_scroll (FORWARD_SCROLL, win_to_scroll, num_to_scroll);
|
2001-07-18 22:03:22 +00:00
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
|
|
|
static void
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_scroll_backward_command (char *arg, int from_tty)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
int num_to_scroll = 1;
|
|
|
|
struct tui_win_info * win_to_scroll;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2001-07-20 22:22:08 +00:00
|
|
|
/* Make sure the curses mode is enabled. */
|
|
|
|
tui_enable ();
|
1999-04-16 01:35:26 +00:00
|
|
|
if (arg == (char *) NULL)
|
2004-02-08 00:05:16 +00:00
|
|
|
parse_scrolling_args (arg, &win_to_scroll, (int *) NULL);
|
1999-04-16 01:35:26 +00:00
|
|
|
else
|
2004-02-08 00:05:16 +00:00
|
|
|
parse_scrolling_args (arg, &win_to_scroll, &num_to_scroll);
|
|
|
|
tui_scroll (BACKWARD_SCROLL, win_to_scroll, num_to_scroll);
|
2001-07-18 22:03:22 +00:00
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
|
|
|
static void
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_scroll_left_command (char *arg, int from_tty)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
int num_to_scroll;
|
|
|
|
struct tui_win_info * win_to_scroll;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2001-07-20 22:22:08 +00:00
|
|
|
/* Make sure the curses mode is enabled. */
|
|
|
|
tui_enable ();
|
2004-02-08 00:05:16 +00:00
|
|
|
parse_scrolling_args (arg, &win_to_scroll, &num_to_scroll);
|
|
|
|
tui_scroll (LEFT_SCROLL, win_to_scroll, num_to_scroll);
|
2001-07-18 22:03:22 +00:00
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
|
|
|
static void
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_scroll_right_command (char *arg, int from_tty)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
int num_to_scroll;
|
|
|
|
struct tui_win_info * win_to_scroll;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2001-07-20 22:22:08 +00:00
|
|
|
/* Make sure the curses mode is enabled. */
|
|
|
|
tui_enable ();
|
2004-02-08 00:05:16 +00:00
|
|
|
parse_scrolling_args (arg, &win_to_scroll, &num_to_scroll);
|
|
|
|
tui_scroll (RIGHT_SCROLL, win_to_scroll, num_to_scroll);
|
2001-07-18 22:03:22 +00:00
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
/* Set focus to the window named by 'arg'. */
|
1999-04-16 01:35:26 +00:00
|
|
|
static void
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_set_focus (char *arg, int from_tty)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
if (arg != (char *) NULL)
|
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
char *buf_ptr = (char *) xstrdup (arg);
|
1999-04-16 01:35:26 +00:00
|
|
|
int i;
|
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 20:57:02 +00:00
|
|
|
struct tui_win_info * win_info = (struct tui_win_info *) NULL;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
for (i = 0; (i < strlen (buf_ptr)); i++)
|
|
|
|
buf_ptr[i] = toupper (arg[i]);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
if (subset_compare (buf_ptr, "NEXT"))
|
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 20:57:02 +00:00
|
|
|
win_info = tui_next_win (tui_win_with_focus ());
|
2004-02-08 00:05:16 +00:00
|
|
|
else if (subset_compare (buf_ptr, "PREV"))
|
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 20:57:02 +00:00
|
|
|
win_info = tui_prev_win (tui_win_with_focus ());
|
1999-04-16 01:35:26 +00:00
|
|
|
else
|
2004-02-08 00:05:16 +00:00
|
|
|
win_info = tui_partial_win_by_name (buf_ptr);
|
1999-04-16 01:35:26 +00: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 20:57:02 +00:00
|
|
|
if (win_info == (struct tui_win_info *) NULL || !win_info->generic.is_visible)
|
1999-04-16 01:35:26 +00:00
|
|
|
warning ("Invalid window specified. \n\
|
|
|
|
The window name specified must be valid and visible.\n");
|
|
|
|
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 20:57:02 +00:00
|
|
|
tui_set_win_focus_to (win_info);
|
|
|
|
keypad (TUI_CMD_WIN->generic.handle, (win_info != TUI_CMD_WIN));
|
1999-04-16 01:35:26 +00: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 20:57:02 +00:00
|
|
|
if (TUI_DATA_WIN && TUI_DATA_WIN->generic.is_visible)
|
2004-02-07 00:23:56 +00:00
|
|
|
tui_refresh_data_win ();
|
2004-02-08 00:05:16 +00:00
|
|
|
xfree (buf_ptr);
|
1999-04-16 01:35:26 +00:00
|
|
|
printf_filtered ("Focus set to %s window.\n",
|
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 16:31:22 +00:00
|
|
|
tui_win_name ((struct tui_gen_win_info *) tui_win_with_focus ()));
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
warning ("Incorrect Number of Arguments.\n%s", FOCUS_USAGE);
|
2004-02-08 00:05:16 +00:00
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
static void
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_set_focus_command (char *arg, int from_tty)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2001-07-20 22:22:08 +00:00
|
|
|
/* Make sure the curses mode is enabled. */
|
|
|
|
tui_enable ();
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_set_focus (arg, from_tty);
|
2001-07-18 22:03:22 +00:00
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
|
|
|
static void
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_all_windows_info (char *arg, int from_tty)
|
1999-04-16 01:35:26 +00: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 17:46:14 +00:00
|
|
|
enum tui_win_type type;
|
2004-02-08 00:05:16 +00:00
|
|
|
struct tui_win_info * win_with_focus = tui_win_with_focus ();
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
for (type = SRC_WIN; (type < MAX_MAJOR_WINDOWS); 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 20:57:02 +00:00
|
|
|
if (tui_win_list[type] && tui_win_list[type]->generic.is_visible)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
if (win_with_focus == tui_win_list[type])
|
1999-04-16 01:35:26 +00:00
|
|
|
printf_filtered (" %s\t(%d lines) <has focus>\n",
|
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 20:57:02 +00:00
|
|
|
tui_win_name (&tui_win_list[type]->generic),
|
|
|
|
tui_win_list[type]->generic.height);
|
1999-04-16 01:35:26 +00:00
|
|
|
else
|
|
|
|
printf_filtered (" %s\t(%d lines)\n",
|
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 20:57:02 +00:00
|
|
|
tui_win_name (&tui_win_list[type]->generic),
|
|
|
|
tui_win_list[type]->generic.height);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
2004-02-08 00:05:16 +00:00
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
|
|
|
static void
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_refresh_all_command (char *arg, int from_tty)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2001-07-20 22:22:08 +00:00
|
|
|
/* Make sure the curses mode is enabled. */
|
|
|
|
tui_enable ();
|
|
|
|
|
2004-02-07 01:02:54 +00:00
|
|
|
tui_refresh_all_win ();
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
/* Set the height of the specified window. */
|
1999-04-16 01:35:26 +00:00
|
|
|
static void
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_set_tab_width_command (char *arg, int from_tty)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2001-07-20 22:22:08 +00:00
|
|
|
/* Make sure the curses mode is enabled. */
|
|
|
|
tui_enable ();
|
1999-04-16 01:35:26 +00:00
|
|
|
if (arg != (char *) NULL)
|
|
|
|
{
|
|
|
|
int ts;
|
|
|
|
|
|
|
|
ts = atoi (arg);
|
|
|
|
if (ts > 0)
|
2004-02-07 04:40:36 +00:00
|
|
|
tui_set_default_tab_len (ts);
|
1999-04-16 01:35:26 +00:00
|
|
|
else
|
|
|
|
warning ("Tab widths greater than 0 must be specified.\n");
|
|
|
|
}
|
2004-02-08 00:05:16 +00:00
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
/* Set the height of the specified window. */
|
1999-04-16 01:35:26 +00:00
|
|
|
static void
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_set_win_height (char *arg, int from_tty)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2001-07-20 22:22:08 +00:00
|
|
|
/* Make sure the curses mode is enabled. */
|
|
|
|
tui_enable ();
|
1999-04-16 01:35:26 +00:00
|
|
|
if (arg != (char *) NULL)
|
|
|
|
{
|
2001-07-20 22:22:08 +00:00
|
|
|
char *buf = xstrdup (arg);
|
2004-02-08 00:05:16 +00:00
|
|
|
char *buf_ptr = buf;
|
1999-04-16 01:35:26 +00:00
|
|
|
char *wname = (char *) NULL;
|
2004-02-08 00:05:16 +00:00
|
|
|
int new_height, i;
|
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 20:57:02 +00:00
|
|
|
struct tui_win_info * win_info;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
wname = buf_ptr;
|
|
|
|
buf_ptr = strchr (buf_ptr, ' ');
|
|
|
|
if (buf_ptr != (char *) NULL)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
*buf_ptr = (char) 0;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
/*
|
1999-07-07 20:19:36 +00:00
|
|
|
** Validate the window name
|
|
|
|
*/
|
1999-04-16 01:35:26 +00:00
|
|
|
for (i = 0; i < strlen (wname); i++)
|
|
|
|
wname[i] = toupper (wname[i]);
|
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 20:57:02 +00:00
|
|
|
win_info = tui_partial_win_by_name (wname);
|
1999-04-16 01:35:26 +00: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 20:57:02 +00:00
|
|
|
if (win_info == (struct tui_win_info *) NULL || !win_info->generic.is_visible)
|
1999-04-16 01:35:26 +00:00
|
|
|
warning ("Invalid window specified. \n\
|
|
|
|
The window name specified must be valid and visible.\n");
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/* Process the size */
|
2004-02-08 00:05:16 +00:00
|
|
|
while (*(++buf_ptr) == ' ')
|
1999-04-16 01:35:26 +00:00
|
|
|
;
|
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
if (*buf_ptr != (char) 0)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
int negate = FALSE;
|
2004-02-08 00:05:16 +00:00
|
|
|
int fixed_size = TRUE;
|
|
|
|
int input_no;;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
if (*buf_ptr == '+' || *buf_ptr == '-')
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
if (*buf_ptr == '-')
|
1999-04-16 01:35:26 +00:00
|
|
|
negate = TRUE;
|
2004-02-08 00:05:16 +00:00
|
|
|
fixed_size = FALSE;
|
|
|
|
buf_ptr++;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
2004-02-08 00:05:16 +00:00
|
|
|
input_no = atoi (buf_ptr);
|
|
|
|
if (input_no > 0)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
if (negate)
|
2004-02-08 00:05:16 +00:00
|
|
|
input_no *= (-1);
|
|
|
|
if (fixed_size)
|
|
|
|
new_height = input_no;
|
1999-04-16 01:35:26 +00:00
|
|
|
else
|
2004-02-08 00:05:16 +00:00
|
|
|
new_height = win_info->generic.height + input_no;
|
1999-04-16 01:35:26 +00:00
|
|
|
/*
|
1999-07-07 20:19:36 +00:00
|
|
|
** Now change the window's height, and adjust all
|
|
|
|
** other windows around it
|
|
|
|
*/
|
2004-02-08 00:05:16 +00:00
|
|
|
if (tui_adjust_win_heights (win_info,
|
|
|
|
new_height) == TUI_FAILURE)
|
1999-04-16 01:35:26 +00:00
|
|
|
warning ("Invalid window height specified.\n%s",
|
|
|
|
WIN_HEIGHT_USAGE);
|
|
|
|
else
|
2002-08-24 16:43:08 +00:00
|
|
|
tui_update_gdb_sizes ();
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
warning ("Invalid window height specified.\n%s",
|
|
|
|
WIN_HEIGHT_USAGE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
printf_filtered (WIN_HEIGHT_USAGE);
|
|
|
|
|
|
|
|
if (buf != (char *) NULL)
|
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 17:46:14 +00:00
|
|
|
xfree (buf);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
printf_filtered (WIN_HEIGHT_USAGE);
|
2004-02-08 00:05:16 +00:00
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
/* Set the height of the specified window, with va_list. */
|
1999-04-16 01:35:26 +00:00
|
|
|
static void
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_set_win_height_command (char *arg, int from_tty)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2001-07-20 22:22:08 +00:00
|
|
|
/* Make sure the curses mode is enabled. */
|
|
|
|
tui_enable ();
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_set_win_height (arg, from_tty);
|
2001-07-18 22:03:22 +00:00
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
/* XDB Compatibility command for setting the window height. This will
|
|
|
|
increase or decrease the command window by the specified amount. */
|
1999-04-16 01:35:26 +00:00
|
|
|
static void
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_xdb_set_win_height (char *arg, int from_tty)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2001-07-20 22:22:08 +00:00
|
|
|
/* Make sure the curses mode is enabled. */
|
|
|
|
tui_enable ();
|
1999-04-16 01:35:26 +00:00
|
|
|
if (arg != (char *) NULL)
|
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
int input_no = atoi (arg);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
if (input_no > 0)
|
1999-04-16 01:35:26 +00:00
|
|
|
{ /* Add 1 for the locator */
|
2004-02-08 00:05:16 +00:00
|
|
|
int new_height = tui_term_height () - (input_no + 1);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
if (!new_height_ok (tui_win_list[CMD_WIN], new_height) ||
|
|
|
|
tui_adjust_win_heights (tui_win_list[CMD_WIN],
|
|
|
|
new_height) == TUI_FAILURE)
|
1999-04-16 01:35:26 +00:00
|
|
|
warning ("Invalid window height specified.\n%s",
|
|
|
|
XDBWIN_HEIGHT_USAGE);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
warning ("Invalid window height specified.\n%s",
|
|
|
|
XDBWIN_HEIGHT_USAGE);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
warning ("Invalid window height specified.\n%s", XDBWIN_HEIGHT_USAGE);
|
2004-02-08 00:05:16 +00:00
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
/* Set the height of the specified window, with va_list. */
|
1999-04-16 01:35:26 +00:00
|
|
|
static void
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_xdb_set_win_height_command (char *arg, int from_tty)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_xdb_set_win_height (arg, from_tty);
|
2001-07-18 22:03:22 +00:00
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
/* Function to adjust all window heights around the primary. */
|
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 17:46:14 +00:00
|
|
|
static enum tui_status
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_adjust_win_heights (struct tui_win_info * primary_win_info, int new_height)
|
1999-04-16 01:35:26 +00: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 17:46:14 +00:00
|
|
|
enum tui_status status = TUI_FAILURE;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
if (new_height_ok (primary_win_info, new_height))
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
status = TUI_SUCCESS;
|
2004-02-08 00:05:16 +00:00
|
|
|
if (new_height != primary_win_info->generic.height)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2002-08-24 12:28:33 +00:00
|
|
|
int diff;
|
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 20:57:02 +00:00
|
|
|
struct tui_win_info * win_info;
|
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 16:31:22 +00:00
|
|
|
struct tui_gen_win_info * locator = tui_locator_win_info_ptr ();
|
2004-02-08 00:05:16 +00:00
|
|
|
enum tui_layout_type cur_layout = tui_current_layout ();
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
diff = (new_height - primary_win_info->generic.height) * (-1);
|
|
|
|
if (cur_layout == SRC_COMMAND || cur_layout == DISASSEM_COMMAND)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
struct tui_win_info * src_win_info;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
make_invisible_and_set_new_height (primary_win_info, new_height);
|
|
|
|
if (primary_win_info->generic.type == CMD_WIN)
|
1999-04-16 01:35:26 +00: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 20:57:02 +00:00
|
|
|
win_info = (struct tui_win_info *) (tui_source_windows ())->list[0];
|
2004-02-08 00:05:16 +00:00
|
|
|
src_win_info = win_info;
|
1999-04-16 01:35:26 +00: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 20:57:02 +00:00
|
|
|
win_info = tui_win_list[CMD_WIN];
|
2004-02-08 00:05:16 +00:00
|
|
|
src_win_info = primary_win_info;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
2004-02-08 00:05:16 +00:00
|
|
|
make_invisible_and_set_new_height (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 20:57:02 +00:00
|
|
|
win_info->generic.height + diff);
|
|
|
|
TUI_CMD_WIN->generic.origin.y = locator->origin.y + 1;
|
2004-02-08 00:05:16 +00:00
|
|
|
make_visible_with_new_height (win_info);
|
|
|
|
make_visible_with_new_height (primary_win_info);
|
|
|
|
if (src_win_info->generic.content_size <= 0)
|
|
|
|
tui_erase_source_content (src_win_info, EMPTY_SOURCE_PROMPT);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
struct tui_win_info *first_win;
|
|
|
|
struct tui_win_info *second_win;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
if (cur_layout == SRC_DISASSEM_COMMAND)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
first_win = TUI_SRC_WIN;
|
|
|
|
second_win = TUI_DISASM_WIN;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
first_win = TUI_DATA_WIN;
|
|
|
|
second_win = (struct tui_win_info *) (tui_source_windows ())->list[0];
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
2004-02-08 00:05:16 +00:00
|
|
|
if (primary_win_info == TUI_CMD_WIN)
|
1999-04-16 01:35:26 +00:00
|
|
|
{ /*
|
1999-07-07 20:19:36 +00:00
|
|
|
** Split the change in height accross the 1st & 2nd windows
|
|
|
|
** adjusting them as well.
|
|
|
|
*/
|
2004-02-08 00:05:16 +00:00
|
|
|
int first_split_diff = diff / 2; /* subtract the locator */
|
|
|
|
int second_split_diff = first_split_diff;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
if (diff % 2)
|
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
if (first_win->generic.height >
|
|
|
|
second_win->generic.height)
|
1999-04-16 01:35:26 +00:00
|
|
|
if (diff < 0)
|
2004-02-08 00:05:16 +00:00
|
|
|
first_split_diff--;
|
1999-04-16 01:35:26 +00:00
|
|
|
else
|
2004-02-08 00:05:16 +00:00
|
|
|
first_split_diff++;
|
1999-04-16 01:35:26 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
if (diff < 0)
|
2004-02-08 00:05:16 +00:00
|
|
|
second_split_diff--;
|
1999-04-16 01:35:26 +00:00
|
|
|
else
|
2004-02-08 00:05:16 +00:00
|
|
|
second_split_diff++;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
/* make sure that the minimum hieghts are honored */
|
2004-02-08 00:05:16 +00:00
|
|
|
while ((first_win->generic.height + first_split_diff) < 3)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
first_split_diff++;
|
|
|
|
second_split_diff--;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
2004-02-08 00:05:16 +00:00
|
|
|
while ((second_win->generic.height + second_split_diff) < 3)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
second_split_diff++;
|
|
|
|
first_split_diff--;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
2004-02-08 00:05:16 +00:00
|
|
|
make_invisible_and_set_new_height (
|
|
|
|
first_win,
|
|
|
|
first_win->generic.height + first_split_diff);
|
|
|
|
second_win->generic.origin.y = first_win->generic.height - 1;
|
|
|
|
make_invisible_and_set_new_height (
|
|
|
|
second_win, second_win->generic.height + second_split_diff);
|
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 20:57:02 +00:00
|
|
|
TUI_CMD_WIN->generic.origin.y = locator->origin.y + 1;
|
2004-02-08 00:05:16 +00:00
|
|
|
make_invisible_and_set_new_height (TUI_CMD_WIN, new_height);
|
1999-04-16 01:35:26 +00: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 20:57:02 +00:00
|
|
|
if ((TUI_CMD_WIN->generic.height + diff) < 1)
|
1999-04-16 01:35:26 +00:00
|
|
|
{ /*
|
1999-07-07 20:19:36 +00:00
|
|
|
** If there is no way to increase the command window
|
|
|
|
** take real estate from the 1st or 2nd window.
|
|
|
|
*/
|
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 20:57:02 +00:00
|
|
|
if ((TUI_CMD_WIN->generic.height + diff) < 1)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
int i;
|
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 20:57:02 +00:00
|
|
|
for (i = TUI_CMD_WIN->generic.height + diff;
|
1999-04-16 01:35:26 +00:00
|
|
|
(i < 1); i++)
|
2004-02-08 00:05:16 +00:00
|
|
|
if (primary_win_info == first_win)
|
|
|
|
second_win->generic.height--;
|
1999-04-16 01:35:26 +00:00
|
|
|
else
|
2004-02-08 00:05:16 +00:00
|
|
|
first_win->generic.height--;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
}
|
2004-02-08 00:05:16 +00:00
|
|
|
if (primary_win_info == first_win)
|
|
|
|
make_invisible_and_set_new_height (first_win, new_height);
|
1999-04-16 01:35:26 +00:00
|
|
|
else
|
2004-02-08 00:05:16 +00:00
|
|
|
make_invisible_and_set_new_height (
|
|
|
|
first_win,
|
|
|
|
first_win->generic.height);
|
|
|
|
second_win->generic.origin.y = first_win->generic.height - 1;
|
|
|
|
if (primary_win_info == second_win)
|
|
|
|
make_invisible_and_set_new_height (second_win, new_height);
|
1999-04-16 01:35:26 +00:00
|
|
|
else
|
2004-02-08 00:05:16 +00:00
|
|
|
make_invisible_and_set_new_height (
|
|
|
|
second_win, second_win->generic.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 20:57:02 +00:00
|
|
|
TUI_CMD_WIN->generic.origin.y = locator->origin.y + 1;
|
|
|
|
if ((TUI_CMD_WIN->generic.height + diff) < 1)
|
2004-02-08 00:05:16 +00:00
|
|
|
make_invisible_and_set_new_height (TUI_CMD_WIN, 1);
|
1999-04-16 01:35:26 +00:00
|
|
|
else
|
2004-02-08 00:05:16 +00:00
|
|
|
make_invisible_and_set_new_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 20:57:02 +00:00
|
|
|
TUI_CMD_WIN, TUI_CMD_WIN->generic.height + diff);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
2004-02-08 00:05:16 +00:00
|
|
|
make_visible_with_new_height (TUI_CMD_WIN);
|
|
|
|
make_visible_with_new_height (second_win);
|
|
|
|
make_visible_with_new_height (first_win);
|
|
|
|
if (first_win->generic.content_size <= 0)
|
|
|
|
tui_erase_source_content (first_win, EMPTY_SOURCE_PROMPT);
|
|
|
|
if (second_win->generic.content_size <= 0)
|
|
|
|
tui_erase_source_content (second_win, EMPTY_SOURCE_PROMPT);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return status;
|
2004-02-08 00:05:16 +00:00
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
/* Function make the target window (and auxillary windows associated
|
|
|
|
with the targer) invisible, and set the new height and location. */
|
1999-04-16 01:35:26 +00:00
|
|
|
static void
|
2004-02-08 00:05:16 +00:00
|
|
|
make_invisible_and_set_new_height (struct tui_win_info * win_info, int height)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
int i;
|
2004-02-08 00:05:16 +00:00
|
|
|
struct tui_gen_win_info * gen_win_info;
|
1999-04-16 01:35:26 +00: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 20:57:02 +00:00
|
|
|
tui_make_invisible (&win_info->generic);
|
|
|
|
win_info->generic.height = height;
|
1999-04-16 01:35:26 +00:00
|
|
|
if (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 20:57:02 +00:00
|
|
|
win_info->generic.viewport_height = height - 1;
|
1999-04-16 01:35:26 +00: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 20:57:02 +00:00
|
|
|
win_info->generic.viewport_height = height;
|
|
|
|
if (win_info != TUI_CMD_WIN)
|
|
|
|
win_info->generic.viewport_height--;
|
1999-04-16 01:35:26 +00: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 20:57:02 +00:00
|
|
|
/* Now deal with the auxillary windows associated with win_info */
|
|
|
|
switch (win_info->generic.type)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
case SRC_WIN:
|
|
|
|
case DISASSEM_WIN:
|
2004-02-08 00:05:16 +00:00
|
|
|
gen_win_info = win_info->detail.source_info.execution_info;
|
|
|
|
tui_make_invisible (gen_win_info);
|
|
|
|
gen_win_info->height = height;
|
|
|
|
gen_win_info->origin.y = win_info->generic.origin.y;
|
1999-04-16 01:35:26 +00:00
|
|
|
if (height > 1)
|
2004-02-08 00:05:16 +00:00
|
|
|
gen_win_info->viewport_height = height - 1;
|
1999-04-16 01:35:26 +00:00
|
|
|
else
|
2004-02-08 00:05:16 +00:00
|
|
|
gen_win_info->viewport_height = 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 20:57:02 +00:00
|
|
|
if (win_info != TUI_CMD_WIN)
|
2004-02-08 00:05:16 +00:00
|
|
|
gen_win_info->viewport_height--;
|
1999-04-16 01:35:26 +00: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 20:57:02 +00:00
|
|
|
if (tui_win_has_locator (win_info))
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
gen_win_info = tui_locator_win_info_ptr ();
|
|
|
|
tui_make_invisible (gen_win_info);
|
|
|
|
gen_win_info->origin.y = win_info->generic.origin.y + height;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case DATA_WIN:
|
|
|
|
/* delete all data item windows */
|
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 20:57:02 +00:00
|
|
|
for (i = 0; i < win_info->generic.content_size; i++)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
gen_win_info = (struct tui_gen_win_info *) & ((struct tui_win_element *)
|
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 20:57:02 +00:00
|
|
|
win_info->generic.content[i])->which_element.data_window;
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_delete_win (gen_win_info->handle);
|
|
|
|
gen_win_info->handle = (WINDOW *) NULL;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2002-08-24 12:28:33 +00:00
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
/* Function to make the windows with new heights visible. This means
|
|
|
|
re-creating the windows' content since the window had to be
|
|
|
|
destroyed to be made invisible. */
|
1999-04-16 01:35:26 +00:00
|
|
|
static void
|
2004-02-08 00:05:16 +00:00
|
|
|
make_visible_with_new_height (struct tui_win_info * win_info)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
struct symtab *s;
|
|
|
|
|
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 20:57:02 +00:00
|
|
|
tui_make_visible (&win_info->generic);
|
|
|
|
tui_check_and_display_highlight_if_needed (win_info);
|
|
|
|
switch (win_info->generic.type)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
case SRC_WIN:
|
|
|
|
case DISASSEM_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 20:57:02 +00:00
|
|
|
tui_free_win_content (win_info->detail.source_info.execution_info);
|
|
|
|
tui_make_visible (win_info->detail.source_info.execution_info);
|
|
|
|
if (win_info->generic.content != NULL)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
union tui_line_or_address line_or_addr;
|
2002-09-30 00:52:27 +00:00
|
|
|
struct symtab_and_line cursal
|
|
|
|
= get_current_source_symtab_and_line ();
|
1999-04-16 01:35:26 +00: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 20:57:02 +00:00
|
|
|
if (win_info->generic.type == SRC_WIN)
|
2004-02-08 00:05:16 +00:00
|
|
|
line_or_addr.line_no =
|
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 20:57:02 +00:00
|
|
|
win_info->detail.source_info.start_line_or_addr.line_no;
|
1999-04-16 01:35:26 +00:00
|
|
|
else
|
2004-02-08 00:05:16 +00:00
|
|
|
line_or_addr.addr =
|
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 20:57:02 +00:00
|
|
|
win_info->detail.source_info.start_line_or_addr.addr;
|
|
|
|
tui_free_win_content (&win_info->generic);
|
2004-02-08 00:05:16 +00:00
|
|
|
tui_update_source_window (win_info, cursal.symtab, line_or_addr, TRUE);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* stack.c (selected_frame, select_frame): Move from here ...
* frame.c (selected_frame, select_frame): ... to here. Include
"language.h".
* Makefile.in (frame.o): Update dependencies.
* frame.c (get_selected_frame): New function.
* frame.h (get_selected_frame): Declare.
(deprecated_selected_frame): Rename selected_frame.
* ada-lang.c, ada-tasks.c, breakpoint.c, corelow.c: Update.
* eval.c, f-valprint.c, findvar.c, frame.c, frame.h: Update.
* h8300-tdep.c, h8500-tdep.c, hppa-tdep.c, infcmd.c: Update.
* inflow.c, infrun.c, macroscope.c, mips-tdep.c: Update.
* mn10300-tdep.c, ocd.c, regcache.h, remote-e7000.c: Update.
* remote-mips.c, remote-rdp.c, sh-tdep.c, sparc-tdep.c: Update.
* stack.c, thread.c, tracepoint.c, valops.c, varobj.c: Update.
* z8k-tdep.c, cli/cli-cmds.c: Update.
Index: mi/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* mi/mi-cmd-stack.c, mi/mi-main.c: Update to use
deprecated_selected_frame.
Index: tui/ChangeLog
2002-11-29 Andrew Cagney <ac131313@redhat.com>
* tui/tui-hooks.c: Update to use deprecated_selected_frame.
* tui/tui.c, tui/tuiDisassem.c, tui/tuiRegs.c: Ditto.
* tui/tuiSource.c, tui/tuiSourceWin.c, tui/tuiWin.c: Ditto.
2002-11-29 19:15:16 +00:00
|
|
|
else if (deprecated_selected_frame != (struct frame_info *) NULL)
|
1999-04-16 01:35:26 +00: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 16:31:22 +00:00
|
|
|
union tui_line_or_address line;
|
2002-09-30 00:52:27 +00:00
|
|
|
struct symtab_and_line cursal = get_current_source_symtab_and_line ();
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2003-06-12 15:44:24 +00:00
|
|
|
s = find_pc_symtab (get_frame_pc (deprecated_selected_frame));
|
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 20:57:02 +00:00
|
|
|
if (win_info->generic.type == SRC_WIN)
|
|
|
|
line.line_no = cursal.line;
|
1999-04-16 01:35:26 +00:00
|
|
|
else
|
2001-07-17 22:22:40 +00:00
|
|
|
{
|
2002-09-30 00:52:27 +00:00
|
|
|
find_line_pc (s, cursal.line, &line.addr);
|
2001-07-17 22:22:40 +00: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 20:57:02 +00:00
|
|
|
tui_update_source_window (win_info, s, line, TRUE);
|
1999-04-16 01:35:26 +00: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 20:57:02 +00:00
|
|
|
if (tui_win_has_locator (win_info))
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-07 04:40:36 +00:00
|
|
|
tui_make_visible (tui_locator_win_info_ptr ());
|
2004-01-28 23:16:50 +00:00
|
|
|
tui_show_locator_content ();
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case DATA_WIN:
|
2004-02-07 00:23:56 +00:00
|
|
|
tui_display_all_data ();
|
1999-04-16 01:35:26 +00:00
|
|
|
break;
|
|
|
|
case CMD_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 20:57:02 +00:00
|
|
|
win_info->detail.command_info.cur_line = 0;
|
|
|
|
win_info->detail.command_info.curch = 0;
|
|
|
|
wmove (win_info->generic.handle,
|
|
|
|
win_info->detail.command_info.cur_line,
|
|
|
|
win_info->detail.command_info.curch);
|
1999-04-16 01:35:26 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2004-02-08 00:05:16 +00:00
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
|
|
|
static int
|
2004-02-08 00:05:16 +00:00
|
|
|
new_height_ok (struct tui_win_info * primary_win_info, int new_height)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
int ok = (new_height < tui_term_height ());
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
if (ok)
|
|
|
|
{
|
2002-08-24 12:28:33 +00:00
|
|
|
int diff;
|
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 20:57:02 +00:00
|
|
|
enum tui_layout_type cur_layout = tui_current_layout ();
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
diff = (new_height - primary_win_info->generic.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 20:57:02 +00:00
|
|
|
if (cur_layout == SRC_COMMAND || cur_layout == DISASSEM_COMMAND)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
ok = ((primary_win_info->generic.type == CMD_WIN &&
|
|
|
|
new_height <= (tui_term_height () - 4) &&
|
|
|
|
new_height >= MIN_CMD_WIN_HEIGHT) ||
|
|
|
|
(primary_win_info->generic.type != CMD_WIN &&
|
|
|
|
new_height <= (tui_term_height () - 2) &&
|
|
|
|
new_height >= MIN_WIN_HEIGHT));
|
1999-04-16 01:35:26 +00:00
|
|
|
if (ok)
|
|
|
|
{ /* check the total 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 20:57:02 +00:00
|
|
|
struct tui_win_info * win_info;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
if (primary_win_info == TUI_CMD_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 20:57:02 +00:00
|
|
|
win_info = (struct tui_win_info *) (tui_source_windows ())->list[0];
|
1999-04-16 01:35:26 +00: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 20:57:02 +00:00
|
|
|
win_info = TUI_CMD_WIN;
|
2004-02-08 00:05:16 +00:00
|
|
|
ok = ((new_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 20:57:02 +00:00
|
|
|
(win_info->generic.height + diff)) <= tui_term_height ());
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
int cur_total_height, total_height, min_height = 0;
|
|
|
|
struct tui_win_info *first_win;
|
|
|
|
struct tui_win_info *second_win;
|
1999-04-16 01:35:26 +00: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 20:57:02 +00:00
|
|
|
if (cur_layout == SRC_DISASSEM_COMMAND)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
first_win = TUI_SRC_WIN;
|
|
|
|
second_win = TUI_DISASM_WIN;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
first_win = TUI_DATA_WIN;
|
|
|
|
second_win = (struct tui_win_info *) (tui_source_windows ())->list[0];
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
/*
|
1999-07-07 20:19:36 +00:00
|
|
|
** We could simply add all the heights to obtain the same result
|
|
|
|
** but below is more explicit since we subtract 1 for the
|
|
|
|
** line that the first and second windows share, and add one
|
|
|
|
** for the locator.
|
|
|
|
*/
|
2004-02-08 00:05:16 +00:00
|
|
|
total_height = cur_total_height =
|
|
|
|
(first_win->generic.height + second_win->generic.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 20:57:02 +00:00
|
|
|
+ TUI_CMD_WIN->generic.height + 1 /*locator */ ;
|
2004-02-08 00:05:16 +00:00
|
|
|
if (primary_win_info == TUI_CMD_WIN)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
/* locator included since first & second win share a line */
|
2004-02-08 00:05:16 +00:00
|
|
|
ok = ((first_win->generic.height +
|
|
|
|
second_win->generic.height + diff) >=
|
1999-04-16 01:35:26 +00:00
|
|
|
(MIN_WIN_HEIGHT * 2) &&
|
2004-02-08 00:05:16 +00:00
|
|
|
new_height >= MIN_CMD_WIN_HEIGHT);
|
1999-04-16 01:35:26 +00:00
|
|
|
if (ok)
|
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
total_height = new_height + (first_win->generic.height +
|
|
|
|
second_win->generic.height + diff);
|
|
|
|
min_height = MIN_CMD_WIN_HEIGHT;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
min_height = MIN_WIN_HEIGHT;
|
1999-04-16 01:35:26 +00:00
|
|
|
/*
|
1999-07-07 20:19:36 +00:00
|
|
|
** First see if we can increase/decrease the command
|
|
|
|
** window. And make sure that the command window is
|
|
|
|
** at least 1 line
|
|
|
|
*/
|
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 20:57:02 +00:00
|
|
|
ok = ((TUI_CMD_WIN->generic.height + diff) > 0);
|
1999-04-16 01:35:26 +00:00
|
|
|
if (!ok)
|
|
|
|
{ /*
|
1999-07-07 20:19:36 +00:00
|
|
|
** Looks like we have to increase/decrease one of
|
|
|
|
** the other windows
|
|
|
|
*/
|
2004-02-08 00:05:16 +00:00
|
|
|
if (primary_win_info == first_win)
|
|
|
|
ok = (second_win->generic.height + diff) >= min_height;
|
1999-04-16 01:35:26 +00:00
|
|
|
else
|
2004-02-08 00:05:16 +00:00
|
|
|
ok = (first_win->generic.height + diff) >= min_height;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
if (ok)
|
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
if (primary_win_info == first_win)
|
|
|
|
total_height = new_height +
|
|
|
|
second_win->generic.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 20:57:02 +00:00
|
|
|
TUI_CMD_WIN->generic.height + diff;
|
1999-04-16 01:35:26 +00:00
|
|
|
else
|
2004-02-08 00:05:16 +00:00
|
|
|
total_height = new_height +
|
|
|
|
first_win->generic.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 20:57:02 +00:00
|
|
|
TUI_CMD_WIN->generic.height + diff;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
/*
|
1999-07-07 20:19:36 +00:00
|
|
|
** Now make sure that the proposed total height doesn't exceed
|
|
|
|
** the old total height.
|
|
|
|
*/
|
1999-04-16 01:35:26 +00:00
|
|
|
if (ok)
|
2004-02-08 00:05:16 +00:00
|
|
|
ok = (new_height >= min_height && total_height <= cur_total_height);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return ok;
|
2004-02-08 00:05:16 +00:00
|
|
|
}
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
|
|
|
|
static void
|
2004-02-08 00:05:16 +00:00
|
|
|
parse_scrolling_args (char *arg, struct tui_win_info * * win_to_scroll,
|
|
|
|
int *num_to_scroll)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
if (num_to_scroll)
|
|
|
|
*num_to_scroll = 0;
|
|
|
|
*win_to_scroll = tui_win_with_focus ();
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
/*
|
1999-07-07 20:19:36 +00:00
|
|
|
** First set up the default window to scroll, in case there is no
|
|
|
|
** window name arg
|
|
|
|
*/
|
1999-04-16 01:35:26 +00:00
|
|
|
if (arg != (char *) NULL)
|
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
char *buf, *buf_ptr;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
|
|
|
/* process the number of lines to scroll */
|
2004-02-08 00:05:16 +00:00
|
|
|
buf = buf_ptr = xstrdup (arg);
|
|
|
|
if (isdigit (*buf_ptr))
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
char *num_str;
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
num_str = buf_ptr;
|
|
|
|
buf_ptr = strchr (buf_ptr, ' ');
|
|
|
|
if (buf_ptr != (char *) NULL)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
2004-02-08 00:05:16 +00:00
|
|
|
*buf_ptr = (char) 0;
|
|
|
|
if (num_to_scroll)
|
|
|
|
*num_to_scroll = atoi (num_str);
|
|
|
|
buf_ptr++;
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
2004-02-08 00:05:16 +00:00
|
|
|
else if (num_to_scroll)
|
|
|
|
*num_to_scroll = atoi (num_str);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* process the window name if one is specified */
|
2004-02-08 00:05:16 +00:00
|
|
|
if (buf_ptr != (char *) NULL)
|
1999-04-16 01:35:26 +00:00
|
|
|
{
|
|
|
|
char *wname;
|
|
|
|
int i;
|
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
if (*buf_ptr == ' ')
|
|
|
|
while (*(++buf_ptr) == ' ')
|
1999-04-16 01:35:26 +00:00
|
|
|
;
|
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
if (*buf_ptr != (char) 0)
|
|
|
|
wname = buf_ptr;
|
2001-07-20 23:06:48 +00:00
|
|
|
else
|
|
|
|
wname = "?";
|
|
|
|
|
1999-04-16 01:35:26 +00:00
|
|
|
/* Validate the window name */
|
|
|
|
for (i = 0; i < strlen (wname); i++)
|
|
|
|
wname[i] = toupper (wname[i]);
|
2004-02-08 00:05:16 +00:00
|
|
|
*win_to_scroll = tui_partial_win_by_name (wname);
|
1999-04-16 01:35:26 +00:00
|
|
|
|
2004-02-08 00:05:16 +00:00
|
|
|
if (*win_to_scroll == (struct tui_win_info *) NULL ||
|
|
|
|
!(*win_to_scroll)->generic.is_visible)
|
1999-04-16 01:35:26 +00:00
|
|
|
warning ("Invalid window specified. \n\
|
|
|
|
The window name specified must be valid and visible.\n");
|
2004-02-08 00:05:16 +00:00
|
|
|
else if (*win_to_scroll == TUI_CMD_WIN)
|
|
|
|
*win_to_scroll = (struct tui_win_info *) (tui_source_windows ())->list[0];
|
1999-04-16 01:35:26 +00: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 17:46:14 +00:00
|
|
|
xfree (buf);
|
1999-04-16 01:35:26 +00:00
|
|
|
}
|
2004-02-08 00:05:16 +00:00
|
|
|
}
|