X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui_sensorpref.c;h=d5ef41f2c38dd31a47436e37324f15ec6c940bc3;hb=633311cbd5621fefdc0373c5ee967a87925e5221;hp=331fef3f8dfa95a24163cb0f0fabcd6dcbaf7160;hpb=ab5b213fd74bfba9e3d3f399741c5eeb52f3c8f6;p=psensor.git

diff --git a/src/ui_sensorpref.c b/src/ui_sensorpref.c
index 331fef3..d5ef41f 100644
--- a/src/ui_sensorpref.c
+++ b/src/ui_sensorpref.c
@@ -32,7 +32,8 @@ struct sensor_pref {
 	int enabled;
 	struct color *color;
 	int alarm_enabled;
-	double alarm_limit;
+	int alarm_high_threshold;
+	int alarm_low_threshold;
 };
 
 struct cb_data {
@@ -44,19 +45,25 @@ struct cb_data {
 static struct sensor_pref *sensor_pref_new(struct psensor *s,
 					   struct config *cfg)
 {
-	struct sensor_pref *p = malloc(sizeof(struct sensor_pref));
+	struct sensor_pref *p;
 
-	p->sensor = s;
+	p = malloc(sizeof(struct sensor_pref));
 
+	p->sensor = s;
 	p->name = strdup(s->name);
 	p->enabled = s->enabled;
 	p->alarm_enabled = s->alarm_enabled;
 	p->color = color_dup(s->color);
 
-	if (cfg->temperature_unit == CELCIUS)
-		p->alarm_limit = s->alarm_limit;
-	else
-		p->alarm_limit = celcius_to_fahrenheit(s->alarm_limit);
+	if (cfg->temperature_unit == CELCIUS) {
+		p->alarm_high_threshold = s->alarm_high_threshold;
+		p->alarm_low_threshold = s->alarm_low_threshold;
+	} else {
+		p->alarm_high_threshold
+			= celcius_to_fahrenheit(s->alarm_high_threshold);
+		p->alarm_low_threshold
+			= celcius_to_fahrenheit(s->alarm_low_threshold);
+	}
 
 	return p;
 }
@@ -200,15 +207,30 @@ static void on_color_set(GtkColorButton *widget, gpointer data)
 	}
 }
 
-static void on_temp_limit_changed(GtkSpinButton *btn, gpointer data)
+static void on_alarm_high_threshold_changed(GtkSpinButton *btn, gpointer data)
 {
-	struct cb_data *cbdata = data;
+	struct cb_data *cbdata;
+	struct sensor_pref *p;
+
+	cbdata = data;
+
+	p = get_selected_sensor_pref(cbdata->builder, cbdata->prefs);
+
+	if (p)
+		p->alarm_high_threshold = gtk_spin_button_get_value(btn);
+}
+
+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);
 
 	if (p)
-		p->alarm_limit = gtk_spin_button_get_value(btn);
+		p->alarm_low_threshold = gtk_spin_button_get_value(btn);
 }
 
 static void connect_signals(GtkBuilder *builder, struct cb_data *cbdata)
@@ -225,8 +247,16 @@ static void connect_signals(GtkBuilder *builder, struct cb_data *cbdata)
 	g_signal_connect(gtk_builder_get_object(builder, "sensor_alarm"),
 			 "toggled", G_CALLBACK(on_alarm_toggled), cbdata);
 
-	g_signal_connect(gtk_builder_get_object(builder, "sensor_temp_limit"),
-			 "value-changed", G_CALLBACK(on_temp_limit_changed),
+	g_signal_connect(gtk_builder_get_object(builder,
+						"sensor_alarm_high_threshold"),
+			 "value-changed",
+			 G_CALLBACK(on_alarm_high_threshold_changed),
+			 cbdata);
+
+	g_signal_connect(gtk_builder_get_object(builder,
+						"sensor_alarm_low_threshold"),
+			 "value-changed",
+			 G_CALLBACK(on_alarm_low_threshold_changed),
 			 cbdata);
 }
 
