style

[psensor.git] / src / ui_sensorlist.c

diff --git a/src/ui_sensorlist.c b/src/ui_sensorlist.c
index 043f579..3de10f7 100644 (file)
--- a/src/ui_sensorlist.c
+++ b/src/ui_sensorlist.c
@@ -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;
 }
@@ -136,13 +141,15 @@ 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;
+       GList *cols, *node;
+       int colx, coli;
+       GtkTreeViewColumn *checkcol;
 
-       for (node = columns; node; node = node->next) {
-               GtkTreeViewColumn *checkcol = (GtkTreeViewColumn *) node->data;
+       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)))
@@ -166,9 +173,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();
@@ -198,32 +203,30 @@ static GtkWidget *create_sensor_popup(struct ui_psensor *ui,
 static int on_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data)
 {
        GtkWidget *menu;
-       struct ui_psensor *ui = (struct ui_psensor *)data;
+       struct ui_psensor *ui;
        GtkTreeView *view;
+       struct psensor *s;
+       int coli;
 
        if (event->button != 3)
                return FALSE;
 
+       ui = (struct ui_psensor *)data;
        view = ui->sensors_tree;
 
-       struct psensor *sensor = get_sensor_at_pos(view,
-                                                  event->x,
-                                                  event->y,
-                                                  ui->sensors);
+       s = get_sensor_at_pos(view, event->x, event->y, ui);
 
-       if (sensor) {
-               int coli = col_index_to_col(get_col_index_at_pos(view,
-                                                                event->x));
+       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)) {
+                                           s->color)) {
                                ui_sensorlist_update(ui, 1);
-                               config_set_sensor_color(sensor->id,
-                                                       sensor->color);
+                               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);
@@ -234,33 +237,27 @@ 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);
-       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 = ui->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);
 }
@@ -279,7 +276,7 @@ static int cmp_sensors(const void *p1, const void *p2)
        return pos1 - pos2;
 }
 
-static void create_widget(struct ui_psensor *ui)
+void ui_sensorlist_create(struct ui_psensor *ui)
 {
        GtkListStore *store;
        GtkCellRenderer *renderer;
@@ -287,6 +284,8 @@ static void create_widget(struct ui_psensor *ui)
        GtkTreeIter iter;
        struct psensor **ordered_sensors;
 
+       log_debug("ui_sensorlist_create()");
+
        renderer = gtk_cell_renderer_text_new();
        gtk_tree_view_insert_column_with_attributes(ui->sensors_tree,
                                                    -1,
@@ -332,7 +331,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,
@@ -343,7 +342,7 @@ static void create_widget(struct ui_psensor *ui)
 
        ordered_sensors = psensor_list_copy(ui->sensors);
        qsort(ordered_sensors,
-             psensor_list_size(ordered_sensors)-1,
+             psensor_list_size(ordered_sensors),
              sizeof(struct psensor *),
              cmp_sensors);
 
@@ -352,12 +351,7 @@ static void create_widget(struct ui_psensor *ui)
                gtk_list_store_append(store, &iter);
                gtk_list_store_set(store, &iter, COL_SENSOR, *s_cur, -1);
        }
+       free(ordered_sensors);
 
        ui_sensorlist_update(ui, 1);
 }
-
-void ui_sensorlist_create(struct ui_psensor *ui)
-{
-       log_debug("ui_sensorlist_create()");
-       create_widget(ui);
-}