X-Git-Url: http://git.wpitchoune.net/gitweb/?p=psensor.git;a=blobdiff_plain;f=src%2Fmain.c;h=defc60d80e7981d22815e88a5afd895b917f3021;hp=f817c14aa451de9f801052362cf82f4f58a69091;hb=30280f0093e8aea4bc8af8a46c2e529e8ec61ac9;hpb=138f4d6a450e4ead5da85fdef006e48e906223d8

diff --git a/src/main.c b/src/main.c
index f817c14..defc60d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -28,46 +28,30 @@
 
 #include <gtk/gtk.h>
 
-#include "config.h"
+#include <config.h>
 
-#include "cfg.h"
+#include <amd.h>
+#include <cfg.h>
+#include <graph.h>
 #include <hdd.h>
-#include "psensor.h"
-#include "graph.h"
-#include "ui.h"
-#include "ui_sensorlist.h"
-#include "ui_color.h"
-#include "lmsensor.h"
-#include "notify_cmd.h"
+#include <lmsensor.h>
+#include <notify_cmd.h>
+#include <nvidia.h>
+#include <pgtop2.h>
 #include <pmutex.h>
+#include <psensor.h>
 #include <pudisks2.h>
-#include "slog.h"
-#include "ui_pref.h"
-#include "ui_graph.h"
+#include <rsensor.h>
+#include <slog.h>
+#include <ui.h>
+#include <ui_appindicator.h>
+#include <ui_color.h>
+#include <ui_graph.h>
 #include <ui_notify.h>
-#include "ui_status.h"
-
-#ifdef HAVE_UNITY
-#include "ui_unity.h"
-#endif
-
-#ifdef HAVE_NVIDIA
-#include "nvidia.h"
-#endif
-
-#ifdef HAVE_LIBATIADL
-#include "amd.h"
-#endif
-
-#ifdef HAVE_REMOTE_SUPPORT
-#include "rsensor.h"
-#endif
-
-#include "ui_appindicator.h"
-
-#ifdef HAVE_GTOP
-#include <pgtop2.h>
-#endif
+#include <ui_pref.h>
+#include <ui_sensorlist.h>
+#include <ui_status.h>
+#include <ui_unity.h>
 
 static const char *program_name;
 
@@ -152,25 +136,13 @@ static void *update_measures(void *data)
 		update_psensor_values_size(sensors, cfg);
 
 		lmsensor_psensor_list_update(sensors);
-#ifdef HAVE_REMOTE_SUPPORT
+
 		remote_psensor_list_update(sensors);
-#endif
-#ifdef HAVE_NVIDIA
 		nvidia_psensor_list_update(sensors);
-#endif
-#ifdef HAVE_LIBATIADL
 		amd_psensor_list_update(sensors);
-#endif
-#ifdef HAVE_LIBUDISKS2
 		udisks2_psensor_list_update(sensors);
-#endif
-#ifdef HAVE_GTOP
 		gtop2_psensor_list_update(sensors);
-#endif
-#ifdef HAVE_ATASMART
 		atasmart_psensor_list_update(sensors);
-#endif
-
 		hddtemp_psensor_list_update(sensors);
 
 		psensor_log_measures(sensors);
