X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Ftui%2Ftui.c;h=dc0d22fd66dae4c9e20b65453d2c36fcab20d999;hb=e379e5f385f874adb0b414f917adb1fc50e20de9;hp=27d51576e1b06508dc85fec8e588032fe4b069e4;hpb=56d397a3824d826cdbaa02dba633bd86da6308c5;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/tui/tui.c b/gdb/tui/tui.c index 27d51576e1..dc0d22fd66 100644 --- a/gdb/tui/tui.c +++ b/gdb/tui/tui.c @@ -1,6 +1,6 @@ /* General functions for the WDB TUI. - Copyright (C) 1998-2013 Free Software Foundation, Inc. + Copyright (C) 1998-2019 Free Software Foundation, Inc. Contributed by Hewlett-Packard Company. @@ -23,6 +23,7 @@ #include "gdbcmd.h" #include "tui/tui.h" #include "tui/tui-hooks.h" +#include "tui/tui-command.h" #include "tui/tui-data.h" #include "tui/tui-layout.h" #include "tui/tui-io.h" @@ -30,16 +31,16 @@ #include "tui/tui-stack.h" #include "tui/tui-win.h" #include "tui/tui-winsource.h" -#include "tui/tui-windata.h" +#include "tui/tui-source.h" #include "target.h" #include "frame.h" #include "breakpoint.h" #include "inferior.h" #include "symtab.h" #include "source.h" +#include "terminal.h" +#include "top.h" -#include -#include #include #include #include @@ -49,6 +50,7 @@ #include #include "gdb_curses.h" +#include "interps.h" /* This redefines CTRL if it is not already defined, so it must come after terminal state releated include files like and @@ -74,8 +76,10 @@ static const struct tui_char_command tui_commands[] = { { 'd', "down" }, { 'f', "finish" }, { 'n', "next" }, + { 'o', "nexti" }, { 'r', "run" }, { 's', "step" }, + { 'i', "stepi" }, { 'u', "up" }, { 'v', "info locals" }, { 'w', "where" }, @@ -90,15 +94,29 @@ static Keymap tui_readline_standard_keymap; static int tui_rl_switch_mode (int notused1, int notused2) { - if (tui_active) + + /* Don't let exceptions escape. We're in the middle of a readline + callback that isn't prepared for that. */ + try { - tui_disable (); - rl_prep_terminal (0); + if (tui_active) + { + tui_disable (); + rl_prep_terminal (0); + } + else + { + /* If tui_enable throws, we'll re-prep below. */ + rl_deprep_terminal (); + tui_enable (); + } } - else + catch (const gdb_exception &ex) { - rl_deprep_terminal (); - tui_enable (); + exception_print (gdb_stderr, ex); + + if (!tui_active) + rl_prep_terminal (0); } /* Clear the readline in case switching occurred in middle of @@ -135,7 +153,6 @@ tui_rl_change_windows (int notused1, int notused2) if (tui_active) { enum tui_layout_type new_layout; - enum tui_register_display_type regs_type = TUI_UNDEFINED_REGS; new_layout = tui_current_layout (); @@ -167,7 +184,7 @@ tui_rl_change_windows (int notused1, int notused2) new_layout = SRC_COMMAND; break; } - tui_set_layout (new_layout, regs_type); + tui_set_layout (new_layout); } return 0; } @@ -183,7 +200,6 @@ tui_rl_delete_other_windows (int notused1, int notused2) if (tui_active) { enum tui_layout_type new_layout; - enum tui_register_display_type regs_type = TUI_UNDEFINED_REGS; new_layout = tui_current_layout (); @@ -202,7 +218,7 @@ tui_rl_delete_other_windows (int notused1, int notused2) new_layout = DISASSEM_COMMAND; break; } - tui_set_layout (new_layout, regs_type); + tui_set_layout (new_layout); } return 0; } @@ -221,9 +237,7 @@ tui_rl_other_window (int count, int key) if (win_info) { tui_set_win_focus_to (win_info); - if (TUI_DATA_WIN && TUI_DATA_WIN->generic.is_visible) - tui_refresh_data_win (); - keypad (TUI_CMD_WIN->generic.handle, (win_info != TUI_CMD_WIN)); + keypad (TUI_CMD_WIN->handle.get (), win_info != TUI_CMD_WIN); } return 0; } @@ -289,7 +303,8 @@ static int tui_rl_startup_hook (void) { rl_already_prompted = 1; - if (tui_current_key_mode != TUI_COMMAND_MODE && immediate_quit == 0) + if (tui_current_key_mode != TUI_COMMAND_MODE + && !gdb_in_secondary_prompt_p (current_ui)) tui_set_key_mode (TUI_SINGLE_KEY_MODE); tui_redisplay_readline (); return 0; @@ -314,13 +329,19 @@ tui_initialize_readline (void) int i; Keymap tui_ctlx_keymap; - rl_initialize (); - rl_add_defun ("tui-switch-mode", tui_rl_switch_mode, -1); - rl_add_defun ("gdb-command", tui_rl_command_key, -1); rl_add_defun ("next-keymap", tui_rl_next_keymap, -1); + rl_add_defun ("tui-delete-other-windows", tui_rl_delete_other_windows, -1); + rl_add_defun ("tui-change-windows", tui_rl_change_windows, -1); + rl_add_defun ("tui-other-window", tui_rl_other_window, -1); tui_keymap = rl_make_bare_keymap (); + + /* The named keymap feature was added in Readline 8.0. */ +#if RL_READLINE_VERSION >= 0x800 + rl_set_keymap_name ("SingleKey", tui_keymap); +#endif + tui_ctlx_keymap = rl_make_bare_keymap (); tui_readline_standard_keymap = rl_get_keymap (); @@ -362,6 +383,20 @@ tui_initialize_readline (void) rl_bind_key_in_map ('s', tui_rl_next_keymap, tui_ctlx_keymap); } +/* Return the TERM variable from the environment, or "" + if not set. */ + +static const char * +gdb_getenv_term (void) +{ + const char *term; + + term = getenv ("TERM"); + if (term != NULL) + return term; + return ""; +} + /* Enter in the tui mode (curses). When in normal mode, it installs the tui hooks in gdb, redirects the gdb output, configures the readline to work in tui mode. @@ -369,37 +404,84 @@ tui_initialize_readline (void) void tui_enable (void) { - if (!tui_allowed_p ()) - error (_("TUI mode not allowed")); - if (tui_active) return; - /* To avoid to initialize curses when gdb starts, there is a defered + /* To avoid to initialize curses when gdb starts, there is a deferred curses initialization. This initialization is made only once and the first time the curses mode is entered. */ if (tui_finish_init) { WINDOW *w; + SCREEN *s; +#ifndef __MINGW32__ + const char *cap; +#endif + const char *interp; + + /* If the top level interpreter is not the console/tui (e.g., + MI), enabling curses will certainly lose. */ + interp = top_level_interpreter ()->name (); + if (strcmp (interp, INTERP_TUI) != 0) + error (_("Cannot enable the TUI when the interpreter is '%s'"), interp); + + /* Don't try to setup curses (and print funny control + characters) if we're not outputting to a terminal. */ + if (!ui_file_isatty (gdb_stdout)) + error (_("Cannot enable the TUI when output is not a terminal")); + + s = newterm (NULL, stdout, stdin); +#ifdef __MINGW32__ + /* The MinGW port of ncurses requires $TERM to be unset in order + to activate the Windows console driver. */ + if (s == NULL) + s = newterm ((char *) "unknown", stdout, stdin); +#endif + if (s == NULL) + { + error (_("Cannot enable the TUI: error opening terminal [TERM=%s]"), + gdb_getenv_term ()); + } + w = stdscr; + if (has_colors ()) + { +#ifdef HAVE_USE_DEFAULT_COLORS + /* Ncurses extension to help with resetting to the default + color. */ + use_default_colors (); +#endif + start_color (); + } + + /* Check required terminal capabilities. The MinGW port of + ncurses does have them, but doesn't expose them through "cup". */ +#ifndef __MINGW32__ + cap = tigetstr ((char *) "cup"); + if (cap == NULL || cap == (char *) -1 || *cap == '\0') + { + endwin (); + delscreen (s); + error (_("Cannot enable the TUI: " + "terminal doesn't support cursor addressing [TERM=%s]"), + gdb_getenv_term ()); + } +#endif - w = initscr (); - cbreak (); noecho (); /* timeout (1); */ nodelay(w, FALSE); nl(); keypad (w, TRUE); - rl_initialize (); tui_set_term_height_to (LINES); tui_set_term_width_to (COLS); def_prog_mode (); tui_show_frame_info (0); - tui_set_layout (SRC_COMMAND, TUI_UNDEFINED_REGS); + tui_set_layout (SRC_COMMAND); tui_set_win_focus_to (TUI_SRC_WIN); - keypad (TUI_CMD_WIN->generic.handle, TRUE); - wrefresh (TUI_CMD_WIN->generic.handle); + keypad (TUI_CMD_WIN->handle.get (), TRUE); + wrefresh (TUI_CMD_WIN->handle.get ()); tui_finish_init = 0; } else @@ -414,20 +496,32 @@ tui_enable (void) tui_install_hooks (); rl_startup_hook = tui_rl_startup_hook; - tui_update_variables (); - + if (tui_update_variables ()) + tui_rehighlight_all (); + tui_setup_io (1); tui_active = 1; + + /* Resize windows before anything might display/refresh a + window. */ + if (tui_win_resized ()) + { + tui_set_win_resized_to (false); + tui_resize_all (); + } + if (deprecated_safe_get_selected_frame ()) - tui_show_frame_info (deprecated_safe_get_selected_frame ()); + tui_show_frame_info (deprecated_safe_get_selected_frame ()); /* Restore TUI keymap. */ tui_set_key_mode (tui_current_key_mode); + + /* Refresh the screen. */ tui_refresh_all_win (); /* Update gdb's knowledge of its terminal. */ - target_terminal_save_ours (); + gdb_save_tty_state (); tui_update_gdb_sizes (); } @@ -457,23 +551,26 @@ tui_disable (void) tui_setup_io (0); /* Update gdb's knowledge of its terminal. */ - target_terminal_save_ours (); + gdb_save_tty_state (); tui_active = 0; tui_update_gdb_sizes (); } -void -strcat_to_buf (char *buf, int buflen, - const char *item_to_add) +/* Command wrapper for enabling tui mode. */ + +static void +tui_enable_command (const char *args, int from_tty) { - if (item_to_add != (char *) NULL && buf != (char *) NULL) - { - if ((strlen (buf) + strlen (item_to_add)) <= buflen) - strcat (buf, item_to_add); - else - strncat (buf, item_to_add, (buflen - strlen (buf))); - } + tui_enable (); +} + +/* Command wrapper for leaving tui mode. */ + +static void +tui_disable_command (const char *args, int from_tty) +{ + tui_disable (); } #if 0 @@ -526,8 +623,6 @@ tui_reset (void) #endif /* CBREAK */ | VTDELAY | ALLDELAY); mode.sg_flags |= XTABS | ECHO | CRMOD | ANYP; - - return; } #endif @@ -550,16 +645,16 @@ tui_show_assembly (struct gdbarch *gdbarch, CORE_ADDR addr) tui_update_source_windows_with_addr (gdbarch, addr); } -int +bool tui_is_window_visible (enum tui_win_type type) { if (tui_active == 0) - return 0; + return false; if (tui_win_list[type] == 0) - return 0; + return false; - return tui_win_list[type]->generic.is_visible; + return tui_win_list[type]->is_visible (); } int @@ -571,7 +666,22 @@ tui_get_command_dimension (unsigned int *width, return 0; } - *width = TUI_CMD_WIN->generic.width; - *height = TUI_CMD_WIN->generic.height; + *width = TUI_CMD_WIN->width; + *height = TUI_CMD_WIN->height; return 1; } + +void +_initialize_tui (void) +{ + struct cmd_list_element **tuicmd; + + tuicmd = tui_get_cmd_list (); + + add_cmd ("enable", class_tui, tui_enable_command, + _("Enable TUI display mode."), + tuicmd); + add_cmd ("disable", class_tui, tui_disable_command, + _("Disable TUI display mode."), + tuicmd); +}