awesomewm-mirrors
/
awesome
mirror of https://github.com/awesomeWM/awesome.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

max values must be > 0 on the graph-widget 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
marco candrian 2008-01-22 14:56:03 +01:00 committed by Julien Danjou
parent bb9b688ead
commit ec7ab36814
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
widgets/graph.c
View File

@ -54,6 +54,9 @@ graph_draw(Widget *widget, DrawCtx *ctx, int offset,
Data *d = widget->data; Data *d = widget->data;
Area rectangle; Area rectangle;
if(d->width < 1 || !(d->max > 0))
return 0;
if(!widget->user_supplied_x) if(!widget->user_supplied_x)
widget->area.x = widget_calculate_offset(widget->statusbar->width, widget->area.x = widget_calculate_offset(widget->statusbar->width,
d->width, d->width,
@ -100,7 +103,7 @@ graph_tell(Widget *widget, char *command)
int i; int i;
float value; float value;
if(!command || d->width < 1) if(!command || d->width < 1 || !(d->max > 0))
return; return;
if(++d->lines_index >= d->lines_size) /* cycle inside the array */ if(++d->lines_index >= d->lines_size) /* cycle inside the array */
@ -172,14 +175,19 @@ graph_new(Statusbar *statusbar, cfg_t *config)
warn("graph widget needs: (width - padding_left) >= 3\n"); warn("graph widget needs: (width - padding_left) >= 3\n");
return w; return w;
} }
/* prevent: division by zero */
d->current_max = d->max = cfg_getfloat(config, "max");
if(!(d->max > 0))
{
warn("graph widget needs a 'max' value greater than zero\n");
return w;
}
d->lines = p_new(int, d->lines_size); d->lines = p_new(int, d->lines_size);
if (cfg_getbool(config, "scale")) if (cfg_getbool(config, "scale"))
d->line_values = p_new(float, d->lines_size); d->line_values = p_new(float, d->lines_size);
/* prevent: division by zero; with a MIN option one day, check for div/0's */
d->current_max = d->max = MAX(cfg_getfloat(config, "max"), 0.0001);
if((color = cfg_getstr(config, "fg"))) if((color = cfg_getstr(config, "fg")))
d->fg = initxcolor(globalconf.display, phys_screen, color); d->fg = initxcolor(globalconf.display, phys_screen, color);
else else

1
widgets/progressbar.c
View File

@ -180,7 +180,6 @@ progressbar_new(Statusbar *statusbar, cfg_t *config)
} }
d->height = cfg_getfloat(config, "height"); d->height = cfg_getfloat(config, "height");
d->gap = cfg_getint(config, "gap"); d->gap = cfg_getint(config, "gap");
d->padding_left = cfg_getint(config, "padding_left"); d->padding_left = cfg_getint(config, "padding_left");