speedie/speedwm-personal
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

powerline: no need for that many colors anyway

Browse source
This commit is contained in:
speedie 2022-12-05 21:11:16 +01:00
parent 7629d9537a
commit 97c5f85d6a
6 changed files with 18 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
bar/statusbar-powerline.c
View file

@ -11,16 +11,15 @@ click_status_pwl(Bar *bar, Arg *arg, BarClickArg *a)
int
click_status_text_pwl(Arg *arg, int rel_x, char *text)
{
int dpad = drw->font->h;
int i = -1;
int x = dpad / 2 - (TEXTW("_") - lrpad);
int x = 0;
char ch;
clickstatusn = 0;
while (text[++i]) {
if ((unsigned char)text[i] < ' ') {
ch = text[i];
text[i] = '\0';
x += textlength(text) + dpad;
x += textlength(text);
text[i] = ch;
text += i+1;
i = -1;
@ -63,7 +62,7 @@ widthpowerlinestatus(char *stext)
strcpy(status, stext);
for (i = n, bs = &status[n-1]; i >= 0; i--, bs--) {
if (*bs == '<' || *bs == '/' || *bs == '\\' || *bs == '>' || *bs == '|') { /* block start */
if (*bs == '<' || *bs == '\\' || *bs == '>' || *bs == '|') { /* block start */
if (bp != '|')
w += plw;
w += TEXTW(bs+2);
@ -89,14 +88,12 @@ drawpowerlinestatus(int xpos, char *stext)
strcpy(status, stext);
for (i = n, bs = &status[n-1]; i >= 0; i--, bs--) {
if (*bs == '<' || *bs == '/' || *bs == '\\' || *bs == '>' || *bs == '|') { /* block start */
int offset = 3;
cn = *(bs + offset - 1) - 1;
if (*bs == '<' || *bs == '\\' || *bs == '>' || *bs == '|') { /* block start */
cn = ((int) *(bs+1)) + 1;
if (cn < LENGTH(powerlinecolors)) {
drw_settrans(drw, prevscheme, (nxtscheme = powerlinescheme[cn]));
} else {
offset--;
drw_settrans(drw, prevscheme, (nxtscheme = powerlinescheme[0]));
}
@ -107,8 +104,8 @@ drawpowerlinestatus(int xpos, char *stext)
}
drw_setscheme(drw, nxtscheme);
w = TEXTW(bs+offset);
drw_text(drw, x - w, 0, w, bh, lrpad / 2, bs+offset, 0, False);
w = TEXTW(bs+2);
drw_text(drw, x - w, 0, w, bh, lrpad / 2, bs+2, 0, False);
x -= w;
bp = *bs;

5
colors.h
View file

@ -32,11 +32,6 @@ static char *powerlinecolors[][2] = {
[SchemeBorderSel] = { col_powerline5_text, col_powerline5 },
[SchemeBorderUrg] = { col_powerline6_text, col_powerline6 },
[SchemeStatus] = { col_powerline7_text, col_powerline7 },
[SchemeTitleNorm] = { col_powerline8_text, col_powerline8 },
[SchemeTitleSel] = { col_powerline9_text, col_powerline9 },
[SchemeTitleHidden] = { col_powerline10_text, col_powerline10 },
[SchemeLayout] = { col_powerline11_text, col_powerline11 },
[SchemeSystray] = { col_powerline12_text, col_powerline12 },
};
/* Colors for the status bar (.Xresources) */

16
docs/example.Xresources
View file

@ -80,14 +80,6 @@ speedwm.col.powerline4: #A89F93
speedwm.col.powerline5: #D3A99B
speedwm.col.powerline6: #AFC9AC
speedwm.col.powerline7: #eae1cb
speedwm.col.powerline8: #a39d8e
speedwm.col.powerline9: #6D5E8E
speedwm.col.powerline10: #a16f9d
speedwm.col.powerline11: #d3a99b
speedwm.col.powerline12: #afc9ac
speedwm.col.powerline13: #eae1cb
speedwm.col.powerline14: #6d5e8e
speedwm.col.powerline15: #ffffff
speedwm.col.powerline0_text: #eeeeee
speedwm.col.powerline1_text: #131210
speedwm.col.powerline2_text: #131210
@ -96,14 +88,6 @@ speedwm.col.powerline4_text: #131210
speedwm.col.powerline5_text: #131210
speedwm.col.powerline6_text: #131210
speedwm.col.powerline7_text: #131210
speedwm.col.powerline8_text: #131210
speedwm.col.powerline9_text: #131210
speedwm.col.powerline10_text: #131210
speedwm.col.powerline11_text: #131210
speedwm.col.powerline12_text: #131210
speedwm.col.powerline13_text: #131210
speedwm.col.powerline14_text: #131210
speedwm.col.powerline15_text: #131210
speedwm.col.systray: #222222
speedwm.col.tag1: #99b3ff
speedwm.col.tag1.text: #eeeeee

16
options.h
View file

@ -222,14 +222,6 @@ static char col_powerline4[] = "#A89F93"; /* Powerline color 4
static char col_powerline5[] = "#D3A99B"; /* Powerline color 5 */
static char col_powerline6[] = "#AFC9AC"; /* Powerline color 6 */
static char col_powerline7[] = "#eae1cb"; /* Powerline color 7 */
static char col_powerline8[] = "#a39d8e"; /* Powerline color 8 */
static char col_powerline9[] = "#6D5E8E"; /* Powerline color 9 */
static char col_powerline10[] = "#A16F9D"; /* Powerline color 10 */
static char col_powerline11[] = "#D3A99B"; /* Powerline color 11 */
static char col_powerline12[] = "#AFC9AC"; /* Powerline color 12 */
static char col_powerline13[] = "#eae1cb"; /* Powerline color 13 */
static char col_powerline14[] = "#6D5E8E"; /* Powerline color 14 */
static char col_powerline15[] = "#ffffff"; /* Powerline color 15 */
static char col_powerline0_text[] = "#eeeeee"; /* Powerline text color 0 */
static char col_powerline1_text[] = "#131210"; /* Powerline text color 1 */
static char col_powerline2_text[] = "#131210"; /* Powerline text color 2 */
@ -238,14 +230,6 @@ static char col_powerline4_text[] = "#131210"; /* Powerline text col
static char col_powerline5_text[] = "#131210"; /* Powerline text color 5 */
static char col_powerline6_text[] = "#131210"; /* Powerline text color 6 */
static char col_powerline7_text[] = "#131210"; /* Powerline text color 7 */
static char col_powerline8_text[] = "#131210"; /* Powerline text color 8 */
static char col_powerline9_text[] = "#131210"; /* Powerline text color 9 */
static char col_powerline10_text[] = "#131210"; /* Powerline text color 10 */
static char col_powerline11_text[] = "#131210"; /* Powerline text color 11 */
static char col_powerline12_text[] = "#131210"; /* Powerline text color 12 */
static char col_powerline13_text[] = "#131210"; /* Powerline text color 13 */
static char col_powerline14_text[] = "#131210"; /* Powerline text color 14 */
static char col_powerline15_text[] = "#131210"; /* Powerline text color 15 */
/* Color options
*

22
status.h
View file

@ -14,17 +14,17 @@
static const Module modules[] = {
/* prefix command update interval update signal */
{ "\x01^C1^", "module_time --print", 1, 1 },
{ "\x02^C2^", "module_date --print", 60, 2 },
{ "\x03^C3^", "module_bat --print", 2, 3 },
{ "\x04^C4^", "module_vol --print", 1, 4 },
{ "\x05^C5^", "module_ram --print", 6, 5 },
{ "\x06^C6^", "module_net --print", 10, 6 },
{ "\x07^C7^", "module_temp --print", 5, 7 },
{ "\x08^C8^", "module_weather --print", 60, 8 },
{ "\x09^C9^", "module_music --print", 1, 9 },
{ "\x10^C10^", "module_dfmpeg --print", 5, 10 },
{ "\x11^C11^", "module_news --print", 30, 11 },
{ "<\x01", "module_time --print", 1, 1 },
{ "<\x02", "module_date --print", 60, 2 },
{ "<\x03", "module_bat --print", 2, 3 },
{ "<\x04", "module_vol --print", 1, 4 },
{ "<\x05", "module_ram --print", 6, 5 },
{ "<\x01", "module_net --print", 10, 6 },
{ "<\x02", "module_temp --print", 5, 7 },
{ "<\x03", "module_weather --print", 60, 8 },
{ "<\x04", "module_music --print", 1, 9 },
{ "<\x05", "module_dfmpeg --print", 5, 10 },
{ "<\x01", "module_news --print", 30, 11 },
};
static char leftpadding[] = ""; /* Padding on the left side of the status text */

24
xresources.h
View file

@ -62,14 +62,6 @@ ResourcePref resources[] = {
{ "col.powerline5_text", STRING, &col_powerline5_text },
{ "col.powerline6_text", STRING, &col_powerline6_text },
{ "col.powerline7_text", STRING, &col_powerline7_text },
{ "col.powerline8_text", STRING, &col_powerline8_text },
{ "col.powerline9_text", STRING, &col_powerline9_text },
{ "col.powerline10_text", STRING, &col_powerline10_text },
{ "col.powerline11_text", STRING, &col_powerline11_text },
{ "col.powerline12_text", STRING, &col_powerline12_text },
{ "col.powerline13_text", STRING, &col_powerline13_text },
{ "col.powerline14_text", STRING, &col_powerline14_text },
{ "col.powerline15_text", STRING, &col_powerline15_text },
{ "col.systray", STRING, &col_systray },
{ "run.shell", STRING, &shell },
{ "status.defaultstatus", STRING, &defaultstatus },
@ -227,14 +219,6 @@ ResourcePref resources[] = {
{ "color5", STRING, &col_powerline5 },
{ "color6", STRING, &col_powerline6 },
{ "color7", STRING, &col_powerline7 },
{ "color8", STRING, &col_powerline8 },
{ "color9", STRING, &col_powerline9 },
{ "color10", STRING, &col_powerline10 },
{ "color11", STRING, &col_powerline11 },
{ "color12", STRING, &col_powerline12 },
{ "color13", STRING, &col_powerline13 },
{ "color14", STRING, &col_powerline14 },
{ "color15", STRING, &col_powerline15 },
{ "color4", STRING, &col_powerline0_text },
{ "color0", STRING, &col_powerline1_text },
{ "color0", STRING, &col_powerline2_text },
@ -243,13 +227,5 @@ ResourcePref resources[] = {
{ "color0", STRING, &col_powerline5_text },
{ "color0", STRING, &col_powerline6_text },
{ "color0", STRING, &col_powerline7_text },
{ "color0", STRING, &col_powerline8_text },
{ "color0", STRING, &col_powerline9_text },
{ "color10", STRING, &col_powerline10_text },
{ "color11", STRING, &col_powerline11_text },
{ "color12", STRING, &col_powerline12_text },
{ "color13", STRING, &col_powerline13_text },
{ "color14", STRING, &col_powerline14_text },
{ "color15", STRING, &col_powerline15_text },
/* value in .Xresources type value in speedwm */
};