@@ -236,11 +266,11 @@ update_pref(struct psensor *s,
 	    struct config *cfg,
 	    GtkBuilder *builder)
 {
-	GtkLabel *w_id, *w_type, *w_temp_unit;
+	GtkLabel *w_id, *w_type, *w_high_threshold_unit, *w_low_threshold_unit;
 	GtkEntry *w_name;
 	GtkToggleButton *w_draw, *w_alarm;
 	GtkColorButton *w_color;
-	GtkSpinButton *w_temp_limit;
+	GtkSpinButton *w_high_threshold, *w_low_threshold;
 	GdkColor *color;
 	struct sensor_pref *p = sensor_pref_get(prefs, s);
 	int use_celcius;
@@ -265,29 +295,44 @@ update_pref(struct psensor *s,
 
 	w_alarm = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder,
 							   "sensor_alarm"));
-	w_temp_limit
-		= GTK_SPIN_BUTTON(gtk_builder_get_object(builder,
-							 "sensor_temp_limit"));
-
-	w_temp_unit
-		= GTK_LABEL(gtk_builder_get_object(builder,
-						   "sensor_temp_unit"));
+	w_high_threshold = GTK_SPIN_BUTTON(gtk_builder_get_object
+					  (builder,
+					   "sensor_alarm_high_threshold"));
+	w_low_threshold = GTK_SPIN_BUTTON(gtk_builder_get_object
+					 (builder,
+					  "sensor_alarm_low_threshold"));
+
+	w_high_threshold_unit = GTK_LABEL(gtk_builder_get_object
+					 (builder,
+					  "sensor_alarm_high_threshold_unit"));
+	w_low_threshold_unit = GTK_LABEL(gtk_builder_get_object
+					(builder,
+					 "sensor_alarm_low_threshold_unit"));
 
 	use_celcius = cfg->temperature_unit == CELCIUS ? 1 : 0;
-	gtk_label_set_text(w_temp_unit,
+	gtk_label_set_text(w_high_threshold_unit,
+			   psensor_type_to_unit_str(s->type,
+						    use_celcius));
+	gtk_label_set_text(w_low_threshold_unit,
 			   psensor_type_to_unit_str(s->type,
 						    use_celcius));
 
-	if (is_temp_type(s->type)) {
+	if (is_temp_type(s->type) || is_fan_type(s->type)) {
 		gtk_toggle_button_set_active(w_alarm, p->alarm_enabled);
-		gtk_spin_button_set_value(w_temp_limit, p->alarm_limit);
+		gtk_spin_button_set_value(w_high_threshold,
+					  p->alarm_high_threshold);
+		gtk_spin_button_set_value(w_low_threshold,
+					  p->alarm_low_threshold);
 		gtk_widget_set_sensitive(GTK_WIDGET(w_alarm), TRUE);
-		gtk_widget_set_sensitive(GTK_WIDGET(w_temp_limit), TRUE);
+		gtk_widget_set_sensitive(GTK_WIDGET(w_high_threshold), TRUE);
+		gtk_widget_set_sensitive(GTK_WIDGET(w_low_threshold), TRUE);
 	} else {
 		gtk_toggle_button_set_active(w_alarm, 0);
-		gtk_spin_button_set_value(w_temp_limit, 0);
+		gtk_spin_button_set_value(w_high_threshold, 0);
+		gtk_spin_button_set_value(w_low_threshold, 0);
 		gtk_widget_set_sensitive(GTK_WIDGET(w_alarm), FALSE);
-		gtk_widget_set_sensitive(GTK_WIDGET(w_temp_limit), FALSE);
+		gtk_widget_set_sensitive(GTK_WIDGET(w_high_threshold), FALSE);
+		gtk_widget_set_sensitive(GTK_WIDGET(w_low_threshold), FALSE);
 	}
 }
 
@@ -360,14 +405,21 @@ apply_prefs(struct sensor_pref **prefs,
 			config_set_sensor_enabled(s->id, s->enabled);
 		}
 
-		if (cfg->temperature_unit == CELCIUS)
-			s->alarm_limit = p->alarm_limit;
-		else
-			s->alarm_limit = fahrenheit_to_celcius
-				(p->alarm_limit);
+		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_limit(s->id,
-					      s->alarm_limit);
+		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;