From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by sourceware.org (Postfix) with ESMTPS id 4C33A3857B94 for ; Sun, 10 Jul 2022 10:11:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4C33A3857B94 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=mail.api.win Authentication-Results: sourceware.org; spf=none smtp.mailfrom=api.win Received: by mail-lf1-f42.google.com with SMTP id e28so816717lfj.4 for ; Sun, 10 Jul 2022 03:11:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rnuTexhmgmAJZi7kdyWTuQkuh5CFYv1yISlNLZe/17A=; b=tEE/+ry/Z3xf724B2O2ufox3TSwpi+wQEahMeCheYjZObCz+BDbmEg4fyaDTzGHohx zrseB+I6n6PKf01qz/nfWaLV4mzH+axe7T992dohHyiLLW1ENNN9RGeh5n12jr+MuFq+ 6xiw4toiJKbtx22CkdZ/lXHx9w8BjvEnejK1tlatiRHJFK6bBAeSWUeFfNfvUIeKzH/8 GOJMSqizA7WxYPmi0wcG1hFrvLUaFC5i5Oy+1swY/4v55qwOWli858LDwbxMzjHGygpx MqE6zuuTqUXLbYRc9IqOCQSIjyIHq5G6sRTwLCuOjlup+B4/Ix5McIhLyo7sU8lrN/UI 1RXw== X-Gm-Message-State: AJIora9uO0vN0ZzLZ6NDLDegmxDKkMy3s65lyR9YsMyv6DQCFPpuRWLb ev9//5JJ4Nij0fVZDgDAtAZEXjZT6Ap4Q9GzcVo= X-Google-Smtp-Source: AGRyM1sxYK/Oalsq4a5KeTHCZWv3GoOm7JAWUL43VXk/VEw8EWanzpW0OZOGycQWs7+p9qAJuSxF5Q== X-Received: by 2002:a05:6512:3503:b0:481:4470:4134 with SMTP id h3-20020a056512350300b0048144704134mr8085816lfs.42.1657447866674; Sun, 10 Jul 2022 03:11:06 -0700 (PDT) Received: from API.. ([2a03:1ac0:b0d6:4d64:a4fa:3059:5172:5fc4]) by smtp.gmail.com with ESMTPSA id e13-20020ac25cad000000b0047fac0f34absm855396lfq.196.2022.07.10.03.11.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Jul 2022 03:11:06 -0700 (PDT) From: Andrei Pikas To: gdb-patches@sourceware.org Cc: Eli Zaretskii , Andrei Pikas Subject: [PATCH v2 (mentions of reverse mode eliminated)] Add style tui-cursorline command to colorize TUI current line. Date: Sun, 10 Jul 2022 13:10:03 +0300 Message-Id: <20220710101003.4245-1-gdb@mail.api.win> X-Mailer: git-send-email 2.34.1 In-Reply-To: <83sfn91rvt.fsf@gnu.org> References: <83sfn91rvt.fsf@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SCC_10_SHORT_WORD_LINES, SCC_20_SHORT_WORD_LINES, SCC_5_SHORT_WORD_LINES, SPF_HELO_NONE, SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Jul 2022 10:11:10 -0000 Adds the ability to customize the colors of the current line of code in TUI. This may be desirable when code highlighting is enabled. Because higlighted keywords in dark blue color are indistinguishable from a black background (which is the default inverse color for a white terminal). Here is a screenshot of old and new behavior https://drive.google.com/file/d/1BbgNwpFa0DvKX0K9UAd48dEgtn8aChXP/view --- gdb/NEWS | 4 ++++ gdb/cli/cli-style.c | 35 +++++++++++++++++++++++++++++++++++ gdb/cli/cli-style.h | 3 +++ gdb/doc/gdb.texinfo | 3 +++ gdb/tui/tui-io.c | 38 ++++++++++++++++++++++++++++++++++---- gdb/tui/tui-win.c | 1 + 6 files changed, 80 insertions(+), 4 deletions(-) diff --git a/gdb/NEWS b/gdb/NEWS index 1178a37017e..646c36ce032 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -41,6 +41,10 @@ * New commands +set style tui-cursorline foreground COLOR +set style tui-cursorline background COLOR + Control the styling of the currently executing line of code. + maintenance set ignore-prologue-end-flag on|off maintenance show ignore-prologue-end-flag This setting, which is off by default, controls whether GDB ignores the diff --git a/gdb/cli/cli-style.c b/gdb/cli/cli-style.c index 3fd85f4aa86..77843cb5fb1 100644 --- a/gdb/cli/cli-style.c +++ b/gdb/cli/cli-style.c @@ -54,6 +54,28 @@ static const char * const cli_colors[] = { "magenta", "cyan", "white", + "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", + "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", + "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", + "47", "48", "49", "50", "51", "52", "53", "54", "55", "56", "57", "58", "59", + "60", "61", "62", "63", "64", "65", "66", "67", "68", "69", "70", "71", "72", + "73", "74", "75", "76", "77", "78", "79", "80", "81", "82", "83", "84", "85", + "86", "87", "88", "89", "90", "91", "92", "93", "94", "95", "96", "97", "98", + "99", "100", "101", "102", "103", "104", "105", "106", "107", "108", "109", + "110", "111", "112", "113", "114", "115", "116", "117", "118", "119", "120", + "121", "122", "123", "124", "125", "126", "127", "128", "129", "130", "131", + "132", "133", "134", "135", "136", "137", "138", "139", "140", "141", "142", + "143", "144", "145", "146", "147", "148", "149", "150", "151", "152", "153", + "154", "155", "156", "157", "158", "159", "160", "161", "162", "163", "164", + "165", "166", "167", "168", "169", "170", "171", "172", "173", "174", "175", + "176", "177", "178", "179", "180", "181", "182", "183", "184", "185", "186", + "187", "188", "189", "190", "191", "192", "193", "194", "195", "196", "197", + "198", "199", "200", "201", "202", "203", "204", "205", "206", "207", "208", + "209", "210", "211", "212", "213", "214", "215", "216", "217", "218", "219", + "220", "221", "222", "223", "224", "225", "226", "227", "228", "229", "230", + "231", "232", "233", "234", "235", "236", "237", "238", "239", "240", "241", + "242", "243", "244", "245", "246", "247", "248", "249", "250", "251", "252", + "253", "254", "255", nullptr }; @@ -101,6 +123,10 @@ cli_style_option tui_active_border_style ("tui-active-border", /* See cli-style.h. */ +cli_style_option tui_cursorline_style ("tui-cursorline", ui_file_style::NONE); + +/* See cli-style.h. */ + cli_style_option metadata_style ("metadata", ui_file_style::DIM); /* See cli-style.h. */ @@ -446,6 +472,15 @@ TUI window that does have the focus."), &style_show_list, true); + tui_cursorline_style.add_setshow_commands (no_class, _("\ +TUI cursor line display styling.\n\ +Configure TUI cursor line colors\n\ +The \"tui-cursorline\" style is used when GDB displays the current line of \ +code."), + &style_set_list, + &style_show_list, + true); + version_style.add_setshow_commands (no_class, _("\ Version string display styling.\n\ Configure colors used to display the GDB version string."), diff --git a/gdb/cli/cli-style.h b/gdb/cli/cli-style.h index f69df47098c..2b10814d18c 100644 --- a/gdb/cli/cli-style.h +++ b/gdb/cli/cli-style.h @@ -122,6 +122,9 @@ extern cli_style_option tui_border_style; /* The border style of a TUI window that does have the focus. */ extern cli_style_option tui_active_border_style; +/* The style of a reverse mode for current line in TUI window. */ +extern cli_style_option tui_cursorline_style; + /* The style to use for the GDB version string. */ extern cli_style_option version_style; diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index 7a4e337d15b..427dfeaa254 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -26642,6 +26642,9 @@ general styling to @value{GDBN}. @xref{TUI Configuration}. Control the styling of the active TUI border; that is, the TUI window that has the focus. +@item tui-cursorline +Control the styling of the currently executing line of code. + @end table @node Numbers diff --git a/gdb/tui/tui-io.c b/gdb/tui/tui-io.c index 22c234a0dc2..7b8c59efdcf 100644 --- a/gdb/tui/tui-io.c +++ b/gdb/tui/tui-io.c @@ -35,6 +35,7 @@ #include "tui/tui-out.h" #include "ui-out.h" #include "cli-out.h" +#include "cli/cli-style.h" #include #include #ifdef __MINGW32__ @@ -351,6 +352,17 @@ tui_apply_style (WINDOW *w, ui_file_style style) last_style = style; } +static bool +get_custom_cursorline_style (ui_file_style *style) +{ + ui_file_style cursorline_style = tui_cursorline_style.style(); + if (cursorline_style.is_default()) + return false; + + *style = cursorline_style; + return true; +} + /* Apply an ANSI escape sequence from BUF to W. BUF must start with the ESC character. If BUF does not start with an ANSI escape, return 0. Otherwise, apply the sequence if it is recognized, or @@ -392,10 +404,12 @@ apply_ansi_escape (WINDOW *w, const char *buf) ui_file_style::color fg = style.get_foreground (); style.set_fg (bg); style.set_bg (fg); - } - /* Enable A_REVERSE. */ - style.set_reverse (true); + /* Enable A_REVERSE. */ + style.set_reverse (true); + } + else if (!get_custom_cursorline_style (&style)) + style.set_reverse (true); } tui_apply_style (w, style); @@ -410,17 +424,19 @@ tui_set_reverse_mode (WINDOW *w, bool reverse) ui_file_style style = last_style; reverse_mode_p = reverse; - style.set_reverse (reverse); if (reverse) { reverse_save_bg = style.get_background (); reverse_save_fg = style.get_foreground (); + if (!get_custom_cursorline_style (&style)) + style.set_reverse (reverse); } else { style.set_bg (reverse_save_bg); style.set_fg (reverse_save_fg); + style.set_reverse (reverse); } tui_apply_style (w, style); @@ -448,6 +464,9 @@ tui_puts (const char *string, WINDOW *w) if (w == nullptr) w = TUI_CMD_WIN->handle.get (); + attr_t w_attrs = 0; + short w_pair = 0; + while (true) { const char *next = strpbrk (string, "\n\1\2\033\t"); @@ -472,6 +491,13 @@ tui_puts (const char *string, WINDOW *w) break; case '\n': + if (wattr_get (w, &w_attrs, &w_pair, nullptr) == OK) + /* Apply current style till the end of line. */ + wchgat (w, -1, w_attrs, w_pair, nullptr); + do_tui_putc (w, c); + ++next; + break; + case '\t': do_tui_putc (w, c); ++next; @@ -497,6 +523,10 @@ tui_puts (const char *string, WINDOW *w) string = next; } + if (wattr_get (w, &w_attrs, &w_pair, nullptr) == OK) + /* Apply current style till the end of line. */ + wchgat (w, -1, w_attrs, w_pair, nullptr); + if (TUI_CMD_WIN != nullptr && w == TUI_CMD_WIN->handle.get ()) update_cmdwin_start_line (); } diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c index 31b6606636a..f80809d6732 100644 --- a/gdb/tui/tui-win.c +++ b/gdb/tui/tui-win.c @@ -1197,4 +1197,5 @@ the line numbers and uses less horizontal space."), tui_border_style.changed.attach (tui_rehighlight_all, "tui-win"); tui_active_border_style.changed.attach (tui_rehighlight_all, "tui-win"); + tui_cursorline_style.changed.attach (tui_refresh_all_win, "tui-win"); } -- 2.34.1