X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_sensorlist.c;h=1daba909941f3d6de913e0a587998c9321379dd1;hb=6cec5b45ac95c368e8b6ad4912f1534da9876c7d;hp=522004c6f5b3812057c7593544cbd2594bd02bc7;hpb=861ae367cfe3456c91e0d5b8d0e57ac64a179583;p=psensor.git diff --git a/src/ui_sensorlist.c b/src/ui_sensorlist.c index 522004c..1daba90 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 { @@ -57,56 +55,51 @@ static int col_index_to_col(int idx) void ui_sensorlist_update(struct ui_psensor *ui, bool complete) { - char *str, *scolor; + 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); + 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); - 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(GTK_LIST_STORE(model), - &iter, COL_NAME, s->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, s->enabled, -1); - + + gtk_list_store_set(store, &iter, + COL_NAME, s->name, + COL_COLOR_STR, scolor, + COL_ENABLED, s->enabled, + -1); free(scolor); } @@ -206,11 +199,13 @@ static int on_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data) { GtkWidget *menu; struct ui_psensor *ui = (struct ui_psensor *)data; - GtkTreeView *view = ui->ui_sensorlist->treeview; + GtkTreeView *view; if (event->button != 3) return FALSE; + view = ui->sensors_tree; + struct psensor *sensor = get_sensor_at_pos(view, event->x, event->y, @@ -232,7 +227,6 @@ static int on_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data) gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, event->button, event->time); - } } @@ -242,9 +236,9 @@ static int on_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data) static void on_toggled(GtkCellRendererToggle *cell, gchar *path_str, gpointer data) { - struct ui_sensorlist *list = (struct ui_sensorlist *)data; + struct ui_psensor *ui = (struct ui_psensor *)data; GtkTreeModel *model - = gtk_tree_view_get_model(list->treeview); + = gtk_tree_view_get_model(ui->sensors_tree); GtkTreeIter iter; GtkTreePath *path = gtk_tree_path_new_from_string(path_str); gboolean fixed; @@ -258,7 +252,7 @@ on_toggled(GtkCellRendererToggle *cell, gchar *path_str, gpointer data) i = gtk_tree_path_get_indices(path); if (i) { int n = *i; - struct psensor **sensor = list->sensors; + struct psensor **sensor = ui->sensors; while (n--) sensor++; (*sensor)->enabled = fixed; @@ -271,44 +265,55 @@ on_toggled(GtkCellRendererToggle *cell, gchar *path_str, gpointer data) gtk_tree_path_free(path); } +static int cmp_sensors(const void *p1, const void *p2) +{ + const struct psensor *s1, *s2; + int pos1, pos2; + + s1 = *(void **)p1; + s2 = *(void **)p2; + + pos1 = config_get_sensor_position(s1->id); + pos2 = config_get_sensor_position(s2->id); + + return pos1 - pos2; +} + static void create_widget(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; - - ui_sl->treeview = ui->sensors_tree; + struct psensor **s_cur; + GtkTreeIter iter; + struct psensor **ordered_sensors; 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, @@ -316,59 +321,43 @@ static void create_widget(struct ui_psensor *ui) "background", COL_COLOR_STR, NULL); - g_signal_connect(ui_sl->treeview, + g_signal_connect(ui->sensors_tree, "button-press-event", (GCallback) on_clicked, 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) on_toggled, 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 = psensor_list_copy(ui->sensors); + qsort(ordered_sensors, + psensor_list_size(ordered_sensors), + sizeof(struct psensor *), + cmp_sensors); + 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); } + + ui_sensorlist_update(ui, 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; - create_widget(ui); }