X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_sensorlist.c;h=3de10f7ddad84cf3bdfc3be4b1ebf1066ea7dd35;hb=781fdffbb2c5e66c10a58b9deef9c909f6b070b4;hp=737311c231e55a82754f76a572c3b8776c5e0597;hpb=522e29b53556e160fc18ed3f54169b4833e33c8f;p=psensor.git

diff --git a/src/ui_sensorlist.c b/src/ui_sensorlist.c
index 737311c..3de10f7 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,
@@ -36,7 +35,7 @@ enum {
 	COL_COLOR_STR,
 	COL_ENABLED,
 	COL_EMPTY,
-	COL_SENSOR
+	COL_SENSOR,
 };
 
 struct cb_data {
@@ -115,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;
 }
@@ -137,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)))
@@ -167,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();
@@ -199,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);
@@ -235,44 +237,54 @@ 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);
 }
 
-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,
@@ -319,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,
@@ -328,36 +340,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);
 }