pk
/
slstatus
mirror of https://github.com/pikami/slstatus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed some small things (update_interval) interferes with get_cpu_usage() and reordered)

This commit is contained in:
Aaron Marcher 2016-03-10 14:59:37 +01:00 committed by Aaron Marcher (drkhsh)
parent e046ee18f9
commit 1b65dec306
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.def.h
View File

@ -17,8 +17,8 @@ static const char batteryfullfile[] = "/sys/class/power_supply/BAT0/energy_full_
/* time */ /* time */
static const char timeformat[] = "%y-%m-%d %H:%M:%S"; static const char timeformat[] = "%y-%m-%d %H:%M:%S";
/* bar update interval in seconds */ /* bar update interval in seconds (smallest value = 1) */
static unsigned int update_interval = 10; static unsigned int update_interval = 1;
/* statusbar /* statusbar
Possible arguments: Possible arguments:

40
slstatus.c
View File

@ -16,9 +16,15 @@
/* local libraries */ /* local libraries */
#include "config.h" #include "config.h"
/* check file macro */
#define CHECK_FILE(X,Y) do { \
if (stat(X,&Y) < 0) return -1; \
if (!S_ISREG(Y.st_mode)) return -1; \
} while (0);
/* functions */ /* functions */
void setstatus(char *str);
int config_check(); int config_check();
void setstatus(char *str);
char *smprintf(char *fmt, ...); char *smprintf(char *fmt, ...);
char *get_battery(); char *get_battery();
char *get_cpu_temperature(); char *get_cpu_temperature();
@ -31,6 +37,17 @@ char *get_wifi_signal();
/* global variables */ /* global variables */
static Display *dpy; static Display *dpy;
/* check configured paths */
int
config_check()
{
struct stat fs;
CHECK_FILE(batterynowfile, fs);
CHECK_FILE(batteryfullfile, fs);
CHECK_FILE(tempfile, fs);
return 0;
}
/* set statusbar (WM_NAME) */ /* set statusbar (WM_NAME) */
void void
setstatus(char *str) setstatus(char *str)
@ -53,22 +70,6 @@ smprintf(char *fmt, ...)
return ret; return ret;
} }
#define CHECK_FILE(X,Y) do { \
if (stat(X,&Y) < 0) return -1; \
if (!S_ISREG(Y.st_mode)) return -1; \
} while (0);
/* check configured paths */
int
config_check()
{
struct stat fs;
CHECK_FILE(batterynowfile, fs);
CHECK_FILE(batteryfullfile, fs);
CHECK_FILE(tempfile, fs);
return 0;
}
/* battery percentage */ /* battery percentage */
char * char *
get_battery() get_battery()
@ -339,6 +340,7 @@ main()
fprintf(stderr, "Config error, please check paths and recompile\n"); fprintf(stderr, "Config error, please check paths and recompile\n");
exit(1); exit(1);
} }
/* open display */ /* open display */
if (!(dpy = XOpenDisplay(0x0))) { if (!(dpy = XOpenDisplay(0x0))) {
fprintf(stderr, "Cannot open display!\n"); fprintf(stderr, "Cannot open display!\n");
@ -368,7 +370,9 @@ main()
free(ram_usage); free(ram_usage);
free(volume); free(volume);
free(wifi_signal); free(wifi_signal);
sleep(update_interval);
/* wait, "update_interval - 1" because of get_cpu_usage() which uses 1 second */
sleep(update_interval -1);
} }
/* close display */ /* close display */