diff options
author | Andrew Cagney <cagney@redhat.com> | 2003-02-14 13:58:06 +0000 |
---|---|---|
committer | Andrew Cagney <cagney@redhat.com> | 2003-02-14 13:58:06 +0000 |
commit | 021e7609055e94c3b2f0ac757c9640d393ed2000 (patch) | |
tree | a992b5a8ac54ade41fcca5b86f1e9622daa1d385 /gdb/cli | |
parent | ed781d5d99c9e91d230e60c75ac10d3ac14f7736 (diff) | |
download | gdb-021e7609055e94c3b2f0ac757c9640d393ed2000.zip gdb-021e7609055e94c3b2f0ac757c9640d393ed2000.tar.gz gdb-021e7609055e94c3b2f0ac757c9640d393ed2000.tar.bz2 |
2003-02-14 Andrew Cagney <ac131313@redhat.com>
* main.c (tui_version): Delete variable.
(captured_main): When --tui, set interpreter_p to "tui" instead of
enabling tui_version.
* printcmd.c (display_command) [TUI]: Test tui_active instead of
tui_version.
* cli/cli-decode.c (lookup_cmd_composition): Ditto.
* cli/cli-cmds.c (disassemble_command): Ditto.
* defs.h (tui_version): Delete declaration.
* Makefile.in (SUBDIR_TUI_SRCS): Add "tui/tui-interp.c".
(tui-interp.o): Add rules.
(SUBDIR_TUI_OBS): Add "tui-interp.o".
Index: tui/ChangeLog
2003-02-14 Andrew Cagney <ac131313@redhat.com>
* tui.c (tui_enable, tui_disable): Don't modify tui_version.
(tui_is_window_visible, tui_get_command_dimension): Test
tui_active instead of tui_version.
* tuiData.h (tui_version): Delete declaration.
* tui-hooks.c (tui_init_hook, tui_event_loop): Delete function,
moved to "tui-interp.c".
(tui_exit, tui_command_loop): Ditto.
(_initialize_tui): Don't initialize init_ui_hook. Initialize
target_new_objfile_hook.
* tui-interp.c: New file.
Diffstat (limited to 'gdb/cli')
-rw-r--r-- | gdb/cli/cli-cmds.c | 8 | ||||
-rw-r--r-- | gdb/cli/cli-decode.c | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index 154ecf6..85dd689 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -852,7 +852,9 @@ disassemble_command (char *arg, int from_tty) if (find_pc_partial_function (pc, &name, &low, &high) == 0) error ("No function contains program counter for selected frame.\n"); #if defined(TUI) - else if (tui_version) + /* NOTE: cagney/2003-02-13 The `tui_active' was previously + `tui_version'. */ + else if (tui_active) low = tuiGetLowDisassemblyAddress (low, pc); #endif low += FUNCTION_START_OFFSET; @@ -864,7 +866,9 @@ disassemble_command (char *arg, int from_tty) if (find_pc_partial_function (pc, &name, &low, &high) == 0) error ("No function contains specified address.\n"); #if defined(TUI) - else if (tui_version) + /* NOTE: cagney/2003-02-13 The `tui_active' was previously + `tui_version'. */ + else if (tui_active) low = tuiGetLowDisassemblyAddress (low, pc); #endif low += FUNCTION_START_OFFSET; diff --git a/gdb/cli/cli-decode.c b/gdb/cli/cli-decode.c index bce0c2d..a9979f6 100644 --- a/gdb/cli/cli-decode.c +++ b/gdb/cli/cli-decode.c @@ -923,9 +923,11 @@ lookup_cmd_1 (char **text, struct cmd_list_element *clist, /* Treating underscores as part of command words is important so that "set args_foo()" doesn't get interpreted as "set args _foo()". */ + /* NOTE: cagney/2003-02-13 The `tui_active' was previously + `tui_version'. */ for (p = *text; *p && (isalnum (*p) || *p == '-' || *p == '_' || - (tui_version && + (tui_active && (*p == '+' || *p == '<' || *p == '>' || *p == '$')) || (xdb_commands && (*p == '!' || *p == '/' || *p == '?'))); p++) @@ -1293,9 +1295,11 @@ lookup_cmd_composition (char *text, /* Treating underscores as part of command words is important so that "set args_foo()" doesn't get interpreted as "set args _foo()". */ + /* NOTE: cagney/2003-02-13 The `tui_active' was previously + `tui_version'. */ for (p = text; *p && (isalnum (*p) || *p == '-' || *p == '_' || - (tui_version && + (tui_active && (*p == '+' || *p == '<' || *p == '>' || *p == '$')) || (xdb_commands && (*p == '!' || *p == '/' || *p == '?'))); p++) |