X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=1a6d774631e527ed192d5a0b19435bbfd8fa237f;hb=d860f90166069842cd5c00b55ee35bcd4b54f0eb;hp=175568ea052ed7a463061e84d5374352cdaf0511;hpb=b2706f38717e778f37beac8d7063d7e48d2a8f33;p=psensor.git diff --git a/src/main.c b/src/main.c index 175568e..1a6d774 100644 --- a/src/main.c +++ b/src/main.c @@ -28,46 +28,32 @@ #include -#include "config.h" +#include -#include "cfg.h" +#include +#include +#include #include -#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 +#include +#include +#include #include +#include #include -#include "slog.h" -#include "ui_pref.h" -#include "ui_graph.h" +#include +#include +#include +#include +#include +#include #include -#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 +#include +#include +#include -#include "ui_appindicator.h" -#ifdef HAVE_GTOP -#include -#endif static const char *program_name; @@ -152,25 +138,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 +159,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); @@ -226,11 +200,9 @@ 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 (ui->graph_update_interval != cfg->graph_update_interval) { ui->graph_update_interval = cfg->graph_update_interval; @@ -248,10 +220,10 @@ 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); + notify_cmd(sensor); + } } static void associate_colors(struct psensor **sensors) @@ -318,9 +290,6 @@ associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui) s->alarm_low_threshold = config_get_sensor_alarm_low_threshold(s->id); - s->alarm_enabled - = config_get_sensor_alarm_enabled(s->id); - sensor_cur++; } } @@ -333,8 +302,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) { @@ -342,8 +309,6 @@ static void associate_preferences(struct psensor **sensors) s->name = n; } - s->appindicator_enabled = config_is_appindicator_enabled(s->id); - sensor_cur++; } } @@ -425,22 +390,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(); @@ -461,14 +418,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; @@ -479,27 +436,20 @@ 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); @@ -599,10 +549,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); @@ -618,9 +566,7 @@ 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 gdk_notify_startup_complete(); @@ -635,8 +581,6 @@ int main(int argc, char **argv) else initial_window_show(&ui); - log_debug("translators: %s\n", _("translator-credits")); - /* main loop */ gtk_main();