X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_sensorpref.c;h=2335cc14a1b5d8e0435bf0a4475759c3d0381197;hb=0d5ce393b282c110929a5e8b65a4076358ce5d59;hp=01ea4625720c8ccf7ffb7a5bdf86bc066dce5f86;hpb=7b33d0128c6e26c9098782c9e52becbc1ba8e4b4;p=psensor.git

diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c
index 01ea462..2335cc1 100644
--- a/src/ui_sensorpref.c
+++ b/src/ui_sensorpref.c
@@ -31,7 +31,8 @@
 #endif
 
 enum {
-	COL_NAME = 0
+	COL_NAME = 0,
+	COL_SENSOR
 };
 
 struct sensor_pref {
@@ -48,7 +49,6 @@ 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,
@@ -90,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, -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);
@@ -183,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);
@@ -195,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);
@@ -207,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);
@@ -218,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);
@@ -232,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);
@@ -245,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;
@@ -302,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);
 
@@ -381,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;
-
-	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);
-	}
+	struct sensor_pref *p;
+	GtkTreeView *tree;
+	
+	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
@@ -425,60 +348,63 @@ 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, 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);
+	}
+}
+
+static void
+apply_prefs(GtkTreeModel *model, struct config *cfg)
+{
+	gboolean valid;
+	struct sensor_pref *spref;
+	GtkTreeIter iter;
+
+	valid = gtk_tree_model_get_iter_first(model, &iter);
+	while (valid) {
+		gtk_tree_model_get(model, &iter, COL_SENSOR, &spref, -1);
+		apply_pref(spref, cfg);
+		valid = gtk_tree_model_iter_next(model, &iter);
 	}
 }
 
@@ -486,22 +412,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;
 	GtkListStore *store;
-	struct psensor **s_cur, *s;
+	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",
@@ -513,40 +442,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);
 
 	store = GTK_LIST_STORE(gtk_builder_get_object(builder,
 						      "sensors_liststore"));
 
-	for (s_cur = ui->sensors; *s_cur; s_cur++) {
+	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, COL_NAME, s->name, -1);
+
+		spref = sensor_pref_new(s, ui->config);
+		gtk_list_store_set(store, &iter,
+				   COL_NAME, s->name,
+				   COL_SENSOR, 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, &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);
 }