diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile | 22 | ||||
| -rwxr-xr-x | runstatus.sh | 7 | ||||
| -rw-r--r-- | statuses/Makefile | 10 | ||||
| -rw-r--r-- | statuses/netif.c | 52 | ||||
| -rw-r--r-- | statuses/netif.h | 7 | ||||
| -rw-r--r-- | sysstatus.c | 7 |
7 files changed, 26 insertions, 80 deletions
@@ -1,4 +1,5 @@ audstatus/* bitmaps/* *.log +*.o sysstatus @@ -1,16 +1,12 @@ -build: - gcc -Wall -o sysstatus sysstatus.c \ - statuses/tools.c \ - statuses/uptime.c \ - statuses/memusage.c \ - statuses/cpuusage.c \ - statuses/netif.c \ - statuses/netif_named.c \ - statuses/power.c \ - statuses/volume_alsa.c \ - statuses/temp.c \ - statuses/datetime.c \ - -lasound +CC=gcc +CCFLAGS=-Wall -Wextra -O3 +LDOUT=sysstatus +LIBS=-lasound + +all: *.c *.h Makefile + make -C statuses + $(CC) $(CCFLAGS) -o $(LDOUT) $(LIBS) sysstatus.c statuses/*.o clean: + make -C statuses clean rm -f sysstatus diff --git a/runstatus.sh b/runstatus.sh index c2b1564..0b73a7b 100755 --- a/runstatus.sh +++ b/runstatus.sh @@ -6,7 +6,12 @@ RESY=${RES##*,} FONT="-misc-fixed-medium-r-normal--13-120-75-75-C-70-iso8859-1" #FONT="-*-fixed-medium-r-semicondensed-*-13-*-*-*-*-*-*-*" +if [ $((RESX)) -gt 1920 ] +then + RESX=1920 +fi + cd ~/sysstatus/ killall sysstatus -./sysstatus | dzen2 -ta l -fn "$FONT" -bg black -y $((RESY+82)) -h 18 -ta r -expand left -e "" +./sysstatus | dzen2 -ta l -fn "$FONT" -bg black -w $((RESX)) -y $((RESY+82)) -h 18 -ta r -expand left -e "" #./sysstatus | tee /dev/shm/sysstatus-log | dzen2 -ta l -fn "$FONT" -bg black -y $((RESY+82)) -h 18 -ta r -expand left -e "" diff --git a/statuses/Makefile b/statuses/Makefile new file mode 100644 index 0000000..fa66069 --- /dev/null +++ b/statuses/Makefile @@ -0,0 +1,10 @@ +STATUSES=cpuusage.o datetime.o memusage.o netif_named.o power.o temp.o uptime.o volume_alsa.o +OTHERS=tools.o + +all: *.c *.h Makefile $(STATUSES) $(OTHERS) + +.c.o: + $(CC) $(CCFLAGS) -c -o $@ $< + +clean: + rm -f *.o diff --git a/statuses/netif.c b/statuses/netif.c deleted file mode 100644 index 944fe2c..0000000 --- a/statuses/netif.c +++ /dev/null @@ -1,52 +0,0 @@ -#include <stdio.h> -#include <stdlib.h> -#include <fcntl.h> -#include <unistd.h> -#include "netif.h" -#include "tools.h" -#include "../config.h" - -void status_netif() -{ - char stline[16]; - int stfile; - size_t stlen; - - double ifsum; - int ifsumpower; - - - stfile = open("/sys/class/net/" IFNAME "/carrier", 0); - if (stfile != -1) - { - stlen = read(stfile, stline, sizeof(stline) - 1); - close(stfile); - if (stline[0] == '1') - fputs("^fg(yellow)", stdout); - else - fputs("^fg(red)", stdout); - } - - stfile = open("/sys/class/net/" IFNAME "/statistics/rx_bytes", 0); - if (stfile != -1) - { - stlen = read(stfile, stline, sizeof(stline) - 1); - close(stfile); - stline[stlen] = '\0'; - ifsum = atof(stline); - } - - stfile = open("/sys/class/net/" IFNAME "/statistics/tx_bytes", 0); - if (stfile != -1) - { - stlen = read(stfile, stline, sizeof(stline) - 1); - close(stfile); - stline[stlen] = '\0'; - ifsum += atof(stline); - } - - for(ifsumpower = 0; ifsum >= 1024.0; ifsumpower++) - ifsum = ifsum / 1024; - - printf(" %s: %.*f %c ", IFNAME, ifsumpower ? ifsumpower - 1 : ifsumpower, ifsum, powertochar(ifsumpower)); -} diff --git a/statuses/netif.h b/statuses/netif.h deleted file mode 100644 index 2f6685e..0000000 --- a/statuses/netif.h +++ /dev/null @@ -1,7 +0,0 @@ - -#ifndef __NETIF_H__ -#define __NETIF_H__ - -void status_netif(); - -#endif diff --git a/sysstatus.c b/sysstatus.c index 835f865..bbdb2fe 100644 --- a/sysstatus.c +++ b/sysstatus.c @@ -2,15 +2,9 @@ #include <fcntl.h> #include <stdlib.h> #include <unistd.h> -//#include <ctype.h> -//#include <memory.h> -//#include <stdint.h> -//#include <sys/socket.h> -//#include <sys/un.h> #include "statuses/uptime.h" #include "statuses/memusage.h" #include "statuses/cpuusage.h" -#include "statuses/netif.h" #include "statuses/netif_named.h" #include "statuses/power.h" #include "statuses/volume_alsa.h" @@ -28,7 +22,6 @@ void updatestatus() status_memusage(); - //status_netif(); status_netif_named("eth0"); status_netif_named("eth1"); status_netif_named("wlan0"); |