@@ -185,24 +157,24 @@ static void *update_measures(void *data)
 
 static void indicators_update(struct ui_psensor *ui)
 {
-	struct psensor **sensor_cur = ui->sensors;
-	unsigned int attention = 0;
+	struct psensor **ss, *s;
+	bool attention;
 
-	while (*sensor_cur) {
-		struct psensor *s = *sensor_cur;
+	attention = false;
+	ss = ui->sensors;
+	while (*ss) {
+		s = *ss;
 
-		if (s->alarm_enabled && s->alarm_raised) {
-			attention = 1;
+		if (s->alarm_raised && config_get_sensor_alarm_enabled(s->id)) {
+			attention = true;
 			break;
 		}
 
-		sensor_cur++;
+		ss++;
 	}
 
-#if defined(HAVE_APPINDICATOR)
 	if (is_appindicator_supported())
 		ui_appindicator_update(ui, attention);
-#endif
 
 	if (is_status_supported())
 		ui_status_update(ui, attention);
@@ -213,6 +185,7 @@ static gboolean ui_refresh_thread(gpointer data)
 	struct config *cfg;
 	gboolean ret;
 	struct ui_psensor *ui = (struct ui_psensor *)data;
+	int use_celsius;
 
 	ret = TRUE;
 	cfg = ui->config;
@@ -226,11 +199,11 @@ static gboolean ui_refresh_thread(gpointer data)
 	if (is_appindicator_supported() || is_status_supported())
 		indicators_update(ui);
 
-#ifdef HAVE_UNITY
-	ui_unity_launcher_entry_update(ui->sensors,
-				       !cfg->unity_launcher_count_disabled,
-				       cfg->temperature_unit == CELSIUS);
-#endif
+	if (config_get_temperature_unit() == CELSIUS)
+		use_celsius = 1;
+	else
+		use_celsius = 0;
+	ui_unity_launcher_entry_update(ui->sensors);
 
 	if (ui->graph_update_interval != cfg->graph_update_interval) {
 		ui->graph_update_interval = cfg->graph_update_interval;
@@ -248,80 +221,46 @@ static gboolean ui_refresh_thread(gpointer data)
 
 static void cb_alarm_raised(struct psensor *sensor, void *data)
 {
-	if (sensor->alarm_enabled)
+	if (config_get_sensor_alarm_enabled(sensor->id)) {
 		ui_notify(sensor, (struct ui_psensor *)data);
-
-	notify_cmd(sensor);
-}
-
-static void associate_colors(struct psensor **sensors)
-{
-	GdkRGBA rgba;
-	/* copied from the default colors of the gtk color color
-	 * chooser. */
-	const char *default_colors[27] = {
-		"#ef2929",  /* Scarlet Red */
-		"#fcaf3e",  /* Orange */
-		"#fce94f",  /* Butter */
-		"#8ae234",  /* Chameleon */
-		"#729fcf",  /* Sky Blue */
-		"#ad7fa8",  /* Plum */
-		"#e9b96e",  /* Chocolate */
-		"#888a85",  /* Aluminum 1 */
-		"#eeeeec",  /* Aluminum 2 */
-		"#cc0000",
-		"#f57900",
-		"#edd400",
-		"#73d216",
-		"#3465a4",
-		"#75507b",
-		"#c17d11",
-		"#555753",
-		"#d3d7cf",
-		"#a40000",
-		"#ce5c00",
-		"#c4a000",
-		"#4e9a06",
-		"#204a87",
-		"#5c3566",
-		"#8f5902",
-		"#2e3436",
-		"#babdb6"
-	};
-	int i;
-	struct psensor **cur;
-	struct color c;
-
-	for (cur = sensors, i = 0; *cur; cur++, i++) {
-		gdk_rgba_parse(&rgba, default_colors[i % 27]);
-		c.red = rgba.red;
-		c.green = rgba.green;
-		c.blue = rgba.blue;
-
-		(*cur)->color = config_get_sensor_color((*cur)->id, &c);
+		notify_cmd(sensor);
 	}
 }
 
 static void
 associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
 {
-	struct psensor **sensor_cur = sensors;
+	bool ret;
+	struct psensor *s;
+	double d, high_temp;
 
-	while (*sensor_cur) {
-		struct psensor *s = *sensor_cur;
+	high_temp = config_get_default_high_threshold_temperature();
+
+	while (*sensors) {
+		s = *sensors;
 
 		s->cb_alarm_raised = cb_alarm_raised;
 		s->cb_alarm_raised_data = ui;
 
-		s->alarm_high_threshold
-			= config_get_sensor_alarm_high_threshold(s->id);
-		s->alarm_low_threshold
-			= config_get_sensor_alarm_low_threshold(s->id);
+		ret = config_get_sensor_alarm_high_threshold
+			(s->id, &s->alarm_high_threshold);
 
-		s->alarm_enabled
-			    = config_get_sensor_alarm_enabled(s->id);
+		if (!ret) {
+			if (s->max == UNKNOWN_DBL_VALUE) {
+				if (s->type & SENSOR_TYPE_TEMP)
+					s->alarm_high_threshold = high_temp;
+			} else {
+				s->alarm_high_threshold = s->max;
+			}
+		}
 
-		sensor_cur++;
+		ret = config_get_sensor_alarm_low_threshold
+			(s->id, &s->alarm_low_threshold);
+
+		if (!ret && s->min != UNKNOWN_DBL_VALUE)
+			s->alarm_low_threshold = s->min;
+
+		sensors++;
 	}
 }
 
@@ -333,8 +272,6 @@ static void associate_preferences(struct psensor **sensors)
 		char *n;
 		struct psensor *s = *sensor_cur;
 
-		s->graph_enabled = config_is_sensor_graph_enabled(s->id);
-
 		n = config_get_sensor_name(s->id);
 
 		if (n) {
@@ -423,22 +360,14 @@ static void cleanup(struct ui_psensor *ui)
 
 	log_debug("Cleanup...");
 
-#ifdef HAVE_NVIDIA
 	nvidia_cleanup();
-#endif
-#ifdef HAVE_LIBATIADL
 	amd_cleanup();
-#endif
-#ifdef HAVE_REMOTE_SUPPORT
 	rsensor_cleanup();
-#endif
 
 	psensor_list_free(ui->sensors);
 	ui->sensors = NULL;
 
-#if defined(HAVE_APPINDICATOR)
 	ui_appindicator_cleanup();
-#endif
 
 	ui_status_cleanup();
 
@@ -459,14 +388,14 @@ static struct psensor **create_sensors_list(const char *url)
 	struct psensor **sensors;
 
 	if (url) {
-#ifdef HAVE_REMOTE_SUPPORT
-		rsensor_init();
-		sensors = get_remote_sensors(url, 600);
-#else
-		log_err(_("Psensor has not been compiled with remote "
-			  "sensor support."));
-		exit(EXIT_FAILURE);
-#endif
+		if (rsensor_is_supported()) {
+			rsensor_init();
+			sensors = get_remote_sensors(url, 600);
+		} else {
+			log_err(_("Psensor has not been compiled with remote "
+				  "sensor support."));
+			exit(EXIT_FAILURE);
+		}
 	} else {
 		sensors = malloc(sizeof(struct psensor *));
 		*sensors = NULL;
@@ -477,31 +406,23 @@ static struct psensor **create_sensors_list(const char *url)
 		if (config_is_hddtemp_enabled())
 			hddtemp_psensor_list_append(&sensors, 600);
 
-#ifdef HAVE_ATASMART
 		if (config_is_libatasmart_enabled())
 			atasmart_psensor_list_append(&sensors, 600);
-#endif
 
-#ifdef HAVE_NVIDIA
 		if (config_is_nvctrl_enabled())
 			nvidia_psensor_list_append(&sensors, 600);
-#endif
-#ifdef HAVE_LIBATIADL
+
 		if (config_is_atiadlsdk_enabled())
 			amd_psensor_list_append(&sensors, 600);
-#endif
-#ifdef HAVE_GTOP
+
 		if (config_is_gtop2_enabled())
 			gtop2_psensor_list_append(&sensors, 600);
-#endif
-#ifdef HAVE_LIBUDISKS2
+
 		if (config_is_udisks2_enabled())
 			udisks2_psensor_list_append(&sensors, 600);
-#endif
 	}
 
 	associate_preferences(sensors);
-	associate_colors(sensors);
 
 	return sensors;
 }
@@ -597,10 +518,8 @@ int main(int argc, char **argv)
 			      &ui.sensors_mutex,
 			      config_get_slog_interval());
 
-#if !defined(HAVE_APPINDICATOR)
 	ui_status_init(&ui);
 	ui_status_set_visible(1);
-#endif
 
 	/* main window */
 	ui_window_create(&ui);
@@ -616,9 +535,8 @@ int main(int argc, char **argv)
 
 	g_timeout_add(1000 * ui.graph_update_interval, ui_refresh_thread, &ui);
 
-#if defined(HAVE_APPINDICATOR)
 	ui_appindicator_init(&ui);
-#endif
+	ui_unity_init();
 
 	gdk_notify_startup_complete();
 
@@ -633,8 +551,6 @@ int main(int argc, char **argv)
 	else
 		initial_window_show(&ui);
 
-	log_debug("translators: %s\n", _("translator-credits"));
-
 	/* main loop */
 	gtk_main();