X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Ftui%2Ftui-data.h;h=264652361ef5ca536406f59f87168e505954fc68;hb=7226433c44e3792aeea6ad19c54cd3056ea4308e;hp=214f728befe02219780a07343cc90ac754174641;hpb=5104fe361d818a46b262b5d504f3d293c9a2b44a;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/tui/tui-data.h b/gdb/tui/tui-data.h index 214f728bef..264652361e 100644 --- a/gdb/tui/tui-data.h +++ b/gdb/tui/tui-data.h @@ -46,7 +46,16 @@ protected: { } + /* This is called after the window is resized, and should update the + window's contents. */ + virtual void rerender () + { + } + + virtual void make_window (); + public: + tui_gen_win_info (tui_gen_win_info &&) = default; virtual ~tui_gen_win_info (); @@ -62,10 +71,16 @@ public: return ""; } - /* Reset this window. The parameters are used to set the window's + /* Resize this window. The parameters are used to set the window's size and position. */ - virtual void reset (int height, int width, - int origin_x, int origin_y); + virtual void resize (int height, int width, + int origin_x, int origin_y); + + /* Return true if this window is visible. */ + bool is_visible () const + { + return handle != nullptr; + } /* Window handle. */ WINDOW *handle = nullptr; @@ -79,50 +94,20 @@ public: struct tui_point origin = {0, 0}; /* Viewport height. */ int viewport_height = 0; - /* Index of last visible line. */ - int last_visible_line = 0; - /* Whether the window is visible or not. */ - bool is_visible = false; - /* Window title to display. */ - char *title = nullptr; -}; - -/* Whether or not a window should be drawn with a box. */ -enum tui_box -{ - DONT_BOX_WINDOW = 0, - BOX_WINDOW }; /* Constant definitions. */ #define DEFAULT_TAB_LEN 8 -#define NO_SRC_STRING "[ No Source Available ]" -#define NO_DISASSEM_STRING "[ No Assembly Available ]" -#define NO_REGS_STRING "[ Register Values Unavailable ]" -#define NO_DATA_STRING "[ No Data Values Displayed ]" #define SRC_NAME "src" #define CMD_NAME "cmd" #define DATA_NAME "regs" #define DISASSEM_NAME "asm" -#define HILITE TRUE -#define NO_HILITE FALSE #define MIN_WIN_HEIGHT 3 #define MIN_CMD_WIN_HEIGHT 3 /* Strings to display in the TUI status line. */ -#define PROC_PREFIX "In: " -#define LINE_PREFIX "L" -#define PC_PREFIX "PC: " #define SINGLE_KEY "(SingleKey)" -/* Minimum/Maximum length of some fields displayed in the TUI status - line. */ -#define MIN_LINE_WIDTH 4 /* Use at least 4 digits for line - numbers. */ -#define MIN_PROC_WIDTH 12 -#define MAX_TARGET_WIDTH 10 -#define MAX_PID_WIDTH 19 - /* The kinds of layouts available. */ enum tui_layout_type { @@ -151,78 +136,6 @@ struct tui_line_or_address } u; }; -/* Current Layout definition. */ -struct tui_layout_def -{ - enum tui_win_type display_mode; -}; - -/* Flags to tell what kind of breakpoint is at current line. */ -enum tui_bp_flag -{ - TUI_BP_ENABLED = 0x01, - TUI_BP_DISABLED = 0x02, - TUI_BP_HIT = 0x04, - TUI_BP_CONDITIONAL = 0x08, - TUI_BP_HARDWARE = 0x10 -}; - -DEF_ENUM_FLAGS_TYPE (enum tui_bp_flag, tui_bp_flags); - -/* Elements in the Source/Disassembly Window. */ -struct tui_source_element -{ - tui_source_element () - { - line_or_addr.loa = LOA_LINE; - line_or_addr.u.line_no = 0; - } - - ~tui_source_element () - { - xfree (line); - } - - char *line = nullptr; - struct tui_line_or_address line_or_addr; - bool is_exec_point = false; - tui_bp_flags break_mode = 0; -}; - - -#ifdef PATH_MAX -# define MAX_LOCATOR_ELEMENT_LEN PATH_MAX -#else -# define MAX_LOCATOR_ELEMENT_LEN 1024 -#endif - -/* Position of breakpoint markers in the exec info string. */ -#define TUI_BP_HIT_POS 0 -#define TUI_BP_BREAK_POS 1 -#define TUI_EXEC_POS 2 -#define TUI_EXECINFO_SIZE 4 - -typedef char tui_exec_info_content[TUI_EXECINFO_SIZE]; - -/* Locator window class. */ - -struct tui_locator_window : public tui_gen_win_info -{ - tui_locator_window () - : tui_gen_win_info (LOCATOR_WIN) - { - full_name[0] = 0; - proc_name[0] = 0; - } - - char full_name[MAX_LOCATOR_ELEMENT_LEN]; - char proc_name[MAX_LOCATOR_ELEMENT_LEN]; - int line_no = 0; - CORE_ADDR addr = 0; - /* Architecture associated with code at this location. */ - struct gdbarch *gdbarch = nullptr; -}; - /* This defines information about each logical window. */ struct tui_win_info : public tui_gen_win_info { @@ -239,9 +152,9 @@ protected: left_scroll and right_scroll. */ virtual void do_scroll_horizontal (int num_to_scroll) = 0; - /* Called after make_visible_with_new_height sets the new height. - Should update the window. */ - virtual void do_make_visible_with_new_height () = 0; + void rerender () override; + + void make_window () override; public: @@ -249,21 +162,6 @@ public: { } - /* Clear the pertinent detail in the window. */ - virtual void clear_detail () = 0; - - /* Called after all the TUI windows are refreshed, to let this - window have a chance to update itself further. */ - virtual void refresh_all () - { - } - - /* Called after a TUI window is given a new height; this updates any - related auxiliary windows. */ - virtual void set_new_height (int height) - { - } - /* Compute the maximum height of this window. */ virtual int max_height () const; @@ -272,14 +170,6 @@ public: { } - /* Function make the target window (and auxiliary windows associated - with the target) invisible, and set the new height and - location. */ - void make_invisible_and_set_new_height (int height); - - /* Make the window visible after the height has been changed. */ - void make_visible_with_new_height (); - /* Set whether this window is highglighted. */ void set_highlight (bool highlight) { @@ -300,6 +190,16 @@ public: return true; } + virtual bool can_box () const + { + return true; + } + + void check_and_display_highlight_if_needed (); + + /* Window title to display. */ + std::string title; + /* Can this window ever be highlighted? */ bool can_highlight = true; @@ -388,28 +288,26 @@ struct all_tui_windows /* Data Manipulation Functions. */ -extern void tui_initialize_static_data (void); extern struct tui_win_info *tui_partial_win_by_name (const char *); extern enum tui_layout_type tui_current_layout (void); -extern void tui_set_current_layout_to (enum tui_layout_type); extern int tui_term_height (void); extern void tui_set_term_height_to (int); extern int tui_term_width (void); extern void tui_set_term_width_to (int); extern struct tui_locator_window *tui_locator_win_info_ptr (void); -extern std::vector &tui_source_windows (); -extern void tui_clear_source_windows (void); -extern void tui_clear_source_windows_detail (void); -extern void tui_add_to_source_windows (struct tui_source_window_base *); extern struct tui_win_info *tui_win_with_focus (void); extern void tui_set_win_with_focus (struct tui_win_info *); -extern struct tui_layout_def *tui_layout_def (void); -extern int tui_win_resized (void); -extern void tui_set_win_resized_to (int); +extern bool tui_win_resized (); +extern void tui_set_win_resized_to (bool); extern struct tui_win_info *tui_next_win (struct tui_win_info *); extern struct tui_win_info *tui_prev_win (struct tui_win_info *); +/* Delete all the invisible windows. Note that it is an error to call + this when the command window is invisible -- we don't allow the + command window to be removed from the layout. */ +extern void tui_delete_invisible_windows (); + extern unsigned int tui_tab_width; #endif /* TUI_TUI_DATA_H */