X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_sensorlist.c;h=f02730ea7ea7bf3e024383cd08b15b3ee1b0d0b9;hb=674ff5b2ea6a4b5fbb2cd1f1831a34c23fdcdcba;hp=85eb2d899c9b762727a2416be8c5ab2787266c4f;hpb=dc01470414798feb7c09391d3ca15f45483739a6;p=psensor.git diff --git a/src/ui_sensorlist.c b/src/ui_sensorlist.c index 85eb2d8..f02730e 100644 --- a/src/ui_sensorlist.c +++ b/src/ui_sensorlist.c @@ -53,19 +53,56 @@ static int col_index_to_col(int idx) return idx; } +static void populate(struct ui_psensor *ui) +{ + GtkTreeIter iter; + GtkListStore *store; + GdkColor color; + char *scolor; + struct psensor **ordered_sensors, **s_cur, *s; + + ordered_sensors = ui_get_sensors_ordered_by_position(ui); + store = ui->sensors_store; + + gtk_list_store_clear(store); + + for (s_cur = ordered_sensors; *s_cur; s_cur++) { + s = *s_cur; + + gtk_list_store_append(store, &iter); + + 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, + COL_SENSOR, s, + -1); + free(scolor); + } + free(ordered_sensors); +} + void ui_sensorlist_update(struct ui_psensor *ui, bool complete) { - char *scolor, *value, *min, *max; + char *value, *min, *max; struct psensor *s; GtkTreeIter iter; GtkTreeModel *model; gboolean valid; int use_celcius; - GdkColor color; GtkListStore *store; + if (complete) + populate(ui); + model = gtk_tree_view_get_model(ui->sensors_tree); - store = GTK_LIST_STORE(model); + store = ui->sensors_store; use_celcius = ui->config->temperature_unit == CELCIUS; @@ -88,21 +125,6 @@ void ui_sensorlist_update(struct ui_psensor *ui, bool complete) 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); } } @@ -141,16 +163,18 @@ get_sensor_at_pos(GtkTreeView *view, int x, int y, struct ui_psensor *ui) */ 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); @@ -161,19 +185,17 @@ static int get_col_index_at_pos(GtkTreeView *view, int x) return -1; } -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(); @@ -193,42 +215,40 @@ 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; + 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); + 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); @@ -245,7 +265,6 @@ toggled_cbk(GtkCellRendererToggle *cell, gchar *path_str, gpointer data) GtkTreeModel *model; GtkTreeIter iter; GtkTreePath *path; - gboolean fixed; struct psensor *s; ui = (struct ui_psensor *)data; @@ -255,11 +274,8 @@ toggled_cbk(GtkCellRendererToggle *cell, gchar *path_str, gpointer data) 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; - - s->enabled = fixed; + s->enabled ^= 1; config_set_sensor_enabled(s->id, s->enabled); gtk_list_store_set(GTK_LIST_STORE(model), &iter, @@ -268,27 +284,11 @@ toggled_cbk(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) +void ui_sensorlist_create(struct ui_psensor *ui) { - GtkListStore *store; GtkCellRenderer *renderer; - struct psensor **s_cur; - 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, @@ -325,7 +325,7 @@ static void create_widget(struct ui_psensor *ui) NULL); g_signal_connect(ui->sensors_tree, - "button-press-event", (GCallback) on_clicked, ui); + "button-press-event", (GCallback)clicked_cbk, ui); renderer = gtk_cell_renderer_toggle_new(); gtk_tree_view_insert_column_with_attributes(ui->sensors_tree, @@ -344,23 +344,5 @@ static void create_widget(struct ui_psensor *ui) renderer, "text", COL_EMPTY, NULL); - 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_SENSOR, *s_cur, -1); - } - ui_sensorlist_update(ui, 1); } - -void ui_sensorlist_create(struct ui_psensor *ui) -{ - log_debug("ui_sensorlist_create()"); - create_widget(ui); -}