godzil/wmfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove border arg of ^g[] sequence

Browse Source
This commit is contained in:
Martin Duquesnoy 2012-02-04 05:41:44 +01:00
parent eb88702788
commit 537d8a6a27
1 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/status.c
View File

@ -76,21 +76,14 @@ status_free_ctx(struct status_ctx *ctx)
static void static void
status_graph_draw(struct status_ctx *ctx, struct status_seq *sq, struct status_gcache *gc) status_graph_draw(struct status_ctx *ctx, struct status_seq *sq, struct status_gcache *gc)
{ {
struct geo g =
{
sq->geo.x + sq->data[0],
sq->geo.y + sq->data[0],
sq->geo.w - sq->data[0] - sq->data[0],
sq->geo.h - sq->data[0] - sq->data[0]
};
int i, j, y; int i, j, y;
int ys = g.y + g.h; int ys = sq->geo.y + sq->geo.h;
XSetForeground(W->dpy, W->gc, sq->color2); XSetForeground(W->dpy, W->gc, sq->color2);
for(i = g.x + g.w, j = gc->ndata; j >= 0 && i >= g.x; --j, --i) for(i = sq->geo.x + sq->geo.w, j = gc->ndata; j >= 0 && i >= sq->geo.x; --j, --i)
{ {
y = g.y + g.h - (g.h / ((float)sq->data[2] / (float)gc->datas[j])); y = ys - (sq->geo.h / ((float)sq->data[2] / (float)gc->datas[j]));
draw_line(ctx->barwin->dr, i, y, i, ys); draw_line(ctx->barwin->dr, i, y, i, ys);
} }
} }
@ -98,7 +91,7 @@ status_graph_draw(struct status_ctx *ctx, struct status_seq *sq, struct status_g
static void static void
status_graph_process(struct status_ctx *ctx, struct status_seq *sq, char *name) status_graph_process(struct status_ctx *ctx, struct status_seq *sq, char *name)
{ {
int i, j; int j;
struct status_gcache *gc; struct status_gcache *gc;
/* Graph already exist and have a cache */ /* Graph already exist and have a cache */
@ -106,7 +99,7 @@ status_graph_process(struct status_ctx *ctx, struct status_seq *sq, char *name)
if(!strcmp(name, gc->name)) if(!strcmp(name, gc->name))
{ {
/* shift buffer to remove unused old value */ /* shift buffer to remove unused old value */
if(gc->ndata > ((sq->geo.w - sq->data[0] - sq->data[0]) << 1)) if(gc->ndata > (sq->geo.w << 1))
for(gc->ndata /= 2, j = 0; for(gc->ndata /= 2, j = 0;
j < gc->ndata; j < gc->ndata;
gc->datas[j] = gc->datas[j + gc->ndata], ++j); gc->datas[j] = gc->datas[j + gc->ndata], ++j);
@ -238,24 +231,23 @@ status_parse(struct status_ctx *ctx)
break; break;
/* /*
* Graph sequence: \p[left/right;w;h;bord;val;valmax;bg;fg;name] OR x;y * Graph sequence: \p[left/right;w;h;val;valmax;bg;fg;name] OR x;y
*/ */
case 'g': case 'g':
i = parse_args(p + 2, ';', ']', 10, arg); i = parse_args(p + 2, ';', ']', 9, arg);
STATUS_CHECK_ARGS(i, 8, 9, dstr, end); STATUS_CHECK_ARGS(i, 7, 8, dstr, end);
sq = status_new_seq(type, i, 8, arg, &shift); sq = status_new_seq(type, i, 7, arg, &shift);
sq->geo.w = ATOI(arg[1 + shift]); sq->geo.w = ATOI(arg[1 + shift]);
sq->geo.h = ATOI(arg[2 + shift]); sq->geo.h = ATOI(arg[2 + shift]);
sq->data[0] = ATOI(arg[3 + shift]); /* Border */ sq->data[1] = ((tmp = ATOI(arg[3 + shift])) ? tmp : 1); /* Value */
sq->data[1] = ((tmp = ATOI(arg[4 + shift])) ? tmp : 1); /* Value */ sq->data[2] = ATOI(arg[4 + shift]); /* Value Max */
sq->data[2] = ATOI(arg[5 + shift]); /* Value Max */
sq->color = color_atoh(arg[6 + shift]); sq->color = color_atoh(arg[5 + shift]);
sq->color2 = color_atoh(arg[7 + shift]); sq->color2 = color_atoh(arg[6 + shift]);
sq->str = xstrdup(arg[8 + shift]); sq->str = xstrdup(arg[7 + shift]);
break; break;