- honor color_good too.

This commit is contained in:
jasper 2012-10-09 11:32:45 +00:00
parent 275db814f1
commit 6c8410d49f
2 changed files with 9 additions and 7 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.20 2012/10/09 11:29:23 jasper Exp $
# $OpenBSD: Makefile,v 1.21 2012/10/09 11:32:45 jasper Exp $
ONLY_FOR_ARCHS= ${APM_ARCHS}
COMMENT= generate a statusbar for use with i3/xmobar/dzen2
DISTNAME= i3status-2.6
REVISION= 11
REVISION= 12
CATEGORIES= x11 sysutils
HOMEPAGE= http://i3wm.org/i3status/

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_print_wireless_info_c,v 1.2 2012/10/09 11:29:24 jasper Exp $
$OpenBSD: patch-src_print_wireless_info_c,v 1.3 2012/10/09 11:32:45 jasper Exp $
- implement %signal and %essid
- handle down wireless interfaces just like ethernet interfaces (e.g. colors!)
@ -6,7 +6,7 @@ $OpenBSD: patch-src_print_wireless_info_c,v 1.2 2012/10/09 11:29:24 jasper Exp $
info of the interface, for example when it's part of a trunk device.)
--- src/print_wireless_info.c.orig Wed Oct 3 13:44:44 2012
+++ src/print_wireless_info.c Tue Oct 9 15:15:53 2012
+++ src/print_wireless_info.c Tue Oct 9 15:25:03 2012
@@ -25,6 +25,17 @@
#define IW_ESSID_MAX_SIZE IEEE80211_NWID_LEN
#endif
@ -96,7 +96,7 @@ $OpenBSD: patch-src_print_wireless_info_c,v 1.2 2012/10/09 11:29:24 jasper Exp $
return 0;
}
@@ -230,6 +305,13 @@ void print_wireless_info(yajl_gen json_gen, char *buff
@@ -230,6 +305,15 @@ void print_wireless_info(yajl_gen json_gen, char *buff
INSTANCE(interface);
@ -105,12 +105,14 @@ $OpenBSD: patch-src_print_wireless_info_c,v 1.2 2012/10/09 11:29:24 jasper Exp $
+ START_COLOR("color_bad");
+ outwalk += sprintf(outwalk, "%s", format_down);
+ goto out;
+ } else {
+ START_COLOR("color_good");
+ }
+
if (get_wireless_info(interface, &info)) {
walk = format_up;
if (info.flags & WIRELESS_INFO_FLAG_HAS_QUALITY)
@@ -291,9 +373,8 @@ void print_wireless_info(yajl_gen json_gen, char *buff
@@ -291,9 +375,8 @@ void print_wireless_info(yajl_gen json_gen, char *buff
}
if (BEGINS_WITH(walk+1, "ip")) {
@ -122,7 +124,7 @@ $OpenBSD: patch-src_print_wireless_info_c,v 1.2 2012/10/09 11:29:24 jasper Exp $
}
#ifdef LINUX
@@ -308,6 +389,7 @@ void print_wireless_info(yajl_gen json_gen, char *buff
@@ -308,6 +391,7 @@ void print_wireless_info(yajl_gen json_gen, char *buff
#endif
}