X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Ftui%2Ftui-winsource.c;h=fbee2e3e1813bc8acbcc393f9a704bb1d5230406;hb=7c392d1de1400202eb86f7679628c4b7c14f8108;hp=254c7e00dcb3392c87db89af53d06c725385fbfd;hpb=5b81daba91b035ce98fb7be4970fc2be0183f6ea;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c index 254c7e00dc..fbee2e3e18 100644 --- a/gdb/tui/tui-winsource.c +++ b/gdb/tui/tui-winsource.c @@ -1,6 +1,6 @@ /* TUI display source/assembly window. - Copyright (C) 1998-2019 Free Software Foundation, Inc. + Copyright (C) 1998-2020 Free Software Foundation, Inc. Contributed by Hewlett-Packard Company. @@ -44,7 +44,8 @@ void tui_display_main () { - if (!tui_source_windows ().empty ()) + auto adapter = tui_source_windows (); + if (adapter.begin () != adapter.end ()) { struct gdbarch *gdbarch; CORE_ADDR addr; @@ -56,257 +57,288 @@ tui_display_main () tui_update_source_windows_with_addr (gdbarch, addr); s = find_pc_line_symtab (addr); - if (s != NULL) - tui_update_locator_fullname (symtab_to_fullname (s)); - else - tui_update_locator_fullname ("??"); + tui_update_locator_fullname (s); } } } +/* See tui-winsource.h. */ - -/* Function to display source in the source window. This function - initializes the horizontal scroll to 0. */ -void -tui_update_source_window (struct tui_win_info *win_info, - struct gdbarch *gdbarch, - struct symtab *s, - struct tui_line_or_address line_or_addr, - int noerror) -{ - tui_source_window_base *base = (tui_source_window_base *) win_info; - base->horizontal_offset = 0; - tui_update_source_window_as_is (win_info, gdbarch, s, line_or_addr, noerror); - - return; -} - - -/* Function to display source in the source/asm window. This function - shows the source as specified by the horizontal offset. */ -void -tui_update_source_window_as_is (struct tui_win_info *win_info, - struct gdbarch *gdbarch, - struct symtab *s, - struct tui_line_or_address line_or_addr, - int noerror) +std::string +tui_copy_source_line (const char **ptr, int line_no, int first_col, + int line_width, int ndigits) { - enum tui_status ret; + const char *lineptr = *ptr; - if (win_info->type == SRC_WIN) - ret = tui_set_source_content (s, line_or_addr.u.line_no, noerror); - else - ret = tui_set_disassem_content (gdbarch, line_or_addr.u.addr); + /* Init the line with the line number. */ + std::string result; - if (ret == TUI_FAILURE) - { - tui_clear_source_content (win_info, EMPTY_SOURCE_PROMPT); - tui_clear_exec_info_content (win_info); - } - else + if (line_no > 0) { - tui_update_breakpoint_info (win_info, 0); - tui_show_source_content (win_info); - tui_update_exec_info (win_info); - if (win_info->type == SRC_WIN) + if (ndigits > 0) + result = string_printf ("%*d ", ndigits, line_no); + else { - symtab_and_line sal; - - sal.line = line_or_addr.u.line_no + - (win_info->content_size - 2); - sal.symtab = s; - sal.pspace = SYMTAB_PSPACE (s); - set_current_source_symtab_and_line (sal); - /* If the focus was in the asm win, put it in the src win if - we don't have a split layout. */ - if (tui_win_with_focus () == TUI_DISASM_WIN - && tui_current_layout () != SRC_DISASSEM_COMMAND) - tui_set_win_focus_to (TUI_SRC_WIN); + result = string_printf ("%-6d", line_no); + int len = result.size (); + len = len - ((len / tui_tab_width) * tui_tab_width); + result.append (len, ' '); } } + int column = 0; + char c; + do + { + int skip_bytes; - return; -} + c = *lineptr; + if (c == '\033' && skip_ansi_escape (lineptr, &skip_bytes)) + { + /* We always have to preserve escapes. */ + result.append (lineptr, lineptr + skip_bytes); + lineptr += skip_bytes; + continue; + } + if (c == '\0') + break; + ++lineptr; + ++column; -/* Function to ensure that the source and/or disassemly windows - reflect the input address. */ -void -tui_update_source_windows_with_addr (struct gdbarch *gdbarch, CORE_ADDR addr) -{ - if (addr != 0) - { - struct symtab_and_line sal; - struct tui_line_or_address l; - - switch (tui_current_layout ()) + auto process_tab = [&] () { - case DISASSEM_COMMAND: - case DISASSEM_DATA_COMMAND: - tui_show_disassem (gdbarch, addr); - break; - case SRC_DISASSEM_COMMAND: - tui_show_disassem_and_update_source (gdbarch, addr); - break; - default: - sal = find_pc_line (addr, 0); - l.loa = LOA_LINE; - l.u.line_no = sal.line; - tui_show_symtab_source (gdbarch, sal.symtab, l, FALSE); - break; + int max_tab_len = tui_tab_width; + + --column; + for (int j = column % max_tab_len; + j < max_tab_len && column < first_col + line_width; + column++, j++) + if (column >= first_col) + result.push_back (' '); + }; + + /* We have to process all the text in order to pick up all the + escapes. */ + if (column <= first_col || column > first_col + line_width) + { + if (c == '\t') + process_tab (); + continue; } - } - else - { - for (struct tui_source_window_base *win_info : tui_source_windows ()) + + if (c == '\n' || c == '\r' || c == '\0') { - tui_clear_source_content (win_info, EMPTY_SOURCE_PROMPT); - tui_clear_exec_info_content (win_info); + /* Nothing. */ } + else if (c < 040 && c != '\t') + { + result.push_back ('^'); + result.push_back (c + 0100); + } + else if (c == 0177) + { + result.push_back ('^'); + result.push_back ('?'); + } + else if (c == '\t') + process_tab (); + else + result.push_back (c); } + while (c != '\0' && c != '\n' && c != '\r'); + + if (c == '\r' && *lineptr == '\n') + ++lineptr; + *ptr = lineptr; + + return result; } -/* Function to ensure that the source and/or disassemly windows - reflect the input address. */ void -tui_update_source_windows_with_line (struct symtab *s, int line) +tui_source_window_base::style_changed () +{ + if (tui_active && is_visible ()) + refill (); +} + +/* Function to display source in the source window. This function + initializes the horizontal scroll to 0. */ +void +tui_source_window_base::update_source_window + (struct gdbarch *gdbarch, + const struct symtab_and_line &sal) { - struct gdbarch *gdbarch; - CORE_ADDR pc; - struct tui_line_or_address l; + horizontal_offset = 0; + update_source_window_as_is (gdbarch, sal); +} - if (!s) - return; - gdbarch = get_objfile_arch (SYMTAB_OBJFILE (s)); +/* Function to display source in the source/asm window. This function + shows the source as specified by the horizontal offset. */ +void +tui_source_window_base::update_source_window_as_is + (struct gdbarch *gdbarch, + const struct symtab_and_line &sal) +{ + bool ret = set_contents (gdbarch, sal); - switch (tui_current_layout ()) + if (!ret) + erase_source_content (); + else { - case DISASSEM_COMMAND: - case DISASSEM_DATA_COMMAND: - find_line_pc (s, line, &pc); - tui_update_source_windows_with_addr (gdbarch, pc); - break; - default: - l.loa = LOA_LINE; - l.u.line_no = line; - tui_show_symtab_source (gdbarch, s, l, FALSE); - if (tui_current_layout () == SRC_DISASSEM_COMMAND) - { - find_line_pc (s, line, &pc); - tui_show_disassem (gdbarch, pc); - } - break; + update_breakpoint_info (nullptr, false); + show_source_content (); + update_exec_info (); } +} + + +/* Function to ensure that the source and/or disassemly windows + reflect the input address. */ +void +tui_update_source_windows_with_addr (struct gdbarch *gdbarch, CORE_ADDR addr) +{ + struct symtab_and_line sal {}; + if (addr != 0) + sal = find_pc_line (addr, 0); - return; + for (struct tui_source_window_base *win_info : tui_source_windows ()) + win_info->update_source_window (gdbarch, sal); } +/* Function to ensure that the source and/or disassembly windows + reflect the symtab and line. */ void -tui_clear_source_content (struct tui_win_info *win_info, - int display_prompt) +tui_update_source_windows_with_line (struct symtab_and_line sal) { - if (win_info != NULL) - { - int i; + if (!sal.symtab) + return; - win_info->content_in_use = FALSE; - tui_erase_source_content (win_info, display_prompt); - for (i = 0; i < win_info->content_size; i++) - { - struct tui_win_element *element = win_info->content[i]; + find_line_pc (sal.symtab, sal.line, &sal.pc); + struct gdbarch *gdbarch = get_objfile_arch (SYMTAB_OBJFILE (sal.symtab)); - element->which_element.source.has_break = FALSE; - element->which_element.source.is_exec_point = FALSE; - } - } + for (struct tui_source_window_base *win_info : tui_source_windows ()) + win_info->update_source_window (gdbarch, sal); } - void -tui_erase_source_content (struct tui_win_info *win_info, - int display_prompt) +tui_source_window_base::do_erase_source_content (const char *str) { int x_pos; - int half_width = (win_info->width - 2) / 2; + int half_width = (width - 2) / 2; - if (win_info->handle != NULL) + content.clear (); + if (handle != NULL) { - werase (win_info->handle); - tui_check_and_display_highlight_if_needed (win_info); - if (display_prompt == EMPTY_SOURCE_PROMPT) - { - const char *no_src_str; - - if (win_info->type == SRC_WIN) - no_src_str = NO_SRC_STRING; - else - no_src_str = NO_DISASSEM_STRING; - if (strlen (no_src_str) >= half_width) - x_pos = 1; - else - x_pos = half_width - strlen (no_src_str); - mvwaddstr (win_info->handle, - (win_info->height / 2), - x_pos, - (char *) no_src_str); - - /* elz: Added this function call to set the real contents of - the window to what is on the screen, so that later calls - to refresh, do display the correct stuff, and not the old - image. */ - - tui_set_source_content_nil (win_info, no_src_str); - } - win_info->refresh_window (); + werase (handle.get ()); + check_and_display_highlight_if_needed (); + + if (strlen (str) >= half_width) + x_pos = 1; + else + x_pos = half_width - strlen (str); + mvwaddstr (handle.get (), + (height / 2), + x_pos, + (char *) str); + + refresh_window (); } } /* Redraw the complete line of a source or disassembly window. */ static void -tui_show_source_line (struct tui_win_info *win_info, int lineno) +tui_show_source_line (struct tui_source_window_base *win_info, int lineno) { - struct tui_win_element *line; + struct tui_source_element *line; int x; - line = win_info->content[lineno - 1]; - if (line->which_element.source.is_exec_point) - tui_set_reverse_mode (win_info->handle, true); + line = &win_info->content[lineno - 1]; + if (line->is_exec_point) + tui_set_reverse_mode (win_info->handle.get (), true); - wmove (win_info->handle, lineno, 1); - tui_puts (line->which_element.source.line, - win_info->handle); - if (line->which_element.source.is_exec_point) - tui_set_reverse_mode (win_info->handle, false); + wmove (win_info->handle.get (), lineno, TUI_EXECINFO_SIZE); + tui_puts (line->line.c_str (), win_info->handle.get ()); + if (line->is_exec_point) + tui_set_reverse_mode (win_info->handle.get (), false); /* Clear to end of line but stop before the border. */ - x = getcurx (win_info->handle); + x = getcurx (win_info->handle.get ()); while (x + 1 < win_info->width) { - waddch (win_info->handle, ' '); - x = getcurx (win_info->handle); + waddch (win_info->handle.get (), ' '); + x = getcurx (win_info->handle.get ()); } } void -tui_show_source_content (struct tui_win_info *win_info) +tui_source_window_base::show_source_content () +{ + gdb_assert (!content.empty ()); + + for (int lineno = 1; lineno <= content.size (); lineno++) + tui_show_source_line (this, lineno); + + check_and_display_highlight_if_needed (); + refresh_window (); +} + +tui_source_window_base::tui_source_window_base (enum tui_win_type type) + : tui_win_info (type) { - if (win_info->content_size > 0) + gdb_assert (type == SRC_WIN || type == DISASSEM_WIN); + start_line_or_addr.loa = LOA_ADDRESS; + start_line_or_addr.u.addr = 0; + + gdb::observers::source_styling_changed.attach + (std::bind (&tui_source_window::style_changed, this), + m_observable); +} + +tui_source_window_base::~tui_source_window_base () +{ + gdb::observers::source_styling_changed.detach (m_observable); +} + +/* See tui-data.h. */ + +void +tui_source_window_base::update_tab_width () +{ + werase (handle.get ()); + rerender (); +} + +void +tui_source_window_base::rerender () +{ + if (!content.empty ()) { - int lineno; + struct symtab_and_line cursal + = get_current_source_symtab_and_line (); - for (lineno = 1; lineno <= win_info->content_size; lineno++) - tui_show_source_line (win_info, lineno); + if (start_line_or_addr.loa == LOA_LINE) + cursal.line = start_line_or_addr.u.line_no; + else + cursal.pc = start_line_or_addr.u.addr; + update_source_window (gdbarch, cursal); + } + else if (deprecated_safe_get_selected_frame () != NULL) + { + struct symtab_and_line cursal + = get_current_source_symtab_and_line (); + struct frame_info *frame = deprecated_safe_get_selected_frame (); + struct gdbarch *gdbarch = get_frame_arch (frame); + + struct symtab *s = find_pc_line_symtab (get_frame_pc (frame)); + if (type != SRC_WIN) + find_line_pc (s, cursal.line, &cursal.pc); + update_source_window (gdbarch, cursal); } else - tui_erase_source_content (win_info, TRUE); - - tui_check_and_display_highlight_if_needed (win_info); - win_info->refresh_window (); - win_info->content_in_use = TRUE; + erase_source_content (); } /* See tui-data.h. */ @@ -314,75 +346,72 @@ tui_show_source_content (struct tui_win_info *win_info) void tui_source_window_base::refill () { - symtab *s = nullptr; + symtab_and_line sal {}; if (type == SRC_WIN) { - symtab_and_line cursal = get_current_source_symtab_and_line (); - s = (cursal.symtab == NULL - ? find_pc_line_symtab (get_frame_pc (get_selected_frame (NULL))) - : cursal.symtab); + sal = get_current_source_symtab_and_line (); + if (sal.symtab == NULL) + { + struct frame_info *fi = deprecated_safe_get_selected_frame (); + if (fi != nullptr) + sal = find_pc_line (get_frame_pc (fi), 0); + } } - tui_update_source_window_as_is (this, gdbarch, s, - content[0] - ->which_element.source.line_or_addr, - FALSE); + if (sal.pspace == nullptr) + sal.pspace = current_program_space; + + if (start_line_or_addr.loa == LOA_LINE) + sal.line = start_line_or_addr.u.line_no; + else + sal.pc = start_line_or_addr.u.addr; + + update_source_window_as_is (gdbarch, sal); } /* Scroll the source forward or backward horizontally. */ void -tui_source_window_base::do_scroll_horizontal - (enum tui_scroll_direction direction, int num_to_scroll) +tui_source_window_base::do_scroll_horizontal (int num_to_scroll) { - if (content != NULL) + if (!content.empty ()) { - int offset; - - if (direction == LEFT_SCROLL) - offset = horizontal_offset + num_to_scroll; - else - { - offset = horizontal_offset - num_to_scroll; - if (offset < 0) - offset = 0; - } + int offset = horizontal_offset + num_to_scroll; + if (offset < 0) + offset = 0; horizontal_offset = offset; refill (); } } -/* Set or clear the has_break flag in the line whose line is +/* Set or clear the is_exec_point flag in the line whose line is line_no. */ void tui_source_window_base::set_is_exec_point_at (struct tui_line_or_address l) { - int changed = 0; + bool changed = false; int i; i = 0; - while (i < content_size) + while (i < content.size ()) { - int new_state; + bool new_state; struct tui_line_or_address content_loa = - content[i]->which_element.source.line_or_addr; + content[i].line_or_addr; - gdb_assert (l.loa == LOA_ADDRESS || l.loa == LOA_LINE); - gdb_assert (content_loa.loa == LOA_LINE - || content_loa.loa == LOA_ADDRESS); if (content_loa.loa == l.loa && ((l.loa == LOA_LINE && content_loa.u.line_no == l.u.line_no) - || (content_loa.u.addr == l.u.addr))) - new_state = TRUE; + || (l.loa == LOA_ADDRESS && content_loa.u.addr == l.u.addr))) + new_state = true; else - new_state = FALSE; - if (new_state != content[i]->which_element.source.is_exec_point) + new_state = false; + if (new_state != content[i].is_exec_point) { - changed++; - content[i]->which_element.source.is_exec_point = new_state; + changed = true; + content[i].is_exec_point = new_state; tui_show_source_line (this, i + 1); } i++; @@ -391,71 +420,54 @@ tui_source_window_base::set_is_exec_point_at (struct tui_line_or_address l) refill (); } -/* Update the execution windows to show the active breakpoints. - This is called whenever a breakpoint is inserted, removed or - has its state changed. */ +/* See tui-winsource.h. */ + void -tui_update_all_breakpoint_info () +tui_update_all_breakpoint_info (struct breakpoint *being_deleted) { for (tui_source_window_base *win : tui_source_windows ()) { - if (tui_update_breakpoint_info (win, FALSE)) - { - tui_update_exec_info (win); - } + if (win->update_breakpoint_info (being_deleted, false)) + win->update_exec_info (); } } -/* Scan the source window and the breakpoints to update the has_break +/* Scan the source window and the breakpoints to update the break_mode information for each line. - Returns 1 if something changed and the execution window must be + Returns true if something changed and the execution window must be refreshed. */ -int -tui_update_breakpoint_info (struct tui_win_info *win, - int current_only) +bool +tui_source_window_base::update_breakpoint_info + (struct breakpoint *being_deleted, bool current_only) { int i; - int need_refresh = 0; - tui_source_window_base *src = (tui_source_window_base *) win; + bool need_refresh = false; - for (i = 0; i < win->content_size; i++) + for (i = 0; i < content.size (); i++) { - struct breakpoint *bp; - extern struct breakpoint *breakpoint_chain; - int mode; struct tui_source_element *line; - line = &win->content[i]->which_element.source; + line = &content[i]; if (current_only && !line->is_exec_point) continue; /* Scan each breakpoint to see if the current line has something to do with it. Identify enable/disabled breakpoints as well as those that we already hit. */ - mode = 0; - for (bp = breakpoint_chain; - bp != NULL; - bp = bp->next) + tui_bp_flags mode = 0; + iterate_over_breakpoints ([&] (breakpoint *bp) -> bool { struct bp_location *loc; - gdb_assert (line->line_or_addr.loa == LOA_LINE - || line->line_or_addr.loa == LOA_ADDRESS); + if (bp == being_deleted) + return false; for (loc = bp->loc; loc != NULL; loc = loc->next) { - if ((win == TUI_SRC_WIN - && loc->symtab != NULL - && filename_cmp (src->fullname, - symtab_to_fullname (loc->symtab)) == 0 - && line->line_or_addr.loa == LOA_LINE - && loc->line_number == line->line_or_addr.u.line_no) - || (win == TUI_DISASM_WIN - && line->line_or_addr.loa == LOA_ADDRESS - && loc->address == line->line_or_addr.u.addr)) + if (location_matches_p (loc, i)) { if (bp->enable_state == bp_disabled) mode |= TUI_BP_DISABLED; @@ -469,211 +481,46 @@ tui_update_breakpoint_info (struct tui_win_info *win, mode |= TUI_BP_HARDWARE; } } - } - if (line->has_break != mode) + return false; + }); + if (line->break_mode != mode) { - line->has_break = mode; - need_refresh = 1; + line->break_mode = mode; + need_refresh = true; } } return need_refresh; } - /* Function to initialize the content of the execution info window, based upon the input window which is either the source or disassembly window. */ -enum tui_status -tui_set_exec_info_content (struct tui_win_info *win_info) -{ - enum tui_status ret = TUI_SUCCESS; - - tui_source_window_base *base = (tui_source_window_base *) win_info; - if (base->execution_info != NULL) - { - struct tui_gen_win_info *exec_info_ptr = base->execution_info; - - if (exec_info_ptr->content == NULL) - exec_info_ptr->content = - tui_alloc_content (win_info->height, exec_info_ptr->type); - if (exec_info_ptr->content != NULL) - { - int i; - - tui_update_breakpoint_info (win_info, 1); - for (i = 0; i < win_info->content_size; i++) - { - struct tui_win_element *element; - struct tui_win_element *src_element; - int mode; - - element = exec_info_ptr->content[i]; - src_element = win_info->content[i]; - - memset(element->which_element.simple_string, ' ', - sizeof(element->which_element.simple_string)); - element->which_element.simple_string[TUI_EXECINFO_SIZE - 1] = 0; - - /* Now update the exec info content based upon the state - of each line as indicated by the source content. */ - mode = src_element->which_element.source.has_break; - if (mode & TUI_BP_HIT) - element->which_element.simple_string[TUI_BP_HIT_POS] = - (mode & TUI_BP_HARDWARE) ? 'H' : 'B'; - else if (mode & (TUI_BP_ENABLED | TUI_BP_DISABLED)) - element->which_element.simple_string[TUI_BP_HIT_POS] = - (mode & TUI_BP_HARDWARE) ? 'h' : 'b'; - - if (mode & TUI_BP_ENABLED) - element->which_element.simple_string[TUI_BP_BREAK_POS] = '+'; - else if (mode & TUI_BP_DISABLED) - element->which_element.simple_string[TUI_BP_BREAK_POS] = '-'; - - if (src_element->which_element.source.is_exec_point) - element->which_element.simple_string[TUI_EXEC_POS] = '>'; - } - exec_info_ptr->content_size = win_info->content_size; - } - else - ret = TUI_FAILURE; - } - - return ret; -} - - void -tui_show_exec_info_content (struct tui_win_info *win_info) +tui_source_window_base::update_exec_info () { - tui_source_window_base *base = (tui_source_window_base *) win_info; - struct tui_gen_win_info *exec_info = base->execution_info; - int cur_line; - - werase (exec_info->handle); - exec_info->refresh_window (); - for (cur_line = 1; (cur_line <= exec_info->content_size); cur_line++) - mvwaddstr (exec_info->handle, - cur_line, - 0, - (char *) exec_info->content[cur_line - 1] - ->which_element.simple_string); - exec_info->refresh_window (); - exec_info->content_in_use = TRUE; -} - - -void -tui_erase_exec_info_content (struct tui_win_info *win_info) -{ - tui_source_window_base *base = (tui_source_window_base *) win_info; - struct tui_gen_win_info *exec_info = base->execution_info; - - werase (exec_info->handle); - exec_info->refresh_window (); -} - -void -tui_clear_exec_info_content (struct tui_win_info *win_info) -{ - tui_source_window_base *base = (tui_source_window_base *) win_info; - base->execution_info->content_in_use = FALSE; - tui_erase_exec_info_content (win_info); - - return; -} - -/* Function to update the execution info window. */ -void -tui_update_exec_info (struct tui_win_info *win_info) -{ - tui_set_exec_info_content (win_info); - tui_show_exec_info_content (win_info); -} - -enum tui_status -tui_alloc_source_buffer (struct tui_win_info *win_info) -{ - int i, line_width, max_lines; - - /* The window width/height includes the highlight box. Determine actual - content dimensions, including string null-terminators. */ - max_lines = win_info->height - 2; - line_width = win_info->width - 2 + 1; - - /* Allocate the buffer for the source lines. */ - if (win_info->content == NULL) + update_breakpoint_info (nullptr, true); + for (int i = 0; i < content.size (); i++) { - /* Allocate the content list. */ - win_info->content = tui_alloc_content (max_lines, SRC_WIN); - for (i = 0; i < max_lines; i++) - win_info->content[i]->which_element.source.line - = (char *) xmalloc (line_width); + struct tui_source_element *src_element = &content[i]; + char element[TUI_EXECINFO_SIZE] = " "; + + /* Now update the exec info content based upon the state + of each line as indicated by the source content. */ + tui_bp_flags mode = src_element->break_mode; + if (mode & TUI_BP_HIT) + element[TUI_BP_HIT_POS] = (mode & TUI_BP_HARDWARE) ? 'H' : 'B'; + else if (mode & (TUI_BP_ENABLED | TUI_BP_DISABLED)) + element[TUI_BP_HIT_POS] = (mode & TUI_BP_HARDWARE) ? 'h' : 'b'; + + if (mode & TUI_BP_ENABLED) + element[TUI_BP_BREAK_POS] = '+'; + else if (mode & TUI_BP_DISABLED) + element[TUI_BP_BREAK_POS] = '-'; + + if (src_element->is_exec_point) + element[TUI_EXEC_POS] = '>'; + + mvwaddstr (handle.get (), i + 1, 1, element); } - - return TUI_SUCCESS; + refresh_window (); } - - -/* Answer whether a particular line number or address is displayed - in the current source window. */ -int -tui_line_is_displayed (int line, - struct tui_win_info *win_info, - int check_threshold) -{ - int is_displayed = FALSE; - int i, threshold; - - if (check_threshold) - threshold = SCROLL_THRESHOLD; - else - threshold = 0; - i = 0; - while (i < win_info->content_size - threshold - && !is_displayed) - { - is_displayed - = win_info->content[i] - ->which_element.source.line_or_addr.loa == LOA_LINE - && win_info->content[i] - ->which_element.source.line_or_addr.u.line_no == line; - i++; - } - - return is_displayed; -} - - -/* Answer whether a particular line number or address is displayed - in the current source window. */ -int -tui_addr_is_displayed (CORE_ADDR addr, - struct tui_win_info *win_info, - int check_threshold) -{ - int is_displayed = FALSE; - int i, threshold; - - if (check_threshold) - threshold = SCROLL_THRESHOLD; - else - threshold = 0; - i = 0; - while (i < win_info->content_size - threshold - && !is_displayed) - { - is_displayed - = win_info->content[i] - ->which_element.source.line_or_addr.loa == LOA_ADDRESS - && win_info->content[i] - ->which_element.source.line_or_addr.u.addr == addr; - i++; - } - - return is_displayed; -} - - -/***************************************** -** STATIC LOCAL FUNCTIONS ** -******************************************/