put everything in logical order

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index b34ea30..4f2a2fe 100644 (file)
--- a/slstatus.c
+++ b/slstatus.c
@@ -15,14 +15,14 @@
 
 /* functions */
 void setstatus(char *str);
 
 /* functions */
 void setstatus(char *str);

-char *battery();
-char *cpu_temperature();
-char *cpu_usage();
-char *datetime();
-char *ram_usage();

 char *smprintf(char *fmt, ...);
 char *smprintf(char *fmt, ...);

-char *volume();
-char *wifi_signal();
+char *get_battery();
+char *get_cpu_temperature();
+char *get_cpu_usage();
+char *get_datetime();
+char *get_ram_usage();
+char *get_volume();
+char *get_wifi_signal();

 
 /* global variables */
 static Display *dpy;
 
 /* global variables */
 static Display *dpy;


@@ -35,9 +35,34 @@ setstatus(char *str)
     XSync(dpy, False);
 }
 
     XSync(dpy, False);
 }
 

+/* smprintf function */
+char *
+smprintf(char *fmt, ...)
+{
+    va_list fmtargs;
+    char *ret;
+    int len;
+
+    va_start(fmtargs, fmt);
+    len = vsnprintf(NULL, 0, fmt, fmtargs);
+    va_end(fmtargs);
+
+    ret = malloc(++len);
+    if (ret == NULL) {
+        fprintf(stderr, "Malloc error.");
+        exit(1);
+    }
+
+    va_start(fmtargs, fmt);
+    vsnprintf(ret, len, fmt, fmtargs);
+    va_end(fmtargs);
+
+    return ret;
+}
+

 /* battery percentage */
 char *
 /* battery percentage */
 char *

