Just use default pulseaudio sink for volume

[khatus.git] / x2 / src / awk / exe / bar.awk

diff --git a/x2/src/awk/exe/bar.awk b/x2/src/awk/exe/bar.awk
index c6fd9ef..48e00f2 100644 (file)
--- a/x2/src/awk/exe/bar.awk
+++ b/x2/src/awk/exe/bar.awk
@@ -152,9 +152,19 @@ function bar_make_status_disk_io_r(    src) {
 # Network
 # -----------------------------------------------------------------------------
 
+function bar_make_status_net_iface_status(interface,    is_plugged_in) {
+    # TODO: Integrate connection/address status into the symbol somehow.
+    cache_get(is_plugged_in, "khatus_sensor_net_carrier", interface, 5)
+    if (!is_plugged_in["is_expired"] && is_plugged_in["value"] == 1)
+        return "<>"
+    else
+        return "--"
+}
+
 function bar_make_status_net_addr(interface,    src) {
     src = "khatus_sensor_net_addr_io"
-    return cache_get_fmt_def(src, "addr" Kfs interface, 5, "%s", "")
+    addr = cache_get_fmt_def(src, "addr" Kfs interface, 5, "%s")
+    return addr ? addr : "--"
 }
 
 function bar_make_status_net_io_w(interface,    src) {
@@ -172,10 +182,26 @@ function bar_make_status_net_wifi(interface,    src) {
     return cache_get_fmt_def(src, "status" Kfs interface, 10, "%s")
 }
 
+function bar_make_status_net_wifi_link(interface,    link) {
+    cache_get(link, "khatus_sensor_net_wifi_status", "link" Kfs interface, 10)
+    if (!link["is_expired"] && link["value"] > 0)
+        return sprintf("%d%%", link["value"])
+    else
+        return "--"
+}
+
 # -----------------------------------------------------------------------------
 # Bluetooth
 # -----------------------------------------------------------------------------
 
+function bar_make_status_bluetooth(    src, controllers, devices) {
+    src = "khatus_sensor_bluetooth"
+    controllers = cache_get_fmt_def(src, "count_powered_controllers", 10, "%d")
+    devices     = cache_get_fmt_def(src, "count_connected_devices"  , 10, "%d")
+    # Using %s format bellow because default value is a string
+    return sprintf("%s:%s", controllers, devices)
+}
+
 function bar_make_status_bluetooth_power(    src) {
     src = "khatus_sensor_bluetooth_power"
     return cache_get_fmt_def(src, "power_status", 10, "%s")
@@ -194,10 +220,10 @@ function bar_make_status_backlight_percent(    src) {
 # Volume
 # -----------------------------------------------------------------------------
 
-function bar_make_status_volume_alsa_device(device,    m, l, r, show) {
-    cache_get(m, "khatus_sensor_volume", "mute"      Kfs device, 5)
-    cache_get(l, "khatus_sensor_volume", "vol_left"  Kfs device, 5)
-    cache_get(r, "khatus_sensor_volume", "vol_right" Kfs device, 5)
+function bar_make_status_volume(    m, l, r, show) {
+    cache_get(m, "khatus_sensor_volume", "mute"      , 5)
+    cache_get(l, "khatus_sensor_volume", "vol_left"  , 5)
+    cache_get(r, "khatus_sensor_volume", "vol_right" , 5)
     show = "--"
     if (!m["is_expired"] && !l["is_expired"] && !r["is_expired"]) {
         if (m["value"] == "yes")
@@ -206,7 +232,7 @@ function bar_make_status_volume_alsa_device(device,    m, l, r, show) {
             show = l["value"] #" " r["value"]
         else
             msg_out_log_error(\
-                "bar_make_status_volume_alsa_device: " device ". ", \
+                "bar_make_status_volume", \
                 "Unexpected value for 'mute' field: " m["value"] \
             )
     }
@@ -223,9 +249,9 @@ function bar_make_status_mpd(    state, status) {
         if (state["value"] == "play") {
             status = bar_make_status_mpd_state_known("▶")
         } else if (state["value"] == "pause") {
-            status = bar_make_status_mpd_state_known("â\9d\9aâ\9d\9a")
+            status = bar_make_status_mpd_state_known("â\8f¸")
         } else if (state["value"] == "stop") {
-            status = bar_make_status_mpd_state_known("â¬\9b")
+            status = bar_make_status_mpd_state_known("â\8f¹")
         } else {
             msg_out_log_error(\
                 "bar_make_status_mpd", \