X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor.git;a=blobdiff_plain;f=src%2Fmain.c;h=69df91b7506d3b86b2908df26e365882563052b4;hp=ad4b06d9f26d872c7411785bbbaee95dbe2152f8;hb=c1e20f2631a1249720e9c75d753eacfcb0f6c7b9;hpb=2cec0f33f19afafe8a9dd28fc3af3db27796c76b diff --git a/src/main.c b/src/main.c index ad4b06d..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 @@ -31,6 +31,7 @@ #include #include +#include #include #include #include @@ -53,8 +54,6 @@ #include #include - - static const char *program_name; static void print_version(void) @@ -146,6 +145,7 @@ static void *update_measures(void *data) gtop2_psensor_list_update(sensors); atasmart_psensor_list_update(sensors); hddtemp_psensor_list_update(sensors); + bcm2835_psensor_list_update(sensors); psensor_log_measures(sensors); @@ -193,16 +193,14 @@ static 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); - ui_unity_launcher_entry_update(ui->sensors, - !cfg->unity_launcher_count_disabled, - cfg->temperature_unit == CELSIUS); + ui_unity_launcher_entry_update(ui->sensors); if (ui->graph_update_interval != cfg->graph_update_interval) { ui->graph_update_interval = cfg->graph_update_interval; @@ -226,71 +224,48 @@ static void cb_alarm_raised(struct psensor *sensor, void *data) } } -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); - } -} - 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; + } - sensor_cur++; + ret = config_get_sensor_alarm_high_threshold + (s->id, &s->alarm_high_threshold, high_default); + + 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++; } } @@ -340,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; } @@ -450,10 +425,11 @@ static struct psensor **create_sensors_list(const char *url) if (config_is_udisks2_enabled()) udisks2_psensor_list_append(&sensors, 600); + + bcm2835_psensor_list_append(&sensors, 600); } associate_preferences(sensors); - associate_colors(sensors); return sensors; } @@ -567,21 +543,20 @@ int main(int argc, char **argv) g_timeout_add(1000 * ui.graph_update_interval, ui_refresh_thread, &ui); ui_appindicator_init(&ui); + 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();