Merge pull request #4 from Vlaix/ram

[slstatus.git] / slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 6ca36e0..331a345 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 *get_battery();
+char *get_cpu_temperature();
+char *get_cpu_usage();
+char *get_datetime();
+char *get_ram_usage();

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

-char *volume();
-char *wifi_signal();
+char *get_volume();
+char *get_wifi_signal();

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


@@ -37,7 +37,7 @@ setstatus(char *str)
 
 /* 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 +75,7 @@ battery()
 
 /* cpu temperature */
 char *
 
 /* cpu temperature */
 char *

-cpu_temperature()
+get_cpu_temperature()

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


@@ -98,7 +98,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 +140,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 +159,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,13 +174,14 @@ 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);


@@ -213,11 +214,11 @@ smprintf(char *fmt, ...)
 
 /* 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;

-        
+

     /* get volume from alsa */
     snd_mixer_t *handle;
     snd_mixer_elem_t *pcm_mixer, *mas_mixer;
     /* get volume from alsa */
     snd_mixer_t *handle;
     snd_mixer_elem_t *pcm_mixer, *mas_mixer;


@@ -232,12 +233,9 @@ volume()
     snd_mixer_selem_id_set_name(mute_info, channel);
     pcm_mixer = snd_mixer_find_selem(handle, vol_info);
     mas_mixer = snd_mixer_find_selem(handle, mute_info);
     snd_mixer_selem_id_set_name(mute_info, channel);
     pcm_mixer = snd_mixer_find_selem(handle, vol_info);
     mas_mixer = snd_mixer_find_selem(handle, mute_info);

-    snd_mixer_selem_get_playback_volume_range((snd_mixer_elem_t *)pcm_mixer,
-                    &min, &max);
-    snd_mixer_selem_get_playback_volume((snd_mixer_elem_t *)pcm_mixer,
-                    SND_MIXER_SCHN_MONO, &vol);
-    snd_mixer_selem_get_playback_switch(mas_mixer, SND_MIXER_SCHN_MONO,
-                    &mute);
+    snd_mixer_selem_get_playback_volume_range((snd_mixer_elem_t *)pcm_mixer, &min, &max);
+    snd_mixer_selem_get_playback_volume((snd_mixer_elem_t *)pcm_mixer, SND_MIXER_SCHN_MONO, &vol);
+    snd_mixer_selem_get_playback_switch(mas_mixer, SND_MIXER_SCHN_MONO, &mute);

     if (vol_info)
         snd_mixer_selem_id_free(vol_info);
     if (mute_info)
     if (vol_info)
         snd_mixer_selem_id_free(vol_info);
     if (mute_info)


@@ -247,14 +245,14 @@ volume()
 
     /* return the string (mute) */
     if (!mute)
 
     /* return the string (mute) */
     if (!mute)

-        return "mute";
+        return smprintf("mute");

     else
         return smprintf("%d%%", (vol * 100) / max);
 }
 
 /* wifi percentage */
 char *
     else
         return smprintf("%d%%", (vol * 100) / max);
 }
 
 /* wifi percentage */
 char *

-wifi_signal()
+get_wifi_signal()

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


@@ -264,9 +262,12 @@ wifi_signal()
     char path_end[11] = "/operstate";
     char path[32];
     char status[5];
     char path_end[11] = "/operstate";
     char path[32];
     char status[5];

+    char needle[sizeof wificard + 1];

     FILE *fp;
 
     /* generate the path name */
     FILE *fp;
 
     /* generate the path name */

+
+    memset(path, 0, sizeof path);

     strcat(path, path_start);
     strcat(path, wificard);
     strcat(path, path_end);
     strcat(path, path_start);
     strcat(path, wificard);
     strcat(path, path_end);


@@ -295,10 +296,12 @@ wifi_signal()
     }
 
     /* extract the signal strength */
     }
 
     /* extract the signal strength */

+    strcpy(needle, wificard);
+    strcat(needle, ":");

     fgets(buf, bufsize, fp);
     fgets(buf, bufsize, fp);
     fgets(buf, bufsize, fp);
     fgets(buf, bufsize, fp);
     fgets(buf, bufsize, fp);
     fgets(buf, bufsize, fp);

-    if ((datastart = strstr(buf, "wlp3s0:")) != NULL) {
+    if ((datastart = strstr(buf, needle)) != NULL) {

         datastart = strstr(buf, ":");
         sscanf(datastart + 1, " %*d   %d  %*d  %*d        %*d      %*d      %*d      %*d      %*d        %*d", &strength);
     }
         datastart = strstr(buf, ":");
         sscanf(datastart + 1, " %*d   %d  %*d  %*d        %*d      %*d      %*d      %*d      %*d        %*d", &strength);
     }


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

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

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


@@ -322,10 +332,29 @@ main()
         exit(1);
     }
 
         exit(1);
     }
 

-    /* return status every second */   
+    /* return status every second */

     for (;;) {
     for (;;) {

+        /* assign the values */
+        wifi_signal = get_wifi_signal();
+        battery = get_battery();
+        cpu_usage = get_cpu_usage();
+        cpu_temperature = get_cpu_temperature();
+        ram_usage = get_ram_usage();
+        volume = get_volume();
+        datetime = get_datetime();
+
+        /* return the status */

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

+
+        /* free the values */
+        free(wifi_signal);
+        free(battery);
+        free(cpu_usage);
+        free(cpu_temperature);
+        free(ram_usage);
+        free(volume);
+        free(datetime);

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