X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fgraph.c;h=fe903314164be73c8a9208296b47fe21ef429dc8;hb=9a85d16663d7837698a3b00574a0652db1f849af;hp=b68c346edcb4c22236668f6ec94d706b3fc42e7a;hpb=0696716f861f7885023466fccbc4a27c0896051f;p=psensor.git diff --git a/src/graph.c b/src/graph.c index b68c346..fe90331 100644 --- a/src/graph.c +++ b/src/graph.c @@ -27,13 +27,14 @@ #include #include +#include #include #include /* horizontal padding */ -const int GRAPH_H_PADDING = 4; +static const int GRAPH_H_PADDING = 4; /* vertical padding */ -const int GRAPH_V_PADDING = 4; +static const int GRAPH_V_PADDING = 4; bool is_smooth_curves_enabled; @@ -52,35 +53,83 @@ struct graph_info { int height; /* Width of the drawing canvas */ int width; - - /* Background color of the current desktop theme */ - GdkRGBA theme_bg_color; - /* Foreground color of the current desktop theme */ - GdkRGBA theme_fg_color; }; +static GtkStyleContext *style; +/* Foreground color of the current desktop theme */ +static GdkRGBA theme_fg_color; +/* Background color of the current desktop theme */ +static GdkRGBA theme_bg_color; + +static void update_theme(GtkWidget *w) +{ + style = gtk_widget_get_style_context(w); + + gtk_style_context_get_background_color(style, + GTK_STATE_FLAG_NORMAL, + &theme_bg_color); + gtk_style_context_get_color(style, + GTK_STATE_FLAG_NORMAL, + &theme_fg_color); +} + +static struct psensor **list_filter_graph_enabled(struct psensor **sensors) +{ + int n, i; + struct psensor **result, **cur, *s; + + if (!sensors) + return NULL; + + n = psensor_list_size(sensors); + result = malloc((n+1) * sizeof(struct psensor *)); + + for (cur = sensors, i = 0; *cur; cur++) { + s = *cur; + + if (config_is_sensor_graph_enabled(s->id)) + result[i++] = s; + } + + result[i] = NULL; + + return result; +} /* Return the end time of the graph i.e. the more recent measure. If * no measure are available, return 0. + * If Bezier curves are used return the measure n-3 to avoid to + * display a part of the curve outside the graph area. */ static time_t get_graph_end_time_s(struct psensor **sensors) { time_t ret, t; struct psensor *s; struct measure *measures; - int i; + int i, n; ret = 0; while (*sensors) { s = *sensors; measures = s->measures; + if (is_smooth_curves_enabled) + n = 2; + else + n = 0; + for (i = s->values_max_length - 1; i >= 0; i--) { if (measures[i].value != UNKNOWN_DBL_VALUE) { - t = measures[i].time.tv_sec; + if (!n) { + t = measures[i].time.tv_sec; - if (t > ret) - ret = t; + if (t > ret) { + ret = t; + break; + } + } else { + n--; + } } i--; } @@ -125,14 +174,30 @@ static char *time_to_str(time_t s) static void draw_left_region(cairo_t *cr, struct graph_info *info) { cairo_set_source_rgb(cr, - info->theme_bg_color.red, - info->theme_bg_color.green, - info->theme_bg_color.blue); + theme_bg_color.red, + theme_bg_color.green, + theme_bg_color.blue); cairo_rectangle(cr, 0, 0, info->g_xoff, info->height); cairo_fill(cr); } +static void draw_right_region(cairo_t *cr, struct graph_info *info) +{ + cairo_set_source_rgb(cr, + theme_bg_color.red, + theme_bg_color.green, + theme_bg_color.blue); + + + cairo_rectangle(cr, + info->g_xoff + info->g_width, + 0, + info->g_xoff + info->g_width + GRAPH_H_PADDING, + info->height); + cairo_fill(cr); +} + static void draw_graph_background(cairo_t *cr, struct config *config, @@ -144,15 +209,15 @@ draw_graph_background(cairo_t *cr, if (config->alpha_channel_enabled) cairo_set_source_rgba(cr, - info->theme_bg_color.red, - info->theme_bg_color.green, - info->theme_bg_color.blue, + theme_bg_color.red, + theme_bg_color.green, + theme_bg_color.blue, config->graph_bg_alpha); else cairo_set_source_rgb(cr, - info->theme_bg_color.red, - info->theme_bg_color.green, - info->theme_bg_color.blue); + theme_bg_color.red, + theme_bg_color.green, + theme_bg_color.blue); cairo_rectangle(cr, info->g_xoff, 0, info->g_width, info->height); cairo_fill(cr); @@ -224,7 +289,7 @@ static void draw_background_lines(cairo_t *cr, cairo_stroke(cr); /* back to normal line style */ - cairo_set_dash(cr, 0, 0, 0); + cairo_set_dash(cr, NULL, 0, 0); } /* Keys: sensor identifier. @@ -245,6 +310,7 @@ static void draw_sensor_smooth_curve(struct psensor *s, int i, dt, vdt, j, k, found; double x[4], y[4], v; time_t t, t0, *stimes; + GdkRGBA *color; if (!times) times = g_hash_table_new_full(g_str_hash, @@ -254,10 +320,13 @@ static void draw_sensor_smooth_curve(struct psensor *s, stimes = g_hash_table_lookup(times, s->id); + color = config_get_sensor_color(s->id); + cairo_set_source_rgb(cr, - s->color->red, - s->color->green, - s->color->blue); + color->red, + color->green, + color->blue); + gdk_rgba_free(color); /* search the index of the first measure used as a start point * of a Bezier curve. The start and end points of the Bezier @@ -347,11 +416,14 @@ static void draw_sensor_curve(struct psensor *s, { int first, i, t, dt, vdt; double v, x, y; + GdkRGBA *color; + color = config_get_sensor_color(s->id); cairo_set_source_rgb(cr, - s->color->red, - s->color->green, - s->color->blue); + color->red, + color->green, + color->blue); + gdk_rgba_free(color); dt = et - bt; first = 1; @@ -407,7 +479,7 @@ graph_update(struct psensor **sensors, double min_rpm, max_rpm, mint, maxt, min, max; char *strmin, *strmax; /* horizontal and vertical offset of the graph */ - int g_xoff, g_yoff, no_graphs; + int g_xoff, g_yoff, no_graphs, use_celsius; cairo_surface_t *cst; cairo_t *cr, *cr_pixmap; char *str_btime, *str_etime; @@ -420,20 +492,24 @@ graph_update(struct psensor **sensors, if (!gtk_widget_is_drawable(w_graph)) return; - enabled_sensors = psensor_list_filter_graph_enabled(sensors); + if (!style) + update_theme(window); + + enabled_sensors = list_filter_graph_enabled(sensors); min_rpm = get_min_rpm(enabled_sensors); max_rpm = get_max_rpm(enabled_sensors); + if (config_get_temperature_unit() == CELSIUS) + use_celsius = 1; + else + use_celsius = 0; + mint = get_min_temp(enabled_sensors); - strmin = psensor_value_to_str(SENSOR_TYPE_TEMP, - mint, - config->temperature_unit == CELSIUS); + strmin = psensor_value_to_str(SENSOR_TYPE_TEMP, mint, use_celsius); maxt = get_max_temp(enabled_sensors); - strmax = psensor_value_to_str(SENSOR_TYPE_TEMP, - maxt, - config->temperature_unit == CELSIUS); + strmax = psensor_value_to_str(SENSOR_TYPE_TEMP, maxt, use_celsius); et = get_graph_end_time_s(enabled_sensors); bt = get_graph_begin_time_s(config, et); @@ -480,14 +556,6 @@ graph_update(struct psensor **sensors, info.g_xoff = g_xoff; - style_ctx = gtk_widget_get_style_context(window); - gtk_style_context_get_background_color(style_ctx, - GTK_STATE_FLAG_NORMAL, - &info.theme_bg_color); - gtk_style_context_get_color(style_ctx, - GTK_STATE_FLAG_NORMAL, - &info.theme_fg_color); - g_width = width - g_xoff - GRAPH_H_PADDING; info.g_width = g_width; @@ -495,9 +563,9 @@ graph_update(struct psensor **sensors, /* Set the color for text drawing */ cairo_set_source_rgb(cr, - info.theme_fg_color.red, - info.theme_fg_color.green, - info.theme_fg_color.blue); + theme_fg_color.red, + theme_fg_color.green, + theme_fg_color.blue); /* draw graph begin time */ cairo_move_to(cr, g_xoff, height - GRAPH_V_PADDING); @@ -557,12 +625,13 @@ graph_update(struct psensor **sensors, } draw_left_region(cr, &info); + draw_right_region(cr, &info); /* draw min and max temp */ cairo_set_source_rgb(cr, - info.theme_fg_color.red, - info.theme_fg_color.green, - info.theme_fg_color.blue); + theme_fg_color.red, + theme_fg_color.green, + theme_fg_color.blue); cairo_move_to(cr, GRAPH_H_PADDING, te_max.height + GRAPH_V_PADDING); cairo_show_text(cr, strmax);