along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
+#include <math.h>
#include <ctype.h>
#include "symtab.h"
#include "frame.h"
#include "tui/tui-data.h"
#include "tui/tui-io.h"
#include "tui/tui-stack.h"
+#include "tui/tui-win.h"
#include "tui/tui-winsource.h"
#include "tui/tui-source.h"
#include "gdb_curses.h"
-/* A helper function for tui_set_source_content that extracts some
- source text from PTR. LINE_NO is the line number; FIRST_COL is the
- first column to extract, and LINE_WIDTH is the number of characters
- to display. Returns a string holding the desired text. */
-
-static std::string
-copy_source_line (const char **ptr, int line_no, int first_col,
- int line_width)
-{
- const char *lineptr = *ptr;
-
- /* Init the line with the line number. */
- std::string 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;
-
- 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;
- }
-
- ++lineptr;
- ++column;
-
- auto process_tab = [&] ()
- {
- 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;
- }
-
- if (c == '\n' || c == '\r' || c == '\0')
- {
- /* 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 display source in the source window. */
enum tui_status
tui_source_window::set_contents (struct gdbarch *arch,
int line_width, nlines;
ret = TUI_SUCCESS;
- line_width = width - 1;
+ line_width = width - TUI_EXECINFO_SIZE - 1;
/* Take hilite (window border) into account, when
calculating the number of lines. */
nlines = (line_no + (height - 2)) - line_no;
std::string srclines;
+ const std::vector<off_t> *offsets;
if (!g_source_cache.get_source_lines (s, line_no, line_no + nlines,
- &srclines))
+ &srclines)
+ || !g_source_cache.get_line_charpos (s, &offsets))
ret = TUI_FAILURE;
else
{
= tui_locator_win_info_ptr ();
const char *s_filename = symtab_to_filename_for_display (s);
- xfree (title);
- title = xstrdup (s_filename);
+ title = s_filename;
- xfree (fullname);
- fullname = xstrdup (symtab_to_fullname (s));
+ m_fullname = make_unique_xstrdup (symtab_to_fullname (s));
cur_line = 0;
gdbarch = get_objfile_arch (SYMTAB_OBJFILE (s));
start_line_or_addr.loa = LOA_LINE;
cur_line_no = start_line_or_addr.u.line_no = line_no;
+ int digits = 0;
+ if (compact_source)
+ {
+ /* Solaris 11+gcc 5.5 has ambiguous overloads of log10, so we
+ cast to double to get the right one. */
+ double l = log10 ((double) offsets->size ());
+ digits = 1 + (int) l;
+ }
+
const char *iter = srclines.c_str ();
content.resize (nlines);
while (cur_line < nlines)
std::string text;
if (*iter != '\0')
- text = copy_source_line (&iter, cur_line_no, horizontal_offset,
- line_width);
+ text = tui_copy_source_line (&iter, cur_line_no,
+ horizontal_offset,
+ line_width, digits);
/* Set whether element is the execution point
and whether there is a break point on it. */
element->line_or_addr.loa = LOA_LINE;
element->line_or_addr.u.line_no = cur_line_no;
element->is_exec_point
- = (filename_cmp (locator->full_name,
+ = (filename_cmp (locator->full_name.c_str (),
symtab_to_fullname (s)) == 0
&& cur_line_no == locator->line_no);
- xfree (content[cur_line].line);
- content[cur_line].line
- = xstrdup (text.c_str ());
+ content[cur_line].line = std::move (text);
cur_line++;
cur_line_no++;
}
-/* Function to display source in the source window. This function
- initializes the horizontal scroll to 0. */
-void
-tui_source_window::show_symtab_source (struct gdbarch *gdbarch,
- struct symtab *s,
- struct tui_line_or_address line)
-{
- horizontal_offset = 0;
- update_source_window_as_is (gdbarch, s, line);
-}
-
-
/* Answer whether the source is currently displayed in the source
window. */
bool
tui_source_window::showing_source_p (const char *fullname) const
{
return (!content.empty ()
- && (filename_cmp (tui_locator_win_info_ptr ()->full_name,
+ && (filename_cmp (tui_locator_win_info_ptr ()->full_name.c_str (),
fullname) == 0));
}
}
}
-tui_source_window::tui_source_window ()
- : tui_source_window_base (SRC_WIN)
-{
- gdb::observers::source_styling_changed.attach
- (std::bind (&tui_source_window::style_changed, this),
- m_observable);
-}
-
-tui_source_window::~tui_source_window ()
-{
- gdb::observers::source_styling_changed.detach (m_observable);
-}
-
-void
-tui_source_window::style_changed ()
-{
- if (tui_active && is_visible ())
- refill ();
-}
-
bool
tui_source_window::location_matches_p (struct bp_location *loc, int line_no)
{
return (content[line_no].line_or_addr.loa == LOA_LINE
&& content[line_no].line_or_addr.u.line_no == loc->line_number
&& loc->symtab != NULL
- && filename_cmp (fullname,
+ && filename_cmp (m_fullname.get (),
symtab_to_fullname (loc->symtab)) == 0);
}
}
void
-tui_source_window::maybe_update (struct frame_info *fi, symtab_and_line sal,
- int line_no, CORE_ADDR addr)
+tui_source_window::maybe_update (struct frame_info *fi, symtab_and_line sal)
{
- int start_line = (line_no - (viewport_height / 2)) + 1;
+ int start_line = (sal.line - (viewport_height / 2)) + 1;
if (start_line <= 0)
start_line = 1;
bool source_already_displayed = (sal.symtab != 0
- && showing_source_p (fullname));
+ && showing_source_p (m_fullname.get ()));
struct tui_line_or_address l;
l.loa = LOA_LINE;
l.u.line_no = start_line;
- if (!(source_already_displayed
- && line_is_displayed (line_no)))
+ if (!(source_already_displayed && line_is_displayed (sal.line)))
update_source_window (get_frame_arch (fi), sal.symtab, l);
else
{
- l.u.line_no = line_no;
+ l.u.line_no = sal.line;
set_is_exec_point_at (l);
}
}
projects / deliverable / binutils-gdb.git / blobdiff