removed useless fct

[psensor.git] / src / ui_sensorlist.c

diff --git a/src/ui_sensorlist.c b/src/ui_sensorlist.c
index 6697753..2b41d29 100644 (file)
--- a/src/ui_sensorlist.c
+++ b/src/ui_sensorlist.c
@@ -35,7 +35,7 @@ enum {
        COL_COLOR_STR,
        COL_ENABLED,
        COL_EMPTY,
-       COL_SENSOR
+       COL_SENSOR,
 };
 
 struct cb_data {
@@ -114,16 +114,21 @@ void ui_sensorlist_update(struct ui_psensor *ui, bool complete)
  * <null> 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;
 }
@@ -166,9 +171,7 @@ static void on_preferences_activated(GtkWidget *menu_item, gpointer data)
 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();
@@ -209,7 +212,7 @@ static int on_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data)
        struct psensor *sensor = get_sensor_at_pos(view,
                                                   event->x,
                                                   event->y,
-                                                  ui->sensors);
+                                                  ui);
 
        if (sensor) {
                int coli = col_index_to_col(get_col_index_at_pos(view,
@@ -234,44 +237,58 @@ 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_psensor *ui = (struct ui_psensor *)data;
-       GtkTreeModel *model
-           = gtk_tree_view_get_model(ui->sensors_tree);
+       struct ui_psensor *ui;
+       GtkTreeModel *model;
        GtkTreeIter iter;
-       GtkTreePath *path = gtk_tree_path_new_from_string(path_str);
+       GtkTreePath *path;
        gboolean fixed;
-       gint *i;
+       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_SENSOR, &s, -1);
        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 = ui->sensors;
-               while (n--)
-                       sensor++;
-               (*sensor)->enabled = fixed;
-               config_set_sensor_enabled((*sensor)->id, (*sensor)->enabled);
-       }
+       s->enabled = fixed;
+       config_set_sensor_enabled(s->id, s->enabled);
 
-       gtk_list_store_set(GTK_LIST_STORE(model),
-                          &iter, COL_ENABLED, fixed, -1);
+       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)
+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;
+}
+
+void ui_sensorlist_create(struct ui_psensor *ui)
 {
        GtkListStore *store;
        GtkCellRenderer *renderer;
-       struct psensor **s_cur = ui->sensors;
+       struct psensor **s_cur;
+       GtkTreeIter iter;
+       struct psensor **ordered_sensors;
 
-       store = ui->sensors_store;
+       log_debug("ui_sensorlist_create()");
 
        renderer = gtk_cell_renderer_text_new();
        gtk_tree_view_insert_column_with_attributes(ui->sensors_tree,
@@ -318,7 +335,7 @@ static void create_widget(struct ui_psensor *ui)
                                                    "active", COL_ENABLED,
                                                    NULL);
        g_signal_connect(G_OBJECT(renderer),
-                        "toggled", (GCallback) on_toggled, ui);
+                        "toggled", (GCallback) toggled_cbk, ui);
 
        renderer = gtk_cell_renderer_text_new();
        gtk_tree_view_insert_column_with_attributes(ui->sensors_tree,
@@ -327,36 +344,18 @@ static void create_widget(struct ui_psensor *ui)
                                                    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);
        }
-}
+       free(ordered_sensors);
 
-void ui_sensorlist_create(struct ui_psensor *ui)
-{
-       log_debug("ui_sensorlist_create()");
-       create_widget(ui);
+       ui_sensorlist_update(ui, 1);
 }