Skip to content
This repository has been archived by the owner on Jan 5, 2018. It is now read-only.

Commit

Permalink
fix code with snprints et all
Browse files Browse the repository at this point in the history
  • Loading branch information
Unia committed Oct 13, 2013
1 parent 2f8fdb2 commit 91e5c00
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 93 deletions.
8 changes: 4 additions & 4 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ PREFIX ?= /usr/local
BINPREFIX = ${PREFIX}/bin

LIBS = -liw -lasound -lX11 `pkg-config --cflags --libs glib-2.0 dbus-glib-1 audclient`
CFLAGS = -O3 -pedantic -Wall -Wextra -Wno-format-zero-length
CFLAGS += -Os -pedantic -Wall -Wextra -Wno-format-zero-length

debug: CFLAGS += -O0 -g
debug: ${PROG}

${PROG}: ${PROG}.c ${PROG}.h
@${CC} ${CFLAGS} ${LIBS} -o ${PROG} ${PROG}.c
@strip ${PROG}

debug: CFLAGS += -O0 -g
debug: ${PROG}

install:
install -Dm755 ${PROG} ${DESTDIR}${BINPREFIX}/${PROG}
install -Dm644 ${PROG}@.service ${DESTDIR}/usr/lib/systemd/system/${PROG}@.service
Expand Down
168 changes: 81 additions & 87 deletions dwmst.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,185 +10,179 @@

#include "dwmst.h"

