From 67fb28a67c57c262e4e0b00191944e3e7c096b17 Mon Sep 17 00:00:00 2001 From: Boris Faure Date: Wed, 14 Feb 2018 22:32:50 +0100 Subject: [PATCH] solarized: set faint/dim colors for black It was previously invisible --- data/themes/solarized.edc | 6 +++++ data/themes/solarized_light.edc | 5 +++++ src/bin/col.c | 40 +++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+) diff --git a/data/themes/solarized.edc b/data/themes/solarized.edc index 0eaa00e5..5581a580 100644 --- a/data/themes/solarized.edc +++ b/data/themes/solarized.edc @@ -40,6 +40,7 @@ color_classes { color_class { name: "c19"; color: S_base1; } color_class { name: "c20"; color: S_base3; } + color_class { name: "c24"; color: S_base00; } color_class { name: "c25"; color: S_base03; } color_class { name: "c26"; color: S_orange; } color_class { name: "c27"; color: S_base01; } @@ -58,6 +59,11 @@ color_classes { color_class { name: "c43"; color: S_base1; } color_class { name: "c44"; color: S_base3; } + color_class { name: "c49"; color: S_base01; } + color_class { name: "c61"; color: S_base01; } + color_class { name: "c73"; color: S_base01; } + color_class { name: "c85"; color: S_base01; } + color_class { name: "C0"; color: S_base02; } // COL_BLACK color_class { name: "C1"; color: S_red; } // COL_RED color_class { name: "C2"; color: S_green; } // COL_GREEN diff --git a/data/themes/solarized_light.edc b/data/themes/solarized_light.edc index c4d54bc9..b68e938f 100644 --- a/data/themes/solarized_light.edc +++ b/data/themes/solarized_light.edc @@ -51,6 +51,11 @@ color_classes { color_class { name: "c38"; color: S_magenta; } + color_class { name: "c49"; color: S_base01; } + color_class { name: "c61"; color: S_base01; } + color_class { name: "c73"; color: S_base01; } + color_class { name: "c85"; color: S_base01; } + color_class { name: "C0"; color: S_base02; } // COL_BLACK color_class { name: "C1"; color: S_red; } // COL_RED color_class { name: "C2"; color: S_green; } // COL_GREEN diff --git a/src/bin/col.c b/src/bin/col.c index e73b4724..57b2a564 100644 --- a/src/bin/col.c +++ b/src/bin/col.c @@ -427,6 +427,46 @@ colors_term_init(Evas_Object *textgrid, textgrid, EVAS_TEXTGRID_PALETTE_STANDARD, n + 24, r / 2, g / 2, b / 2, a / 2); } + for (c = 48; c < 72; c++) + { + if (!config->colors_use) + { + snprintf(buf, sizeof(buf) - 1, "c%i", c); + if (edje_object_color_class_get(bg, buf, + &r, + &g, + &b, + &a, + NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL)) + { + /* faint */ + evas_object_textgrid_palette_set( + textgrid, EVAS_TEXTGRID_PALETTE_STANDARD, c, + r, g, b, a); + } + } + } + for (c = 72; c < 96; c++) + { + if (!config->colors_use) + { + snprintf(buf, sizeof(buf) - 1, "c%i", c); + if (edje_object_color_class_get(bg, buf, + &r, + &g, + &b, + &a, + NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL)) + { + /* faint */ + evas_object_textgrid_palette_set( + textgrid, EVAS_TEXTGRID_PALETTE_STANDARD, c - 48, + r, g, b, a); + } + } + } for (c = 0; c < 256; c++) { snprintf(buf, sizeof(buf) - 1, "C%i", c);