COL_COLOR_STR,
COL_ENABLED,
COL_EMPTY,
- COL_SENSOR
+ COL_SENSOR,
};
struct cb_data {
* <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;
}
*/
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);
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();
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->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);
}
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);
}
-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;
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,
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,
"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,
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 = ui->sensors; *s_cur; s_cur++) {
+ 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);
}
+ free(ordered_sensors);
ui_sensorlist_update(ui, 1);
}
-
-void ui_sensorlist_create(struct ui_psensor *ui)
-{
- log_debug("ui_sensorlist_create()");
- create_widget(ui);
-}
projects / psensor.git / blobdiff