From patchwork Fri Mar 8 14:55:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eli Zaretskii X-Patchwork-Id: 31786 Received: (qmail 63277 invoked by alias); 8 Mar 2019 14:55:41 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 63268 invoked by uid 89); 8 Mar 2019 14:55:40 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-14.9 required=5.0 tests=AWL, BAYES_40, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.1 spammy=sk:backgro, styles, utils.c, UD:utils.c X-HELO: eggs.gnu.org Received: from eggs.gnu.org (HELO eggs.gnu.org) (209.51.188.92) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 08 Mar 2019 14:55:38 +0000 Received: from fencepost.gnu.org ([2001:470:142:3::e]:40156) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2GuM-0003lN-U5; Fri, 08 Mar 2019 09:55:36 -0500 Received: from [176.228.60.248] (port=2357 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1h2GuE-0005Er-TA; Fri, 08 Mar 2019 09:55:32 -0500 Date: Fri, 08 Mar 2019 16:55:08 +0200 Message-Id: <83d0n1a01f.fsf@gnu.org> From: Eli Zaretskii To: tom@tromey.com CC: gdb-patches@sourceware.org In-reply-to: <834l8he3gn.fsf@gnu.org> (message from Eli Zaretskii on Tue, 05 Mar 2019 17:38:32 +0200) Subject: Re: [PATCH 00/16] Add styling to the gdb CLI and TUI References: <20181128001435.12703-1-tom@tromey.com> <83k1kxfzwo.fsf@gnu.org> <8736rja4i8.fsf@tromey.com> <83r2brhw8k.fsf@gnu.org> <87h8cmh1wg.fsf@tromey.com> <83va12gz8j.fsf@gnu.org> <87mumeb935.fsf@tromey.com> <83ef7oezh0.fsf@gnu.org> <878sxuad8g.fsf@tromey.com> <83va0yeipj.fsf@gnu.org> <87sgw27gyu.fsf@tromey.com> <834l8he3gn.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-IsSubscribed: yes > Date: Tue, 05 Mar 2019 17:38:32 +0200 > From: Eli Zaretskii > CC: gdb-patches@sourceware.org > > > From: Tom Tromey > > Cc: Tom Tromey , gdb-patches@sourceware.org > > Date: Mon, 04 Mar 2019 09:16:25 -0700 > > > > (gdb) printf "\e[38;2;255;100;0mTRUECOLOR\e[0m\n" > > Thanks, I used this example (and its variations) to extend the support > to any kind of color. Here's the patch I propose to enable styling on native MS-Windows console. OK to commit, master and the release branch? diff --git a/gdb/ChangeLog b/gdb/ChangeLog index de5e74a..bb10c7d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,21 @@ +2019-03-08 Eli Zaretskii + + Support styling on native MS-Windows console + + PR/24315 + * utils.c (can_emit_style_escape) [_WIN32]: Don't disable styling + on MS-Windows if $TERM is not defined. + + * cli/cli-style.c: Set cli_styling to 1 in the MinGW build. + + * posix-hdep.c (gdb_console_fputs): + * mingw-hdep.c (rgb_to_16colors, gdb_console_fputs): New + functions. + * ui-file.h (gdb_console_fputs): Add prototype. + + * ui-file.c (stdio_file::puts): Call gdb_console_fputs, and fall + back to fputs only if the former returns zero. + 2019-03-07 Tom Tromey * symmisc.c (print_symbol_bcache_statistics): Update. diff --git a/gdb/cli/cli-style.c b/gdb/cli/cli-style.c index 234cc41..ec385da 100644 --- a/gdb/cli/cli-style.c +++ b/gdb/cli/cli-style.c @@ -24,7 +24,7 @@ /* True if styling is enabled. */ -#if defined(_WIN32) || defined (__CYGWIN__) +#if defined (__MSDOS__) || defined (__CYGWIN__) int cli_styling = 0; #else int cli_styling = 1; diff --git a/gdb/mingw-hdep.c b/gdb/mingw-hdep.c index 1a4b93b..8ed4b44 100644 --- a/gdb/mingw-hdep.c +++ b/gdb/mingw-hdep.c @@ -177,3 +177,195 @@ gdb_select (int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, return num_ready; } + +/* Map COLOR's RGB triplet, with 8 bits per component, into 16 Windows + console colors, where each component has just 1 bit, plus a single + intensity bit which affects all 3 components. */ +static int +rgb_to_16colors (const ui_file_style::color &color) +{ + uint8_t rgb[3]; + color.get_rgb (rgb); + + int retval = 0; + for (int i = 0; i < 3; i++) + { + /* Subdivide 256 possible values of each RGB component into 3 + regions: no color, normal color, bright color. 256 / 3 = 85, + but ui-style.c follows xterm and uses 92 for R and G + components of the bright-blue color, so we bias the divisor a + bit to have the bright colors between 9 and 15 identical to + what ui-style.c expects. */ + int bits = rgb[i] / 93; + retval |= ((bits > 0) << (2 - i)) | ((bits > 1) << 3); + } + + return retval; +} + +/* Zero if not yet initialized, 1 if stdout is a console device, else -1. */ +static int mingw_console_initialized; + +/* Handle to stdout . */ +static HANDLE hstdout = INVALID_HANDLE_VALUE; + +/* Text attribute to use for normal text (the "none" pseudo-color). */ +static SHORT norm_attr; + +/* The most recently applied style. */ +static ui_file_style last_style; + +/* Alternative for the libc 'fputs' which handles embedded SGR + sequences in support of styling. */ + +int +gdb_console_fputs (const char *linebuf, FILE *fstream) +{ + if (!mingw_console_initialized) + { + hstdout = (HANDLE)_get_osfhandle (fileno (fstream)); + DWORD cmode; + CONSOLE_SCREEN_BUFFER_INFO csbi; + + if (hstdout != INVALID_HANDLE_VALUE + && GetConsoleMode (hstdout, &cmode) != 0 + && GetConsoleScreenBufferInfo (hstdout, &csbi)) + { + norm_attr = csbi.wAttributes; + mingw_console_initialized = 1; + } + else if (hstdout != INVALID_HANDLE_VALUE) + mingw_console_initialized = -1; /* valid, but not a console device */ + } + /* If our stdout is not a console device, let the default 'fputs' + handle the task. */ + if (mingw_console_initialized <= 0) + return 0; + + /* Mapping between 8 ANSI colors and Windows console attributes. */ + static int fg_color[] = { + 0, /* black */ + FOREGROUND_RED, /* red */ + FOREGROUND_GREEN, /* green */ + FOREGROUND_GREEN | FOREGROUND_RED, /* yellow */ + FOREGROUND_BLUE, /* blue */ + FOREGROUND_BLUE | FOREGROUND_RED, /* magenta */ + FOREGROUND_BLUE | FOREGROUND_GREEN, /* cyan */ + FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE /* gray */ + }; + static int bg_color[] = { + 0, /* black */ + BACKGROUND_RED, /* red */ + BACKGROUND_GREEN, /* green */ + BACKGROUND_GREEN | BACKGROUND_RED, /* yellow */ + BACKGROUND_BLUE, /* blue */ + BACKGROUND_BLUE | BACKGROUND_RED, /* magenta */ + BACKGROUND_BLUE | BACKGROUND_GREEN, /* cyan */ + BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE /* gray */ + }; + + ui_file_style style = last_style; + unsigned char c; + size_t n_read; + + for ( ; (c = *linebuf) != 0; linebuf += n_read) + { + if (c == '\033') + { + fflush (fstream); + bool parsed = style.parse (linebuf, &n_read); + if (n_read <= 0) /* should never happen */ + n_read = 1; + if (!parsed) + { + /* This means we silently swallow SGR sequences we + cannot parse. */ + continue; + } + /* Colors. */ + const ui_file_style::color &fg = style.get_foreground (); + const ui_file_style::color &bg = style.get_background (); + int fgcolor, bgcolor, bright, inverse; + if (fg.is_none ()) + fgcolor = norm_attr & 15; + else if (fg.is_basic ()) + fgcolor = fg_color[fg.get_value () & 15]; + else + fgcolor = rgb_to_16colors (fg); + if (bg.is_none ()) + bgcolor = norm_attr & (15 << 4); + else if (bg.is_basic ()) + bgcolor = bg_color[bg.get_value () & 15]; + else + bgcolor = rgb_to_16colors (bg) << 4; + + /* Intensity. */ + switch (style.get_intensity ()) + { + case ui_file_style::NORMAL: + case ui_file_style::DIM: + bright = 0; + break; + case ui_file_style::BOLD: + bright = 1; + break; + default: + gdb_assert_not_reached ("invalid intensity"); + } + + /* Inverse video. */ + if (style.is_reverse ()) + inverse = 1; + else + inverse = 0; + + /* Construct the attribute. */ + if (inverse) + { + int t = fgcolor; + fgcolor = (bgcolor >> 4); + bgcolor = (t << 4); + } + if (bright) + fgcolor |= FOREGROUND_INTENSITY; + + SHORT attr = (bgcolor & (15 << 4)) | (fgcolor & 15); + + /* Apply the attribute. */ + SetConsoleTextAttribute (hstdout, attr); + } + else + { + /* When we are about to write newline, we need to clear to + EOL with the normal attribute, to avoid spilling the + colors to the next screen line. We assume here that no + non-default attribute extends beyond the newline. */ + if (c == '\n') + { + DWORD nchars; + COORD start_pos; + DWORD written; + CONSOLE_SCREEN_BUFFER_INFO csbi; + + fflush (fstream); + GetConsoleScreenBufferInfo (hstdout, &csbi); + + if (csbi.wAttributes != norm_attr) + { + start_pos = csbi.dwCursorPosition; + nchars = csbi.dwSize.X - start_pos.X; + + FillConsoleOutputAttribute (hstdout, norm_attr, nchars, + start_pos, &written); + FillConsoleOutputCharacter (hstdout, ' ', nchars, + start_pos, &written); + } + } + fputc (c, fstream); + n_read = 1; + } + } + + last_style = style; + return 1; +} diff --git a/gdb/posix-hdep.c b/gdb/posix-hdep.c index 7911bc5..d0f467e 100644 --- a/gdb/posix-hdep.c +++ b/gdb/posix-hdep.c @@ -30,3 +30,11 @@ gdb_select (int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, { return select (n, readfds, writefds, exceptfds, timeout); } + +/* Host-dependent console fputs method. POSIX platforms always return + zero, to use the default C 'fputs'. */ +int +gdb_console_fputs (const char *buf, FILE *f) +{ + return 0; +} diff --git a/gdb/ui-file.c b/gdb/ui-file.c index 690fc62..77f6b31 100644 --- a/gdb/ui-file.c +++ b/gdb/ui-file.c @@ -236,6 +236,12 @@ stdio_file::write_async_safe (const char *buf, long length_buf) void stdio_file::puts (const char *linebuffer) { + /* This host-dependent function (with implementations in + posix-hdep.c and mingw-hdep.c) is given the opportunity to + process the output first in host-dependent way. If it does, it + should return non-zero, to avoid calling fputs below. */ + if (gdb_console_fputs (linebuffer, m_file)) + return; /* Calling error crashes when we are called from the exception framework. */ if (fputs (linebuffer, m_file)) { diff --git a/gdb/ui-file.h b/gdb/ui-file.h index 26cf2bf..6e6ca1c 100644 --- a/gdb/ui-file.h +++ b/gdb/ui-file.h @@ -101,6 +101,8 @@ extern void ui_file_write_async_safe (struct ui_file *file, const char *buf, extern long ui_file_read (struct ui_file *file, char *buf, long length_buf); +extern int gdb_console_fputs (const char *, FILE *); + /* A std::string-based ui_file. Can be used as a scratch buffer for collecting output. */ diff --git a/gdb/utils.c b/gdb/utils.c index 258614a..840779a 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -1445,8 +1445,18 @@ can_emit_style_escape (struct ui_file *stream) || !ui_file_isatty (stream)) return false; const char *term = getenv ("TERM"); + /* Windows doesn't by default define $TERM, but can support styles + regardless. */ +#ifndef _WIN32 if (term == nullptr || !strcmp (term, "dumb")) return false; +#else + /* But if they do define $TERM, let us behave the same as on Posix + platforms, for the benefit of programs which invoke GDB as their + back-end. */ + if (term && !strcmp (term, "dumb")) + return false; +#endif return true; }