]> git.sur5r.net Git - i3/i3status/blobdiff - src/print_wireless_info.c
document the path option in sample config
[i3/i3status] / src / print_wireless_info.c
index 50cf8e4b08047c57ec82774978f3c6458a4cb228..3a96b86f93b3d10147c49cace6105cf516dd99fb 100644 (file)
@@ -25,6 +25,7 @@ typedef struct {
         int signal_level_max;
         int noise_level;
         int noise_level_max;
+        int bitrate;
 } wireless_info_t;
 
 static int get_wireless_info(const char *interface, wireless_info_t *info) {
@@ -39,7 +40,7 @@ static int get_wireless_info(const char *interface, wireless_info_t *info) {
 
         wireless_config wcfg;
         if (iw_get_basic_config(skfd, interface, &wcfg) < 0) {
-            perror("iw_get_basic_config");
+            close(skfd);
             return 0;
         }
 
@@ -132,6 +133,10 @@ static int get_wireless_info(const char *interface, wireless_info_t *info) {
                 }
         }
 
+        struct iwreq wrq;
+        if (iw_get_ext(skfd, interface, SIOCGIWRATE, &wrq) >= 0)
+                info->bitrate = wrq.u.bitrate.value;
+
         close(skfd);
         return 1;
 #endif
@@ -143,11 +148,11 @@ void print_wireless_info(const char *interface, const char *format_up, const cha
         if (get_wireless_info(interface, &info)) {
                 walk = format_up;
                 if (info.flags & WIRELESS_INFO_FLAG_HAS_QUALITY)
-                        printf("%s", info.quality < info.quality_average ? color("#FFFF00") : color("#00FF00"));
+                        printf("%s", info.quality < info.quality_average ? color("color_degraded") : color("color_good"));
         }
         else {
                 walk = format_down;
-                printf("%s", color("#FF0000"));
+                printf("%s", color("color_bad"));
         }
 
         for (; *walk != '\0'; walk++) {
@@ -210,6 +215,15 @@ void print_wireless_info(const char *interface, const char *format_up, const cha
                         else (void)printf("no IP");
                         walk += strlen("ip");
                 }
+
+                if (BEGINS_WITH(walk+1, "bitrate")) {
+                        char buffer[128];
+
+                        iw_print_bitrate(buffer, sizeof(buffer), info.bitrate);
+
+                        printf("%s", buffer);
+                        walk += strlen("bitrate");
+                }
         }
 
         (void)printf("%s", endcolor());