/* General functions for the WDB TUI.
- Copyright (C) 1998-2019 Free Software Foundation, Inc.
+ Copyright (C) 1998-2020 Free Software Foundation, Inc.
Contributed by Hewlett-Packard Company.
#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"
#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 <ctype.h>
#include <signal.h>
#include <fcntl.h>
-#if 0
-#include <termio.h>
-#endif
#include <setjmp.h>
#include "gdb_curses.h"
#include "readline/readline.h"
/* Tells whether the TUI is active or not. */
-int tui_active = 0;
-static int tui_finish_init = 1;
+bool tui_active = false;
+static bool tui_finish_init = true;
enum tui_key_mode tui_current_key_mode = TUI_COMMAND_MODE;
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;
}
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 ();
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)
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_set_win_focus_to (TUI_SRC_WIN);
- keypad (TUI_CMD_WIN->generic.handle, TRUE);
- wrefresh (TUI_CMD_WIN->generic.handle);
- tui_finish_init = 0;
+ keypad (TUI_CMD_WIN->handle.get (), TRUE);
+ wrefresh (TUI_CMD_WIN->handle.get ());
+ tui_finish_init = false;
}
else
{
clearok (stdscr, TRUE);
}
- /* Install the TUI specific hooks. */
- tui_install_hooks ();
- rl_startup_hook = tui_rl_startup_hook;
+ if (tui_update_variables ())
+ tui_rehighlight_all ();
- tui_update_variables ();
-
tui_setup_io (1);
- tui_active = 1;
+ tui_active = true;
/* Resize windows before anything might display/refresh a
window. */
if (tui_win_resized ())
{
- tui_set_win_resized_to (FALSE);
+ tui_set_win_resized_to (false);
tui_resize_all ();
}
if (deprecated_safe_get_selected_frame ())
tui_show_frame_info (deprecated_safe_get_selected_frame ());
+ else
+ tui_display_main ();
+
+ /* Install the TUI specific hooks. This must be done after the call to
+ tui_display_main so that we don't detect the symtab changed event it
+ can cause. */
+ tui_install_hooks ();
+ rl_startup_hook = tui_rl_startup_hook;
/* Restore TUI keymap. */
tui_set_key_mode (tui_current_key_mode);
/* Update gdb's knowledge of its terminal. */
gdb_save_tty_state ();
- tui_active = 0;
+ tui_active = false;
tui_update_gdb_sizes ();
}
tui_disable ();
}
-void
-strcat_to_buf (char *buf, int buflen,
- const char *item_to_add)
-{
- if (item_to_add != NULL && buf != NULL)
- {
- if ((strlen (buf) + strlen (item_to_add)) <= buflen)
- strcat (buf, item_to_add);
- else
- strncat (buf, item_to_add, (buflen - strlen (buf)));
- }
-}
-
-#if 0
-/* Solaris <sys/termios.h> defines CTRL. */
-#ifndef CTRL
-#define CTRL(x) (x & ~0140)
-#endif
-
-#define FILEDES 2
-#define CHK(val, dft) (val<=0 ? dft : val)
-
-static void
-tui_reset (void)
-{
- struct termio mode;
-
- /* Reset the teletype mode bits to a sensible state.
- Copied tset.c. */
-#if defined (TIOCGETC)
- struct tchars tbuf;
-#endif /* TIOCGETC */
-#ifdef UCB_NTTY
- struct ltchars ltc;
-
- if (ldisc == NTTYDISC)
- {
- ioctl (FILEDES, TIOCGLTC, <c);
- ltc.t_suspc = CHK (ltc.t_suspc, CTRL ('Z'));
- ltc.t_dsuspc = CHK (ltc.t_dsuspc, CTRL ('Y'));
- ltc.t_rprntc = CHK (ltc.t_rprntc, CTRL ('R'));
- ltc.t_flushc = CHK (ltc.t_flushc, CTRL ('O'));
- ltc.t_werasc = CHK (ltc.t_werasc, CTRL ('W'));
- ltc.t_lnextc = CHK (ltc.t_lnextc, CTRL ('V'));
- ioctl (FILEDES, TIOCSLTC, <c);
- }
-#endif /* UCB_NTTY */
-#ifdef TIOCGETC
- ioctl (FILEDES, TIOCGETC, &tbuf);
- tbuf.t_intrc = CHK (tbuf.t_intrc, CTRL ('?'));
- tbuf.t_quitc = CHK (tbuf.t_quitc, CTRL ('\\'));
- tbuf.t_startc = CHK (tbuf.t_startc, CTRL ('Q'));
- tbuf.t_stopc = CHK (tbuf.t_stopc, CTRL ('S'));
- tbuf.t_eofc = CHK (tbuf.t_eofc, CTRL ('D'));
- /* brkc is left alone. */
- ioctl (FILEDES, TIOCSETC, &tbuf);
-#endif /* TIOCGETC */
- mode.sg_flags &= ~(RAW
-#ifdef CBREAK
- | CBREAK
-#endif /* CBREAK */
- | VTDELAY | ALLDELAY);
- mode.sg_flags |= XTABS | ECHO | CRMOD | ANYP;
-
- return;
-}
-#endif
-
-void
-tui_show_source (const char *fullname, int line)
-{
- struct symtab_and_line cursal = get_current_source_symtab_and_line ();
-
- /* Make sure that the source window is displayed. */
- tui_add_win_to_layout (SRC_WIN);
-
- tui_update_source_windows_with_line (cursal.symtab, line);
- tui_update_locator_fullname (fullname);
-}
-
void
tui_show_assembly (struct gdbarch *gdbarch, CORE_ADDR addr)
{
bool
tui_is_window_visible (enum tui_win_type type)
{
- if (tui_active == 0)
+ if (!tui_active)
return false;
if (tui_win_list[type] == 0)
return false;
- return tui_win_list[type]->generic.is_visible;
+ return tui_win_list[type]->is_visible ();
}
-int
+bool
tui_get_command_dimension (unsigned int *width,
unsigned int *height)
{
if (!tui_active || (TUI_CMD_WIN == NULL))
- {
- return 0;
- }
+ return false;
- *width = TUI_CMD_WIN->generic.width;
- *height = TUI_CMD_WIN->generic.height;
- return 1;
+ *width = TUI_CMD_WIN->width;
+ *height = TUI_CMD_WIN->height;
+ return true;
}
void