completely new system: only values in config file get updated + cleaner code

1 files changed, 20 insertions, 24 deletions

diff --git a/config.def.h b/config.def.h
index 5f1d4db..b3f01df 100644
--- a/config.def.h
+++ b/config.def.h
@@ -1,37 +1,33 @@
 /* See LICENSE file for copyright and license details. */
 
 /* alsa sound */
-static const char soundcard[] = "default";
 static const char channel[]   = "Master";
 
-/* cpu temperature */
-static const char tempfile[] = "/sys/devices/platform/coretemp.0/hwmon/hwmon2/temp1_input";
-
-/* wifi */
-static const char wificard[] = "wlp3s0";
-
 /* battery */
-static const char batterynowfile[]  = "/sys/class/power_supply/BAT0/energy_now";
-static const char batteryfullfile[] = "/sys/class/power_supply/BAT0/energy_full_design";
-
-/* time */
-static const char timeformat[] = "%y-%m-%d %H:%M:%S";
+static const char batterypath[] = "/sys/class/power_supply/";
+static const char batterynow[]  = "energy_now";
+static const char batteryfull[] = "energy_full_design";
 
 /* bar update interval in seconds (smallest value = 1) */
 static unsigned int update_interval = 1;
 
-/* mountpoint for diskusage */
-static const char mountpath[] = "/home";
-
 /* statusbar
-Possible arguments:
-- battery (battery percentage)
-- cpu_temperature (cpu temperature in degrees)
+- get_battery (battery percentage) [argument: battery name]
+- cpu_temperature (cpu temperature in degrees) [argument: temperature file]
 - cpu usage (cpu usage in percent)
-- datetime (date and time)
-- diskusage (disk usage in percent)
+- datetime (date and time) [argument: format]
+- diskusage (disk usage in percent) [argument: mountpoint]
 - ram_usage (ram usage in percent)
-- volume (alsa volume and mute status in percent)
-- wifi_signal (wifi signal in percent) */
-#define FORMATSTRING "wifi %4s | bat %4s | cpu %4s %3s | ram %3s | vol %4s | disk %4s | %3s"
-#define ARGUMENTS wifi_signal, battery, cpu_usage, cpu_temperature, ram_usage, volume, diskusage, datetime
+- volume (alsa volume and mute status in percent) [argument: soundcard]
+- wifi_signal (wifi signal in percent) [argument: wifi card interface name] */
+static const struct arg args[] = {
+    /* function             format          argument */
+    { get_wifi_signal,      "wifi %4s | ",  "wlp3s0" },
+    { get_battery,          "bat %4s | ",   "BAT0" },
+    { get_cpu_usage,        "cpu %4s ",     NULL },
+    { get_cpu_temperature,  "%3s | ",       "/sys/devices/platform/coretemp.0/hwmon/hwmon2/temp1_input" },
+    { get_ram_usage,        "ram %3s | ",   NULL },
+    { get_volume,           "vol %4s | ",   "default" },
+    { get_diskusage,        "ssd %3s | ",   "/" },
+    { get_datetime,         "%s",           "%y-%m-%d %H:%M:%S" }
+};