public inbox for gdb-testers@sourceware.org help / color / mirror / Atom feed
From: gdb-buildbot@sergiodj.net To: gdb-testers@sourceware.org Subject: [binutils-gdb] Remove the TUI annotation hack Date: Mon, 24 Feb 2020 03:04:00 -0000 [thread overview] Message-ID: <fc96d20b2c6d7ff24349ad015119438077d3f1e9@gdb-build> (raw) *** TEST RESULTS FOR COMMIT fc96d20b2c6d7ff24349ad015119438077d3f1e9 *** commit fc96d20b2c6d7ff24349ad015119438077d3f1e9 Author: Tom Tromey <tom@tromey.com> AuthorDate: Sat Feb 22 11:48:26 2020 -0700 Commit: Tom Tromey <tom@tromey.com> CommitDate: Sat Feb 22 11:48:39 2020 -0700 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 474825b095..718e500507 100644 --- 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 d9f23334f5..b5ee2a2b6b 100644 --- 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
next reply other threads:[~2020-02-24 2:28 UTC|newest] Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-02-24 3:04 gdb-buildbot [this message] 2020-02-24 3:11 ` *** COMPILATION FAILED *** Failures on Solaris11-sparcv9-m64, branch master *** BREAKAGE *** gdb-buildbot 2020-02-24 5:01 ` *** COMPILATION FAILED *** Failures on Solaris11-amd64-m64, " gdb-buildbot 2020-03-07 14:38 ` *** COMPILATION FAILED *** Failures on Fedora-x86_64-cc-with-index, " gdb-buildbot 2020-03-07 14:46 ` *** COMPILATION FAILED *** Failures on Fedora-x86_64-m32, " gdb-buildbot 2020-03-07 14:53 ` *** COMPILATION FAILED *** Failures on Fedora-x86_64-m64, " gdb-buildbot 2020-03-07 15:00 ` *** COMPILATION FAILED *** Failures on Fedora-x86_64-native-extended-gdbserver-m32, " gdb-buildbot 2020-03-07 15:06 ` *** COMPILATION FAILED *** Failures on Fedora-x86_64-native-extended-gdbserver-m64, " gdb-buildbot 2020-03-08 0:06 ` *** COMPILATION FAILED *** Failures on Ubuntu-Aarch64-m64, " gdb-buildbot 2020-03-08 0:09 ` *** COMPILATION FAILED *** Failures on Ubuntu-Aarch64-native-extended-gdbserver-m64, " gdb-buildbot 2020-03-08 0:13 ` *** COMPILATION FAILED *** Failures on Ubuntu-Aarch64-native-gdbserver-m64, " gdb-buildbot 2020-03-08 17:27 ` *** COMPILATION FAILED *** Failures on Fedora-x86_64-native-gdbserver-m64, " gdb-buildbot 2020-03-09 23:45 ` *** COMPILATION FAILED *** Failures on Fedora-x86_64-native-gdbserver-m32, " gdb-buildbot
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=fc96d20b2c6d7ff24349ad015119438077d3f1e9@gdb-build \ --to=gdb-buildbot@sergiodj.net \ --cc=gdb-testers@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).