[Pkg-wmaker-commits] [wmsysmon] 08/13: *: minor formatting cleanups
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Tue Nov 22 19:52:02 UTC 2016
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch upstream
in repository wmsysmon.
commit a4da635b5106284248614b90e7dba0241641124e
Author: Vito Caputo <vcaputo at gnugeneration.com>
Date: Fri Aug 7 22:09:59 2015 -0700
*: minor formatting cleanups
---
src/wmgeneral.c | 79 ++++++++++++++++++++++-----------------------------------
src/wmsysmon.c | 39 ++++++----------------------
2 files changed, 38 insertions(+), 80 deletions(-)
diff --git a/src/wmgeneral.c b/src/wmgeneral.c
index 29c2cfa..dd3631d 100644
--- a/src/wmgeneral.c
+++ b/src/wmgeneral.c
@@ -24,14 +24,12 @@ GC NormalGC;
XpmIcon wmgen;
Pixmap pixmask;
-
static void GetXPM(XpmIcon *, char **);
static Pixel GetColor(char *);
void RedrawWindow(void);
static void GetXPM(XpmIcon *wmgen, char *pixmap_bytes[]) {
-
XWindowAttributes attributes;
int err;
@@ -46,7 +44,7 @@ static void GetXPM(XpmIcon *wmgen, char *pixmap_bytes[]) {
wmgen->dirty_y = wmgen->attributes.height;
wmgen->dirty_w = 0;
wmgen->dirty_h = 0;
-
+
if (err != XpmSuccess) {
fprintf(stderr, "Not enough free colorcells.\n");
exit(1);
@@ -55,8 +53,7 @@ static void GetXPM(XpmIcon *wmgen, char *pixmap_bytes[]) {
static Pixel GetColor(char *name) {
-
- XColor color;
+ XColor color;
XWindowAttributes attributes;
XGetWindowAttributes(display, Root, &attributes);
@@ -73,7 +70,6 @@ static Pixel GetColor(char *name) {
void RedrawWindow(void) {
-
if(wmgen.dirty_w && wmgen.dirty_h)
XCopyArea(display,
wmgen.pixmap,
@@ -111,12 +107,10 @@ void RedrawWindow(void) {
wmgen.dirty_y = wmgen.attributes.height;
wmgen.dirty_w = 0;
wmgen.dirty_h = 0;
-
}
void RedrawWindowXY(int x, int y) {
-
XCopyArea(display, wmgen.pixmap, iconwin, NormalGC,
x, y, wmgen.attributes.width, wmgen.attributes.height, 0,0);
XCopyArea(display, wmgen.pixmap, win, NormalGC,
@@ -162,44 +156,40 @@ void DirtyWindow(int x, int y, unsigned int w, unsigned int h) {
wmgen.dirty_w,
wmgen.dirty_h);
#endif
-};
+}
void createXBMfromXPM(char *xbm, char **xpm, int sx, int sy) {
-
int i,j,k;
int width, height, numcol, depth;
- int zero=0;
+ int zero=0;
unsigned char bwrite;
- int bcount;
- int curpixel;
+ int bcount;
+ int curpixel;
-
sscanf(*xpm, "%d %d %d %d", &width, &height, &numcol, &depth);
-
- for (k=0; k!=depth; k++)
- {
- zero <<=8;
- zero |= xpm[1][k];
- }
+ for (k=0; k!=depth; k++) {
+ zero <<=8;
+ zero |= xpm[1][k];
+ }
for (i=numcol+1; i < numcol+sy+1; i++) {
bcount = 0;
bwrite = 0;
for (j=0; j<sx*depth; j+=depth) {
- bwrite >>= 1;
-
- curpixel=0;
- for (k=0; k!=depth; k++)
- {
- curpixel <<=8;
- curpixel |= xpm[i][j+k];
- }
+ bwrite >>= 1;
+ curpixel=0;
+
+ for (k=0; k!=depth; k++) {
+ curpixel <<=8;
+ curpixel |= xpm[i][j+k];
+ }
- if ( curpixel != zero ) {
+ if (curpixel != zero) {
bwrite += 128;
}
+
bcount++;
if (bcount == 8) {
*xbm = bwrite;
@@ -209,12 +199,10 @@ void createXBMfromXPM(char *xbm, char **xpm, int sx, int sy) {
}
}
}
-
}
void copyXPMArea(int sx, int sy, unsigned int w, unsigned int h, int dx, int dy) {
-
XCopyArea(display,
wmgen.pixmap,
wmgen.pixmap,
@@ -231,7 +219,6 @@ void copyXPMArea(int sx, int sy, unsigned int w, unsigned int h, int dx, int dy)
void copyXBMArea(int sx, int sy, unsigned int w, unsigned int h, int dx, int dy) {
-
XCopyArea(display,
wmgen.mask,
wmgen.pixmap,
@@ -244,32 +231,29 @@ void copyXBMArea(int sx, int sy, unsigned int w, unsigned int h, int dx, int dy)
dy);
DirtyWindow(dx, dy, w, h);
-
}
void setMaskXY(int x, int y) {
-
XShapeCombineMask(display, win, ShapeBounding, x, y, pixmask, ShapeSet);
XShapeCombineMask(display, iconwin, ShapeBounding, x, y, pixmask, ShapeSet);
}
int openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bits, int pixmask_width, int pixmask_height) {
-
unsigned int borderwidth = 1;
- XClassHint classHint;
- char *display_name = NULL;
- char *wname = argv[0];
+ XClassHint classHint;
+ char *display_name = NULL;
+ char *wname = argv[0];
XTextProperty name;
- XGCValues gcv;
+ XGCValues gcv;
unsigned long gcm;
- char *geometry = NULL;
+ char *geometry = NULL;
- int dummy=0;
- int i, wx, wy, fd;
+ int dummy=0;
+ int i, wx, wy, fd;
for (i=1; argv[i]; i++) {
if (!strcmp(argv[i], "-display")) {
@@ -284,7 +268,7 @@ int openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bits
if (!(display = XOpenDisplay(display_name))) {
fprintf(stderr, "%s: can't open display %s\n",
- wname, XDisplayName(display_name));
+ wname, XDisplayName(display_name));
return -1;
}
fd = ConnectionNumber(display);
@@ -305,15 +289,15 @@ int openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bits
fore_pix = GetColor("black");
XWMGeometry(display, screen, Geometry, NULL, borderwidth, &mysizehints,
- &mysizehints.x, &mysizehints.y,&mysizehints.width,&mysizehints.height, &dummy);
+ &mysizehints.x, &mysizehints.y,&mysizehints.width,&mysizehints.height, &dummy);
mysizehints.width = 64;
mysizehints.height = 64;
DirtyWindow(0, 0, 64, 64);
-
+
win = XCreateSimpleWindow(display, Root, mysizehints.x, mysizehints.y,
mysizehints.width, mysizehints.height, borderwidth, fore_pix, back_pix);
-
+
iconwin = XCreateSimpleWindow(display, win, mysizehints.x, mysizehints.y,
mysizehints.width, mysizehints.height, borderwidth, fore_pix, back_pix);
@@ -334,7 +318,6 @@ int openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bits
XSetWMName(display, win, &name);
/* Create GC for drawing */
-
gcm = GCForeground | GCBackground | GCGraphicsExposures;
gcv.foreground = fore_pix;
gcv.background = back_pix;
@@ -342,14 +325,12 @@ int openXwindow(int argc, char *argv[], char *pixmap_bytes[], char *pixmask_bits
NormalGC = XCreateGC(display, Root, gcm, &gcv);
/* ONLYSHAPE ON */
-
pixmask = XCreateBitmapFromData(display, win, pixmask_bits, pixmask_width, pixmask_height);
XShapeCombineMask(display, win, ShapeBounding, 0, 0, pixmask, ShapeSet);
XShapeCombineMask(display, iconwin, ShapeBounding, 0, 0, pixmask, ShapeSet);
/* ONLYSHAPE OFF */
-
mywmhints.initial_state = WithdrawnState;
mywmhints.icon_window = iconwin;
mywmhints.icon_x = mysizehints.x;
diff --git a/src/wmsysmon.c b/src/wmsysmon.c
index d413224..e49f75f 100644
--- a/src/wmsysmon.c
+++ b/src/wmsysmon.c
@@ -173,7 +173,7 @@ int main(int argc, char *argv[]) {
}
break;
case 'g':
- if (strcmp(arg+1, "geometry")) {
+ if (strcmp(arg + 1, "geometry")) {
usage();
exit(1);
}
@@ -202,7 +202,6 @@ int main(int argc, char *argv[]) {
wmsysmon_routine(argc, argv);
-
return 0;
}
@@ -215,7 +214,6 @@ void wmsysmon_routine(int argc, char **argv)
int xfd;
struct pollfd pfd;
-
createXBMfromXPM(wmsysmon_mask_bits, wmsysmon_master_xpm, wmsysmon_mask_width, wmsysmon_mask_height);
xfd = openXwindow(argc, argv, wmsysmon_master_xpm, wmsysmon_mask_bits, wmsysmon_mask_width, wmsysmon_mask_height);
@@ -224,13 +222,13 @@ void wmsysmon_routine(int argc, char **argv)
pfd.fd = xfd;
pfd.events = (POLLIN);
- /* init ints */
+ /* init ints */
bzero(&_last_ints, sizeof(_last_ints));
bzero(&_ints, sizeof(_ints));
bzero(&int_peaks, sizeof(int_peaks));
- /* init uptime */
+ /* init uptime */
fp = fopen("/proc/uptime", "r");
if (fp) {
if (fscanf(fp, "%ld", &start_time) < 1)
@@ -261,7 +259,6 @@ void wmsysmon_routine(int argc, char **argv)
}
while(1) {
-
curtime = time(0);
DrawUptime();
@@ -343,7 +340,6 @@ void DrawBar(int sx, int sy, int w, int h, float percent, int dx, int dy)
void DrawLite(int state, int dx, int dy)
{
-
switch(state) {
case B_RED:
copyXPMArea(BREDX, BREDY, LITEW, LITEH, dx, dy);
@@ -356,7 +352,6 @@ void DrawLite(int state, int dx, int dy)
copyXPMArea(BOFFX, BOFFY, LITEW, LITEH, dx, dy);
break;
}
-
}
@@ -365,9 +360,8 @@ void DrawUptime(void)
static int first = 1;
static int old_days = 0, old_hours = 0, old_minutes = 0;
static long uptime;
- static int i;
+ static int i;
-
uptime = curtime - start_uptime + start_time;
/* blit minutes */
@@ -397,7 +391,6 @@ void DrawUptime(void)
BlitString(buf, 29, 37);
#endif
}
-
/* blit days */
uptime /= 24;
@@ -487,7 +480,7 @@ void DrawStuff( void )
ents++;
} else if(i == intr_l) {
sscanf( buf,
- #ifdef HI_INTS
+#ifdef HI_INTS
"%*s %*d %ld %ld %ld %ld %ld"
"%ld %ld %ld %ld %ld %ld %ld"
"%ld %ld %ld %ld %ld %ld %ld"
@@ -500,7 +493,7 @@ void DrawStuff( void )
&ints[15], &ints[16], &ints[17],
&ints[18], &ints[19], &ints[20],
&ints[21], &ints[22], &ints[23]);
- #else
+#else
"%*s %*d %ld %ld %ld %ld %ld"
"%ld %ld %ld %ld %ld %ld %ld"
"%ld %ld %ld %ld",
@@ -510,7 +503,7 @@ void DrawStuff( void )
&ints[9], &ints[10], &ints[11],
&ints[12], &ints[13], &ints[14],
&ints[15]);
- #endif
+#endif
ents++;
}
}
@@ -531,7 +524,6 @@ void DrawStuff( void )
if(iodiff > io_max_diff) io_max_diff = iodiff;
if (iopercent > 100) iopercent = 100;
-
if(iopercent != io_last || first) {
io_last = iopercent;
@@ -542,7 +534,6 @@ void DrawStuff( void )
#endif
}
-
if(int_mode == INT_LITES) {
/* top 8 ints */
for (i = 0; i < 8; i++) {
@@ -650,7 +641,6 @@ void DrawStuff( void )
ints = tints;
/* page in / out */
-
if (pageins > last_pageins && !pagein_lite) {
pagein_lite = 1;
#ifdef HI_INTS
@@ -687,7 +677,6 @@ void DrawStuff( void )
last_pageouts = pageouts;
/* swap in/out */
-
if(swapins > last_swapins && !swapin_lite) {
swapin_lite = 1;
#ifdef HI_INTS
@@ -724,7 +713,6 @@ void DrawStuff( void )
last_swapouts = swapouts;
first = 0;
-
}
@@ -743,7 +731,6 @@ void DrawMem(void)
static int swappercent = 0;
static int i, ents;
-
counter--;
if(counter >= 0) return; /* polling /proc/meminfo is EXPENSIVE */
@@ -798,7 +785,6 @@ void DrawMem(void)
}
first = 0;
-
}
@@ -809,7 +795,6 @@ void BlitString(char *name, int x, int y)
k = x;
for (i=0; name[i]; i++) {
-
c = toupper(name[i]);
if (c >= 'A' && c <= 'Z') {
c -= 'A';
@@ -821,21 +806,13 @@ void BlitString(char *name, int x, int y)
k += 6;
}
}
-
}
void BlitNum(int num, int x, int y)
{
- static int newx;
-
-
- newx = x;
-
sprintf(buf, "%03i", num);
-
- BlitString(buf, newx, y);
-
+ BlitString(buf, x, y);
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmsysmon.git
More information about the Pkg-wmaker-commits
mailing list