#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_pref.h>
+#include <ui_sensorlist.h>
+#include <ui_status.h>
+#include <ui_unity.h>
-#include "ui_appindicator.h"
-#ifdef HAVE_GTOP
-#include <pgtop2.h>
-#endif
static const char *program_name;
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);
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);
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 (ui->graph_update_interval != cfg->graph_update_interval) {
ui->graph_update_interval = cfg->graph_update_interval;
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);
+ notify_cmd(sensor);
+ }
}
static void associate_colors(struct psensor **sensors)
s->alarm_low_threshold
= config_get_sensor_alarm_low_threshold(s->id);
- s->alarm_enabled
- = config_get_sensor_alarm_enabled(s->id);
-
sensor_cur++;
}
}
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) {
s->name = n;
}
- s->appindicator_enabled = config_is_appindicator_enabled(s->id);
-
sensor_cur++;
}
}
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();
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;
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);
&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);
g_timeout_add(1000 * ui.graph_update_interval, ui_refresh_thread, &ui);
-#if defined(HAVE_APPINDICATOR)
ui_appindicator_init(&ui);
-#endif
gdk_notify_startup_complete();
else
initial_window_show(&ui);
- log_debug("translators: %s\n", _("translator-credits"));
-
/* main loop */
gtk_main();