X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_sensorpref.c;h=ecacf80b9c80784c7c62c58066fb162be075e1fe;hb=04bc9d1fcd8c9e382f90227f9fa302d34a602c4d;hp=9c17475e9c0c34f87e19d46e134a0c29f1cc6aa8;hpb=861ae367cfe3456c91e0d5b8d0e57ac64a179583;p=psensor.git

diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c
index 9c17475..ecacf80 100644
--- a/src/ui_sensorpref.c
+++ b/src/ui_sensorpref.c
@@ -30,6 +30,11 @@
 #include "ui_appindicator.h"
 #endif
 
+enum {
+	COL_NAME = 0,
+	COL_SENSOR_PREF
+};
+
 struct sensor_pref {
 	struct psensor *sensor;
 	char *name;
@@ -44,11 +49,10 @@ struct sensor_pref {
 struct cb_data {
 	struct ui_psensor *ui;
 	GtkBuilder *builder;
-	struct sensor_pref **prefs;
 };
 
-static struct sensor_pref *sensor_pref_new(struct psensor *s,
-					   struct config *cfg)
+static struct sensor_pref *
+sensor_pref_new(struct psensor *s, struct config *cfg)
 {
 	struct sensor_pref *p;
 
@@ -86,89 +90,31 @@ static void sensor_pref_free(struct sensor_pref *p)
 	free(p);
 }
 
-static struct sensor_pref **sensor_pref_list_new(struct psensor **sensors,
-						 struct config *cfg)
-{
-	int n, i;
-	struct sensor_pref **pref_list;
-
-	n = psensor_list_size(sensors);
-	pref_list = malloc(sizeof(struct sensor_pref *) * (n+1));
-
-	for (i = 0; i < n; i++)
-		pref_list[i] = sensor_pref_new(sensors[i],
-					       cfg);
-
-	pref_list[n] = NULL;
-
-	return pref_list;
-}
-
-static void sensor_pref_list_free(struct sensor_pref **list)
-{
-	struct sensor_pref **cur = list;
-
-	while (*cur) {
-		sensor_pref_free(*cur);
-
-		cur++;
-	}
-
-	free(list);
-}
-
 static struct sensor_pref *
-sensor_pref_get(struct sensor_pref **ps, struct psensor *s)
-{
-	struct sensor_pref **p_cur = ps;
-
-	while (*p_cur) {
-		struct sensor_pref *p = *p_cur;
-
-		if (p->sensor == s)
-			return p;
-
-		p_cur++;
-	}
-
-	return NULL;
-}
-
-static struct sensor_pref *
-get_selected_sensor_pref(GtkBuilder *builder, struct sensor_pref **ps)
+get_selected_sensor_pref(GtkTreeView *tree)
 {
 	GtkTreeModel *model;
 	GtkTreeIter iter;
-	struct sensor_pref *pref = NULL;
+	struct sensor_pref *pref;
 	GtkTreeSelection *selection;
-	GtkTreeView *tree;
-
-	tree = GTK_TREE_VIEW(gtk_builder_get_object(builder,
-				     "sensors_list"));
 
 	selection = gtk_tree_view_get_selection(tree);
 
-	if (gtk_tree_selection_get_selected(selection, &model, &iter)) {
-		GtkTreePath *p = gtk_tree_model_get_path(model, &iter);
-		gint *indices = gtk_tree_path_get_indices(p);
-
-		pref = ps[*indices];
-
-		gtk_tree_path_free(p);
-	}
+	pref = NULL;
+	if (gtk_tree_selection_get_selected(selection, &model, &iter))
+		gtk_tree_model_get(model, &iter, COL_SENSOR_PREF, &pref, -1);
 
 	return pref;
 }
 
 static void on_name_changed(GtkEntry *entry, gpointer data)
 {
-	struct cb_data *cbdata = data;
 	struct sensor_pref *p;
 	const char *str;
 
 	str = gtk_entry_get_text(entry);
 
-	p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs);
+	p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
 
 	if (p && strcmp(p->name, str)) {
 		free(p->name);
@@ -179,10 +125,9 @@ static void on_name_changed(GtkEntry *entry, gpointer data)
 static void
 on_drawed_toggled(GtkToggleButton *btn, gpointer data)
 {
-	struct cb_data *cbdata = data;
 	struct sensor_pref *p;
 
-	p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs);
+	p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
 
 	if (p)
 		p->enabled = gtk_toggle_button_get_active(btn);
@@ -191,10 +136,9 @@ on_drawed_toggled(GtkToggleButton *btn, gpointer data)
 static void
 on_alarm_toggled(GtkToggleButton *btn, gpointer data)
 {
-	struct cb_data *cbdata = data;
 	struct sensor_pref *p;
 
-	p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs);
+	p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
 
 	if (p)
 		p->alarm_enabled = gtk_toggle_button_get_active(btn);
@@ -203,10 +147,9 @@ on_alarm_toggled(GtkToggleButton *btn, gpointer data)
 static void
 on_appindicator_toggled(GtkToggleButton *btn, gpointer data)
 {
-	struct cb_data *cbdata = data;
 	struct sensor_pref *p;
 
-	p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs);
+	p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
 
 	if (p)
 		p->appindicator_enabled = gtk_toggle_button_get_active(btn);
@@ -214,11 +157,10 @@ on_appindicator_toggled(GtkToggleButton *btn, gpointer data)
 
 static void on_color_set(GtkColorButton *widget, gpointer data)
 {
-	struct cb_data *cbdata = data;
 	struct sensor_pref *p;
 	GdkColor color;
 
-	p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs);
+	p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
 
 	if (p) {
 		gtk_color_button_get_color(widget, &color);
@@ -228,12 +170,9 @@ static void on_color_set(GtkColorButton *widget, gpointer data)
 
 static void on_alarm_high_threshold_changed(GtkSpinButton *btn, gpointer data)
 {
-	struct cb_data *cbdata;
 	struct sensor_pref *p;
 
-	cbdata = data;
-
-	p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs);
+	p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
 
 	if (p)
 		p->alarm_high_threshold = gtk_spin_button_get_value(btn);
@@ -241,55 +180,49 @@ static void on_alarm_high_threshold_changed(GtkSpinButton *btn, gpointer data)
 
 static void on_alarm_low_threshold_changed(GtkSpinButton *btn, gpointer data)
 {
-	struct cb_data *cbdata;
 	struct sensor_pref *p;
 
-	cbdata = data;
-
-	p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs);
+	p = get_selected_sensor_pref(GTK_TREE_VIEW(data));
 
 	if (p)
 		p->alarm_low_threshold = gtk_spin_button_get_value(btn);
 }
 
-static void connect_signals(GtkBuilder *builder, struct cb_data *cbdata)
+static void connect_signals(GtkBuilder *builder, GtkTreeView *tree)
 {
 	g_signal_connect(gtk_builder_get_object(builder, "sensor_name"),
-			 "changed", G_CALLBACK(on_name_changed), cbdata);
+			 "changed", G_CALLBACK(on_name_changed), tree);
 
 	g_signal_connect(gtk_builder_get_object(builder, "sensor_draw"),
-			 "toggled", G_CALLBACK(on_drawed_toggled), cbdata);
+			 "toggled", G_CALLBACK(on_drawed_toggled), tree);
 
 	g_signal_connect(gtk_builder_get_object(builder, "sensor_color"),
-			 "color-set", G_CALLBACK(on_color_set), cbdata);
+			 "color-set", G_CALLBACK(on_color_set), tree);
 
 	g_signal_connect(gtk_builder_get_object(builder, "sensor_alarm"),
-			 "toggled", G_CALLBACK(on_alarm_toggled), cbdata);
+			 "toggled", G_CALLBACK(on_alarm_toggled), tree);
 
 	g_signal_connect(gtk_builder_get_object(builder,
 						"sensor_alarm_high_threshold"),
 			 "value-changed",
 			 G_CALLBACK(on_alarm_high_threshold_changed),
-			 cbdata);
+			 tree);
 
 	g_signal_connect(gtk_builder_get_object(builder,
 						"sensor_alarm_low_threshold"),
 			 "value-changed",
 			 G_CALLBACK(on_alarm_low_threshold_changed),
-			 cbdata);
+			 tree);
 
 	g_signal_connect(gtk_builder_get_object(builder,
 						"indicator_checkbox"),
 			 "toggled",
 			 G_CALLBACK(on_appindicator_toggled),
-			 cbdata);
+			 tree);
 }
 
 static void
