Change members of tui_locator_window to std::string

[deliverable/binutils-gdb.git] / gdb / tui / tui-source.c

diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c
index 8d68c7e86fe4077b2dacc9a3f72d7c36f6e3ac5c..e6cc0dbc1a3dcf6ec08a0e5b4d7c10d9d31f8f4f 100644 (file)
--- a/gdb/tui/tui-source.c
+++ b/gdb/tui/tui-source.c
@@ -1,7 +1,6 @@
 /* TUI display source window.
 
 /* TUI display source window.
 

-   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
-   Foundation, Inc.
+   Copyright (C) 1998-2019 Free Software Foundation, Inc.

 
    Contributed by Hewlett-Packard Company.
 
 
    Contributed by Hewlett-Packard Company.
 


@@ -9,7 +8,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -18,9 +17,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include "defs.h"
 #include <ctype.h>
 
 #include "defs.h"
 #include <ctype.h>


@@ -28,330 +25,300 @@
 #include "frame.h"
 #include "breakpoint.h"
 #include "source.h"
 #include "frame.h"
 #include "breakpoint.h"
 #include "source.h"

-#include "symtab.h"
+#include "objfiles.h"
+#include "filenames.h"
+#include "source-cache.h"

 
 #include "tui/tui.h"
 #include "tui/tui-data.h"
 
 #include "tui/tui.h"
 #include "tui/tui-data.h"

+#include "tui/tui-io.h"

 #include "tui/tui-stack.h"
 #include "tui/tui-winsource.h"
 #include "tui/tui-source.h"
 #include "tui/tui-stack.h"
 #include "tui/tui-winsource.h"
 #include "tui/tui-source.h"

+#include "gdb_curses.h"

 
 

-#ifdef HAVE_NCURSES_H       
-#include <ncurses.h>
-#else
-#ifdef HAVE_CURSES_H
-#include <curses.h>
-#endif
-#endif
+/* 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.  */

 
 

