From e7c944a5d6ab71ddcedeff7765e5d8ede95aedbb Mon Sep 17 00:00:00 2001 From: speedie Date: Thu, 8 Jun 2023 08:17:42 +0200 Subject: [PATCH] Improve SGR sequence colors --- docs/example.Xresources | 32 ++++++++++++++++---------------- docs/spmenu.conf | 32 ++++++++++++++++---------------- options.h | 32 ++++++++++++++++---------------- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/docs/example.Xresources b/docs/example.Xresources index f5bac0f..935404e 100644 --- a/docs/example.Xresources +++ b/docs/example.Xresources @@ -46,22 +46,22 @@ spmenu.col_modefg: #ffffff spmenu.col_modebg: #35638A spmenu.col_capsfg: #ffffff spmenu.col_capsbg: #45638A -spmenu.col_sgr0: #000000 -spmenu.col_sgr1: #7f0000 -spmenu.col_sgr2: #007f00 -spmenu.col_sgr3: #7f7f00 -spmenu.col_sgr4: #00007f -spmenu.col_sgr5: #7f007f -spmenu.col_sgr6: #007f7f -spmenu.col_sgr7: #cccccc -spmenu.col_sgr8: #333333 -spmenu.col_sgr9: #ff0000 -spmenu.col_sgr10: #00ff00 -spmenu.col_sgr11: #ffff00 -spmenu.col_sgr12: #0000ff -spmenu.col_sgr13: #ff00ff -spmenu.col_sgr14: #00ffff -spmenu.col_sgr15: #ffffff +spmenu.col_sgr0: #20201d +spmenu.col_sgr1: #d73737 +spmenu.col_sgr2: #60ac39 +spmenu.col_sgr3: #cfb017 +spmenu.col_sgr4: #6684e1 +spmenu.col_sgr5: #b854d4 +spmenu.col_sgr6: #1fad83 +spmenu.col_sgr7: #a6a28c +spmenu.col_sgr8: #7d7a68 +spmenu.col_sgr9: #d73737 +spmenu.col_sgr10: #60ac39 +spmenu.col_sgr11: #cfb017 +spmenu.col_sgr12: #6684e1 +spmenu.col_sgr13: #b854d4 +spmenu.col_sgr14: #1fad83 +spmenu.col_sgr15: #fefbec !! Alpha spmenu.alpha_itemnormfg: 255 diff --git a/docs/spmenu.conf b/docs/spmenu.conf index aa59040..82f32c1 100644 --- a/docs/spmenu.conf +++ b/docs/spmenu.conf @@ -79,22 +79,22 @@ spmenu = { border = "#35638A"; // Border color (#RRGGBB) caretfg = "#ffffff"; // Caret (cursor) foreground color (#RRGGBB) caretbg = "#222222"; // Caret (cursor) background color (#RRGGBB) - sgr0 = "#000000"; // SGR 0 color (#RRGGBB) - sgr1 = "#7f0000"; // SGR 1 color (#RRGGBB) - sgr2 = "#007f00"; // SGR 2 color (#RRGGBB) - sgr3 = "#7f7f00"; // SGR 3 color (#RRGGBB) - sgr4 = "#00007f"; // SGR 4 color (#RRGGBB) - sgr5 = "#7f007f"; // SGR 5 color (#RRGGBB) - sgr6 = "#007f7f"; // SGR 6 color (#RRGGBB) - sgr7 = "#cccccc"; // SGR 7 color (#RRGGBB) - sgr8 = "#333333"; // SGR 8 color (#RRGGBB) - sgr9 = "#ff0000"; // SGR 9 color (#RRGGBB) - sgr10 = "#00ff00"; // SGR 10 color (#RRGGBB) - sgr11 = "#ffff00"; // SGR 11 color (#RRGGBB) - sgr12 = "#0000ff"; // SGR 12 color (#RRGGBB) - sgr13 = "#ff00ff"; // SGR 13 color (#RRGGBB) - sgr14 = "#00ffff"; // SGR 14 color (#RRGGBB) - sgr15 = "#ffffff"; // SGR 15 color (#RRGGBB) + sgr0 = "#20201d"; // SGR 0 color (#RRGGBB) + sgr1 = "#d73737"; // SGR 1 color (#RRGGBB) + sgr2 = "#60ac39"; // SGR 2 color (#RRGGBB) + sgr3 = "#cfb017"; // SGR 3 color (#RRGGBB) + sgr4 = "#6684e1"; // SGR 4 color (#RRGGBB) + sgr5 = "#b854d4"; // SGR 5 color (#RRGGBB) + sgr6 = "#1fad83"; // SGR 6 color (#RRGGBB) + sgr7 = "#a6a28c"; // SGR 7 color (#RRGGBB) + sgr8 = "#7d7a68"; // SGR 8 color (#RRGGBB) + sgr9 = "#d73737"; // SGR 9 color (#RRGGBB) + sgr10 = "#60ac39"; // SGR 10 color (#RRGGBB) + sgr11 = "#cfb017"; // SGR 11 color (#RRGGBB) + sgr12 = "#6684e1"; // SGR 12 color (#RRGGBB) + sgr13 = "#b854d4"; // SGR 13 color (#RRGGBB) + sgr14 = "#1fad83"; // SGR 14 color (#RRGGBB) + sgr15 = "#fefbec"; // SGR 15 color (#RRGGBB) coloritems = 1; // Color the selected item (0/1) sgr = 1; // Interpret SGR sequences (0/1) } ); diff --git a/options.h b/options.h index 2a71bf7..1f6da6f 100644 --- a/options.h +++ b/options.h @@ -178,22 +178,22 @@ static char col_capsfg[] = "#ffffff"; /* Caps lock text color */ static char col_capsbg[] = "#45638A"; /* Caps lock background color */ /* SGR colors */ -static char col_sgr0[] = "#000000"; /* SGR color #0 */ -static char col_sgr1[] = "#7f0000"; /* SGR color #1 */ -static char col_sgr2[] = "#007f00"; /* SGR color #2 */ -static char col_sgr3[] = "#7f7f00"; /* SGR color #3 */ -static char col_sgr4[] = "#00007f"; /* SGR color #4 */ -static char col_sgr5[] = "#7f007f"; /* SGR color #5 */ -static char col_sgr6[] = "#007f7f"; /* SGR color #6 */ -static char col_sgr7[] = "#cccccc"; /* SGR color #7 */ -static char col_sgr8[] = "#333333"; /* SGR color #8 */ -static char col_sgr9[] = "#ff0000"; /* SGR color #9 */ -static char col_sgr10[] = "#00ff00"; /* SGR color #10 */ -static char col_sgr11[] = "#ffff00"; /* SGR color #11 */ -static char col_sgr12[] = "#0000ff"; /* SGR color #12 */ -static char col_sgr13[] = "#ff00ff"; /* SGR color #13 */ -static char col_sgr14[] = "#00ffff"; /* SGR color #14 */ -static char col_sgr15[] = "#ffffff"; /* SGR color #15 */ +static char col_sgr0[] = "#20201d"; /* SGR color #0 */ +static char col_sgr1[] = "#d73737"; /* SGR color #1 */ +static char col_sgr2[] = "#60ac39"; /* SGR color #2 */ +static char col_sgr3[] = "#cfb017"; /* SGR color #3 */ +static char col_sgr4[] = "#6684e1"; /* SGR color #4 */ +static char col_sgr5[] = "#b854d4"; /* SGR color #5 */ +static char col_sgr6[] = "#1fad83"; /* SGR color #6 */ +static char col_sgr7[] = "#a6a28c"; /* SGR color #7 */ +static char col_sgr8[] = "#7d7a68"; /* SGR color #8 */ +static char col_sgr9[] = "#d73737"; /* SGR color #9 */ +static char col_sgr10[] = "#60ac39"; /* SGR color #10 */ +static char col_sgr11[] = "#cfb017"; /* SGR color #11 */ +static char col_sgr12[] = "#6684e1"; /* SGR color #12 */ +static char col_sgr13[] = "#b854d4"; /* SGR color #13 */ +static char col_sgr14[] = "#1fad83"; /* SGR color #14 */ +static char col_sgr15[] = "#fefbec"; /* SGR color #15 */ /* Alpha options */ static int alpha_itemnormfg = 255; /* Alpha for normal item foreground (0-255) */