snow/dockapps
1
0
Fork 0
Code Issues Releases Activity

asmon: re-indent code

Browse source 
indent -linux asmon.c
This commit is contained in:
Carlos R. Mafra 2019-01-12 18:32:05 +00:00
parent deb3acc132
commit e239e4a58d
1 changed files with 570 additions and 586 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

328
asmon/asmon/asmon.c
View file

@ -38,7 +38,6 @@
#define B_RED (1) #define B_RED (1)
#define B_GREEN (2) #define B_GREEN (2)
/* Evil globals I haven't removed yet */ /* Evil globals I haven't removed yet */
long last_pageins = 0, last_pageouts = 0; long last_pageins = 0, last_pageouts = 0;
long last_swapins = 0, last_swapouts = 0; long last_swapins = 0, last_swapouts = 0;
@ -113,7 +112,8 @@ int main(int argc, char *argv[])
break; break;
case 'u': case 'u':
#ifdef __solaris__ #ifdef __solaris__
fprintf(stderr, "X Server memory stats unavailable for Solaris.\n"); fprintf(stderr,
"X Server memory stats unavailable for Solaris.\n");
exit(0); exit(0);
#endif #endif
Xpid = 0; Xpid = 0;
@ -127,13 +127,11 @@ exit(0);
} }
#ifndef __solaris__ #ifndef __solaris__
if (Xpid != 0) { if (Xpid != 0) {
if ( (fp = fopen("/var/run/server.0.pid", "r")) != NULL) if ((fp = fopen("/var/run/server.0.pid", "r")) != NULL) {
{
fscanf(fp, " %d", &Xpid); fscanf(fp, " %d", &Xpid);
fclose(fp); fclose(fp);
} else { } else {
if ( (fp = fopen("/tmp/.X0-lock", "r")) != NULL) if ((fp = fopen("/tmp/.X0-lock", "r")) != NULL) {
{
fscanf(fp, " %d", &Xpid); fscanf(fp, " %d", &Xpid);
fclose(fp); fclose(fp);
} else { } else {
@ -143,20 +141,17 @@ exit(0);
} }
#endif #endif
/* Open 64x64 window */ /* Open 64x64 window */
openXwindow(argc, argv, asmon_master_xpm, asmon_mask_bits, asmon_mask_width, asmon_mask_height); openXwindow(argc, argv, asmon_master_xpm, asmon_mask_bits,
asmon_mask_width, asmon_mask_height);
if( uname( &name ) != -1 ) if (uname(&name) != -1) {
{ if (strcmp(name.sysname, "Linux") == 0) {
if( strcmp( name.sysname, "Linux" ) == 0 )
{
sscanf(name.release, "%d.%d.%d", &kernMajor, &kernMinor, sscanf(name.release, "%d.%d.%d", &kernMajor, &kernMinor,
&kernRev); &kernRev);
if ((kernMajor == 2) && (kernMinor == 6)) if ((kernMajor == 2) && (kernMinor == 6))
has_kern26 = 1; has_kern26 = 1;
} }
} } else {
else
{
fprintf(stderr, "Can't find system name\n"); fprintf(stderr, "Can't find system name\n");
exit(1); exit(1);
} }
@ -167,17 +162,25 @@ exit(0);
/**************************************************************************/ /**************************************************************************/
void usage(void) { void usage(void)
fprintf(stderr, "\nasmon %s - by Brad Hall (bkh@rio.vg)\n\t\toriginally based on Timecop's wmcpu\n\n", ASMON_VERSION); {
fprintf(stderr, "The top bar: left is the CPU usage, right is the load average\n"); fprintf(stderr,
fprintf(stderr, "The middle bar: left memory usage devided by ticks into shared, buffers, and\n\t\t cached, respectively, and the number of megs used\n"); "\nasmon %s - by Brad Hall (bkh@rio.vg)\n\t\toriginally based on Timecop's wmcpu\n\n",
fprintf(stderr, "The lower bar: the left swap usage and the number of megs swappedd avg\n"); ASMON_VERSION);
fprintf(stderr, "The bottom: the left is a set of LED's marking page's and swap's, the right is\n\t\t a bar representing the amount of memory that the X server \n\t\t is taking up, and the exact megs\n\n usage:\n"); fprintf(stderr,
"The top bar: left is the CPU usage, right is the load average\n");
fprintf(stderr,
"The middle bar: left memory usage devided by ticks into shared, buffers, and\n\t\t cached, respectively, and the number of megs used\n");
fprintf(stderr,
"The lower bar: the left swap usage and the number of megs swappedd avg\n");
fprintf(stderr,
"The bottom: the left is a set of LED's marking page's and swap's, the right is\n\t\t a bar representing the amount of memory that the X server \n\t\t is taking up, and the exact megs\n\n usage:\n");
fprintf(stderr, "\t-display <display name>\n"); fprintf(stderr, "\t-display <display name>\n");
fprintf(stderr, "\t-h\tthis screen\n"); fprintf(stderr, "\t-h\tthis screen\n");
fprintf(stderr, "\t-v\tprint the version number\n"); fprintf(stderr, "\t-v\tprint the version number\n");
#ifndef __solaris__ #ifndef __solaris__
fprintf(stderr, "\t-u\tforce asmon to show uptime, rather than X mem use\n"); fprintf(stderr,
"\t-u\tforce asmon to show uptime, rather than X mem use\n");
#endif #endif
#ifdef EXEC_ON_CLICK #ifdef EXEC_ON_CLICK
fprintf(stderr, "\t-e cmd\texecute 'cmd' on mouse click\n"); fprintf(stderr, "\t-e cmd\texecute 'cmd' on mouse click\n");
@ -200,8 +203,7 @@ void asmon_routine(int Xpid, int allmem)
XEvent Event; XEvent Event;
float total = 0.0; float total = 0.0;
while(1) while (1) {
{
DrawCPU(); DrawCPU();
DrawLoad(); DrawLoad();
@ -217,8 +219,7 @@ void asmon_routine(int Xpid, int allmem)
DrawUptime(); DrawUptime();
#else #else
/* X mem or Uptime? */ /* X mem or Uptime? */
if (Xpid == 0) if (Xpid == 0) {
{
DrawUptime(); DrawUptime();
} else { } else {
if (count == 5) if (count == 5)
@ -228,17 +229,16 @@ void asmon_routine(int Xpid, int allmem)
/* Redraw Windows */ /* Redraw Windows */
RedrawWindowXY(xpm_X, xpm_Y); RedrawWindowXY(xpm_X, xpm_Y);
while (XPending(display)) while (XPending(display)) {
{
XNextEvent(display, &Event); XNextEvent(display, &Event);
switch (Event.type) switch (Event.type) {
{
#ifdef EXEC_ON_CLICK #ifdef EXEC_ON_CLICK
case ButtonPress: case ButtonPress:
#if 0 #if 0
fprintf(stderr, "system(%s)\n", Command); fprintf(stderr, "system(%s)\n", Command);
#endif #endif
if (Command[ 0 ]) system(Command); if (Command[0])
system(Command);
break; break;
#endif #endif
case Expose: case Expose:
@ -257,17 +257,13 @@ void asmon_routine(int Xpid, int allmem)
} }
} }
/**************************************************************************/ /**************************************************************************/
#ifdef __solaris__ #ifdef __solaris__
/* CPU Usage Meter */ /* CPU Usage Meter */
void DrawCPU void DrawCPU(void
( ) {
void
)
{
unsigned long cpuIdle, cpuUser, cpuKern, cpuWait; unsigned long cpuIdle, cpuUser, cpuKern, cpuWait;
unsigned long pageIn, pageOut, swapIn, swapOut; unsigned long pageIn, pageOut, swapIn, swapOut;
@ -297,31 +293,38 @@ void DrawCPU
cputotal += fields[3]; cputotal += fields[3];
// CPU Bar // CPU Bar
if(cputotal > 0) if (cputotal > 0) {
{
cputotal = ((cputotal - (fields[0] + fields[2])) * 1.55); cputotal = ((cputotal - (fields[0] + fields[2])) * 1.55);
if (cputotal > 26) cputotal = 26; if (cputotal > 26)
cputotal = 26;
copyXPMArea(3, 84, cputotal, 9, 5, 5); copyXPMArea(3, 84, cputotal, 9, 5, 5);
copyXPMArea(15, 105, (27 - cputotal), 9, (5 + cputotal), 5); copyXPMArea(15, 105, (27 - cputotal), 9, (5 + cputotal), 5);
copyXPMArea(16, 46, 2, 14, 32, 2); copyXPMArea(16, 46, 2, 14, 32, 2);
} }
// Page In/Out // Page In/Out
if (pageIn > last_pageins) DrawLite(B_RED, 5, 48); if (pageIn > last_pageins)
else DrawLite(B_OFF, 5, 48); DrawLite(B_RED, 5, 48);
else
DrawLite(B_OFF, 5, 48);
if (pageOut > last_pageouts) DrawLite(B_RED, 10, 48); if (pageOut > last_pageouts)
else DrawLite(B_OFF, 10, 48); DrawLite(B_RED, 10, 48);
else
DrawLite(B_OFF, 10, 48);
last_pageins = pageIn; last_pageins = pageIn;
last_pageouts = pageOut; last_pageouts = pageOut;
// Swap In/Out // Swap In/Out
if (swapIn > last_swapins) DrawLite(B_RED, 5, 53); if (swapIn > last_swapins)
else DrawLite(B_OFF, 5, 53); DrawLite(B_RED, 5, 53);
else
DrawLite(B_OFF, 5, 53);
if (swapOut > last_swapouts) DrawLite(B_RED, 10, 53); if (swapOut > last_swapouts)
else DrawLite(B_OFF, 10, 53); DrawLite(B_RED, 10, 53);
else
DrawLite(B_OFF, 10, 53);
last_swapins = swapIn; last_swapins = swapIn;
last_swapouts = swapOut; last_swapouts = swapOut;
@ -340,64 +343,63 @@ void DrawCPU(void)
char buf[128]; char buf[128];
int i; int i;
if( (fp = fopen("/proc/stat", "r")) != NULL) if ((fp = fopen("/proc/stat", "r")) != NULL) {
{ if (has_kern26 > 0) {
if( has_kern26 > 0 )
{
// CPU data // CPU data
fscanf(fp, "cpu %lf %lf %lf %lf %lf %lf %lf", info, info+1, fscanf(fp, "cpu %lf %lf %lf %lf %lf %lf %lf", info,
info+2, info+3, info+4, info+5, info+6); info + 1, info + 2, info + 3, info + 4, info + 5,
info + 6);
fclose(fp); fclose(fp);
if( (fp = fopen("/proc/vmstat", "r")) != NULL) if ((fp = fopen("/proc/vmstat", "r")) != NULL) {
{
// gather data for LED's // gather data for LED's
while( fgets(buf, 127, fp) ) while (fgets(buf, 127, fp)) {
{
if (strstr(buf, "pgpgin")) if (strstr(buf, "pgpgin"))
sscanf(buf, "pgpgin %ld", &pageins); sscanf(buf, "pgpgin %ld",
&pageins);
if (strstr(buf, "pgpgout")) if (strstr(buf, "pgpgout"))
sscanf(buf, "pgpgout %ld", &pageouts); sscanf(buf, "pgpgout %ld",
&pageouts);
if (strstr(buf, "pswpin")) if (strstr(buf, "pswpin"))
sscanf(buf, "pswpin %ld", &swapins); sscanf(buf, "pswpin %ld",
&swapins);
if (strstr(buf, "pswpout")) if (strstr(buf, "pswpout"))
sscanf(buf, "pswpout %ld", &swapouts); sscanf(buf, "pswpout %ld",
&swapouts);
} }
fclose(fp); fclose(fp);
} }
} else { } else {
// CPU data // CPU data
fscanf(fp, "cpu %lf %lf %lf %lf", info, info+1, info+2, fscanf(fp, "cpu %lf %lf %lf %lf", info, info + 1,
info+3); info + 2, info + 3);
// gather data for LED's // gather data for LED's
while( fgets(buf, 127, fp) ) while (fgets(buf, 127, fp)) {
{
if (strstr(buf, "page")) if (strstr(buf, "page"))
sscanf(buf, "page %ld %ld", &pageins, &pageouts); sscanf(buf, "page %ld %ld", &pageins,
&pageouts);
if (strstr(buf, "swap")) if (strstr(buf, "swap"))
sscanf(buf, "swap %ld %ld", &swapins, &swapouts); sscanf(buf, "swap %ld %ld", &swapins,
&swapouts);
} }
fclose(fp); fclose(fp);
} }
// Calculate CPU stuff // Calculate CPU stuff
if( has_kern26 > 0 ) if (has_kern26 > 0) {
{ for (i = 0; i < 7; i++) {
for(i = 0; i < 7; i++)
{
fields[i] = info[i] - cpustat[i]; fields[i] = info[i] - cpustat[i];
cputotal += fields[i]; cputotal += fields[i];
cpustat[i] = info[i]; cpustat[i] = info[i];
} }
} else { } else {
for(i = 0; i < 4; i++) for (i = 0; i < 4; i++) {
{
fields[i] = info[i] - cpustat[i]; fields[i] = info[i] - cpustat[i];
cputotal += fields[i]; cputotal += fields[i];
cpustat[i] = info[i]; cpustat[i] = info[i];
@ -411,25 +413,23 @@ void DrawCPU(void)
//cputotal = 100 * l1 ; //cputotal = 100 * l1 ;
//cputotal=(100-(idlee*100/16))*26/100; //cputotal=(100-(idlee*100/16))*26/100;
if(cputotal > 0) if (cputotal > 0) {
{
cputotal = (cputotal - (fields[3] + fields[4])) * 1.55; cputotal = (cputotal - (fields[3] + fields[4])) * 1.55;
if ( cputotal > 26 ) cputotal = 26; if (cputotal > 26)
cputotal = 26;
copyXPMArea(3, 84, cputotal, 9, 5, 5); copyXPMArea(3, 84, cputotal, 9, 5, 5);
copyXPMArea(15,105,(27-cputotal),9,(5+cputotal),5); copyXPMArea(15, 105, (27 - cputotal), 9, (5 + cputotal),
5);
copyXPMArea(16, 46, 2, 14, 32, 2); copyXPMArea(16, 46, 2, 14, 32, 2);
} }
// Page In/Out // Page In/Out
if (pageins > last_pageins) if (pageins > last_pageins) {
{
DrawLite(B_RED, 5, 48); DrawLite(B_RED, 5, 48);
} else { } else {
DrawLite(B_OFF, 5, 48); DrawLite(B_OFF, 5, 48);
} }
if (pageouts > last_pageouts) if (pageouts > last_pageouts) {
{
DrawLite(B_RED, 10, 48); DrawLite(B_RED, 10, 48);
} else { } else {
DrawLite(B_OFF, 10, 48); DrawLite(B_OFF, 10, 48);
@ -438,15 +438,13 @@ void DrawCPU(void)
last_pageouts = pageouts; last_pageouts = pageouts;
// Swap In/Out // Swap In/Out
if (swapins > last_swapins) if (swapins > last_swapins) {
{
DrawLite(B_RED, 5, 53); DrawLite(B_RED, 5, 53);
} else { } else {
DrawLite(B_OFF, 5, 53); DrawLite(B_OFF, 5, 53);
} }
if (swapouts > last_swapouts) if (swapouts > last_swapouts) {
{
DrawLite(B_RED, 10, 53); DrawLite(B_RED, 10, 53);
} else { } else {
DrawLite(B_OFF, 10, 53); DrawLite(B_OFF, 10, 53);
@ -468,17 +466,14 @@ void DrawLoad(void)
float ftmp; float ftmp;
#ifdef __solaris__ #ifdef __solaris__
if (getLoad(&ftmp) != -1) if (getLoad(&ftmp) != -1) {
{
#else #else
FILE *fp; FILE *fp;
if( (fp = fopen("/proc/loadavg", "r")) != NULL) if ((fp = fopen("/proc/loadavg", "r")) != NULL) {
{
fscanf(fp, "%f", &ftmp); fscanf(fp, "%f", &ftmp);
fclose(fp); fclose(fp);
#endif #endif
if(oldv != ftmp) if (oldv != ftmp) {
{
oldv = ftmp; oldv = ftmp;
tempa = (ftmp + 0.005) * 100; tempa = (ftmp + 0.005) * 100;
tempy = tempa % 10; tempy = tempa % 10;
@ -488,8 +483,7 @@ void DrawLoad(void)
copyXPMArea(3 + (tempy * 6), 66, 6, 9, 44, 5); copyXPMArea(3 + (tempy * 6), 66, 6, 9, 44, 5);
copyXPMArea(65, 66, 3, 9, 41, 5); copyXPMArea(65, 66, 3, 9, 41, 5);
tempy = tempa / 100; tempy = tempa / 100;
if ( tempy > 9 ) if (tempy > 9) {
{
tempy = (tempy - 10); tempy = (tempy - 10);
copyXPMArea(3 + (tempy * 6), 95, 6, 9, 34, 5); copyXPMArea(3 + (tempy * 6), 95, 6, 9, 34, 5);
} else { } else {
@ -504,11 +498,8 @@ void DrawLoad(void)
#ifdef __solaris__ #ifdef __solaris__
/* Mem/Swap Meter */ /* Mem/Swap Meter */
float DrawMemSwap float DrawMemSwap(void
( ) {
void
)
{
unsigned long memMax, memFree, swapMax, swapFree; unsigned long memMax, memFree, swapMax, swapFree;
unsigned long MEMmem, MEMswap; unsigned long MEMmem, MEMswap;
float memUsed, swapUsed; float memUsed, swapUsed;
@ -523,8 +514,7 @@ float DrawMemSwap
/* MEM Meter */ /* MEM Meter */
if (memMax == 0) if (memMax == 0)
MEMmem = 0; MEMmem = 0;
else else {
{
if (((float)memMax / 1048576) >= 1) if (((float)memMax / 1048576) >= 1)
MEMmem = ((memUsed * 31) / (float)memMax); MEMmem = ((memUsed * 31) / (float)memMax);
else else
@ -544,13 +534,10 @@ float DrawMemSwap
tempy = ((tempa / 10) % 10); tempy = ((tempa / 10) % 10);
copyXPMArea((3 + (tempy * 6)), 66, 6, 9, 44, 19); copyXPMArea((3 + (tempy * 6)), 66, 6, 9, 44, 19);
tempy = ((tempa / 100) % 10); tempy = ((tempa / 100) % 10);
if (tempy != 0) if (tempy != 0) {
{
copyXPMArea((3 + (tempy * 6)), 66, 6, 9, 38, 19); copyXPMArea((3 + (tempy * 6)), 66, 6, 9, 38, 19);
copyXPMArea(16, 46, 2, 14, 35, 16); copyXPMArea(16, 46, 2, 14, 35, 16);
} } else {
else
{
copyXPMArea(16, 46, 2, 14, 41, 16); copyXPMArea(16, 46, 2, 14, 41, 16);
} }
@ -560,8 +547,7 @@ float DrawMemSwap
/* SWAP Meter */ /* SWAP Meter */
if (swapMax == 0) if (swapMax == 0)
MEMswap = 0; MEMswap = 0;
else else {
{
if (((float)swapMax / 1048576) >= 1) if (((float)swapMax / 1048576) >= 1)
MEMswap = ((swapUsed * 31) / (float)swapMax); MEMswap = ((swapUsed * 31) / (float)swapMax);
else else
@ -577,13 +563,10 @@ float DrawMemSwap
tempy = ((tempa / 10) % 10); tempy = ((tempa / 10) % 10);
copyXPMArea((3 + (tempy * 6)), 66, 6, 9, 44, 33); copyXPMArea((3 + (tempy * 6)), 66, 6, 9, 44, 33);
tempy = ((tempa / 100) % 10); tempy = ((tempa / 100) % 10);
if (tempy != 0) if (tempy != 0) {
{
copyXPMArea((3 + (tempy * 6)), 66, 6, 9, 38, 33); copyXPMArea((3 + (tempy * 6)), 66, 6, 9, 38, 33);
copyXPMArea(16, 46, 2, 14, 42, 16); copyXPMArea(16, 46, 2, 14, 42, 16);
} } else {
else
{
copyXPMArea(16, 46, 2, 14, 41, 30); copyXPMArea(16, 46, 2, 14, 41, 30);
} }
@ -596,88 +579,91 @@ float DrawMemSwap
float DrawMemSwap(float total, int allmem) float DrawMemSwap(float total, int allmem)
{ {
FILE *fp; FILE *fp;
if( (fp = fopen("/proc/meminfo", "r")) != NULL) if ((fp = fopen("/proc/meminfo", "r")) != NULL) {
{ static float stotal = 0.0, sshared = 0.0, sbuffers =
static float stotal=0.0, sshared=0.0, sbuffers=0.0, scached=0.0; 0.0, scached = 0.0;
char junk[128]; char junk[128];
float used, freeM, shared, buffers, cached, swaptotal, float used, freeM, shared, buffers, cached, swaptotal,
swapused, swapfreeM; swapused, swapfreeM;
unsigned long MEMshar, MEMbuff, MEMswap; unsigned long MEMshar, MEMbuff, MEMswap;
int tempy, tempa; int tempy, tempa;
if( has_kern26 > 0 ) if (has_kern26 > 0) {
{
float scratch; float scratch;
while(!feof(fp)) while (!feof(fp)) {
{
fgets(junk, 120, fp); fgets(junk, 120, fp);
if (strstr(junk, "MemTotal")) if (strstr(junk, "MemTotal")) {
{ sscanf(junk, "MemTotal: %f kB",
sscanf(junk, "MemTotal: %f kB", &scratch); &scratch);
total = scratch * 1024; total = scratch * 1024;
} }
if (strstr(junk, "MemFree")) if (strstr(junk, "MemFree")) {
{ sscanf(junk, "MemFree: %f kB",
sscanf(junk, "MemFree: %f kB", &scratch); &scratch);
freeM = scratch * 1024; freeM = scratch * 1024;
used = total - freeM; used = total - freeM;
} }
if (strstr(junk, "Buffers")) if (strstr(junk, "Buffers")) {
{ sscanf(junk, "Buffers: %f kB",
sscanf(junk, "Buffers: %f kB", &scratch); &scratch);
buffers = scratch * 1024; buffers = scratch * 1024;
} }
if (strstr(junk, "Cached")) if (strstr(junk, "Cached")) {
{
sscanf(junk, "Cached: %f kB", &scratch); sscanf(junk, "Cached: %f kB", &scratch);
cached = scratch * 1024; cached = scratch * 1024;
} }
if (strstr(junk, "SwapTotal")) if (strstr(junk, "SwapTotal")) {
{ sscanf(junk, "SwapTotal: %f kB",
sscanf(junk, "SwapTotal: %f kB", &scratch); &scratch);
swaptotal = scratch * 1024; swaptotal = scratch * 1024;
} }
if (strstr(junk, "SwapFree")) if (strstr(junk, "SwapFree")) {
{ sscanf(junk, "SwapFree: %f kB",
sscanf(junk, "SwapFree: %f kB", &scratch); &scratch);
swapfreeM = scratch * 1024; swapfreeM = scratch * 1024;
swapused = swaptotal - swapfreeM; swapused = swaptotal - swapfreeM;
} }
} }
} else { } else {
fgets(junk, 80, fp); fgets(junk, 80, fp);
fscanf(fp, "Mem: %f %f %f %f %f %f\nSwap: %f %f %f", &total, fscanf(fp, "Mem: %f %f %f %f %f %f\nSwap: %f %f %f",
&used, &freeM, &shared, &buffers, &cached, &total, &used, &freeM, &shared, &buffers,
&swaptotal, &swapused, &swapfreeM); &cached, &swaptotal, &swapused, &swapfreeM);
} }
fclose(fp); fclose(fp);
/* All mem areas */ /* All mem areas */
if(stotal != total || sshared != shared || sbuffers != buffers || scached != cached) if (stotal != total || sshared != shared || sbuffers != buffers
{ || scached != cached) {
stotal = total; sshared = shared; sbuffers = buffers; scached = cached; stotal = total;
if ( (total/101048576) >= 1) sshared = shared;
{ sbuffers = buffers;
MEMshar=((used-buffers-cached)/total)*27; scached = cached;
if ((total / 101048576) >= 1) {
MEMshar =
((used - buffers - cached) / total) * 27;
MEMbuff = (buffers / total) * 27; MEMbuff = (buffers / total) * 27;
} else { } else {
MEMshar=((used-buffers-cached)/total)*33; MEMshar =
((used - buffers - cached) / total) * 33;
MEMbuff = (buffers / total) * 33; MEMbuff = (buffers / total) * 33;
} }
// refresh // refresh
copyXPMArea(4, 115, 55, 11, 4, 18); copyXPMArea(4, 115, 55, 11, 4, 18);
// Bar // Bar
if ( (total/101048576) >= 1) if ((total / 101048576) >= 1) {
{ copyXPMArea(3, 75, ((used / total) * 28), 9, 5,
copyXPMArea(3,75,((used/total)*28),9,5,19); 19);
} else { } else {
copyXPMArea(3,75,((used/total)*34),9,5,19); copyXPMArea(3, 75, ((used / total) * 34), 9, 5,
19);
} }
// Separators // Separators
copyXPMArea(15, 105, 1, 9, 5 + MEMshar, 19); copyXPMArea(15, 105, 1, 9, 5 + MEMshar, 19);
copyXPMArea(15, 105, 1, 9, 7 + MEMshar + MEMbuff, 19); copyXPMArea(15, 105, 1, 9, 7 + MEMshar + MEMbuff, 19);
copyXPMArea(15,105,(36-(used/total)*34),9,(5+(used/total)*34),19); copyXPMArea(15, 105, (36 - (used / total) * 34), 9,
(5 + (used / total) * 34), 19);
// Numbers // Numbers
tempa = used / 1048576; tempa = used / 1048576;
tempy = tempa % 10; tempy = tempa % 10;
@ -693,11 +679,13 @@ float DrawMemSwap(float total, int allmem)
} }
} }
/* SWAP Meter */ /* SWAP Meter */
if ( swaptotal == 0 ) MEMswap = 0; if (swaptotal == 0)
MEMswap = 0;
else { else {
if ((total / 101048576) >= 1) if ((total / 101048576) >= 1)
MEMswap = (swapused * 31) / swaptotal; MEMswap = (swapused * 31) / swaptotal;
else MEMswap=(swapused*36)/swaptotal; else
MEMswap = (swapused * 36) / swaptotal;
} }
// refresh // refresh
copyXPMArea(4, 115, 55, 11, 4, 32); copyXPMArea(4, 115, 55, 11, 4, 32);
@ -737,35 +725,34 @@ void DrawXmem(int Xpid, float total)
sprintf(XFileName, "/proc/%d/status", Xpid); sprintf(XFileName, "/proc/%d/status", Xpid);
if ((fp = fopen(XFileName, "r")) != NULL) if ((fp = fopen(XFileName, "r")) != NULL) {
{ while (fgets(buf, 127, fp)) {
while( fgets(buf, 127, fp) )
{
if (strstr(buf, "VmSize")) if (strstr(buf, "VmSize"))
sscanf(buf, "VmSize: %ld", &Xsize); sscanf(buf, "VmSize: %ld", &Xsize);
} }
if(old_Xsize!=Xsize) if (old_Xsize != Xsize) {
{
int tempy, tempa, tempb; int tempy, tempa, tempb;
old_Xsize = Xsize; old_Xsize = Xsize;
ratio = Xsize / (total / 1024); ratio = Xsize / (total / 1024);
if ( Xsize > (total/1024) ) Xsize=total/1024; if (Xsize > (total / 1024))
Xsize = total / 1024;
Xsize = Xsize / 1024; Xsize = Xsize / 1024;
tempy = Xsize % 10; tempy = Xsize % 10;
copyXPMArea(3 + (tempy * 6), 66, 6, 9, 50, 48); copyXPMArea(3 + (tempy * 6), 66, 6, 9, 50, 48);
tempa = Xsize / 10; tempa = Xsize / 10;
tempy = tempa % 10; tempy = tempa % 10;
tempb = Xsize / 100; tempb = Xsize / 100;
if ( Xsize > 100 ) if (Xsize > 100) {
{
copyXPMArea(3, 84, ((ratio) * 17), 11, 18, 47); copyXPMArea(3, 84, ((ratio) * 17), 11, 18, 47);
copyXPMArea(15,105,(23-((ratio)*17)),11,(18+(ratio*22)),47); copyXPMArea(15, 105, (23 - ((ratio) * 17)), 11,
(18 + (ratio * 22)), 47);
copyXPMArea(3 + (tempy * 6), 66, 6, 9, 44, 48); copyXPMArea(3 + (tempy * 6), 66, 6, 9, 44, 48);
copyXPMArea(3 + (tempb * 6), 66, 6, 9, 38, 48); copyXPMArea(3 + (tempb * 6), 66, 6, 9, 38, 48);
copyXPMArea(16, 46, 2, 14, 36, 46); copyXPMArea(16, 46, 2, 14, 36, 46);
} else { } else {
copyXPMArea(3, 84, ((ratio) * 22), 11, 18, 47); copyXPMArea(3, 84, ((ratio) * 22), 11, 18, 47);
copyXPMArea(15,105,(23-((ratio)*22)),11,(18+(ratio*22)),47); copyXPMArea(15, 105, (23 - ((ratio) * 22)), 11,
(18 + (ratio * 22)), 47);
copyXPMArea(3 + (tempy * 6), 66, 6, 9, 44, 48); copyXPMArea(3 + (tempy * 6), 66, 6, 9, 44, 48);
copyXPMArea(16, 46, 2, 14, 41, 46); copyXPMArea(16, 46, 2, 14, 41, 46);
} }
@ -801,12 +788,10 @@ void DrawUptime(void)
days = (upt / 86400); days = (upt / 86400);
if (old_hours != hours) if (old_hours != hours)
old_hours = hours; old_hours = hours;
if(old_mins!=mins) if (old_mins != mins) {
{
int tempy; int tempy;
old_mins = mins; old_mins = mins;
if ( days > 9 ) if (days > 9) {
{
copyXPMArea(20, 105, 36, 9, 18, 48); copyXPMArea(20, 105, 36, 9, 18, 48);
tempy = hours % 10; tempy = hours % 10;
copyXPMArea(3 + (tempy * 6), 66, 6, 9, 50, 48); copyXPMArea(3 + (tempy * 6), 66, 6, 9, 50, 48);
@ -842,8 +827,7 @@ void DrawUptime(void)
/* Drawing LED's */ /* Drawing LED's */
void DrawLite(int state, int dx, int dy) void DrawLite(int state, int dx, int dy)
{ {
switch(state) switch (state) {
{
case B_RED: case B_RED:
copyXPMArea(BREDX, BREDY, LITEW, LITEH, dx, dy); copyXPMArea(BREDX, BREDY, LITEW, LITEH, dx, dy);
break; break;