-/* Function to display source in the source window.  */
-enum tui_status
-tui_set_source_content (struct symtab *s, int lineNo, int noerror)
+static std::string
+copy_source_line (const char **ptr, int line_no, int first_col,
+                 int line_width)

 {
 {

-  TuiStatus ret = TUI_FAILURE;
+  const char *lineptr = *ptr;

 
 

-  if (s != (struct symtab *) NULL && s->filename != (char *) NULL)
+  /* 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

     {
     {

-      register FILE *stream;
-      register int i, desc, c, lineWidth, nlines;
-      register char *srcLine = 0;
+      int skip_bytes;

 
 

-      if ((ret = tui_alloc_source_buffer (srcWin)) == TUI_SUCCESS)
+      c = *lineptr;
+      if (c == '\033' && skip_ansi_escape (lineptr, &skip_bytes))

        {
        {

-         lineWidth = srcWin->generic.width - 1;
-         /* Take hilite (window border) into account, when calculating
-            the number of lines  */
-         nlines = (lineNo + (srcWin->generic.height - 2)) - lineNo;
-         desc = open_source_file (s);
-         if (desc < 0)
-           {
-             if (!noerror)
-               {
-                 char *name = alloca (strlen (s->filename) + 100);
-                 sprintf (name, "%s:%d", s->filename, lineNo);
-                 print_sys_errmsg (name, errno);
-               }
-             ret = TUI_FAILURE;
-           }
-         else
-           {
-             if (s->line_charpos == 0)
-               find_source_lines (s, desc);
-
-             if (lineNo < 1 || lineNo > s->nlines)
-               {
-                 close (desc);
-                 printf_unfiltered (
-                         "Line number %d out of range; %s has %d lines.\n",
-                                     lineNo, s->filename, s->nlines);
-               }
-             else if (lseek (desc, s->line_charpos[lineNo - 1], 0) < 0)
-               {
-                 close (desc);
-                 perror_with_name (s->filename);
-               }
-             else
-               {
-                 register int offset, curLineNo, curLine, curLen, threshold;
-                 struct tui_gen_win_info * locator = tui_locator_win_info_ptr ();
-                  struct tui_source_info * src = &srcWin->detail.sourceInfo;
-
-                  if (srcWin->generic.title)
-                    xfree (srcWin->generic.title);
-                  srcWin->generic.title = xstrdup (s->filename);
-
-                  if (src->filename)
-                    xfree (src->filename);
-                  src->filename = xstrdup (s->filename);
-
-                 /* Determine the threshold for the length of the line
-                     and the offset to start the display.  */
-                 offset = src->horizontalOffset;
-                 threshold = (lineWidth - 1) + offset;
-                 stream = fdopen (desc, FOPEN_RT);
-                 clearerr (stream);
-                 curLine = 0;
-                 curLineNo = src->startLineOrAddr.lineNo = lineNo;
-                 if (offset > 0)
-                   srcLine = (char *) xmalloc (
-                                          (threshold + 1) * sizeof (char));
-                 while (curLine < nlines)
-                   {
-                     struct tui_win_element * element = (struct tui_win_element *)
-                     srcWin->generic.content[curLine];
-
-                     /* get the first character in the line */
-                     c = fgetc (stream);
-
-                     if (offset == 0)
-                       srcLine = ((struct tui_win_element *)
-                                  srcWin->generic.content[
-                                       curLine])->whichElement.source.line;
-                     /* Init the line with the line number */
-                     sprintf (srcLine, "%-6d", curLineNo);
-                     curLen = strlen (srcLine);
-                     i = curLen -
-                       ((curLen / tui_default_tab_len ()) * tui_default_tab_len ());
-                     while (i < tui_default_tab_len ())
-                       {
-                         srcLine[curLen] = ' ';
-                         i++;
-                         curLen++;
-                       }
-                     srcLine[curLen] = (char) 0;
-
-                     /* Set whether element is the execution point and
-                        whether there is a break point on it.  */
-                     element->whichElement.source.lineOrAddr.lineNo =
-                       curLineNo;
-                     element->whichElement.source.isExecPoint =
-                       (strcmp (((struct tui_win_element *)
-                       locator->content[0])->whichElement.locator.fileName,
-                                s->filename) == 0
-                        && curLineNo == ((struct tui_win_element *)
-                        locator->content[0])->whichElement.locator.lineNo);
-                     if (c != EOF)
-                       {
-                         i = strlen (srcLine) - 1;
-                         do
-                           {
-                             if ((c != '\n') &&
-                                 (c != '\r') && (++i < threshold))
-                               {
-                                 if (c < 040 && c != '\t')
-                                   {
-                                     srcLine[i++] = '^';
-                                     srcLine[i] = c + 0100;
-                                   }
-                                 else if (c == 0177)
-                                   {
-                                     srcLine[i++] = '^';
-                                     srcLine[i] = '?';
-                                   }
-                                 else
-                                   {   /* Store the charcter in the line
-                                          buffer.  If it is a tab, then
-                                          translate to the correct number of
-                                          chars so we don't overwrite our
-                                          buffer.  */
-                                     if (c == '\t')
-                                       {
-                                         int j, maxTabLen = tui_default_tab_len ();
-
-                                         for (j = i - (
-                                              (i / maxTabLen) * maxTabLen);
-                                              ((j < maxTabLen) &&
-                                               i < threshold);
-                                              i++, j++)
-                                           srcLine[i] = ' ';
-                                         i--;
-                                       }
-                                     else
-                                       srcLine[i] = c;
-                                   }
-                                 srcLine[i + 1] = 0;
-                               }
-                             else
-                               {       /* If we have not reached EOL, then eat
-                                           chars until we do  */
-                                 while (c != EOF && c != '\n' && c != '\r')
-                                   c = fgetc (stream);
-                               }
-                           }
-                         while (c != EOF && c != '\n' && c != '\r' &&
-                                i < threshold && (c = fgetc (stream)));
-                       }
-                     /* Now copy the line taking the offset into account */
-                     if (strlen (srcLine) > offset)
-                       strcpy (((struct tui_win_element *) srcWin->generic.content[
-                                       curLine])->whichElement.source.line,
-                               &srcLine[offset]);
-                     else
-                       ((struct tui_win_element *)
-                        srcWin->generic.content[
-                         curLine])->whichElement.source.line[0] = (char) 0;
-                     curLine++;
-                     curLineNo++;
-                   }
-                 if (offset > 0)
-                   tuiFree (srcLine);
-                 fclose (stream);
-                 srcWin->generic.contentSize = nlines;
-                 ret = TUI_SUCCESS;
-               }
-           }
+         /* We always have to preserve escapes.  */
+         result.append (lineptr, lineptr + skip_bytes);
+         lineptr += skip_bytes;
+         continue;

        }
        }

-    }
-  return ret;
-}
-

 
 

-/* elz: this function sets the contents of the source window to empty
-   except for a line in the middle with a warning message about the
-   source not being available. This function is called by
-   tuiEraseSourceContents, which in turn is invoked when the source
-   files cannot be accessed.  */
+      ++lineptr;
+      ++column;

 
 