-battery()
+get_battery()

 {
     int battery_now, battery_full, battery_perc;
     FILE *fp;
 {
     int battery_now, battery_full, battery_perc;
     FILE *fp;


@@ -75,7 +100,7 @@ battery()
 
 /* cpu temperature */
 char *
 
 /* cpu temperature */
 char *

-cpu_temperature()
+get_cpu_temperature()

 {
     int temperature;
     FILE *fp;
 {
     int temperature;
     FILE *fp;


@@ -98,7 +123,7 @@ cpu_temperature()
 
 /* cpu percentage */
 char *
 
 /* cpu percentage */
 char *

-cpu_usage()
+get_cpu_usage()

 {
     int cpu_perc;
     long double a[4], b[4];
 {
     int cpu_perc;
     long double a[4], b[4];


@@ -140,7 +165,7 @@ cpu_usage()
 
 /* date and time */
 char *
 
 /* date and time */
 char *

-datetime()
+get_datetime()

 {
     time_t tm;
     size_t bufsize = 19;
 {
     time_t tm;
     size_t bufsize = 19;


@@ -159,10 +184,10 @@ datetime()
 
 /* ram percentage */
 char *
 
 /* ram percentage */
 char *

-ram_usage()
+get_ram_usage()

 {
     int ram_perc;
 {
     int ram_perc;

-    long total, free, available;
+    long total, free, buffers, cached;

     FILE *fp;
 
     /* open meminfo file */
     FILE *fp;
 
     /* open meminfo file */


@@ -174,46 +199,22 @@ ram_usage()
     /* read the values */
     fscanf(fp, "MemTotal: %ld kB\n", &total);
     fscanf(fp, "MemFree: %ld kB\n", &free);
     /* read the values */
     fscanf(fp, "MemTotal: %ld kB\n", &total);
     fscanf(fp, "MemFree: %ld kB\n", &free);

-    fscanf(fp, "MemAvailable: %ld kB\n", &available);
+    fscanf(fp, "MemAvailable: %ld kB\nBuffers: %ld kB\n", &buffers, &buffers);
+    fscanf(fp, "Cached: %ld kB\n", &cached);

 
     /* close meminfo file */
     fclose(fp);
 
     /* calculate percentage */
 
     /* close meminfo file */
     fclose(fp);
 
     /* calculate percentage */

-    ram_perc = 100 * (total - available) / total;
+    ram_perc = 100 * ((total - free) - (buffers + cached)) / total;

 
     /* return ram_perc as string */
     return smprintf("%d%%",ram_perc);
 }
 
 
     /* return ram_perc as string */
     return smprintf("%d%%",ram_perc);
 }
 

-/* smprintf function */
-char *
-smprintf(char *fmt, ...)
-{
-    va_list fmtargs;
-    char *ret;
-    int len;
-
-    va_start(fmtargs, fmt);
-    len = vsnprintf(NULL, 0, fmt, fmtargs);
-    va_end(fmtargs);
-
-    ret = malloc(++len);
-    if (ret == NULL) {
-        fprintf(stderr, "Malloc error.");
-        exit(1);
-    }
-
-    va_start(fmtargs, fmt);
-    vsnprintf(ret, len, fmt, fmtargs);
-    va_end(fmtargs);
-
-    return ret;
-}
-

 /* alsa volume percentage */
 char *
 /* alsa volume percentage */
 char *

-volume()
+get_volume()

 {
     int mute = 0;
     long vol = 0, max = 0, min = 0;
 {
     int mute = 0;
     long vol = 0, max = 0, min = 0;


@@ -251,7 +252,7 @@ volume()
 
 /* wifi percentage */
 char *
 
 /* wifi percentage */
 char *

-wifi_signal()
+get_wifi_signal()

 {
     int bufsize = 255;
     int strength;
 {
     int bufsize = 255;
     int strength;


@@ -317,6 +318,13 @@ int
 main()
 {
     char status[1024];
 main()
 {
     char status[1024];

+    char *battery = NULL;
+    char *cpu_temperature = NULL;
+    char *cpu_usage = NULL;
+    char *datetime = NULL;
+    char *ram_usage = NULL;
+    char *volume = NULL;
+    char *wifi_signal = NULL;

 
     /* open display */
     if (!(dpy = XOpenDisplay(0x0))) {
 
     /* open display */
     if (!(dpy = XOpenDisplay(0x0))) {


@@ -324,32 +332,29 @@ main()
         exit(1);
     }
 
         exit(1);
     }
 

-    char *pWifi_signal = NULL;
-    char *pBattery = NULL;
-    char *pCpu_usage = NULL;
-    char *pCpu_temperature = NULL;
-    char *pRam_usage = NULL;
-    char *pVolume = NULL;
-    char *pDatetime = NULL;
-

     /* return status every second */
     for (;;) {
     /* return status every second */
     for (;;) {

-        pWifi_signal = wifi_signal();
-        pBattery = battery();
-        pCpu_usage = cpu_usage();
-        pCpu_temperature = cpu_temperature();
-        pRam_usage = ram_usage();
-        pVolume = volume();
-        pDatetime = datetime();
+        /* assign the values */
+        battery = get_battery();
+        cpu_temperature = get_cpu_temperature();
+        cpu_usage = get_cpu_usage();
+        datetime = get_datetime();
+        ram_usage = get_ram_usage();
+        volume = get_volume();
+        wifi_signal = get_wifi_signal();
+
+        /* return the status */

         sprintf(status, FORMATSTRING, ARGUMENTS);
         setstatus(status);
         sprintf(status, FORMATSTRING, ARGUMENTS);
         setstatus(status);

-        free(pWifi_signal);
-        free(pBattery);
-        free(pCpu_usage);
-        free(pCpu_temperature);
-        free(pRam_usage);
-        free(pVolume);
-        free(pDatetime);
+
+        /* free the values */
+        free(battery);
+        free(cpu_temperature);
+        free(cpu_usage);
+        free(datetime);
+        free(ram_usage);
+        free(volume);
+        free(wifi_signal);

     }
 
     /* close display */
     }
 
     /* close display */