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.s
instead of "red, default" string value for 'colors.top')

Cc: Namhyung Kim <namhy...@kernel.org>
Cc: Jiri Olsa <jo...@kernel.org>
Cc: Masami Hiramatsu <mhira...@kernel.org>
Cc: Wang Nan <wangn...@huawei.com>
Signed-off-by: Taeung Song <treeze.tae...@gmail.com>
---
 tools/perf/ui/browser.c | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/tools/perf/ui/browser.c b/tools/perf/ui/browser.c
index 1c80f00..5caa7e4 100644
--- a/tools/perf/ui/browser.c
+++ b/tools/perf/ui/browser.c
@@ -509,37 +509,30 @@ static struct ui_browser_colorset {
        {
                .colorset = HE_COLORSET_TOP,
                .name     = "top",
-               .colors   = "red, default",
        },
        {
                .colorset = HE_COLORSET_MEDIUM,
                .name     = "medium",
-               .colors   = "green, default",
        },
        {
                .colorset = HE_COLORSET_NORMAL,
                .name     = "normal",
-               .colors   = "default, default",
        },
        {
                .colorset = HE_COLORSET_SELECTED,
                .name     = "selected",
-               .colors   = "black, yellow",
        },
        {
                .colorset = HE_COLORSET_JUMP_ARROWS,
                .name     = "jump_arrows",
-               .colors   = "blue, default",
        },
        {
                .colorset = HE_COLORSET_ADDR,
                .name     = "addr",
-               .colors   = "magenta, default",
        },
        {
                .colorset = HE_COLORSET_ROOT,
                .name     = "root",
-               .colors   = "white, blue",
        },
        {
                .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].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.7.4

Reply via email to