X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=ad4b06d9f26d872c7411785bbbaee95dbe2152f8;hb=2cec0f33f19afafe8a9dd28fc3af3db27796c76b;hp=461949fbfc48910a5a1ff257e443e50d0008890e;hpb=14fc47ac64775ddfbc62ad606c7a94054dc4a898;p=psensor.git diff --git a/src/main.c b/src/main.c index 461949f..ad4b06d 100644 --- a/src/main.c +++ b/src/main.c @@ -28,53 +28,36 @@ #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 "ui_status.h" - -#ifdef HAVE_UNITY -#include "ui_unity.h" -#endif +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#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 static const char *program_name; -static void print_version() +static void print_version(void) { printf("psensor %s\n", VERSION); printf(_("Copyright (C) %s jeanfi@gmail.com\n" @@ -86,7 +69,7 @@ static void print_version() "2010-2014"); } -static void print_help() +static void print_help(void) { printf(_("Usage: %s [OPTION]...\n"), program_name); @@ -155,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); @@ -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) || defined(HAVE_APPINDICATOR_029) 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; @@ -229,11 +200,9 @@ 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; @@ -251,12 +220,10 @@ 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); + notify_cmd(sensor); + } } static void associate_colors(struct psensor **sensors) @@ -323,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++; } } @@ -338,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) { @@ -347,13 +309,11 @@ static void associate_preferences(struct psensor **sensors) s->name = n; } - s->appindicator_enabled = config_is_appindicator_enabled(s->id); - sensor_cur++; } } -static void log_init() +static void log_init(void) { const char *dir; char *path; @@ -372,12 +332,12 @@ static void log_init() } static struct option long_options[] = { - {"version", no_argument, 0, 'v'}, - {"help", no_argument, 0, 'h'}, - {"url", required_argument, 0, 'u'}, - {"debug", required_argument, 0, 'd'}, - {"new-instance", no_argument, 0, 'n'}, - {0, 0, 0, 0} + {"version", no_argument, NULL, 'v'}, + {"help", no_argument, NULL, 'h'}, + {"url", required_argument, NULL, 'u'}, + {"debug", required_argument, NULL, 'd'}, + {"new-instance", no_argument, NULL, 'n'}, + {NULL, 0, NULL, 0} }; static gboolean initial_window_show(gpointer data) @@ -402,7 +362,7 @@ static gboolean initial_window_show(gpointer data) return FALSE; } -static void log_glib_info() +static void log_glib_info(void) { log_debug("Compiled with GLib %d.%d.%d", GLIB_MAJOR_VERSION, @@ -430,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) || defined(HAVE_APPINDICATOR_029) ui_appindicator_cleanup(); -#endif ui_status_cleanup(); @@ -466,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; @@ -484,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); @@ -519,7 +464,7 @@ int main(int argc, char **argv) pthread_t thread; int optc, cmdok, opti, new_instance, ret; char *url = NULL; - GtkApplication *app; + GApplication *app; program_name = argv[0]; @@ -567,12 +512,12 @@ int main(int argc, char **argv) log_init(); - app = gtk_application_new("wpitchoune.psensor", G_APPLICATION_IS_SERVICE); + app = g_application_new("wpitchoune.psensor", 0); - printf("%d\n",g_application_register(G_APPLICATION(app), NULL, NULL)); + g_application_register(app, NULL, NULL); - if (!new_instance && g_application_get_is_remote(G_APPLICATION(app))) { - g_application_activate(G_APPLICATION(app)); + if (!new_instance && g_application_get_is_remote(app)) { + g_application_activate(app); log_warn(_("A Psensor instance already exists.")); exit(EXIT_SUCCESS); } @@ -589,17 +534,6 @@ int main(int argc, char **argv) g_thread_init(NULL); #endif -#ifdef HAVE_APPINDICATOR_029 - /* gdk_thread_enter/leave only used to workaround mutex bug - * of appindicator < 0.2.9, so do not call gdk_threads_init - * if useless. Calling this function leads to - * crash "Attempt to unlock mutex that was not locked" with - * GLib 2.41.2 (new checking) probably due to bugs in GTK - * itself. - */ - gdk_threads_init(); -#endif - gtk_init(NULL, NULL); pmutex_init(&ui.sensors_mutex); @@ -615,10 +549,8 @@ int main(int argc, char **argv) &ui.sensors_mutex, config_get_slog_interval()); -#if !defined(HAVE_APPINDICATOR) && !defined(HAVE_APPINDICATOR_029) ui_status_init(&ui); ui_status_set_visible(1); -#endif /* main window */ ui_window_create(&ui); @@ -634,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) || defined(HAVE_APPINDICATOR_029) ui_appindicator_init(&ui); -#endif gdk_notify_startup_complete();