Draw axis over data

[batteryviewer] / batteryviewer.c

diff --git a/batteryviewer.c b/batteryviewer.c
index 1c38b3cca8527a36052023be1d85a54c5863c453..37b6e009c1ce71a0b9b15e7dac65368b8f3706ad 100644 (file)
--- a/batteryviewer.c
+++ b/batteryviewer.c
@@ -1,15 +1,32 @@
+// For vasprintf
+#define _GNU_SOURCE
+
 #include "chart.h"
 #include <ctype.h>
 #include <errno.h>
+#include <glob.h>
 #include <gtk/gtk.h>
 #include <math.h>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-
-const char voltage_filename[] = "/sys/class/power_supply/BAT0/voltage_now";
-const char current_filename[] = "/sys/class/power_supply/BAT0/current_now";
+#include <string.h>
+
+char *sasprintf(const char *fmt, ...) {
+  char *result;
+  va_list args;
+  va_start(args, fmt);
+  if (vasprintf(&result, fmt, args) == -1) {
+    fprintf(stderr, "Can't allocate memory!?\n");
+    abort();
+  }
+  va_end(args);
+  return result;
+}
 
 struct State {
+  char *voltage_filename;
+  char *current_filename;
   BVChart *voltage;
   BVChart *current;
 };
@@ -42,9 +59,18 @@ static float fatof(const char *filename) {
   return val;
 }
 
-static gboolean collect_data(struct State *state __attribute__((unused))) {
-  fprintf(stderr, "Voltage: %f, current: %f\n", fatof(voltage_filename),
-          fatof(current_filename));
+static gboolean collect_data(struct State *state) {
+  float now = g_get_monotonic_time() / 1e6;
+  float voltage = fatof(state->voltage_filename);
+  float current = fatof(state->current_filename);
+  if (!isnan(voltage)) {
+    bv_chart_add_point(state->voltage, now, voltage);
+    gtk_widget_queue_draw(GTK_WIDGET(state->voltage));
+  }
+  if (!isnan(current)) {
+    bv_chart_add_point(state->current, now, current);
+    gtk_widget_queue_draw(GTK_WIDGET(state->current));
+  }
   return TRUE;
 }
 
@@ -59,9 +85,6 @@ static void activate(GtkApplication *app, gpointer user_data) {
 
   struct State *state = (struct State *)user_data;
   state->voltage = BV_CHART(bv_chart_new());
-  bv_chart_add_point(state->voltage, 0.0, 0.0);
-  bv_chart_add_point(state->voltage, 1.0, 1.0);
-  bv_chart_add_point(state->voltage, 3.0, 2.0);
   gboolean expand = TRUE;
   gboolean fill = TRUE;
   guint padding = 0;
@@ -69,8 +92,6 @@ static void activate(GtkApplication *app, gpointer user_data) {
                      padding);
 
   state->current = BV_CHART(bv_chart_new());
-  bv_chart_add_point(state->current, 0.0, 1.0);
-  bv_chart_add_point(state->current, 1.0, 0.0);
   gtk_box_pack_end(GTK_BOX(box), GTK_WIDGET(state->current), expand, fill,
                    padding);
 
@@ -79,11 +100,36 @@ static void activate(GtkApplication *app, gpointer user_data) {
   g_timeout_add_seconds(1, (GSourceFunc)collect_data, user_data);
 }
 
-int main(int argc, char **argv) {
-  struct State state;
+char *find_battery_dir() {
+  glob_t globbuf = {.gl_offs = 0};
+  char pattern[] = "/sys/class/power_supply/*[Bb][Aa][Tt]*";
+  if (glob(pattern, GLOB_ERR, NULL, &globbuf) != 0 || globbuf.gl_pathc == 0) {
+    fprintf(stderr, "Could not find battery dir %s\n", pattern);
+    exit(1);
+  }
+  if (globbuf.gl_pathc != 1) {
+    // TODO: Filter for directories that have {voltage,current}_now files.
+    // TODO: Support multiple batteries
+    fprintf(stderr, "Multiple batteries found. Arbitrarily choosing %s\n",
+            globbuf.gl_pathv[0]);
+  }
+  char *dir = strdup(globbuf.gl_pathv[0]);
+  globfree(&globbuf);
+  return dir;
+}
 
-  GtkApplication *app = gtk_application_new("com.scottworley.batteryviewer",
-                                            G_APPLICATION_DEFAULT_FLAGS);
+int main(int argc, char **argv) {
+  char *battery_dir = find_battery_dir();
+  struct State state = {
+      .voltage_filename = sasprintf("%s/voltage_now", battery_dir),
+      .current_filename = sasprintf("%s/current_now", battery_dir),
+  };
+
+  GtkApplication *app = gtk_application_new(
+      "com.scottworley.batteryviewer",
+      // G_APPLICATION_FLAGS_NONE is deprecated, but
+      // G_APPLICATION_DEFAULT_FLAGS isn't available on Stable Debian yet.
+      G_APPLICATION_FLAGS_NONE);
   g_signal_connect(app, "activate", G_CALLBACK(activate), &state);
   int status = g_application_run(G_APPLICATION(app), argc, argv);
   g_object_unref(app);