Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-11-17 02:25:09 +00:00
Code Issues Releases Activity

Fix some minor graph related bugs.

Browse Source
This commit is contained in:
Brenden Matthews 2009-05-24 23:16:36 -06:00
parent d03df4a367
commit 35a72f5a95
2 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/conky.c
View File

@ -6116,23 +6116,43 @@ static void draw_line(char *s)
if (specials[special_index].last_colour != 0 if (specials[special_index].last_colour != 0
|| specials[special_index].first_colour != 0) { || specials[special_index].first_colour != 0) {
if (specials[special_index].tempgrad) { if (specials[special_index].tempgrad) {
#ifdef DEBUG_lol
assert(
(int)((float)(w - 2) - specials[special_index].graph[j] *
(w - 2) / (float)specials[special_index].graph_scale)
< w - 1
);
assert(
(int)((float)(w - 2) - specials[special_index].graph[j] *
(w - 2) / (float)specials[special_index].graph_scale)
> -1
);
if (specials[special_index].graph[j] == specials[special_index].graph_scale) {
assert(
(int)((float)(w - 2) - specials[special_index].graph[j] *
(w - 2) / (float)specials[special_index].graph_scale)
== 0
);
}
#endif /* DEBUG_lol */
XSetForeground(display, window.gc, tmpcolour[ XSetForeground(display, window.gc, tmpcolour[
(int)((float)(w - 1) - specials[special_index].graph[j] * (int)((float)(w - 2) - specials[special_index].graph[j] *
(w - 2) / (float)specials[special_index].graph_scale) - 1]); (w - 2) / (float)specials[special_index].graph_scale)
]);
} else { } else {
XSetForeground(display, window.gc, tmpcolour[colour_idx++]); XSetForeground(display, window.gc, tmpcolour[colour_idx++]);
} }
} }
if ((w - i) / ((float) (w - 2) /
(specials[special_index].graph_width)) > j
&& j < MAX_GRAPH_DEPTH - 3) {
j++;
}
/* this is mugfugly, but it works */ /* this is mugfugly, but it works */
XDrawLine(display, window.drawable, window.gc, XDrawLine(display, window.drawable, window.gc,
cur_x + i + 1, by + h, cur_x + i + 1, cur_x + i + 1, by + h, cur_x + i + 1,
by + h - specials[special_index].graph[j] * by + h - specials[special_index].graph[j] *
(h - 1) / specials[special_index].graph_scale); (h - 1) / specials[special_index].graph_scale);
if ((w - i) / ((float) (w - 2) /
(specials[special_index].graph_width)) > j
&& j < MAX_GRAPH_DEPTH - 3) {
j++;
}
} }
if (tmpcolour) free(tmpcolour); if (tmpcolour) free(tmpcolour);
if (h > cur_y_add if (h > cur_y_add

8
src/specials.c
View File

@ -288,11 +288,15 @@ static void graph_append(struct special_t *graph, double f, char showaslog)
/* shift all the data by 1 */ /* shift all the data by 1 */
for (i = graph->graph_width - 1; i > 0; i--) { for (i = graph->graph_width - 1; i > 0; i--) {
graph->graph[i] = graph->graph[i - 1]; graph->graph[i] = graph->graph[i - 1];
if (graph->scaled && graph->graph[i] > graph->graph_scale) { if (graph->scaled && graph->graph[i - 1] > graph->graph_scale) {
/* check if we need to update the scale */ /* check if we need to update the scale */
graph->graph_scale = graph->graph[i]; graph->graph_scale = graph->graph[i - 1];
} }
} }
if (graph->scaled && graph->graph[graph->graph_width] > graph->graph_scale) {
/* check if we need to update the scale */
graph->graph_scale = graph->graph[graph->graph_width];
}
} }
void new_graph(char *buf, int w, int h, unsigned int first_colour, void new_graph(char *buf, int w, int h, unsigned int first_colour,