11 files changed, 50 insertions, 65 deletions
diff --git a/include/common.h b/include/common.h
new file mode 100644
index 0000000..04869bb
--- /dev/null
+++ b/include/common.h
@@ -0,0 +1,32 @@
+#ifndef __COMMON_H__
+#define __COMMON_H__
+
+#include <sys/types.h>
+
+typedef struct GlobalData GlobalData;
+
+typedef struct {
+  char *color;
+  char *text;
+} StatusItem;
+
+
+typedef struct GlobalData {
+  char *line;
+  size_t linelen;
+  size_t linemax; /* Buffer size, including NUL */
+} GlobalData;
+
+
+
+void line_clear(GlobalData *g);
+void line_append_strn(GlobalData *g, char *string, size_t len);
+void line_append_str(GlobalData *g, char *string);
+
+void line_append_item(GlobalData *g, StatusItem *s);
+
+void line_print(GlobalData *g);
+
+void statusitem_init(StatusItem *s);
+
+#endif
diff --git a/include/status/battery.h b/include/status/battery.h
deleted file mode 100644
index 0824392..0000000
--- a/include/status/battery.h
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#ifndef __BATTERY_H__
-#define __BATTERY_H__
-
-void status_battery(char *batname);
-
-#endif
diff --git a/include/status/cpuusage.h b/include/status/cpuusage.h
deleted file mode 100644
index 1de2aed..0000000
--- a/include/status/cpuusage.h
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#ifndef __CPUUSAGE_H__
-#define __CPUUSAGE_H__
-
-void status_cpuusage();
-
-#endif
diff --git a/include/status/datetime.h b/include/status/datetime.h
deleted file mode 100644
index e4c9554..0000000
--- a/include/status/datetime.h
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#ifndef __DATETIME_H__
-#define __DATETIME_H__
-
-void status_datetime();
-
-#endif
diff --git a/include/status/fan.h b/include/status/fan.h
deleted file mode 100644
index dd5e494..0000000
--- a/include/status/fan.h
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#ifndef __FAN_H__
-#define __FAN_H__
-
-void status_fan(char *title, char *sysfile);
-
-#endif
diff --git a/include/status/memusage.h b/include/status/memusage.h
deleted file mode 100644
index 9db9719..0000000
--- a/include/status/memusage.h
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#ifndef __MEMUSAGE_H__
-#define __MEMUSAGE_H__
-
-void status_memusage();
-
-#endif
diff --git a/include/status/netif.h b/include/status/netif.h
deleted file mode 100644
index 92ccc1f..0000000
--- a/include/status/netif.h
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#ifndef __NETIF_H__
-#define __NETIF_H__
-
-void status_netif(char *ifname);
-
-#endif
diff --git a/include/status/temp.h b/include/status/temp.h
deleted file mode 100644
index 0856a17..0000000
--- a/include/status/temp.h
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#ifndef __TEMP_H__
-#define __TEMP_H__
-
-void status_temp(char *title, char *sysfile);
-
-#endif
diff --git a/include/status/uptime.h b/include/status/uptime.h
deleted file mode 100644
index 153f35d..0000000
--- a/include/status/uptime.h
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#ifndef __UPTIME_H__
-#define __UPTIME_H__
-
-void status_uptime();
-
-#endif
diff --git a/include/status/volume_alsa.h b/include/status/volume_alsa.h
deleted file mode 100644
index 044824d..0000000
--- a/include/status/volume_alsa.h
+++ /dev/null
@@ -1,9 +0,0 @@
-
-#ifndef __VOLUME_ALSA_H__
-#define __VOLUME_ALSA_H__
-
-#include <alsa/asoundlib.h>
-
-int status_volume_alsa(char *cardname, char *mixername, snd_mixer_selem_channel_id_t channel);
-
-#endif
diff --git a/include/statuses.h b/include/statuses.h
new file mode 100644
index 0000000..c523afd
--- /dev/null
+++ b/include/statuses.h
@@ -0,0 +1,18 @@
+#ifndef __STATUSES_H__
+#define __STATUSES_H__
+
+#include <alsa/asoundlib.h>
+
+#include "common.h"
+
+void status_battery(GlobalData *g, char *batname);
+void status_cpuusage(GlobalData *g);
+void status_datetime(GlobalData *g);
+void status_fan(GlobalData *g, char *title, char *sysfile);
+void status_memusage(GlobalData *g);
+void status_netif(GlobalData *g, char *ifname);
+void status_temp(GlobalData *g, char *title, char *sysfile);
+void status_uptime(GlobalData *g);
+int status_volume_alsa(GlobalData *g, char *cardname, char *mixername, snd_mixer_selem_channel_id_t channel);
+
+#endif