char *get_aud(char *buf, DBusGProxy *session) {
char *get_aud (char *buf, DBusGProxy *session) {
char *psong = NULL;

psong = audacious_remote_get_playlist_title(session, audacious_remote_get_playlist_pos(session));
psong = audacious_remote_get_playlist_title (session, audacious_remote_get_playlist_pos (session));
if (psong) {
if (audacious_remote_is_paused(session))
sprintf(buf, AUD_P_STR, psong);
else if (audacious_remote_is_playing(session))
sprintf(buf, AUD_STR, psong);
free(psong);
snprintf (buf, 184, AUD_STR, psong);
free (psong);
} else
sprintf(buf, AUD_S_STR);
snprintf (buf, 1, NO_AUD_STR);
return buf;
}

char *get_skype(char *buf) {
if(access(SKYPE_LOCK, F_OK) == 0)
sprintf(buf, SKYPE_STR);
char *get_skype (char *buf) {
if (access (SKYPE_LOCK, F_OK) == 0)
snprintf (buf, 6, SKYPE_STR);
else
sprintf(buf, NO_SKYPE_STR);
snprintf (buf, 1, NO_SKYPE_STR);
return buf;
}

int is_up(char *device) {
char devpath[35], state[5];
int is_up (char *device) {
char devpath[32], state[5];
FILE *infile;

sprintf(devpath, "/sys/class/net/%s/operstate", device);
infile = fopen(devpath, "r");
if(infile != NULL) {
fscanf(infile, "%s", state);
fclose(infile);
if(strcmp(state, "up") == 0)
snprintf (devpath, 32, "/sys/class/net/%s/operstate", device);
if ((infile = fopen (devpath, "r")) != NULL) {
fscanf (infile, "%s", state); fclose (infile);
if (strncmp (state, "up", 2) == 0)
return 1;
}
return 0;
}

char *get_net(char *buf, int skfd, wireless_info *winfo) {
if (is_up(WIRED_DEVICE))
sprintf(buf, LAN_STR);
else if (is_up(WIRELESS_DEVICE)) {
if (iw_get_basic_config(skfd, WIRELESS_DEVICE, &(winfo->b)) > -1) {
char *get_net (char *buf, int skfd, wireless_info *winfo) {
if (is_up (WIRELESS_DEVICE)) {
if (iw_get_basic_config (skfd, WIRELESS_DEVICE, &(winfo->b)) > -1) {
if (winfo->b.has_essid && winfo->b.essid_on)
sprintf(buf, WLAN_STR, winfo->b.essid);
snprintf (buf, 30, WLAN_STR, winfo->b.essid);
}
} else
sprintf(buf, NO_CON_STR);
}
else if (is_up (WIRED_DEVICE))
snprintf (buf, 10, LAN_STR);
else
snprintf (buf, 1, NO_CON_STR);
return buf;
}

char *get_volume(char *buf, snd_mixer_t *handle) {
char *get_volume (char *buf, snd_mixer_t *handle) {
snd_mixer_elem_t *pcm_mixer, *mas_mixer;
snd_mixer_selem_id_t *vol_info, *mute_info;
long vol = 0, max = 0, min = 0;
int mute = 0, realvol = 0;

snd_mixer_handle_events(handle);
snd_mixer_selem_id_malloc(&vol_info);
snd_mixer_selem_id_malloc(&mute_info);
snd_mixer_selem_id_set_name(vol_info, VOL_CH);
snd_mixer_selem_id_set_name(mute_info, VOL_CH);
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, 0, &vol);
snd_mixer_selem_get_playback_switch(mas_mixer, 0, &mute);
snd_mixer_handle_events (handle);
snd_mixer_selem_id_malloc (&vol_info);
snd_mixer_selem_id_malloc (&mute_info);
snd_mixer_selem_id_set_name (vol_info, VOL_CH);
snd_mixer_selem_id_set_name (mute_info, VOL_CH);
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, 0, &vol);
snd_mixer_selem_get_playback_switch (mas_mixer, 0, &mute);
if (!mute)
sprintf(buf, VOL_MUTE_STR);
snprintf (buf, 9, VOL_MUTE_STR);
else {
realvol = (vol * 100) / max;
sprintf(buf, VOL_STR, realvol);
snprintf (buf, 12, VOL_STR, realvol);
}
snd_mixer_selem_id_free(vol_info);
snd_mixer_selem_id_free(mute_info);
snd_mixer_selem_id_free (vol_info);
snd_mixer_selem_id_free (mute_info);
return buf;
}

char *get_battery(char *buf) {
char *get_battery (char *buf) {
FILE *infile;
char state[8];
long now = -1, full = -1, voltage = -1, rate = -1;
int perc, hours, minutes, seconds = -1;

if(access("/sys/class/power_supply/BAT1/", F_OK) == 0) {
infile = fopen(BATT_STAT, "r"); fscanf(infile, "%s\n", state); fclose(infile);
if (strncmp(state, "Full", 8) == 0) {
sprintf(buf, BAT_FULL_STR);
return buf;
} else if (strncmp(state, "Unknown", 8) == 0) {
sprintf(buf, BAT_UNK_STR);
return buf;
} else {
infile = fopen(BATT_NOW, "r"); fscanf(infile, "%ld\n", &now); fclose(infile);
infile = fopen(BATT_FULL, "r"); fscanf(infile, "%ld\n", &full); fclose(infile);
infile = fopen(BATT_VOLT, "r"); fscanf(infile, "%ld\n", &voltage); fclose(infile);
infile = fopen(BATT_CNOW, "r"); fscanf(infile, "%ld\n", &rate); fclose(infile);
if (access ("/sys/class/power_supply/BAT1/", F_OK) == 0) {
infile = fopen (BATT_STAT, "r"); fscanf (infile, "%s\n", state); fclose (infile);
if (strncmp (state, "Full", 4) == 0)
snprintf (buf, 11, BAT_FULL_STR);
else if (strncmp (state, "Unknown", 7) == 0)
snprintf (buf, 11, BAT_UNK_STR);
else {
infile = fopen (BATT_NOW, "r"); fscanf (infile, "%ld\n", &now); fclose (infile);
infile = fopen (BATT_FULL, "r"); fscanf (infile, "%ld\n", &full); fclose (infile);
infile = fopen (BATT_VOLT, "r"); fscanf (infile, "%ld\n", &voltage); fclose (infile);
infile = fopen (BATT_CNOW, "r"); fscanf (infile, "%ld\n", &rate); fclose (infile);
now = ((float)voltage * (float)now);
full = ((float)voltage * (float)full);
rate = ((float)voltage * (float)rate);
perc = (now * 100) / full;

if (strncmp(state, "Charging", 8) == 0)
if (strncmp (state, "Charging", 8) == 0)
seconds = 3600 * (((float)full - (float)now) / (float)rate);
else
seconds = 3600 * ((float)now / (float)rate);
hours = seconds / 3600;
seconds -= 3600 * hours;
minutes = seconds / 60;
seconds -= 60 * minutes;
if (strncmp(state, "Charging", 8) == 0)
sprintf(buf, BAT_CHRG_STR, perc, hours, minutes);
if (strncmp (state, "Charging", 8) == 0)
snprintf (buf, 24, BAT_CHRG_STR, perc, hours, minutes);
else {
/*if (perc < BAT_LOW_P || minutes < BAT_LOW_T)*/
/*notify*/
sprintf(buf, BAT_STR, perc, hours, minutes);
snprintf (buf, 24, BAT_STR, perc, hours, minutes);
}
}
} else
sprintf(buf, NO_BAT_STR);
snprintf (buf, 14, NO_BAT_STR);

return buf;
}

int main(void) {
Display *dpy;
Window root;
char status[201], music[100], skype[7], net[30], volume[14], battery[35];
char status[256], music[184], skype[6], net[30], volume[12], battery[24];
int netloops = 60, musicloops = 10;
DBusGProxy *session = NULL;
DBusGConnection *connection = NULL;
int skfd;
struct wireless_info *winfo;
snd_mixer_t *handle;

dpy = XOpenDisplay(NULL);
dpy = XOpenDisplay (NULL);
if (dpy == NULL) {
fprintf(stderr, "ERROR: could not open display\n");
return 1;
}

root = XRootWindow(dpy, DefaultScreen(dpy));
root = XRootWindow (dpy, DefaultScreen (dpy));

connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
session = dbus_g_proxy_new_for_name(connection, AUDACIOUS_DBUS_SERVICE, AUDACIOUS_DBUS_PATH, AUDACIOUS_DBUS_INTERFACE);
connection = dbus_g_bus_get (DBUS_BUS_SESSION, NULL);
session = dbus_g_proxy_new_for_name (connection, AUDACIOUS_DBUS_SERVICE, AUDACIOUS_DBUS_PATH, AUDACIOUS_DBUS_INTERFACE);

winfo = malloc(sizeof(struct wireless_info));
memset(winfo, 0, sizeof(struct wireless_info));
skfd = iw_sockets_open();
winfo = malloc (sizeof (struct wireless_info));
memset (winfo, 0, sizeof (struct wireless_info));
skfd = iw_sockets_open ();

snd_mixer_open(&handle, 0);
snd_mixer_attach(handle, "default");
snd_mixer_selem_register(handle, NULL, NULL);
snd_mixer_load(handle);
snd_mixer_open (&handle, 0);
snd_mixer_attach (handle, "default");
snd_mixer_selem_register (handle, NULL, NULL);
snd_mixer_load (handle);

while(1) {
if (++musicloops > 10) {
musicloops = 0;
get_aud(music, session);
get_aud (music, session);
}
get_skype(skype);
if (++netloops > 60) {
netloops = 0;
get_net(net, skfd, winfo);
get_net (net, skfd, winfo);
}
get_volume(volume, handle);
get_battery(battery);
get_volume (volume, handle);
get_battery (battery);

sprintf(status, "%s %s %s %s %s", music, skype, net, volume, battery);
snprintf (status, 256, "%s %s %s %s %s", music, skype, net, volume, battery);

XStoreName(dpy, root, status);
XFlush(dpy);
sleep(INTERVAL);
XStoreName (dpy, root, status);
XFlush (dpy);
sleep (INTERVAL);
}

XCloseDisplay(dpy);
dbus_g_connection_unref(connection);
g_object_unref(session);
iw_sockets_close(skfd);
snd_mixer_close(handle);
XCloseDisplay (dpy);
dbus_g_connection_unref (connection);
g_object_unref (session);
iw_sockets_close (skfd);
snd_mixer_close (handle);
return 0;
}
3 changes: 1 addition & 2 deletions dwmst.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
#define BATT_CNOW "/sys/class/power_supply/BAT1/power_now"

#define AUD_STR "%s"
#define AUD_P_STR "%s"
#define AUD_S_STR ""
#define NO_AUD_STR ""
#define SKYPE_STR "Skype"
#define NO_SKYPE_STR ""
#define LAN_STR "Verbonden"
Expand Down

0 comments on commit 91e5c00

Please sign in to comment.