marco/i3status
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix: Don’t show colors in wireless info if colors are disabled (Thanks shatter)

Browse Source
This commit is contained in:
Michael Stapelberg 2009-09-26 13:26:13 +02:00
parent 89ad3dbaa2
commit cdb450376e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/get_wireless_info.c
View File

@ -33,9 +33,7 @@ const char *get_wireless_info() {
if (sscanf(interfaces, "%*[^:]: 0000 %d", &quality) != 1) if (sscanf(interfaces, "%*[^:]: 0000 %d", &quality) != 1)
continue; continue;
if ((quality == UCHAR_MAX) || (quality == 0)) { if ((quality == UCHAR_MAX) || (quality == 0)) {
if (use_colors)
(void)snprintf(part, sizeof(part), "%sW: down%s", color("#FF0000"), endcolor()); (void)snprintf(part, sizeof(part), "%sW: down%s", color("#FF0000"), endcolor());
else (void)snprintf(part, sizeof(part), "W: down");
} else (void)snprintf(part, sizeof(part), "%sW: (%03d%%) %s%s", } else (void)snprintf(part, sizeof(part), "%sW: (%03d%%) %s%s",
color("#00FF00"), quality, get_ip_addr(wlan_interface), endcolor()); color("#00FF00"), quality, get_ip_addr(wlan_interface), endcolor());
return part; return part;

4
src/output.c
View File

@ -26,6 +26,10 @@ void write_error_to_statusbar(const char *message) {
*/ */
char *color(const char *colorstr) { char *color(const char *colorstr) {
static char colorbuf[32]; static char colorbuf[32];
if (!use_colors) {
colorbuf[0] = '\0';
return colorbuf;
}
#ifdef DZEN #ifdef DZEN
(void)snprintf(colorbuf, sizeof(colorbuf), "^fg(%s)", colorstr); (void)snprintf(colorbuf, sizeof(colorbuf), "^fg(%s)", colorstr);
#elif XMOBAR #elif XMOBAR