Remove the TUI annotation hack

do_tui_putc has some code to remove annotations from gdb output.  This
was added in 2001, see commit a198b876bbcb.

However, I think this code is not needed.  It seems very unlikely to
enable both annotations and the TUI, and in any case I think this is
something that should not be supported.

So, this patch removes this code.

gdb/ChangeLog
2020-02-22  Tom Tromey  <tom@tromey.com>

	* tui/tui-io.c (do_tui_putc): Don't omit annotations.

Change-Id: I05728110365a362d37c9821df9c8779316100bb8

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 474825b095c02dd71bc1645bc17e71c1a639030a..718e500507b664b8d0b5f76ecbcae1e14d288d14 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2020-02-22  Tom Tromey  <tom@tromey.com>
+
+       * tui/tui-io.c (do_tui_putc): Don't omit annotations.
+
 2020-02-22  Tom Tromey  <tom@tromey.com>
 
        * tui/tui-win.c (tui_set_win_focus_to): Move to tui-data.c.

diff --git a/gdb/tui/tui-io.c b/gdb/tui/tui-io.c
index d9f23334f57b707f70019ad2e51409dffee5747a..b5ee2a2b6b6d788b2fe336051fb663cfcc670d1a 100644 (file)
--- a/gdb/tui/tui-io.c
+++ b/gdb/tui/tui-io.c
@@ -138,35 +138,21 @@ static int tui_readline_pipe[2];
 static void
 do_tui_putc (WINDOW *w, char c)
 {
-  static int tui_skip_line = -1;
-
-  /* Catch annotation and discard them.  We need two \032 and discard
-     until a \n is seen.  */
-  if (c == '\032')
-    {
-      tui_skip_line++;
-    }
-  else if (tui_skip_line != 1)
+  /* Expand TABs, since ncurses on MS-Windows doesn't.  */
+  if (c == '\t')
     {
-      tui_skip_line = -1;
-      /* Expand TABs, since ncurses on MS-Windows doesn't.  */
-      if (c == '\t')
-       {
-         int col;
+      int col;
 
-         col = getcurx (w);
-         do
-           {
-             waddch (w, ' ');
-             col++;
-           }
-         while ((col % 8) != 0);
+      col = getcurx (w);
+      do
+       {
+         waddch (w, ' ');
+         col++;
        }
-      else
-       waddch (w, c);
+      while ((col % 8) != 0);
     }
-  else if (c == '\n')
-    tui_skip_line = -1;
+  else
+    waddch (w, c);
 }
 
 /* Update the cached value of the command window's start line based on