This commit is contained in:
Ali H. Fardan 2016-09-14 03:24:53 +03:00
commit 81e8da5d90
3 changed files with 74 additions and 44 deletions

View File

@ -8,7 +8,7 @@ Looking at the LOC (lines of code) of the [Conky project](https://github.com/brn
The following information is included: The following information is included:
- Battery percentage - Battery percentage/state
- CPU usage (in percent) - CPU usage (in percent)
- Custom shell commands - Custom shell commands
- Date and time - Date and time
@ -39,11 +39,7 @@ Before you continue, please be sure that a C compiler (preferrably gcc), GNU mak
Write the following code to your ~/.xinitrc (or any other initialization script): Write the following code to your ~/.xinitrc (or any other initialization script):
while true; do slstatus &
slstatus
done &
The loop is needed that the program runs after suspend to ram.
## Contributing ## Contributing

View File

@ -1,13 +1,5 @@
/* See LICENSE file for copyright and license details. */ /* See LICENSE file for copyright and license details. */
/* alsa sound */
#define ALSA_CHANNEL "Master"
/* battery */
#define BATTERY_PATH "/sys/class/power_supply/"
#define BATTERY_NOW "energy_now"
#define BATTERY_FULL "energy_full_design"
/* how often to update the statusbar (min value == 1) */ /* how often to update the statusbar (min value == 1) */
#define UPDATE_INTERVAL 1 #define UPDATE_INTERVAL 1
@ -16,6 +8,7 @@
/* statusbar /* statusbar
- battery_perc (battery percentage) [argument: battery name] - battery_perc (battery percentage) [argument: battery name]
- battery_state (battery charging state) [argument: battery name]
- cpu_perc (cpu usage in percent) [argument: NULL] - cpu_perc (cpu usage in percent) [argument: NULL]
- datetime (date and time) [argument: format] - datetime (date and time) [argument: format]
- disk_free (disk usage in percent) [argument: mountpoint] - disk_free (disk usage in percent) [argument: mountpoint]

View File

@ -8,6 +8,7 @@
#include <linux/wireless.h> #include <linux/wireless.h>
#include <netdb.h> #include <netdb.h>
#include <pwd.h> #include <pwd.h>
#include <signal.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -39,6 +40,7 @@ struct arg {
static char *smprintf(const char *, ...); static char *smprintf(const char *, ...);
static char *battery_perc(const char *); static char *battery_perc(const char *);
static char *battery_state(const char *);
static char *cpu_perc(void); static char *cpu_perc(void);
static char *datetime(const char *); static char *datetime(const char *);
static char *disk_free(const char *); static char *disk_free(const char *);
@ -62,9 +64,11 @@ static char *username(void);
static char *vol_perc(const char *); static char *vol_perc(const char *);
static char *wifi_perc(const char *); static char *wifi_perc(const char *);
static char *wifi_essid(const char *); static char *wifi_essid(const char *);
static void sighandler(const int);
static unsigned short int delay; static unsigned short int delay;
static Display *dpy; static Display *dpy;
static int done = 0;
#include "config.h" #include "config.h"
@ -95,36 +99,52 @@ smprintf(const char *fmt, ...)
static char * static char *
battery_perc(const char *battery) battery_perc(const char *battery)
{ {
int now, full, perc; int perc;
FILE *fp; FILE *fp;
ccat(4, BATTERY_PATH, battery, "/", BATTERY_NOW); ccat(3, "/sys/class/power_supply/", battery, "/capacity");
fp = fopen(concat, "r"); fp = fopen(concat, "r");
if (fp == NULL) { if (fp == NULL) {
warn("Error opening battery file: %s", concat); warn("Error opening battery file: %s", concat);
return smprintf(UNKNOWN_STR); return smprintf(UNKNOWN_STR);
} }
fscanf(fp, "%i", &perc);
fscanf(fp, "%i", &now);
fclose(fp); fclose(fp);
ccat(4, BATTERY_PATH, battery, "/", BATTERY_FULL);
fp = fopen(concat, "r");
if (fp == NULL) {
warn("Error opening battery file: %s", concat);
return smprintf(UNKNOWN_STR);
}
fscanf(fp, "%i", &full);
fclose(fp);
perc = now / (full / 100);
return smprintf("%d%%", perc); return smprintf("%d%%", perc);
} }
static char *
battery_state(const char *battery)
{
char *state = malloc(sizeof(char)*12);
FILE *fp;
if (!state) {
warn("Failed to get battery state.");
return smprintf(UNKNOWN_STR);
}
ccat(3, "/sys/class/power_supply/", battery, "/status");
fp = fopen(concat, "r");
if (fp == NULL) {
warn("Error opening battery file: %s", concat);
return smprintf(UNKNOWN_STR);
}
fscanf(fp, "%s", state);
fclose(fp);
if (strcmp(state, "Charging") == 0)
return smprintf("+");
else if (strcmp(state, "Discharging") == 0)
return smprintf("-");
else if (strcmp(state, "Full") == 0)
return smprintf("=");
else
return smprintf("?");
}
static char * static char *
cpu_perc(void) cpu_perc(void)
{ {
@ -471,25 +491,25 @@ uid(void)
static char * static char *
vol_perc(const char *snd_card) vol_perc(const char *soundcard)
{ /* FIX THIS SHIT! */ {
long int vol, max, min; long int vol, max, min;
snd_mixer_t *handle; snd_mixer_t *handle;
snd_mixer_elem_t *elem; snd_mixer_elem_t *elem;
snd_mixer_selem_id_t *s_elem; snd_mixer_selem_id_t *s_elem;
snd_mixer_open(&handle, 0); snd_mixer_open(&handle, 0);
snd_mixer_attach(handle, snd_card); snd_mixer_attach(handle, soundcard);
snd_mixer_selem_register(handle, NULL, NULL); snd_mixer_selem_register(handle, NULL, NULL);
snd_mixer_load(handle); snd_mixer_load(handle);
snd_mixer_selem_id_malloc(&s_elem); snd_mixer_selem_id_malloc(&s_elem);
snd_mixer_selem_id_set_name(s_elem, ALSA_CHANNEL); snd_mixer_selem_id_set_name(s_elem, "Master");
elem = snd_mixer_find_selem(handle, s_elem); elem = snd_mixer_find_selem(handle, s_elem);
if (elem == NULL) { if (elem == NULL) {
snd_mixer_selem_id_free(s_elem); snd_mixer_selem_id_free(s_elem);
snd_mixer_close(handle); snd_mixer_close(handle);
warn("error: ALSA"); warn("Failed to get volume percentage for: %s.", soundcard);
return smprintf(UNKNOWN_STR); return smprintf(UNKNOWN_STR);
} }
@ -500,7 +520,7 @@ vol_perc(const char *snd_card)
snd_mixer_selem_id_free(s_elem); snd_mixer_selem_id_free(s_elem);
snd_mixer_close(handle); snd_mixer_close(handle);
return smprintf("%d", ((uint_fast16_t)(vol * 100) / max)); return smprintf("%d%%", ((uint_fast16_t)(vol * 100) / max));
} }
static char * static char *
@ -568,24 +588,42 @@ wifi_essid(const char *wificard)
return smprintf(UNKNOWN_STR); return smprintf(UNKNOWN_STR);
} }
close(sockfd);
if (strcmp((char *)wreq.u.essid.pointer, "") == 0) if (strcmp((char *)wreq.u.essid.pointer, "") == 0)
return smprintf(UNKNOWN_STR); return smprintf(UNKNOWN_STR);
else else
return smprintf("%s", (char *)wreq.u.essid.pointer); return smprintf("%s", (char *)wreq.u.essid.pointer);
} }
static void
sighandler(const int signo)
{
if (signo == SIGTERM || signo == SIGINT) {
done = 1;
}
}
int int
main(void) main(void)
{ {
size_t i; size_t i;
char status_string[4096]; char status_string[4096];
char *res, *element; char *res, *element, *status_old;
struct arg argument; struct arg argument;
struct sigaction act;
memset(&act, 0, sizeof(act));
act.sa_handler = sighandler;
sigaction(SIGINT, &act, 0);
sigaction(SIGTERM, &act, 0);
dpy = XOpenDisplay(NULL); dpy = XOpenDisplay(NULL);
for (;;) { XFetchName(dpy, DefaultRootWindow(dpy), &status_old);
memset(status_string, 0, sizeof(status_string));
while (!done) {
status_string[0] = '\0';
for (i = 0; i < sizeof(args) / sizeof(args[0]); ++i) { for (i = 0; i < sizeof(args) / sizeof(args[0]); ++i) {
argument = args[i]; argument = args[i];
if (argument.args == NULL) if (argument.args == NULL)
@ -611,6 +649,9 @@ main(void)
delay = 0; delay = 0;
} }
XStoreName(dpy, DefaultRootWindow(dpy), status_old);
XSync(dpy, False);
XCloseDisplay(dpy); XCloseDisplay(dpy);
return 0; return 0;