diff options
| -rw-r--r-- | CONTRIBUTING.md | 2 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | config.def.h | 26 | ||||
| -rw-r--r-- | slstatus.c | 1016 | ||||
| -rw-r--r-- | slstatus.h | 6 |
5 files changed, 523 insertions, 529 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 39a704a..46baccf 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,4 @@ Contributing ============ -If you want to contribute, please use [the suckless coding style](http://suckless.org/coding_style) and 4 spaces for indentation. +If you want to contribute, please use [the suckless coding style](http://suckless.org/coding_style). @@ -38,7 +38,7 @@ Put the following code in your ~/.xinitrc (or similar): ``` while true; do - slstatus + slstatus done & ``` diff --git a/config.def.h b/config.def.h index 5576936..39215e2 100644 --- a/config.def.h +++ b/config.def.h @@ -1,12 +1,12 @@ /* See LICENSE file for copyright and license details. */ /* alsa sound */ -static const char channel[] = "Master"; +static const char channel[] = "Master"; /* battery */ -static const char batterypath[] = "/sys/class/power_supply/"; -static const char batterynow[] = "energy_now"; -static const char batteryfull[] = "energy_full_design"; +static const char batterypath[] = "/sys/class/power_supply/"; +static const char batterynow[] = "energy_now"; +static const char batteryfull[] = "energy_full_design"; /* bar update interval in seconds (smallest value = 1) */ static unsigned int update_interval = 1; @@ -35,13 +35,13 @@ static unsigned int update_interval = 1; - wifi_perc (wifi signal in percent) [argument: wifi card interface name] - wifi_essid (wifi essid) [argument: wifi card interface name] */ static const struct arg args[] = { - /* function format argument */ - { wifi_perc, "wifi %4s | ", "wlp3s0" }, - { battery_perc, "bat %4s | ", "BAT0" }, - { cpu_perc, "cpu %4s ", NULL }, - { temp, "%3s | ", "/sys/devices/platform/coretemp.0/hwmon/hwmon2/temp1_input" }, - { ram_perc, "ram %3s | ", NULL }, - { vol_perc, "vol %4s | ", "default" }, - { disk_perc, "ssd %3s | ", "/" }, - { datetime, "%s", "%y-%m-%d %H:%M:%S" }, + /* function format argument */ + { wifi_perc, "wifi %4s | ", "wlp3s0" }, + { battery_perc, "bat %4s | ", "BAT0" }, + { cpu_perc, "cpu %4s ", NULL }, + { temp, "%3s | ", "/sys/devices/platform/coretemp.0/hwmon/hwmon2/temp1_input" }, + { ram_perc, "ram %3s | ", NULL }, + { vol_perc, "vol %4s | ", "default" }, + { disk_perc, "ssd %3s | ", "/" }, + { datetime, "%s", "%y-%m-%d %H:%M:%S" }, }; @@ -31,457 +31,455 @@ void setstatus(const char *str) { - /* set WM_NAME via X11 */ - XStoreName(dpy, DefaultRootWindow(dpy), str); - XSync(dpy, False); + /* set WM_NAME via X11 */ + XStoreName(dpy, DefaultRootWindow(dpy), str); + XSync(dpy, False); } /* smprintf function */ char * smprintf(const char *fmt, ...) { - va_list fmtargs; - char *ret = NULL; + va_list fmtargs; + char *ret = NULL; - va_start(fmtargs, fmt); - if (vasprintf(&ret, fmt, fmtargs) < 0) - return NULL; - va_end(fmtargs); + va_start(fmtargs, fmt); + if (vasprintf(&ret, fmt, fmtargs) < 0) { + return NULL; + } + va_end(fmtargs); - return ret; + return ret; } /* battery percentage */ char * battery_perc(const char *battery) { - int now, full, perc; - char batterynowfile[64] = ""; - char batteryfullfile[64] = ""; - FILE *fp; - - /* generate battery nowfile path */ - strcat(batterynowfile, batterypath); - strcat(batterynowfile, battery); - strcat(batterynowfile, "/"); - strcat(batterynowfile, batterynow); - - /* generate battery fullfile path */ - strcat(batteryfullfile, batterypath); - strcat(batteryfullfile, battery); - strcat(batteryfullfile, "/"); - strcat(batteryfullfile, batteryfull); - - /* open battery now file */ - if (!(fp = fopen(batterynowfile, "r"))) { - fprintf(stderr, "Error opening battery file.%s",batterynowfile); - return smprintf("n/a"); - } - - /* read value */ - fscanf(fp, "%i", &now); - - /* close battery now file */ - fclose(fp); - - /* open battery full file */ - if (!(fp = fopen(batteryfullfile, "r"))) { - fprintf(stderr, "Error opening battery file."); - return smprintf("n/a"); - } - - /* read value */ - fscanf(fp, "%i", &full); - - /* close battery full file */ - fclose(fp); - - /* calculate percent */ - perc = now / (full / 100); - - /* return perc as string */ - return smprintf("%d%%", perc); + int now, full, perc; + char batterynowfile[64] = ""; + char batteryfullfile[64] = ""; + FILE *fp; + + /* generate battery nowfile path */ + strcat(batterynowfile, batterypath); + strcat(batterynowfile, battery); + strcat(batterynowfile, "/"); + strcat(batterynowfile, batterynow); + + /* generate battery fullfile path */ + strcat(batteryfullfile, batterypath); + strcat(batteryfullfile, battery); + strcat(batteryfullfile, "/"); + strcat(batteryfullfile, batteryfull); + + /* open battery now file */ + if (!(fp = fopen(batterynowfile, "r"))) { + fprintf(stderr, "Error opening battery file.%s", batterynowfile); + return smprintf("n/a"); + } + + /* read value */ + fscanf(fp, "%i", &now); + + /* close battery now file */ + fclose(fp); + + /* open battery full file */ + if (!(fp = fopen(batteryfullfile, "r"))) { + fprintf(stderr, "Error opening battery file."); + return smprintf("n/a"); + } + + /* read value */ + fscanf(fp, "%i", &full); + + /* close battery full file */ + fclose(fp); + + /* calculate percent */ + perc = now / (full / 100); + + /* return perc as string */ + return smprintf("%d%%", perc); } /* cpu percentage */ char * cpu_perc(const char *null) { - int perc; - long double a[4], b[4]; - FILE *fp; + int perc; + long double a[4], b[4]; + FILE *fp; - /* open stat file */ - if (!(fp = fopen("/proc/stat","r"))) { - fprintf(stderr, "Error opening stat file."); - return smprintf("n/a"); - } + /* open stat file */ + if (!(fp = fopen("/proc/stat","r"))) { + fprintf(stderr, "Error opening stat file."); + return smprintf("n/a"); + } - /* read values */ - fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]); + /* read values */ + fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]); - /* close stat file */ - fclose(fp); + /* close stat file */ + fclose(fp); - /* wait a second (for avg values) */ - sleep(1); + /* wait a second (for avg values) */ + sleep(1); - /* open stat file */ - if (!(fp = fopen("/proc/stat","r"))) { - fprintf(stderr, "Error opening stat file."); - return smprintf("n/a"); - } + /* open stat file */ + if (!(fp = fopen("/proc/stat","r"))) { + fprintf(stderr, "Error opening stat file."); + return smprintf("n/a"); + } - /* read values */ - fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &b[0], &b[1], &b[2], &b[3]); + /* read values */ + fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &b[0], &b[1], &b[2], &b[3]); - /* close stat file */ - fclose(fp); + /* close stat file */ + fclose(fp); - /* calculate avg in this second */ - 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])); + /* calculate avg in this second */ + 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 perc as string */ - return smprintf("%d%%", perc); + /* return perc as string */ + return smprintf("%d%%", perc); } /* date and time */ char * datetime(const char *timeformat) { - time_t tm; - size_t bufsize = 64; - char *buf = malloc(bufsize); - if (buf == NULL) { - fprintf(stderr, "Failed to get date/time"); - return smprintf("n/a"); - } - - /* get time in format */ - time(&tm); - setlocale(LC_TIME, ""); - if(!strftime(buf, bufsize, timeformat, localtime(&tm))) { - setlocale(LC_TIME, "C"); - free(buf); - fprintf(stderr, "Strftime failed.\n"); - return smprintf("n/a"); - } - - setlocale(LC_TIME, "C"); - /* return time */ - char *ret = smprintf("%s", buf); - free(buf); - return ret; + time_t tm; + size_t bufsize = 64; + char *buf = malloc(bufsize); + if (buf == NULL) { + fprintf(stderr, "Failed to get date/time"); + return smprintf("n/a"); + } + + /* get time in format */ + time(&tm); + setlocale(LC_TIME, ""); + if (!strftime(buf, bufsize, timeformat, localtime(&tm))) { + setlocale(LC_TIME, "C"); + free(buf); + fprintf(stderr, "Strftime failed.\n"); + return smprintf("n/a"); + } + + setlocale(LC_TIME, "C"); + /* return time */ + char *ret = smprintf("%s", buf); + free(buf); + return ret; } /* disk free */ char * disk_free(const char *mountpoint) { - struct statvfs fs; + struct statvfs fs; - /* try to open mountpoint */ - if (statvfs(mountpoint, &fs) < 0) { - fprintf(stderr, "Could not get filesystem info.\n"); - return smprintf("n/a"); - } + /* try to open mountpoint */ + if (statvfs(mountpoint, &fs) < 0) { + fprintf(stderr, "Could not get filesystem info.\n"); + return smprintf("n/a"); + } - /* return free */ - return smprintf("%f", (float)fs.f_bsize * (float)fs.f_bfree / 1024 / 1024 / 1024); + /* return free */ + return smprintf("%f", (float)fs.f_bsize * (float)fs.f_bfree / 1024 / 1024 / 1024); } /* disk usage percentage */ char * disk_perc(const char *mountpoint) { - int perc = 0; - struct statvfs fs; + int perc = 0; + struct statvfs fs; - /* try to open mountpoint */ - if (statvfs(mountpoint, &fs) < 0) { - fprintf(stderr, "Could not get filesystem info.\n"); - return smprintf("n/a"); - } + /* try to open mountpoint */ + if (statvfs(mountpoint, &fs) < 0) { + fprintf(stderr, "Could not get filesystem info.\n"); + return smprintf("n/a"); + } - /* calculate percent */ - perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks)); + /* calculate percent */ + perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks)); - /* return perc */ - return smprintf("%d%%", perc); + /* return perc */ + return smprintf("%d%%", perc); } /* disk total */ char * disk_total(const char *mountpoint) { - struct statvfs fs; + struct statvfs fs; - /* try to open mountpoint */ - if (statvfs(mountpoint, &fs) < 0) { - fprintf(stderr, "Could not get filesystem info.\n"); - return smprintf("n/a"); - } + /* try to open mountpoint */ + if (statvfs(mountpoint, &fs) < 0) { + fprintf(stderr, "Could not get filesystem info.\n"); + return smprintf("n/a"); + } - /* return total */ - return smprintf("%f", (float)fs.f_bsize * (float)fs.f_blocks / 1024 / 1024 / 1024); + /* return total */ + return smprintf("%f", (float)fs.f_bsize * (float)fs.f_blocks / 1024 / 1024 / 1024); } /* disk used */ char * disk_used(const char *mountpoint) { - struct statvfs fs; + struct statvfs fs; - /* try to open mountpoint */ - if (statvfs(mountpoint, &fs) < 0) { - fprintf(stderr, "Could not get filesystem info.\n"); - return smprintf("n/a"); - } + /* try to open mountpoint */ + if (statvfs(mountpoint, &fs) < 0) { + fprintf(stderr, "Could not get filesystem info.\n"); + return smprintf("n/a"); + } - /* return used */ - return smprintf("%f", (float)fs.f_bsize * ((float)fs.f_blocks - (float)fs.f_bfree) / 1024 / 1024 / 1024); + /* return used */ + return smprintf("%f", (float)fs.f_bsize * ((float)fs.f_blocks - (float)fs.f_bfree) / 1024 / 1024 / 1024); } /* entropy available */ char * entropy(const char *null) { - int entropy = 0; - FILE *fp; + int entropy = 0; + FILE *fp; - /* open entropy file */ - if (!(fp = fopen("/proc/sys/kernel/random/entropy_avail", "r"))) { - fprintf(stderr, "Could not open entropy file.\n"); - return smprintf("n/a"); - } + /* open entropy file */ + if (!(fp = fopen("/proc/sys/kernel/random/entropy_avail", "r"))) { + fprintf(stderr, "Could not open entropy file.\n"); + return smprintf("n/a"); + } - /* extract entropy */ - fscanf(fp, "%d", &entropy); + /* extract entropy */ + fscanf(fp, "%d", &entropy); - /* close entropy file */ - fclose(fp); + /* close entropy file */ + fclose(fp); - /* return entropy */ - return smprintf("%d", entropy); + /* return entropy */ + return smprintf("%d", entropy); } /* gid */ char * gid(const char *null) { - gid_t gid; + gid_t gid; - if ((gid = getgid()) < 0) { - fprintf(stderr, "Could no get gid."); - return smprintf("n/a"); - } else { - return smprintf("%d", gid); - } + if ((gid = getgid()) < 0) { + fprintf(stderr, "Could no get gid."); + return smprintf("n/a"); + } else { + return smprintf("%d", gid); + } - return smprintf("n/a"); + return smprintf("n/a"); } /* hostname */ char * hostname(const char *null) { - char hostname[HOST_NAME_MAX]; - FILE *fp; + char hostname[HOST_NAME_MAX]; + FILE *fp; - /* open hostname file */ - if (!(fp = fopen("/proc/sys/kernel/hostname", "r"))) { - fprintf(stderr, "Could not open hostname file.\n"); - return smprintf("n/a"); - } + /* open hostname file */ + if (!(fp = fopen("/proc/sys/kernel/hostname", "r"))) { + fprintf(stderr, "Could not open hostname file.\n"); + return smprintf("n/a"); + } - /* extract hostname */ - fscanf(fp, "%s\n", hostname); + /* extract hostname */ + fscanf(fp, "%s\n", hostname); - /* close hostname file */ - fclose(fp); + /* close hostname file */ + fclose(fp); - /* return entropy */ - return smprintf("%s", hostname); + /* return entropy */ + return smprintf("%s", hostname); } /* ip address */ char * ip(const char *interface) { - struct ifaddrs *ifaddr, *ifa; - int s; - char host[NI_MAXHOST]; - - /* check if getting ip address works */ - if (getifaddrs(&ifaddr) == -1) - { - fprintf(stderr, "Error getting IP address."); - return smprintf("n/a"); - } - - /* get the ip address */ - for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) - { - if (ifa->ifa_addr == NULL) - continue; - - s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST); - - if ((strcmp(ifa->ifa_name, interface) == 0) && (ifa->ifa_addr->sa_family == AF_INET)) - { - if (s != 0) - { - fprintf(stderr, "Error getting IP address."); - return smprintf("n/a"); - } - return smprintf("%s", host); - } - } - - /* free the address */ - freeifaddrs(ifaddr); - - /* return n/a if nothing works */ - return smprintf("n/a"); + struct ifaddrs *ifaddr, *ifa; + int s; + char host[NI_MAXHOST]; + + /* check if getting ip address works */ + if (getifaddrs(&ifaddr) == -1) { + fprintf(stderr, "Error getting IP address."); + return smprintf("n/a"); + } + + /* get the ip address */ + for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) { + if (ifa->ifa_addr == NULL) { + continue; + } + + s = getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in), host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST); + + if ((strcmp(ifa->ifa_name, interface) == 0) && (ifa->ifa_addr->sa_family == AF_INET)) { + if (s != 0) { + fprintf(stderr, "Error getting IP address."); + return smprintf("n/a"); + } + return smprintf("%s", host); + } + } + + /* free the address */ + freeifaddrs(ifaddr); + + /* return n/a if nothing works */ + return smprintf("n/a"); } /* ram free */ char * ram_free(const char *null) { - long free; - FILE *fp; + long free; + FILE *fp; - /* open meminfo file */ - if (!(fp = fopen("/proc/meminfo", "r"))) { - fprintf(stderr, "Error opening meminfo file."); - return smprintf("n/a"); - } + /* open meminfo file */ + if (!(fp = fopen("/proc/meminfo", "r"))) { + fprintf(stderr, "Error opening meminfo file."); + return smprintf("n/a"); + } - /* read the values */ - fscanf(fp, "MemFree: %ld kB\n", &free); + /* read the values */ + fscanf(fp, "MemFree: %ld kB\n", &free); - /* close meminfo file */ - fclose(fp); + /* close meminfo file */ + fclose(fp); - /* return free ram as string */ - return smprintf("%f", (float)free / 1024 / 1024); + /* return free ram as string */ + return smprintf("%f", (float)free / 1024 / 1024); } /* ram percentage */ char * ram_perc(const char *null) { - int perc; - long total, free, buffers, cached; - FILE *fp; - - /* open meminfo file */ - if (!(fp = fopen("/proc/meminfo", "r"))) { - fprintf(stderr, "Error opening meminfo file."); - return smprintf("n/a"); - } - - /* read the values */ - fscanf(fp, "MemTotal: %ld kB\n", &total); - fscanf(fp, "MemFree: %ld kB\n", &free); - 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 */ - perc = 100 * ((total - free) - (buffers + cached)) / total; - - /* return perc as string */ - return smprintf("%d%%", perc); + int perc; + long total, free, buffers, cached; + FILE *fp; + + /* open meminfo file */ + if (!(fp = fopen("/proc/meminfo", "r"))) { + fprintf(stderr, "Error opening meminfo file."); + return smprintf("n/a"); + } + + /* read the values */ + fscanf(fp, "MemTotal: %ld kB\n", &total); + fscanf(fp, "MemFree: %ld kB\n", &free); + 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 */ + perc = 100 * ((total - free) - (buffers + cached)) / total; + + /* return perc as string */ + return smprintf("%d%%", perc); } /* ram total */ char * ram_total(const char *null) { - long total; - FILE *fp; + long total; + FILE *fp; - /* open meminfo file */ - if (!(fp = fopen("/proc/meminfo", "r"))) { - fprintf(stderr, "Error opening meminfo file."); - return smprintf("n/a"); - } + /* open meminfo file */ + if (!(fp = fopen("/proc/meminfo", "r"))) { + fprintf(stderr, "Error opening meminfo file."); + return smprintf("n/a"); + } - /* read the values */ - fscanf(fp, "MemTotal: %ld kB\n", &total); + /* read the values */ + fscanf(fp, "MemTotal: %ld kB\n", &total); - /* close meminfo file */ - fclose(fp); + /* close meminfo file */ + fclose(fp); - /* return total ram as string */ - return smprintf("%f", (float)total / 1024 / 1024); + /* return total ram as string */ + return smprintf("%f", (float)total / 1024 / 1024); } /* ram used */ char * ram_used(const char *null) { - long free, total, buffers, cached, used; - FILE *fp; + long free, total, buffers, cached, used; + FILE *fp; - /* open meminfo file */ - if (!(fp = fopen("/proc/meminfo", "r"))) { - fprintf(stderr, "Error opening meminfo file."); - return smprintf("n/a"); - } + /* open meminfo file */ + if (!(fp = fopen("/proc/meminfo", "r"))) { + fprintf(stderr, "Error opening meminfo file."); + return smprintf("n/a"); + } - /* read the values */ - fscanf(fp, "MemTotal: %ld kB\n", &total); - fscanf(fp, "MemFree: %ld kB\n", &free); - fscanf(fp, "MemAvailable: %ld kB\nBuffers: %ld kB\n", &buffers, &buffers); - fscanf(fp, "Cached: %ld kB\n", &cached); + /* read the values */ + fscanf(fp, "MemTotal: %ld kB\n", &total); + fscanf(fp, "MemFree: %ld kB\n", &free); + fscanf(fp, "MemAvailable: %ld kB\nBuffers: %ld kB\n", &buffers, &buffers); + fscanf(fp, "Cached: %ld kB\n", &cached); - /* close meminfo file */ - fclose(fp); + /* close meminfo file */ + fclose(fp); - /* calculate used */ - used = total - free - buffers - cached; + /* calculate used */ + used = total - free - buffers - cached; - /* return used ram as string */ - return smprintf("%f", (float)used / 1024 / 1024); + /* return used ram as string */ + return smprintf("%f", (float)used / 1024 / 1024); } /* custom shell command */ char * run_command(const char* command) { - int good; + int good; FILE *fp; char buffer[64]; - /* try to open the command output */ + /* try to open the command output */ if (!(fp = popen(command, "r"))) { - fprintf(stderr, "Could not get command output for: %s.\n", command); - return smprintf("n/a"); - } + fprintf(stderr, "Could not get command output for: %s.\n", command); + return smprintf("n/a"); + } - /* get command output text, save it to buffer */ - fgets(buffer, sizeof(buffer)-1, fp); + /* get command output text, save it to buffer */ + fgets(buffer, sizeof(buffer) - 1, fp); - /* close it again */ + /* close it again */ pclose(fp); - /* add nullchar at the end */ - for (int i = 0 ; i != sizeof(buffer) ; i++) { - if (buffer[i] == '\0') { - good = 1; - break; - } - } - if (good) { - buffer[strlen(buffer) - 1] = '\0'; - } - - /* return the output */ + /* add nullchar at the end */ + for (int i = 0 ; i != sizeof(buffer); i++) { + if (buffer[i] == '\0') { + good = 1; + break; + } + } + if (good) { + buffer[strlen(buffer) - 1] = '\0'; + } + + /* return the output */ return smprintf("%s", buffer); } @@ -489,67 +487,65 @@ run_command(const char* command) char * temp(const char *file) { - int temperature; - FILE *fp; + int temperature; + FILE *fp; - /* open temperature file */ - if (!(fp = fopen(file, "r"))) { - fprintf(stderr, "Could not open temperature file.\n"); - return smprintf("n/a"); - } + /* open temperature file */ + if (!(fp = fopen(file, "r"))) { + fprintf(stderr, "Could not open temperature file.\n"); + return smprintf("n/a"); + } - /* extract temperature */ - fscanf(fp, "%d", &temperature); + /* extract temperature */ + fscanf(fp, "%d", &temperature); - /* close temperature file */ - fclose(fp); + /* close temperature file */ + fclose(fp); - /* return temperature in degrees */ - return smprintf("%d°C", temperature / 1000); + /* return temperature in degrees */ + return smprintf("%d°C", temperature / 1000); } /* username */ char * username(const char *null) { - register struct passwd *pw; - register uid_t uid; - - /* get the values */ - uid = geteuid (); - pw = getpwuid (uid); - - /* if it worked, return */ - if (pw) { - return smprintf("%s", pw->pw_name); - } - else { - fprintf(stderr, "Could not get username.\n"); - return smprintf("n/a"); - } - - return smprintf("n/a"); + register struct passwd *pw; + register uid_t uid; + + /* get the values */ + uid = geteuid(); + pw = getpwuid(uid); + + /* if it worked, return */ + if (pw) { + return smprintf("%s", pw->pw_name); + } else { + fprintf(stderr, "Could not get username.\n"); + return smprintf("n/a"); + } + + return smprintf("n/a"); } /* uid */ char * uid(const char *null) { - register uid_t uid; + register uid_t uid; - /* get the values */ - uid = geteuid (); + /* get the values */ + uid = geteuid(); - /* if it worked, return */ - if (uid) { - return smprintf("%d", uid); - } - else { - fprintf(stderr, "Could not get uid.\n"); - return smprintf("n/a"); - } + /* if it worked, return */ + if (uid) { + return smprintf("%d", uid); + } else { + fprintf(stderr, "Could not get uid.\n"); + return smprintf("n/a"); + } - return smprintf("n/a"); + return smprintf("n/a"); } @@ -557,193 +553,191 @@ uid(const char *null) char * vol_perc(const char *soundcard) { - int mute = 0; - long vol = 0, max = 0, min = 0; - snd_mixer_t *handle; - snd_mixer_elem_t *pcm_mixer, *mas_mixer; - snd_mixer_selem_id_t *vol_info, *mute_info; - - /* open everything */ - snd_mixer_open(&handle, 0); - snd_mixer_attach(handle, soundcard); - snd_mixer_selem_register(handle, NULL, NULL); - snd_mixer_load(handle); - - /* prepare everything */ - snd_mixer_selem_id_malloc(&vol_info); - snd_mixer_selem_id_malloc(&mute_info); - /* check */ - if (vol_info == NULL || mute_info == NULL) { - fprintf(stderr, "Could not get alsa volume"); - return smprintf("n/a"); - } - 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); - - /* get the 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); - - /* clean up */ - 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); - } + int mute = 0; + long vol = 0, max = 0, min = 0; + snd_mixer_t *handle; + snd_mixer_elem_t *pcm_mixer, *mas_mixer; + snd_mixer_selem_id_t *vol_info, *mute_info; + + /* open everything */ + snd_mixer_open(&handle, 0); + snd_mixer_attach(handle, soundcard); + snd_mixer_selem_register(handle, NULL, NULL); + snd_mixer_load(handle); + + /* prepare everything */ + snd_mixer_selem_id_malloc(&vol_info); + snd_mixer_selem_id_malloc(&mute_info); + /* check */ + if (vol_info == NULL || mute_info == NULL) { + fprintf(stderr, "Could not get alsa volume"); + return smprintf("n/a"); + } + 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); + + /* get the 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); + + /* clean up */ + 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 */ char * wifi_perc(const char *wificard) { - int bufsize = 255; - int strength; - char buf[bufsize]; - char *datastart; - char path[64]; - char status[5]; - char needle[sizeof wificard + 1]; - FILE *fp; - - /* generate the path name */ - memset(path, 0, sizeof path); - strcat(path, "/sys/class/net/"); - strcat(path, wificard); - strcat(path, "/operstate"); - - /* open wifi file */ - if(!(fp = fopen(path, "r"))) { - fprintf(stderr, "Error opening wifi operstate file."); - return smprintf("n/a"); - } - - /* read the status */ - fgets(status, 5, fp); - - /* close wifi file */ - fclose(fp); - - /* check if interface down */ - if(strcmp(status, "up\n") != 0){ - return smprintf("n/a"); - } - - /* open wifi file */ - if (!(fp = fopen("/proc/net/wireless", "r"))) { - fprintf(stderr, "Error opening wireless file."); - return smprintf("n/a"); - } - - /* extract the signal strength */ - 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); - } - - /* close wifi file */ - fclose(fp); - - /* return strength in percent */ - return smprintf("%d%%", strength); + int bufsize = 255; + int strength; + char buf[bufsize]; + char *datastart; + char path[64]; + char status[5]; + char needle[sizeof wificard + 1]; + FILE *fp; + + /* generate the path name */ + memset(path, 0, sizeof path); + strcat(path, "/sys/class/net/"); + strcat(path, wificard); + strcat(path, "/operstate"); + + /* open wifi file */ + if(!(fp = fopen(path, "r"))) { + fprintf(stderr, "Error opening wifi operstate file."); + return smprintf("n/a"); + } + + /* read the status */ + fgets(status, 5, fp); + + /* close wifi file */ + fclose(fp); + + /* check if interface down */ + if(strcmp(status, "up\n") != 0) { + return smprintf("n/a"); + } + + /* open wifi file */ + if (!(fp = fopen("/proc/net/wireless", "r"))) { + fprintf(stderr, "Error opening wireless file."); + return smprintf("n/a"); + } + + /* extract the signal strength */ + 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); + } + + /* close wifi file */ + fclose(fp); + + /* return strength in percent */ + return smprintf("%d%%", strength); } /* wifi essid */ char * wifi_essid(const char *wificard) { - char id[IW_ESSID_MAX_SIZE+1]; - int sockfd; - struct iwreq wreq; - - /* prepare */ - memset(&wreq, 0, sizeof(struct iwreq)); - wreq.u.essid.length = IW_ESSID_MAX_SIZE+1; - - /* set the interface */ - sprintf(wreq.ifr_name, wificard); - - /* check */ - if((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) == -1) { - fprintf(stderr, "Cannot open socket for interface: %s\n", wificard); - return smprintf("n/a"); - } - wreq.u.essid.pointer = id; - if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) { - fprintf(stderr, "Get ESSID ioctl failed for interface %s\n", wificard); - return smprintf("n/a"); - } - - /* return the essid */ - if (strcmp((char *)wreq.u.essid.pointer, "") == 0) { - return smprintf("n/a"); - } - else { - return smprintf("%s", (char *)wreq.u.essid.pointer); - } + char id[IW_ESSID_MAX_SIZE+1]; + int sockfd; + struct iwreq wreq; + + /* prepare */ + memset(&wreq, 0, sizeof(struct iwreq)); + wreq.u.essid.length = IW_ESSID_MAX_SIZE+1; + + /* set the interface */ + sprintf(wreq.ifr_name, wificard); + + /* check */ + if((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) == -1) { + fprintf(stderr, "Cannot open socket for interface: %s\n", wificard); + return smprintf("n/a"); + } + wreq.u.essid.pointer = id; + if (ioctl(sockfd,SIOCGIWESSID, &wreq) == -1) { + fprintf(stderr, "Get ESSID ioctl failed for interface %s\n", wificard); + return smprintf("n/a"); + } + + /* return the essid */ + if (strcmp((char *)wreq.u.essid.pointer, "") == 0) { + return smprintf("n/a"); + } else { + return smprintf("%s", (char *)wreq.u.essid.pointer); + } } /* main function */ int main(void) { - char status_string[1024]; - struct arg argument; - - /* try to open display */ - if (!(dpy = XOpenDisplay(0x0))) { - fprintf(stderr, "Cannot open display!\n"); - exit(1); - } - - /* return status every interval */ - for (;;) { - /* clear the string */ - memset(status_string, 0, sizeof(status_string)); - - /* generate status_string */ - for (size_t i = 0; i < sizeof(args) / sizeof(args[0]); ++i) { - argument = args[i]; - char *res = argument.func(argument.args); - char *element = smprintf(argument.format, res); - if (element == NULL) { - element = smprintf("n/a"); - fprintf(stderr, "Failed to format output."); - } - strcat(status_string, element); - free(res); - free(element); - } - - /* return the statusbar */ - setstatus(status_string); - - /* wait, "update_interval - 1" because of get_cpu_usage() which uses 1 second */ - sleep(update_interval -1); - } - - /* close display */ - XCloseDisplay(dpy); - - /* exit successfully */ - return 0; + char status_string[1024]; + struct arg argument; + + /* try to open display */ + if (!(dpy = XOpenDisplay(0x0))) { + fprintf(stderr, "Cannot open display!\n"); + exit(1); + } + + /* return status every interval */ + for (;;) { + /* clear the string */ + memset(status_string, 0, sizeof(status_string)); + + /* generate status_string */ + for (size_t i = 0; i < sizeof(args) / sizeof(args[0]); ++i) { + argument = args[i]; + char *res = argument.func(argument.args); + char *element = smprintf(argument.format, res); + if (element == NULL) { + element = smprintf("n/a"); + fprintf(stderr, "Failed to format output."); + } + strcat(status_string, element); + free(res); + free(element); + } + + /* return the statusbar */ + setstatus(status_string); + + /* wait, "update_interval - 1" because of get_cpu_usage() which uses 1 second */ + sleep(update_interval -1); + } + + /* close display */ + XCloseDisplay(dpy); + + /* exit successfully */ + return 0; } @@ -6,9 +6,9 @@ static Display *dpy; /* statusbar configuration type and struct */ typedef char *(*op_fun) (const char *); struct arg { - op_fun func; - const char *format; - const char *args; + op_fun func; + const char *format; + const char *args; }; /* functions */ |