int g_xoff, int g_yoff,
int g_width, int g_height,
int width, int height, struct config *config,
- GtkWidget *widget)
+ GtkWidget *widget,
+ GtkWidget *window)
{
- GtkStyle *style;
- struct color *bgcolor = config->graph_bgcolor;
- GdkColor *bg;
+ GtkStyleContext *style_ctx;
+ struct color *bgcolor;
+ GdkRGBA rgba;
- style = gtk_widget_get_style(widget);
+ bgcolor = config->graph_bgcolor;
- bg = &style->bg[GTK_STATE_NORMAL];
+ style_ctx = gtk_widget_get_style_context(window);
+ gtk_style_context_get_background_color(style_ctx,
+ GTK_STATE_FLAG_NORMAL,
+ &rgba);
if (config->alpha_channel_enabled)
cairo_set_source_rgba(cr,
- ((double)bg->red) / 65535,
- ((double)bg->green) / 65535,
- ((double)bg->blue) / 65535,
+ rgba.red,
+ rgba.green,
+ rgba.blue,
config->graph_bg_alpha);
else
cairo_set_source_rgb(cr,
- ((double)bg->red) / 65535,
- ((double)bg->green) / 65535,
- ((double)bg->blue) / 65535);
+ rgba.red,
+ rgba.green,
+ rgba.blue);
cairo_rectangle(cr, 0, 0, width, height);
cairo_fill(cr);
cairo_set_source_rgba(cr,
bgcolor->f_red,
bgcolor->f_green,
- bgcolor->f_blue, config->graph_bg_alpha);
+ bgcolor->f_blue,
+ config->graph_bg_alpha);
else
cairo_set_source_rgb(cr,
bgcolor->f_red,
- bgcolor->f_green, bgcolor->f_blue);
-
-
+ bgcolor->f_green,
+ bgcolor->f_blue);
cairo_rectangle(cr, g_xoff, g_yoff, g_width, g_height);
cairo_fill(cr);
first = 1;
for (i = 0; i < s->values_max_length; i++) {
t = s->measures[i].time.tv_sec;
- v = s->measures[i].value.d_num;
+ v = s->measures[i].value;
if (v == UNKNOWN_DBL_VALUE || !t)
continue;
void
graph_update(struct psensor **sensors,
GtkWidget *w_graph,
- struct config *config)
+ struct config *config,
+ GtkWidget *window)
{
struct color *fgcolor = config->graph_fgcolor;
int et, bt, width, height, g_width, g_height;
cairo_text_extents_t te_btime, te_etime, te_max, te_min;
struct psensor **sensor_cur;
GtkAllocation galloc;
+ GtkStyleContext *style_ctx;
+ GdkRGBA rgba;
if (!gtk_widget_is_drawable(w_graph))
return ;
max_rpm = get_max_rpm(sensors);
mint = get_min_temp(sensors);
- strmin = psensor_value_to_string(SENSOR_TYPE_TEMP, mint);
+
+ strmin = psensor_value_to_str(SENSOR_TYPE_TEMP,
+ mint,
+ config->temperature_unit == CELCIUS);
maxt = get_max_temp(sensors);
- strmax = psensor_value_to_string(SENSOR_TYPE_TEMP, maxt);
+ strmax = psensor_value_to_str(SENSOR_TYPE_TEMP,
+ maxt,
+ config->temperature_unit == CELCIUS);
str_btime = time_to_str(get_graph_begin_time_s(config));
str_etime = time_to_str(get_graph_end_time_s());
draw_graph_background(cr,
g_xoff, g_yoff, g_width, g_height,
width, height, config,
- w_graph);
+ w_graph,
+ window);
- cairo_set_source_rgb(cr,
- fgcolor->f_red, fgcolor->f_green, fgcolor->f_blue);
+ /** Set the color for text drawing */
+ style_ctx = gtk_widget_get_style_context(window);
+ gtk_style_context_get_color(style_ctx, GTK_STATE_FLAG_NORMAL, &rgba);
+ cairo_set_source_rgb(cr, rgba.red, rgba.green, rgba.blue);
/* draw graph begin time */
cairo_move_to(cr, g_xoff, height - GRAPH_V_PADDING);
cairo_set_line_join(cr, CAIRO_LINE_JOIN_ROUND);
cairo_set_line_width(cr, 1);
-
while (*sensor_cur) {
struct psensor *s = *sensor_cur;