-void
-tui_set_source_content_nil (struct tui_win_info * winInfo, char *warning_string)
-{
-  int lineWidth;
-  int nLines;
-  int curr_line = 0;
-
-  lineWidth = winInfo->generic.width - 1;
-  nLines = winInfo->generic.height - 2;
+      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;
+       }

 
 

-  /* set to empty each line in the window, except for the one
-     which contains the message */
-  while (curr_line < winInfo->generic.contentSize)
-    {
-      /* set the information related to each displayed line
-         to null: i.e. the line number is 0, there is no bp,
-         it is not where the program is stopped */
-
-      struct tui_win_element * element =
-      (struct tui_win_element *) winInfo->generic.content[curr_line];
-      element->whichElement.source.lineOrAddr.lineNo = 0;
-      element->whichElement.source.isExecPoint = FALSE;
-      element->whichElement.source.hasBreak = FALSE;
-
-      /* set the contents of the line to blank */
-      element->whichElement.source.line[0] = (char) 0;
-
-      /* if the current line is in the middle of the screen, then we want to
-         display the 'no source available' message in it.
-         Note: the 'weird' arithmetic with the line width and height comes from
-         the function tuiEraseSourceContent. We need to keep the screen and the
-         window's actual contents in synch */
-
-      if (curr_line == (nLines / 2 + 1))
+      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)

        {
        {

-         int i;
-         int xpos;
-         int warning_length = strlen (warning_string);
-         char *srcLine;
+         result.push_back ('^');
+         result.push_back ('?');
+       }
+      else if (c == '\t')
+       process_tab ();
+      else
+       result.push_back (c);
+    }
+  while (c != '\0' && c != '\n' && c != '\r');

 
 

-         srcLine = element->whichElement.source.line;
+  if (c == '\r' && *lineptr == '\n')
+    ++lineptr;
+  *ptr = lineptr;

 
 

-         if (warning_length >= ((lineWidth - 1) / 2))
-           xpos = 1;
-         else
-           xpos = (lineWidth - 1) / 2 - warning_length;
+  return result;
+}

 
 