-update_pref(struct psensor *s,
-	    struct sensor_pref **prefs,
-	    struct config *cfg,
-	    GtkBuilder *builder)
+update_pref(struct sensor_pref *p, struct config *cfg, GtkBuilder *builder)
 {
 	GtkLabel *w_id, *w_type, *w_high_threshold_unit, *w_low_threshold_unit,
 		*w_chipname;
@@ -298,9 +231,11 @@ update_pref(struct psensor *s,
 	GtkColorButton *w_color;
 	GtkSpinButton *w_high_threshold, *w_low_threshold;
 	GdkColor *color;
-	struct sensor_pref *p = sensor_pref_get(prefs, s);
+	struct psensor *s;
 	int use_celcius;
 
+	s = p->sensor;
+
 	w_id = GTK_LABEL(gtk_builder_get_object(builder, "sensor_id"));
 	gtk_label_set_text(w_id, s->id);
 
@@ -377,23 +312,15 @@ update_pref(struct psensor *s,
 
 static void on_changed(GtkTreeSelection *selection, gpointer data)
 {
-	GtkTreeModel *model;
-	GtkTreeIter iter;
 	struct cb_data *cbdata = data;
 	struct ui_psensor *ui = cbdata->ui;
+	struct sensor_pref *p;
+	GtkTreeView *tree;
 
-	if (gtk_tree_selection_get_selected(selection, &model, &iter)) {
-		GtkTreePath *p = gtk_tree_model_get_path(model, &iter);
-		gint *indices = gtk_tree_path_get_indices(p);
-		struct psensor *s = *(ui->sensors + *indices);
-
-		update_pref(s,
-			    cbdata->prefs,
-			    ui->config,
-			    cbdata->builder);
-
-		gtk_tree_path_free(p);
-	}
+	tree = GTK_TREE_VIEW(gtk_builder_get_object(cbdata->builder,
+						    "sensors_list"));
+	p = get_selected_sensor_pref(tree);
+	update_pref(p, ui->config, cbdata->builder);
 }
 
 static void
@@ -421,60 +348,67 @@ select_sensor(struct psensor *s, struct psensor **sensors, GtkTreeView *tree)
 	}
 }
 
-static void
-apply_prefs(struct sensor_pref **prefs,
-	    struct psensor **sensors,
-	    struct config *cfg)
+static void apply_pref(struct sensor_pref *p, int pos, struct config *cfg)
 {
-	int n = psensor_list_size(sensors);
-	int i;
+	struct psensor *s;
 
-	for (i = 0; i < n; i++) {
-		struct psensor *s = sensors[i];
-		struct sensor_pref *p = prefs[i];
+	s = p->sensor;
 
-		if (strcmp(p->name, s->name)) {
-			free(s->name);
-			s->name = strdup(p->name);
-			config_set_sensor_name(s->id, s->name);
-		}
+	if (strcmp(p->name, s->name)) {
+		free(s->name);
+		s->name = strdup(p->name);
+		config_set_sensor_name(s->id, s->name);
+	}
 
-		if (s->enabled != p->enabled) {
-			s->enabled = p->enabled;
-			config_set_sensor_enabled(s->id, s->enabled);
-		}
+	if (s->enabled != p->enabled) {
+		s->enabled = p->enabled;
+		config_set_sensor_enabled(s->id, s->enabled);
+	}
 
-		if (is_temp_type(s->type)
-		    && cfg->temperature_unit == FAHRENHEIT) {
-			s->alarm_high_threshold = fahrenheit_to_celcius
-				(p->alarm_high_threshold);
-			s->alarm_low_threshold = fahrenheit_to_celcius
-				(p->alarm_low_threshold);
-		} else {
-			s->alarm_high_threshold = p->alarm_high_threshold;
-			s->alarm_low_threshold = p->alarm_low_threshold;
-		}
+	if (is_temp_type(s->type) && cfg->temperature_unit == FAHRENHEIT) {
+		s->alarm_high_threshold
+			= fahrenheit_to_celcius(p->alarm_high_threshold);
+		s->alarm_low_threshold
+			= fahrenheit_to_celcius(p->alarm_low_threshold);
+	} else {
+		s->alarm_high_threshold = p->alarm_high_threshold;
+		s->alarm_low_threshold = p->alarm_low_threshold;
+	}
 
-		config_set_sensor_alarm_high_threshold(s->id,
-						      s->alarm_high_threshold);
-		config_set_sensor_alarm_low_threshold(s->id,
-						     s->alarm_low_threshold);
+	config_set_sensor_alarm_high_threshold(s->id, s->alarm_high_threshold);
+	config_set_sensor_alarm_low_threshold(s->id, s->alarm_low_threshold);
 
-		if (s->alarm_enabled != p->alarm_enabled) {
-			s->alarm_enabled = p->alarm_enabled;
-			config_set_sensor_alarm_enabled(s->id,
-							s->alarm_enabled);
-		}
+	if (s->alarm_enabled != p->alarm_enabled) {
+		s->alarm_enabled = p->alarm_enabled;
+		config_set_sensor_alarm_enabled(s->id, s->alarm_enabled);
+	}
 
-		color_set(s->color,
-			  p->color->red, p->color->green, p->color->blue);
-		config_set_sensor_color(s->id, s->color);
+	color_set(s->color, p->color->red, p->color->green, p->color->blue);
+	config_set_sensor_color(s->id, s->color);
 
-		if (s->appindicator_enabled != p->appindicator_enabled) {
-			s->appindicator_enabled = p->appindicator_enabled;
-			config_set_appindicator_enabled
-				(s->id, s->appindicator_enabled);
-		}
+	if (s->appindicator_enabled != p->appindicator_enabled) {
+		s->appindicator_enabled = p->appindicator_enabled;
+		config_set_appindicator_enabled(s->id, s->appindicator_enabled);
+	}
+
+	config_set_sensor_position(s->id, pos);
+}
+
+static void
+apply_prefs(GtkTreeModel *model, struct config *cfg)
+{
+	gboolean valid;
+	struct sensor_pref *spref;
+	GtkTreeIter iter;
+	int i;
+
+	valid = gtk_tree_model_get_iter_first(model, &iter);
+	i = 0;
+	while (valid) {
+		gtk_tree_model_get(model, &iter, COL_SENSOR_PREF, &spref, -1);
+		apply_pref(spref, i, cfg);
+		valid = gtk_tree_model_iter_next(model, &iter);
+		i++;
 	}
 }
 
@@ -482,23 +416,25 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui)
 {
 	GtkDialog *diag;
 	gint result;
+	guint ok;
 	GtkBuilder *builder;
-	GError *error = NULL;
+	GError *error;
 	GtkTreeView *w_sensors_list;
-	guint ok;
-	GtkCellRenderer *renderer;
 	GtkListStore *store;
-	struct psensor **s_cur;
+	struct psensor **s_cur, *s, **ordered_sensors;
 	GtkTreeSelection *selection;
 	struct cb_data cbdata;
+	GtkTreeIter iter;
+	struct sensor_pref *spref;
+	gboolean valid;
+	GtkTreeModel *model;
 
 	cbdata.ui = ui;
-	cbdata.prefs = sensor_pref_list_new(ui->sensors,
-					    ui->config);
 
 	builder = gtk_builder_new();
 	cbdata.builder = builder;
 
+	error = NULL;
 	ok = gtk_builder_add_from_file
 		(builder,
 		 PACKAGE_DATA_DIR G_DIR_SEPARATOR_S "sensor-edit.glade",
@@ -510,51 +446,56 @@ void ui_sensorpref_dialog_run(struct psensor *sensor, struct ui_psensor *ui)
 		return ;
 	}
 
-	update_pref(sensor, cbdata.prefs, ui->config, builder);
-	connect_signals(builder, &cbdata);
-
 	w_sensors_list
 		= GTK_TREE_VIEW(gtk_builder_get_object(builder,
 						       "sensors_list"));
+	connect_signals(builder, w_sensors_list);
 
-	renderer = gtk_cell_renderer_text_new();
-	gtk_tree_view_insert_column_with_attributes(w_sensors_list,
-						    -1,
-						    _("Sensor Name"),
-						    renderer,
-						    "text", 0, NULL);
-
-	store = GTK_LIST_STORE(gtk_tree_view_get_model(w_sensors_list));
-
-	s_cur = ui->sensors;
-	while (*s_cur) {
-		GtkTreeIter iter;
-		struct psensor *s = *s_cur;
+	store = GTK_LIST_STORE(gtk_builder_get_object(builder,
+						      "sensors_liststore"));
 
+	ordered_sensors = ui_get_sensors_ordered_by_position(ui);
+	for (s_cur = ordered_sensors; *s_cur; s_cur++) {
+		s = *s_cur;
 		gtk_list_store_append(store, &iter);
-		gtk_list_store_set(store, &iter, 0, s->name, -1);
 
-		s_cur++;
+		spref = sensor_pref_new(s, ui->config);
+		gtk_list_store_set(store, &iter,
+				   COL_NAME, s->name,
+				   COL_SENSOR_PREF, spref,
+				   -1);
+
+		if (s == sensor)
+			update_pref(spref, ui->config, builder);
 	}
 
 	selection = gtk_tree_view_get_selection(w_sensors_list);
 	g_signal_connect(selection, "changed", G_CALLBACK(on_changed), &cbdata);
-	select_sensor(sensor, ui->sensors, w_sensors_list);
+	select_sensor(sensor, ordered_sensors, w_sensors_list);
+
+	free(ordered_sensors);
 
 	diag = GTK_DIALOG(gtk_builder_get_object(builder, "dialog1"));
 	result = gtk_dialog_run(diag);
 
+	model = gtk_tree_view_get_model(w_sensors_list);
+
 	if (result == GTK_RESPONSE_ACCEPT) {
-		apply_prefs(cbdata.prefs, ui->sensors, ui->config);
+		apply_prefs(model, ui->config);
 		ui_sensorlist_update(ui, 1);
 #if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
 		ui_appindicator_update_menu(ui);
 #endif
 	}
 
+	valid = gtk_tree_model_get_iter_first(model, &iter);
+	while (valid) {
+		gtk_tree_model_get(model, &iter, COL_SENSOR_PREF, &spref, -1);
+		sensor_pref_free(spref);
+		valid = gtk_tree_model_iter_next(model, &iter);
+	}
+
 	g_object_unref(G_OBJECT(builder));
 
 	gtk_widget_destroy(GTK_WIDGET(diag));
-
-	sensor_pref_list_free(cbdata.prefs);
 }