X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor.git;a=blobdiff_plain;f=src%2Fmain.c;h=69df91b7506d3b86b2908df26e365882563052b4;hp=a87c64389f5fd89b7bdbc2675d50ec71080af8b1;hb=c1e20f2631a1249720e9c75d753eacfcb0f6c7b9;hpb=41e195b3221e9936e83c3a4c2dd62e8496323e91 diff --git a/src/main.c b/src/main.c index a87c643..69df91b 100644 --- a/src/main.c +++ b/src/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2014 jeanfi@gmail.com + * Copyright (C) 2010-2017 jeanfi@gmail.com * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -28,49 +28,31 @@ #include -#include "config.h" +#include -#include "cfg.h" +#include +#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 "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_LIBNOTIFY -#include "ui_notify.h" -#endif - -#ifdef HAVE_GTOP -#include -#endif +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include static const char *program_name; @@ -155,26 +137,15 @@ 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); + bcm2835_psensor_list_update(sensors); psensor_log_measures(sensors); @@ -188,30 +159,30 @@ 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); } -gboolean ui_refresh_thread(gpointer data) +static gboolean ui_refresh_thread(gpointer data) { struct config *cfg; gboolean ret; @@ -222,18 +193,14 @@ gboolean ui_refresh_thread(gpointer data) pmutex_lock(&ui->sensors_mutex); - graph_update(ui->sensors, ui->w_graph, ui->config, ui->main_window); + graph_update(ui->sensors, ui_get_graph(), ui->config, ui->main_window); ui_sensorlist_update(ui, 0); 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 + ui_unity_launcher_entry_update(ui->sensors); if (ui->graph_update_interval != cfg->graph_update_interval) { ui->graph_update_interval = cfg->graph_update_interval; @@ -251,82 +218,54 @@ gboolean ui_refresh_thread(gpointer data) static void cb_alarm_raised(struct psensor *sensor, void *data) { -#ifdef HAVE_LIBNOTIFY - if (sensor->alarm_enabled) + if (config_get_sensor_alarm_enabled(sensor->id)) { ui_notify(sensor, (struct ui_psensor *)data); -#endif - - 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 high_temp, high_default, low_default; - 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); + if (s->max == UNKNOWN_DBL_VALUE) { + if (s->type & SENSOR_TYPE_TEMP) + high_default = high_temp; + else + high_default = UNKNOWN_DBL_VALUE; + } else { + high_default = s->max; + } - s->alarm_enabled - = config_get_sensor_alarm_enabled(s->id); + ret = config_get_sensor_alarm_high_threshold + (s->id, &s->alarm_high_threshold, high_default); - sensor_cur++; + if (!ret) + s->alarm_high_threshold = high_default; + + if (s->min == UNKNOWN_DBL_VALUE) + low_default = 0; + else + low_default = s->min; + + ret = config_get_sensor_alarm_low_threshold + (s->id, &s->alarm_low_threshold, low_default); + + if (!ret) + s->alarm_low_threshold = low_default; + + sensors++; } } @@ -338,8 +277,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) { @@ -347,8 +284,6 @@ static void associate_preferences(struct psensor **sensors) s->name = n; } - s->appindicator_enabled = config_is_appindicator_enabled(s->id); - sensor_cur++; } } @@ -380,25 +315,25 @@ static struct option long_options[] = { {NULL, 0, NULL, 0} }; -static gboolean initial_window_show(gpointer data) +/* + * show the main window if there will be no way for the user to show + * it (no appindicator, no status icon). + */ +static gboolean check_ui_visible(gpointer data) { struct ui_psensor *ui; - log_debug("initial_window_show()"); + log_debug("check_ui_visible()"); ui = (struct ui_psensor *)data; log_debug("is_status_supported: %d", is_status_supported()); log_debug("is_appindicator_supported: %d", is_appindicator_supported()); - log_debug("hide_on_startup: %d", ui->config->hide_on_startup); - if (!ui->config->hide_on_startup - || (!is_appindicator_supported() && !is_status_supported())) + if (!is_appindicator_supported() && !is_status_supported()) ui_window_show(ui); - ui_window_update(ui); - return FALSE; } @@ -430,22 +365,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(); @@ -466,14 +393,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; @@ -484,31 +411,25 @@ 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 + + bcm2835_psensor_list_append(&sensors, 600); } associate_preferences(sensors); - associate_colors(sensors); return sensors; } @@ -604,10 +525,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); @@ -623,24 +542,21 @@ 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(); - /* - * hack, did not find a cleaner solution. - * wait 30s to ensure that the status icon is attempted to be - * drawn before determining whether the main window must be - * show. - */ - if (ui.config->hide_on_startup) - g_timeout_add(30000, (GSourceFunc)initial_window_show, &ui); + log_debug("hide_on_startup: %d", ui.config->hide_on_startup); + if (ui.config->hide_on_startup) + /* Wait 30s to allow attempt to show status icon or other UI, + * then check whether any UI is accessible. If not, then main + * window must be shown despite hide_on_startup preference. + * There may be a cleaner way to deal with this. + */ + g_timeout_add(30000, (GSourceFunc)check_ui_visible, &ui); else - initial_window_show(&ui); - - log_debug("translators: %s\n", _("translator-credits")); + ui_window_show(&ui); /* main loop */ gtk_main();