Fixed broken wifi
Fixed indentation Removed trailig white spaces
This commit is contained in:
Vincent Loupmon
parent
16d01e8ded
commit
3b6f51f8eb
1 changed files with 228 additions and 223 deletions
451
slstatus.c
451
slstatus.c
|
|
@ -31,328 +31,333 @@ static Display *dpy;
|
||||||
void
|
void
|
||||||
setstatus(char *str)
|
setstatus(char *str)
|
||||||
{
|
{
|
||||||
XStoreName(dpy, DefaultRootWindow(dpy), str);
|
XStoreName(dpy, DefaultRootWindow(dpy), str);
|
||||||
XSync(dpy, False);
|
XSync(dpy, False);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* battery percentage */
|
/* battery percentage */
|
||||||
char *
|
char *
|
||||||
battery()
|
battery()
|
||||||
{
|
{
|
||||||
int battery_now, battery_full, battery_perc;
|
int battery_now, battery_full, battery_perc;
|
||||||
FILE *fp;
|
FILE *fp;
|
||||||
|
|
||||||
/* open battery now file */
|
/* open battery now file */
|
||||||
if (!(fp = fopen(batterynowfile, "r"))) {
|
if (!(fp = fopen(batterynowfile, "r"))) {
|
||||||
fprintf(stderr, "Error opening battery file.");
|
fprintf(stderr, "Error opening battery file.");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* read value */
|
/* read value */
|
||||||
fscanf(fp, "%i", &battery_now);
|
fscanf(fp, "%i", &battery_now);
|
||||||
|
|
||||||
/* close battery now file */
|
/* close battery now file */
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
|
|
||||||
/* open battery full file */
|
/* open battery full file */
|
||||||
if (!(fp = fopen(batteryfullfile, "r"))) {
|
if (!(fp = fopen(batteryfullfile, "r"))) {
|
||||||
fprintf(stderr, "Error opening battery file.");
|
fprintf(stderr, "Error opening battery file.");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* read value */
|
/* read value */
|
||||||
fscanf(fp, "%i", &battery_full);
|
fscanf(fp, "%i", &battery_full);
|
||||||
|
|
||||||
/* close battery full file */
|
/* close battery full file */
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
|
|
||||||
/* calculate percent */
|
/* calculate percent */
|
||||||
battery_perc = battery_now / (battery_full / 100);
|
battery_perc = battery_now / (battery_full / 100);
|
||||||
|
|
||||||
/* return batt_perc as string */
|
/* return batt_perc as string */
|
||||||
return smprintf("%d%%", battery_perc);
|
return smprintf("%d%%", battery_perc);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* cpu temperature */
|
/* cpu temperature */
|
||||||
char *
|
char *
|
||||||
cpu_temperature()
|
cpu_temperature()
|
||||||
{
|
{
|
||||||
int temperature;
|
int temperature;
|
||||||
FILE *fp;
|
FILE *fp;
|
||||||
|
|
||||||
/* open temperature file */
|
/* open temperature file */
|
||||||
if (!(fp = fopen(tempfile, "r"))) {
|
if (!(fp = fopen(tempfile, "r"))) {
|
||||||
fprintf(stderr, "Could not open temperature file.\n");
|
fprintf(stderr, "Could not open temperature file.\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* extract temperature */
|
/* extract temperature */
|
||||||
fscanf(fp, "%d", &temperature);
|
fscanf(fp, "%d", &temperature);
|
||||||
|
|
||||||
/* close temperature file */
|
/* close temperature file */
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
|
|
||||||
/* return temperature in degrees */
|
/* return temperature in degrees */
|
||||||
return smprintf("%d°C", temperature / 1000);
|
return smprintf("%d°C", temperature / 1000);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* cpu percentage */
|
/* cpu percentage */
|
||||||
char *
|
char *
|
||||||
cpu_usage()
|
cpu_usage()
|
||||||
{
|
{
|
||||||
int cpu_perc;
|
int cpu_perc;
|
||||||
long double a[4], b[4];
|
long double a[4], b[4];
|
||||||
FILE *fp;
|
FILE *fp;
|
||||||
|
|
||||||
/* open stat file */
|
/* open stat file */
|
||||||
if (!(fp = fopen("/proc/stat","r"))) {
|
if (!(fp = fopen("/proc/stat","r"))) {
|
||||||
fprintf(stderr, "Error opening stat file.");
|
fprintf(stderr, "Error opening stat file.");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* read values */
|
/* read values */
|
||||||
fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]);
|
fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]);
|
||||||
|
|
||||||
/* close stat file */
|
/* close stat file */
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
|
|
||||||
/* wait a second (for avg values) */
|
/* wait a second (for avg values) */
|
||||||
sleep(1);
|
sleep(1);
|
||||||
|
|
||||||
/* open stat file */
|
/* open stat file */
|
||||||
if (!(fp = fopen("/proc/stat","r"))) {
|
if (!(fp = fopen("/proc/stat","r"))) {
|
||||||
fprintf(stderr, "Error opening stat file.");
|
fprintf(stderr, "Error opening stat file.");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* read values */
|
/* read values */
|
||||||
fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &b[0], &b[1], &b[2], &b[3]);
|
fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &b[0], &b[1], &b[2], &b[3]);
|
||||||
|
|
||||||
/* close stat file */
|
/* close stat file */
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
|
|
||||||
/* calculate avg in this second */
|
/* calculate avg in this second */
|
||||||
cpu_perc = 100 * ((b[0]+b[1]+b[2]) - (a[0]+a[1]+a[2])) / ((b[0]+b[1]+b[2]+b[3]) - (a[0]+a[1]+a[2]+a[3]));
|
cpu_perc = 100 * ((b[0]+b[1]+b[2]) - (a[0]+a[1]+a[2])) / ((b[0]+b[1]+b[2]+b[3]) - (a[0]+a[1]+a[2]+a[3]));
|
||||||
|
|
||||||
/* return cpu_perc as string */
|
/* return cpu_perc as string */
|
||||||
return smprintf("%d%%", cpu_perc);
|
return smprintf("%d%%", cpu_perc);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* date and time */
|
/* date and time */
|
||||||
char *
|
char *
|
||||||
datetime()
|
datetime()
|
||||||
{
|
{
|
||||||
time_t tm;
|
time_t tm;
|
||||||
size_t bufsize = 19;
|
size_t bufsize = 19;
|
||||||
char *buf = malloc(bufsize);
|
char *buf = malloc(bufsize);
|
||||||
|
|
||||||
/* get time in format */
|
/* get time in format */
|
||||||
time(&tm);
|
time(&tm);
|
||||||
if(!strftime(buf, bufsize, timeformat, localtime(&tm))) {
|
if(!strftime(buf, bufsize, timeformat, localtime(&tm))) {
|
||||||
fprintf(stderr, "Strftime failed.\n");
|
fprintf(stderr, "Strftime failed.\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* return time */
|
/* return time */
|
||||||
return buf;
|
return buf;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ram percentage */
|
/* ram percentage */
|
||||||
char *
|
char *
|
||||||
ram_usage()
|
ram_usage()
|
||||||
{
|
{
|
||||||
int ram_perc;
|
int ram_perc;
|
||||||
long total, free, available;
|
long total, free, available;
|
||||||
FILE *fp;
|
FILE *fp;
|
||||||
|
|
||||||
/* open meminfo file */
|
/* open meminfo file */
|
||||||
if (!(fp = fopen("/proc/meminfo", "r"))) {
|
if (!(fp = fopen("/proc/meminfo", "r"))) {
|
||||||
fprintf(stderr, "Error opening meminfo file.");
|
fprintf(stderr, "Error opening meminfo file.");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* read the values */
|
/* read the values */
|
||||||
fscanf(fp, "MemTotal: %ld kB\n", &total);
|
fscanf(fp, "MemTotal: %ld kB\n", &total);
|
||||||
fscanf(fp, "MemFree: %ld kB\n", &free);
|
fscanf(fp, "MemFree: %ld kB\n", &free);
|
||||||
fscanf(fp, "MemAvailable: %ld kB\n", &available);
|
fscanf(fp, "MemAvailable: %ld kB\n", &available);
|
||||||
|
|
||||||
/* close meminfo file */
|
/* close meminfo file */
|
||||||
fclose(fp);
|
fclose(fp);
|
||||||
|
|
||||||
/* calculate percentage */
|
/* calculate percentage */
|
||||||
ram_perc = 100 * (total - available) / total;
|
ram_perc = 100 * (total - available) / total;
|
||||||
|
|
||||||
/* return ram_perc as string */
|
/* return ram_perc as string */
|
||||||
return smprintf("%d%%",ram_perc);
|
return smprintf("%d%%",ram_perc);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* smprintf function */
|
/* smprintf function */
|
||||||
char *
|
char *
|
||||||
smprintf(char *fmt, ...)
|
smprintf(char *fmt, ...)
|
||||||
{
|
{
|
||||||
va_list fmtargs;
|
va_list fmtargs;
|
||||||
char *ret;
|
char *ret;
|
||||||
int len;
|
int len;
|
||||||
|
|
||||||
va_start(fmtargs, fmt);
|
va_start(fmtargs, fmt);
|
||||||
len = vsnprintf(NULL, 0, fmt, fmtargs);
|
len = vsnprintf(NULL, 0, fmt, fmtargs);
|
||||||
va_end(fmtargs);
|
va_end(fmtargs);
|
||||||
|
|
||||||
ret = malloc(++len);
|
ret = malloc(++len);
|
||||||
if (ret == NULL) {
|
if (ret == NULL) {
|
||||||
fprintf(stderr, "Malloc error.");
|
fprintf(stderr, "Malloc error.");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
va_start(fmtargs, fmt);
|
va_start(fmtargs, fmt);
|
||||||
vsnprintf(ret, len, fmt, fmtargs);
|
vsnprintf(ret, len, fmt, fmtargs);
|
||||||
va_end(fmtargs);
|
va_end(fmtargs);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* alsa volume percentage */
|
/* alsa volume percentage */
|
||||||
char *
|
char *
|
||||||
volume()
|
volume()
|
||||||
{
|
{
|
||||||
int mute = 0;
|
int mute = 0;
|
||||||
long vol = 0, max = 0, min = 0;
|
long vol = 0, max = 0, min = 0;
|
||||||
|
|
||||||
/* get volume from alsa */
|
|
||||||
snd_mixer_t *handle;
|
|
||||||
snd_mixer_elem_t *pcm_mixer, *mas_mixer;
|
|
||||||
snd_mixer_selem_id_t *vol_info, *mute_info;
|
|
||||||
snd_mixer_open(&handle, 0);
|
|
||||||
snd_mixer_attach(handle, soundcard);
|
|
||||||
snd_mixer_selem_register(handle, NULL, NULL);
|
|
||||||
snd_mixer_load(handle);
|
|
||||||
snd_mixer_selem_id_malloc(&vol_info);
|
|
||||||
snd_mixer_selem_id_malloc(&mute_info);
|
|
||||||
snd_mixer_selem_id_set_name(vol_info, channel);
|
|
||||||
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);
|
|
||||||
if (vol_info)
|
|
||||||
snd_mixer_selem_id_free(vol_info);
|
|
||||||
if (mute_info)
|
|
||||||
snd_mixer_selem_id_free(mute_info);
|
|
||||||
if (handle)
|
|
||||||
snd_mixer_close(handle);
|
|
||||||
|
|
||||||
/* return the string (mute) */
|
/* get volume from alsa */
|
||||||
if (!mute)
|
snd_mixer_t *handle;
|
||||||
return smprintf("mute");
|
snd_mixer_elem_t *pcm_mixer, *mas_mixer;
|
||||||
else
|
snd_mixer_selem_id_t *vol_info, *mute_info;
|
||||||
return smprintf("%d%%", (vol * 100) / max);
|
snd_mixer_open(&handle, 0);
|
||||||
|
snd_mixer_attach(handle, soundcard);
|
||||||
|
snd_mixer_selem_register(handle, NULL, NULL);
|
||||||
|
snd_mixer_load(handle);
|
||||||
|
snd_mixer_selem_id_malloc(&vol_info);
|
||||||
|
snd_mixer_selem_id_malloc(&mute_info);
|
||||||
|
snd_mixer_selem_id_set_name(vol_info, channel);
|
||||||
|
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);
|
||||||
|
if (vol_info)
|
||||||
|
snd_mixer_selem_id_free(vol_info);
|
||||||
|
if (mute_info)
|
||||||
|
snd_mixer_selem_id_free(mute_info);
|
||||||
|
if (handle)
|
||||||
|
snd_mixer_close(handle);
|
||||||
|
|
||||||
|
/* return the string (mute) */
|
||||||
|
if (!mute)
|
||||||
|
return smprintf("mute");
|
||||||
|
else
|
||||||
|
return smprintf("%d%%", (vol * 100) / max);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* wifi percentage */
|
/* wifi percentage */
|
||||||
char *
|
char *
|
||||||
wifi_signal()
|
wifi_signal()
|
||||||
{
|
{
|
||||||
int bufsize = 255;
|
int bufsize = 255;
|
||||||
int strength;
|
int strength;
|
||||||
char buf[bufsize];
|
char buf[bufsize];
|
||||||
char *datastart;
|
char *datastart;
|
||||||
char path_start[16] = "/sys/class/net/";
|
char path_start[16] = "/sys/class/net/";
|
||||||
char path_end[11] = "/operstate";
|
char path_end[11] = "/operstate";
|
||||||
char path[32];
|
char path[32];
|
||||||
char status[5];
|
char status[5];
|
||||||
FILE *fp;
|
char needle[sizeof wificard + 1];
|
||||||
|
FILE *fp;
|
||||||
|
|
||||||
/* generate the path name */
|
/* generate the path name */
|
||||||
strcat(path, path_start);
|
|
||||||
strcat(path, wificard);
|
|
||||||
strcat(path, path_end);
|
|
||||||
|
|
||||||
/* open wifi file */
|
memset(path, 0, sizeof path);
|
||||||
if(!(fp = fopen(path, "r"))) {
|
strcat(path, path_start);
|
||||||
fprintf(stderr, "Error opening wifi operstate file.");
|
strcat(path, wificard);
|
||||||
exit(1);
|
strcat(path, path_end);
|
||||||
}
|
|
||||||
|
|
||||||
/* read the status */
|
/* open wifi file */
|
||||||
fgets(status, 5, fp);
|
if(!(fp = fopen(path, "r"))) {
|
||||||
|
fprintf(stderr, "Error opening wifi operstate file.");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
/* close wifi file */
|
/* read the status */
|
||||||
fclose(fp);
|
fgets(status, 5, fp);
|
||||||
|
|
||||||
/* check if interface down */
|
/* close wifi file */
|
||||||
if(strcmp(status, "up\n") != 0){
|
fclose(fp);
|
||||||
return "n/a";
|
|
||||||
}
|
|
||||||
|
|
||||||
/* open wifi file */
|
/* check if interface down */
|
||||||
if (!(fp = fopen("/proc/net/wireless", "r"))) {
|
if(strcmp(status, "up\n") != 0){
|
||||||
fprintf(stderr, "Error opening wireless file.");
|
return "n/a";
|
||||||
exit(1);
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/* extract the signal strength */
|
/* open wifi file */
|
||||||
fgets(buf, bufsize, fp);
|
if (!(fp = fopen("/proc/net/wireless", "r"))) {
|
||||||
fgets(buf, bufsize, fp);
|
fprintf(stderr, "Error opening wireless file.");
|
||||||
fgets(buf, bufsize, fp);
|
exit(1);
|
||||||
if ((datastart = strstr(buf, "wlp3s0:")) != NULL) {
|
}
|
||||||
datastart = strstr(buf, ":");
|
|
||||||
sscanf(datastart + 1, " %*d %d %*d %*d %*d %*d %*d %*d %*d %*d", &strength);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* close wifi file */
|
/* extract the signal strength */
|
||||||
fclose(fp);
|
strcpy(needle, wificard);
|
||||||
|
strcat(needle, ":");
|
||||||
|
fgets(buf, bufsize, fp);
|
||||||
|
fgets(buf, bufsize, fp);
|
||||||
|
fgets(buf, bufsize, fp);
|
||||||
|
if ((datastart = strstr(buf, needle)) != NULL) {
|
||||||
|
datastart = strstr(buf, ":");
|
||||||
|
sscanf(datastart + 1, " %*d %d %*d %*d %*d %*d %*d %*d %*d %*d", &strength);
|
||||||
|
}
|
||||||
|
|
||||||
/* return strength in percent */
|
/* close wifi file */
|
||||||
return smprintf("%d%%", strength);
|
fclose(fp);
|
||||||
|
|
||||||
|
/* return strength in percent */
|
||||||
|
return smprintf("%d%%", strength);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* main function */
|
/* main function */
|
||||||
int
|
int
|
||||||
main()
|
main()
|
||||||
{
|
{
|
||||||
char status[1024];
|
char status[1024];
|
||||||
|
|
||||||
/* open display */
|
/* open display */
|
||||||
if (!(dpy = XOpenDisplay(0x0))) {
|
if (!(dpy = XOpenDisplay(0x0))) {
|
||||||
fprintf(stderr, "Cannot open display!\n");
|
fprintf(stderr, "Cannot open display!\n");
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
char *pWifi_signal = NULL;
|
char *pWifi_signal = NULL;
|
||||||
char *pBattery = NULL;
|
char *pBattery = NULL;
|
||||||
char *pCpu_usage = NULL;
|
char *pCpu_usage = NULL;
|
||||||
char *pCpu_temperature = NULL;
|
char *pCpu_temperature = NULL;
|
||||||
char *pRam_usage = NULL;
|
char *pRam_usage = NULL;
|
||||||
char *pVolume = NULL;
|
char *pVolume = NULL;
|
||||||
char *pDatetime = NULL;
|
char *pDatetime = NULL;
|
||||||
|
|
||||||
/* return status every second */
|
/* return status every second */
|
||||||
for (;;) {
|
for (;;) {
|
||||||
pWifi_signal = wifi_signal();
|
pWifi_signal = wifi_signal();
|
||||||
pBattery = battery();
|
pBattery = battery();
|
||||||
pCpu_usage = cpu_usage();
|
pCpu_usage = cpu_usage();
|
||||||
pCpu_temperature = cpu_temperature();
|
pCpu_temperature = cpu_temperature();
|
||||||
pRam_usage = ram_usage();
|
pRam_usage = ram_usage();
|
||||||
pVolume = volume();
|
pVolume = volume();
|
||||||
pDatetime = datetime();
|
pDatetime = datetime();
|
||||||
sprintf(status, FORMATSTRING, ARGUMENTS);
|
sprintf(status, FORMATSTRING, ARGUMENTS);
|
||||||
setstatus(status);
|
setstatus(status);
|
||||||
free(pWifi_signal);
|
free(pWifi_signal);
|
||||||
free(pBattery);
|
free(pBattery);
|
||||||
free(pCpu_usage);
|
free(pCpu_usage);
|
||||||
free(pCpu_temperature);
|
free(pCpu_temperature);
|
||||||
free(pRam_usage);
|
free(pRam_usage);
|
||||||
free(pVolume);
|
free(pVolume);
|
||||||
free(pDatetime);
|
free(pDatetime);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* close display */
|
/* close display */
|
||||||
XCloseDisplay(dpy);
|
XCloseDisplay(dpy);
|
||||||
|
|
||||||
/* exit successfully */
|
/* exit successfully */
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue