linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Taeung Song <treeze.taeung@gmail.com>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: linux-kernel@vger.kernel.org, Jiri Olsa <jolsa@kernel.org>,
	Namhyung Kim <namhyung@kernel.org>,
	Ingo Molnar <mingo@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Masami Hiramatsu <mhiramat@kernel.org>,
	Wang Nan <wangnan0@huawei.com>,
	Taeung Song <treeze.taeung@gmail.com>
Subject: [PATCH v4 5/7] perf config: Initialize ui_browser__colorsets with default config items
Date: Mon,  4 Jul 2016 07:52:17 +0900	[thread overview]
Message-ID: <1467586339-30835-6-git-send-email-treeze.taeung@gmail.com> (raw)
In-Reply-To: <1467586339-30835-1-git-send-email-treeze.taeung@gmail.com>

Set default config values for 'colors' section with 'colors_config_items[]'
instead of actual const char * type values.
(e.g. using colors_config_item[CONFIG_COLORS_TOP].value
instead of "red, default" string value for 'colors.top')

Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
---
 tools/perf/ui/browser.c | 53 +++++++++++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/tools/perf/ui/browser.c b/tools/perf/ui/browser.c
index b4e21d1..380abab 100644
--- a/tools/perf/ui/browser.c
+++ b/tools/perf/ui/browser.c
@@ -507,39 +507,32 @@ static struct ui_browser_colorset {
 	int colorset;
 } ui_browser__colorsets[] = {
 	{
-		.colorset  = HE_COLORSET_TOP,
-		.name      = "top",
-		.fore_back_colors = "red, default",
+		.colorset = HE_COLORSET_TOP,
+		.name	  = "top",
 	},
 	{
-		.colorset  = HE_COLORSET_MEDIUM,
-		.name      = "medium",
-		.fore_back_colors = "green, default",
+		.colorset = HE_COLORSET_MEDIUM,
+		.name	  = "medium",
 	},
 	{
-		.colorset  = HE_COLORSET_NORMAL,
-		.name      = "normal",
-		.fore_back_colors = "default, default",
+		.colorset = HE_COLORSET_NORMAL,
+		.name	  = "normal",
 	},
 	{
-		.colorset  = HE_COLORSET_SELECTED,
-		.name      = "selected",
-		.fore_back_colors = "black, yellow",
+		.colorset = HE_COLORSET_SELECTED,
+		.name	  = "selected",
 	},
 	{
-		.colorset  = HE_COLORSET_JUMP_ARROWS,
-		.name      = "jump_arrows",
-		.fore_back_colors = "blue, default",
+		.colorset = HE_COLORSET_JUMP_ARROWS,
+		.name	  = "jump_arrows",
 	},
 	{
-		.colorset  = HE_COLORSET_ADDR,
-		.name      = "addr",
-		.fore_back_colors = "magenta, default",
+		.colorset = HE_COLORSET_ADDR,
+		.name	  = "addr",
 	},
 	{
-		.colorset  = HE_COLORSET_ROOT,
-		.name      = "root",
-		.fore_back_colors = "white, blue",
+		.colorset = HE_COLORSET_ROOT,
+		.name	  = "root",
 	},
 	{
 		.name = NULL,
@@ -724,10 +717,28 @@ void __ui_browser__line_arrow(struct ui_browser *browser, unsigned int column,
 		__ui_browser__line_arrow_down(browser, column, start, end);
 }
 
+static void default_colors_config_init(void)
+{
+	int i, j;
+
+	for (i = 0; ui_browser__colorsets[i].name != NULL; ++i) {
+		const char *name = ui_browser__colorsets[i].name;
+
+		for (j = 0; colors_config_items[j].name != NULL; j++) {
+			if (!strcmp(name, colors_config_items[j].name)) {
+				ui_browser__colorsets[i].fore_back_colors =
+					colors_config_items[j].value.s;
+				break;
+			}
+		}
+	}
+}
+
 void ui_browser__init(void)
 {
 	int i = 0;
 
+	default_colors_config_init();
 	perf_config(ui_browser__color_config, NULL);
 
 	while (ui_browser__colorsets[i].name) {
-- 
2.5.0

  parent reply	other threads:[~2016-07-03 22:52 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-03 22:52 [RFC PATCH v4 0/7] perf config: Introduce default config key-value pairs arrays Taeung Song
2016-07-03 22:52 ` [PATCH v4 1/7] perf config: Introduce default_config_section and default_config_item for default config key-value pairs Taeung Song
2016-07-03 22:52 ` [PATCH v4 2/7] perf config: Add macros assigning key-value pairs to default_config_item Taeung Song
2016-07-03 22:52 ` [PATCH v4 3/7] perf config: Add 'colors' section default configs arrrays Taeung Song
2016-07-03 22:52 ` [PATCH v4 4/7] perf config: Use combined {fore,back}ground colors value instead of each two color Taeung Song
2016-07-03 22:52 ` Taeung Song [this message]
2016-07-03 22:52 ` [PATCH v4 6/7] perf config: Add 'annotate' section default configs arrrays Taeung Song
2016-07-03 22:52 ` [PATCH v4 7/7] perf config: Initialize annotate_browser__opts with default config items Taeung Song

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=1467586339-30835-6-git-send-email-treeze.taeung@gmail.com \
    --to=treeze.taeung@gmail.com \
    --cc=acme@kernel.org \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mhiramat@kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=peterz@infradead.org \
    --cc=wangnan0@huawei.com \
    /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: link
Be 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 NNTP newsgroup(s).