-         for (i = 0; i < xpos; i++)
-           srcLine[i] = ' ';
+/* Function to display source in the source window.  */
+enum tui_status
+tui_source_window::set_contents (struct gdbarch *arch,
+                                struct symtab *s, 
+                                struct tui_line_or_address line_or_addr)
+{
+  gdb_assert (line_or_addr.loa == LOA_LINE);
+  int line_no = line_or_addr.u.line_no;

 
 

-         sprintf (srcLine + i, "%s", warning_string);
+  enum tui_status ret = TUI_FAILURE;

 
 

-         for (i = xpos + warning_length; i < lineWidth; i++)
-           srcLine[i] = ' ';
+  if (s != NULL)
+    {
+      int line_width, nlines;
+
+      ret = TUI_SUCCESS;
+      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;
+      if (!g_source_cache.get_source_lines (s, line_no, line_no + nlines,
+                                           &srclines))
+       ret = TUI_FAILURE;
+      else
+       {
+         int cur_line_no, cur_line;
+         struct tui_locator_window *locator
+           = tui_locator_win_info_ptr ();
+         const char *s_filename = symtab_to_filename_for_display (s);

 
 

-         srcLine[i] = '\n';
+         title = s_filename;

 
 

-       }                       /* end if */
+         fullname = make_unique_xstrdup (symtab_to_fullname (s));

 
 

-      curr_line++;
+         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;

 
 

-    }                          /* end while */
+         const char *iter = srclines.c_str ();
+         content.resize (nlines);
+         while (cur_line < nlines)
+           {
+             struct tui_source_element *element
+               = &content[cur_line];
+
+             std::string text;
+             if (*iter != '\0')
+               text = copy_source_line (&iter, cur_line_no, horizontal_offset,
+                                        line_width);
+
+             /* 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.c_str (),
+                                symtab_to_fullname (s)) == 0
+                  && cur_line_no == locator->line_no);
+
+             content[cur_line].line.reset (xstrdup (text.c_str ()));
+
+             cur_line++;
+             cur_line_no++;
+           }
+         ret = TUI_SUCCESS;
+       }
+    }
+  return ret;

 }
 
 
 /* Function to display source in the source window.  This function
    initializes the horizontal scroll to 0.  */
 void
 }
 
 
 /* Function to display source in the source window.  This function
    initializes the horizontal scroll to 0.  */
 void

-tui_show_symtab_source (struct symtab *s, union tui_line_or_address line, int noerror)
+tui_source_window::show_symtab_source (struct gdbarch *gdbarch,
+                                      struct symtab *s,
+                                      struct tui_line_or_address line)

 {
 {

-  srcWin->detail.sourceInfo.horizontalOffset = 0;
-  tui_update_source_window_as_is (srcWin, s, line, noerror);
+  horizontal_offset = 0;
+  update_source_window_as_is (gdbarch, s, line);

 }
 
 
 /* Answer whether the source is currently displayed in the source
    window.  */
 }
 
 
 /* Answer whether the source is currently displayed in the source
    window.  */

-int
-tui_source_is_displayed (char *fname)
+bool
+tui_source_window::showing_source_p (const char *fullname) const

 {
 {

-  return (srcWin->generic.contentInUse &&
-         (strcmp (((struct tui_win_element *) (tui_locator_win_info_ptr ())->
-                 content[0])->whichElement.locator.fileName, fname) == 0));
+  return (!content.empty ()
+         && (filename_cmp (tui_locator_win_info_ptr ()->full_name.c_str (),
+                           fullname) == 0));

 }
 
 
 /* Scroll the source forward or backward vertically.  */
 void
 }
 
 
 /* Scroll the source forward or backward vertically.  */
 void

-tui_vertical_source_scroll (enum tui_scroll_direction scrollDirection,
-                           int numToScroll)
+tui_source_window::do_scroll_vertical (int num_to_scroll)

 {
 {

-  if (srcWin->generic.content != (OpaquePtr) NULL)
+  if (!content.empty ())

     {
     {

-      union tui_line_or_address l;
+      struct tui_line_or_address l;

       struct symtab *s;
       struct symtab *s;

-      tui_win_content content = (tui_win_content) srcWin->generic.content;

       struct symtab_and_line cursal = get_current_source_symtab_and_line ();
 
       struct symtab_and_line cursal = get_current_source_symtab_and_line ();
 

-      if (cursal.symtab == (struct symtab *) NULL)
-       s = find_pc_symtab (get_frame_pc (deprecated_selected_frame));
+      if (cursal.symtab == NULL)
+       s = find_pc_line_symtab (get_frame_pc (get_selected_frame (NULL)));

       else
        s = cursal.symtab;
 
       else
        s = cursal.symtab;
 

-      if (scrollDirection == FORWARD_SCROLL)
-       {
-         l.lineNo = content[0]->whichElement.source.lineOrAddr.lineNo +
-           numToScroll;
-         if (l.lineNo > s->nlines)
-           /*line = s->nlines - winInfo->generic.contentSize + 1; */
-           /*elz: fix for dts 23398 */
-           l.lineNo = content[0]->whichElement.source.lineOrAddr.lineNo;
-       }
-      else
-       {
-         l.lineNo = content[0]->whichElement.source.lineOrAddr.lineNo -
-           numToScroll;
-         if (l.lineNo <= 0)
-           l.lineNo = 1;
-       }
+      l.loa = LOA_LINE;
+      l.u.line_no = content[0].line_or_addr.u.line_no
+       + num_to_scroll;
+      const std::vector<off_t> *offsets;
+      if (g_source_cache.get_line_charpos (s, &offsets)
+         && l.u.line_no > offsets->size ())
+       /* line = s->nlines - win_info->content_size + 1; */
+       /* elz: fix for dts 23398.  */
+       l.u.line_no = content[0].line_or_addr.u.line_no;
+      if (l.u.line_no <= 0)
+       l.u.line_no = 1;
+
+      print_source_lines (s, l.u.line_no, l.u.line_no + 1, 0);
+    }
+}

 
 

-      print_source_lines (s, l.lineNo, l.lineNo + 1, 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.get (),
+                          symtab_to_fullname (loc->symtab)) == 0);
+}
+
+/* See tui-source.h.  */
+
+bool
+tui_source_window::line_is_displayed (int line) const
+{
+  bool is_displayed = false;
+  int threshold = SCROLL_THRESHOLD;
+  int i = 0;
+  while (i < content.size () - threshold && !is_displayed)
+    {
+      is_displayed
+       = (content[i].line_or_addr.loa == LOA_LINE
+          && content[i].line_or_addr.u.line_no == line);
+      i++;
+    }
+
+  return is_displayed;
+}
+
+void
+tui_source_window::maybe_update (struct frame_info *fi, symtab_and_line sal,
+                                int line_no, CORE_ADDR addr)
+{
+  int start_line = (line_no - (viewport_height / 2)) + 1;
+  if (start_line <= 0)
+    start_line = 1;
+
+  bool source_already_displayed = (sal.symtab != 0
+                                  && showing_source_p (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)))
+    update_source_window (get_frame_arch (fi), sal.symtab, l);
+  else
+    {
+      l.u.line_no = line_no;
+      set_is_exec_point_at (l);

     }
 }
     }
 }