X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_sensorlist.c;h=904d4f547a63edaf14f22c5fd664670a67046cf8;hb=82d6cd427538eab87c74a3296d12cb712dd6c390;hp=4f45c07b24caf40dbb1796f1c88db42bd8724c31;hpb=19a24512ebf7a7a061973bd76a34effa2452f89d;p=psensor.git diff --git a/src/ui_sensorlist.c b/src/ui_sensorlist.c index 4f45c07..904d4f5 100644 --- a/src/ui_sensorlist.c +++ b/src/ui_sensorlist.c @@ -25,7 +25,6 @@ #include "ui_sensorpref.h" #include "cfg.h" #include "ui_color.h" -#include "compat.h" enum { COL_NAME = 0, @@ -37,7 +36,6 @@ enum { COL_ENABLED, COL_EMPTY, COL_SENSOR, - COLS_COUNT }; struct cb_data { @@ -55,46 +53,57 @@ static int col_index_to_col(int idx) return idx; } -void ui_sensorlist_update(struct ui_psensor *ui) +void ui_sensorlist_update(struct ui_psensor *ui, bool complete) { - char *str; + char *scolor, *value, *min, *max; struct psensor *s; GtkTreeIter iter; - struct ui_sensorlist *ui_sl = ui->ui_sensorlist; - GtkTreeModel *model - = gtk_tree_view_get_model(ui_sl->treeview); - gboolean valid = gtk_tree_model_get_iter_first(model, &iter); - struct psensor **sensor = ui->sensors; + GtkTreeModel *model; + gboolean valid; int use_celcius; + GdkColor color; + GtkListStore *store; + + model = gtk_tree_view_get_model(ui->sensors_tree); + store = GTK_LIST_STORE(model); use_celcius = ui->config->temperature_unit == CELCIUS; + valid = gtk_tree_model_get_iter_first(model, &iter); while (valid) { - gtk_tree_model_get(model, &iter, - COL_SENSOR, &s, - -1); + gtk_tree_model_get(model, &iter, COL_SENSOR, &s, -1); - str = psensor_value_to_str(s->type, - s->measures[s->values_max_length - - 1].value, - use_celcius); + value = psensor_value_to_str(s->type, + psensor_get_current_value(s), + use_celcius); + min = psensor_value_to_str(s->type, s->min, use_celcius); + max = psensor_value_to_str(s->type, s->max, use_celcius); - gtk_list_store_set(GTK_LIST_STORE(model), &iter, COL_TEMP, str, + gtk_list_store_set(store, &iter, + COL_TEMP, value, + COL_TEMP_MIN, min, + COL_TEMP_MAX, max, -1); - free(str); - - str = psensor_value_to_str(s->type, s->min, use_celcius); - gtk_list_store_set(GTK_LIST_STORE(model), &iter, - COL_TEMP_MIN, str, -1); - free(str); - - str = psensor_value_to_str(s->type, s->max, use_celcius); - gtk_list_store_set(GTK_LIST_STORE(model), &iter, - COL_TEMP_MAX, str, -1); - free(str); + free(value); + free(min); + free(max); + + if (complete) { + color.red = s->color->red; + color.green = s->color->green; + color.blue = s->color->blue; + + scolor = gdk_color_to_string(&color); + + gtk_list_store_set(store, &iter, + COL_NAME, s->name, + COL_COLOR_STR, scolor, + COL_ENABLED, s->enabled, + -1); + free(scolor); + } valid = gtk_tree_model_iter_next(model, &iter); - sensor++; } } @@ -105,16 +114,21 @@ void ui_sensorlist_update(struct ui_psensor *ui) * if none. */ static struct psensor * -get_sensor_at_pos(GtkTreeView *view, int x, int y, struct psensor **sensors) +get_sensor_at_pos(GtkTreeView *view, int x, int y, struct ui_psensor *ui) { GtkTreePath *path; + GtkTreeModel *model; + GtkTreeIter iter; + struct psensor *s; gtk_tree_view_get_path_at_pos(view, x, y, &path, NULL, NULL, NULL); + model = gtk_tree_view_get_model(ui->sensors_tree); if (path) { - gint *i = gtk_tree_path_get_indices(path); - if (i) - return *(sensors + *i); + if (gtk_tree_model_get_iter(model, &iter, path)) { + gtk_tree_model_get(model, &iter, COL_SENSOR, &s, -1); + return s; + } } return NULL; } @@ -127,16 +141,18 @@ get_sensor_at_pos(GtkTreeView *view, int x, int y, struct psensor **sensors) */ static int get_col_index_at_pos(GtkTreeView *view, int x) { - GList *columns = gtk_tree_view_get_columns(view); - GList *node; - int colx = 0; - int coli = 0; - - for (node = columns; node; node = node->next) { - GtkTreeViewColumn *checkcol = (GtkTreeViewColumn *) node->data; - - if (x >= colx && - x < (colx + gtk_tree_view_column_get_width(checkcol))) + GList *cols, *node; + int colx, coli; + GtkTreeViewColumn *checkcol; + + cols = gtk_tree_view_get_columns(view); + colx = 0; + coli = 0; + for (node = cols; node; node = node->next) { + checkcol = (GtkTreeViewColumn *)node->data; + + if (x >= colx + && x < (colx + gtk_tree_view_column_get_width(checkcol))) return coli; else colx += gtk_tree_view_column_get_width(checkcol); @@ -147,53 +163,17 @@ static int get_col_index_at_pos(GtkTreeView *view, int x) return -1; } -void ui_sensorlist_update_sensors_preferences(struct ui_psensor *ui) -{ - GtkTreeIter iter; - GtkTreeModel *model - = gtk_tree_view_get_model(ui->ui_sensorlist->treeview); - gboolean valid = gtk_tree_model_get_iter_first(model, &iter); - struct psensor **sensor = ui->ui_sensorlist->sensors; - - while (valid && *sensor) { - GdkColor color; - gchar *scolor; - - color.red = (*sensor)->color->red; - color.green = (*sensor)->color->green; - color.blue = (*sensor)->color->blue; - - scolor = gdk_color_to_string(&color); - - gtk_list_store_set(GTK_LIST_STORE(model), - &iter, COL_NAME, (*sensor)->name, -1); - - gtk_list_store_set(GTK_LIST_STORE(model), - &iter, COL_COLOR_STR, scolor, -1); - - gtk_list_store_set(GTK_LIST_STORE(model), - &iter, COL_ENABLED, (*sensor)->enabled, -1); - - free(scolor); - - valid = gtk_tree_model_iter_next(model, &iter); - sensor++; - } -} - -static void on_preferences_activated(GtkWidget *menu_item, gpointer data) +static void preferences_activated_cbk(GtkWidget *menu_item, gpointer data) { struct cb_data *cb_data = data; ui_sensorpref_dialog_run(cb_data->sensor, cb_data->ui); } -static GtkWidget *create_sensor_popup(struct ui_psensor *ui, - struct psensor *sensor) +static GtkWidget * +create_sensor_popup(struct ui_psensor *ui, struct psensor *sensor) { - GtkWidget *menu; - GtkWidget *item; - GtkWidget *separator; + GtkWidget *menu, *item, *separator; struct cb_data *data; menu = gtk_menu_new(); @@ -213,44 +193,43 @@ static GtkWidget *create_sensor_popup(struct ui_psensor *ui, g_signal_connect(item, "activate", - G_CALLBACK(on_preferences_activated), data); + G_CALLBACK(preferences_activated_cbk), data); gtk_widget_show_all(menu); return menu; } -static int on_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data) +static int clicked_cbk(GtkWidget *widget, GdkEventButton *event, gpointer data) { GtkWidget *menu; - struct ui_psensor *ui = (struct ui_psensor *)data; - GtkTreeView *view = ui->ui_sensorlist->treeview; + struct ui_psensor *ui; + GtkTreeView *view; + struct psensor *s; + int coli; if (event->button != 3) return FALSE; - struct psensor *sensor = get_sensor_at_pos(view, - event->x, - event->y, - ui->sensors); + ui = (struct ui_psensor *)data; + view = ui->sensors_tree; - if (sensor) { - int coli = col_index_to_col(get_col_index_at_pos(view, - event->x)); + s = get_sensor_at_pos(view, event->x, event->y, ui); + + if (s) { + coli = col_index_to_col(get_col_index_at_pos(view, event->x)); if (coli == COL_COLOR) { if (ui_change_color(_("Select foreground color"), - sensor->color)) { - ui_sensorlist_update_sensors_preferences(ui); - config_set_sensor_color(sensor->id, - sensor->color); + s->color)) { + ui_sensorlist_update(ui, 1); + config_set_sensor_color(s->id, s->color); } } else if (coli >= 0 && coli != COL_ENABLED) { - menu = create_sensor_popup(ui, sensor); + menu = create_sensor_popup(ui, s); gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event->button, event->time); - } } @@ -258,75 +237,68 @@ static int on_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data) } static void -on_toggled(GtkCellRendererToggle *cell, gchar *path_str, gpointer data) +toggled_cbk(GtkCellRendererToggle *cell, gchar *path_str, gpointer data) { - struct ui_sensorlist *list = (struct ui_sensorlist *)data; - GtkTreeModel *model - = gtk_tree_view_get_model(list->treeview); + struct ui_psensor *ui; + GtkTreeModel *model; GtkTreeIter iter; - GtkTreePath *path = gtk_tree_path_new_from_string(path_str); - gboolean fixed; - gint *i; + GtkTreePath *path; + struct psensor *s; + + ui = (struct ui_psensor *)data; + model = gtk_tree_view_get_model(ui->sensors_tree); + path = gtk_tree_path_new_from_string(path_str); gtk_tree_model_get_iter(model, &iter, path); - gtk_tree_model_get(model, &iter, COL_ENABLED, &fixed, -1); - - fixed ^= 1; - - i = gtk_tree_path_get_indices(path); - if (i) { - int n = *i; - struct psensor **sensor = list->sensors; - while (n--) - sensor++; - (*sensor)->enabled = fixed; - config_set_sensor_enabled((*sensor)->id, (*sensor)->enabled); - } - gtk_list_store_set(GTK_LIST_STORE(model), - &iter, COL_ENABLED, fixed, -1); + gtk_tree_model_get(model, &iter, COL_SENSOR, &s, -1); + + s->enabled ^= 1; + config_set_sensor_enabled(s->id, s->enabled); + + gtk_list_store_set(GTK_LIST_STORE(model), &iter, + COL_ENABLED, s->enabled, -1); gtk_tree_path_free(path); } -static void create_widget(struct ui_psensor *ui) +void ui_sensorlist_create(struct ui_psensor *ui) { GtkListStore *store; GtkCellRenderer *renderer; - struct psensor **s_cur = ui->sensors; - struct ui_sensorlist *ui_sl = ui->ui_sensorlist; - - store = ui->sensors_store; + struct psensor **s_cur; + GtkTreeIter iter; + struct psensor **ordered_sensors; - ui_sl->treeview = ui->sensors_tree; + log_debug("ui_sensorlist_create()"); renderer = gtk_cell_renderer_text_new(); - gtk_tree_view_insert_column_with_attributes(ui_sl->treeview, + gtk_tree_view_insert_column_with_attributes(ui->sensors_tree, -1, _("Sensor"), renderer, "text", COL_NAME, NULL); - gtk_tree_view_insert_column_with_attributes(ui_sl->treeview, + gtk_tree_view_insert_column_with_attributes(ui->sensors_tree, -1, _("Value"), renderer, "text", COL_TEMP, NULL); - gtk_tree_view_insert_column_with_attributes(ui_sl->treeview, + gtk_tree_view_insert_column_with_attributes(ui->sensors_tree, -1, _("Min"), renderer, "text", COL_TEMP_MIN, NULL); - gtk_tree_view_insert_column_with_attributes(ui_sl->treeview, + gtk_tree_view_insert_column_with_attributes(ui->sensors_tree, -1, _("Max"), renderer, "text", COL_TEMP_MAX, NULL); renderer = gtk_cell_renderer_text_new(); - gtk_tree_view_insert_column_with_attributes(ui_sl->treeview, + gtk_tree_view_insert_column_with_attributes(ui->sensors_tree, -1, _("Color"), renderer, @@ -334,59 +306,34 @@ static void create_widget(struct ui_psensor *ui) "background", COL_COLOR_STR, NULL); - g_signal_connect(ui_sl->treeview, - "button-press-event", (GCallback) on_clicked, ui); + g_signal_connect(ui->sensors_tree, + "button-press-event", (GCallback)clicked_cbk, ui); renderer = gtk_cell_renderer_toggle_new(); - gtk_tree_view_insert_column_with_attributes(ui_sl->treeview, + gtk_tree_view_insert_column_with_attributes(ui->sensors_tree, -1, _("Graph"), renderer, "active", COL_ENABLED, NULL); g_signal_connect(G_OBJECT(renderer), - "toggled", (GCallback) on_toggled, ui_sl); + "toggled", (GCallback) toggled_cbk, ui); renderer = gtk_cell_renderer_text_new(); - gtk_tree_view_insert_column_with_attributes(ui_sl->treeview, + gtk_tree_view_insert_column_with_attributes(ui->sensors_tree, -1, "", renderer, "text", COL_EMPTY, NULL); - while (*s_cur) { - GtkTreeIter iter; - GdkColor color; - gchar *scolor; - struct psensor *s = *s_cur; - - color.red = s->color->red; - color.green = s->color->green; - color.blue = s->color->blue; - - scolor = gdk_color_to_string(&color); + ordered_sensors = ui_get_sensors_ordered_by_position(ui); + store = ui->sensors_store; + for (s_cur = ordered_sensors; *s_cur; s_cur++) { gtk_list_store_append(store, &iter); - gtk_list_store_set(store, &iter, - COL_NAME, s->name, - COL_TEMP, _("N/A"), - COL_TEMP_MIN, _("N/A"), - COL_TEMP_MAX, _("N/A"), - COL_COLOR_STR, scolor, - COL_ENABLED, s->enabled, - COL_SENSOR, s, -1); - - free(scolor); - - s_cur++; + gtk_list_store_set(store, &iter, COL_SENSOR, *s_cur, -1); } -} - -void ui_sensorlist_create(struct ui_psensor *ui) -{ - log_debug("ui_sensorlist_create()"); - ui->ui_sensorlist = malloc(sizeof(struct ui_sensorlist)); - ui->ui_sensorlist->sensors = ui->sensors; + free(ordered_sensors); - create_widget(ui); + ui_sensorlist_update(ui, 1); }