X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=95163e0085d88a5fe8022f83fe3cdf9490be2d76;hb=40f68c37206c95bb29c310b6f4337d45b0ea8ea0;hp=f06ea5bab54f5513db8c144910cf761e5b51f6ae;hpb=9962504b9013b78943b8a8854da0ec4bb6456750;p=psensor.git diff --git a/src/main.c b/src/main.c index f06ea5b..95163e0 100644 --- a/src/main.c +++ b/src/main.c @@ -1,22 +1,21 @@ /* - Copyright (C) 2010-2011 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 published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA -*/ - + * Copyright (C) 2010-2012 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 + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ #include #include @@ -58,9 +57,7 @@ #include "rsensor.h" #endif -#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029) #include "ui_appindicator.h" -#endif #ifdef HAVE_LIBNOTIFY #include "ui_notify.h" @@ -77,12 +74,13 @@ static const char *program_name; static void print_version() { printf("psensor %s\n", VERSION); - printf(_("Copyright (C) %s jeanfi@gmail.com\n\ -License GPLv2: GNU GPL version 2 or later \ -\n\ -This is free software: you are free to change and redistribute it.\n\ -There is NO WARRANTY, to the extent permitted by law.\n"), - "2010-2011"); + printf(_("Copyright (C) %s jeanfi@gmail.com\n" + "License GPLv2: GNU GPL version 2 or later " + "\n" + "This is free software: you are free to change and " + " redistribute it.\n" + "There is NO WARRANTY, to the extent permitted by law.\n"), + "2010-2012"); } static void print_help() @@ -94,15 +92,20 @@ static void print_help() puts(""); puts(_("Options:")); - puts(_("\ - -h, --help display this help and exit\n\ - -v, --version display version information and exit")); + puts(_(" -h, --help display this help and exit\n" + " -v, --version display version information and exit")); + + puts(""); + puts(_(" -u, --url=URL " + "the URL of the psensor-server, example: http://hostname:3131")); + puts(_(" --use-libatasmart " + "use atasmart library for disk monitoring " + "instead of hddtemp daemon")); puts(""); - puts(_("\ - -u, --url=URL \ -the URL of the psensor-server, example: http://hostname:3131")); + puts(_(" -d, --debug=LEVEL " + "set the debug level, integer between 0 and 3")); puts(""); @@ -132,18 +135,6 @@ update_psensor_values_size(struct psensor **sensors, struct config *cfg) } } -static void log_measures(struct psensor **sensors) -{ - if (log_level == LOG_DEBUG) - while (*sensors) { - log_printf(LOG_DEBUG, "%s %.2f", - (*sensors)->name, - psensor_get_current_value(*sensors)); - - sensors++; - } -} - void update_psensor_measures(struct ui_psensor *ui) { struct psensor **sensors = ui->sensors; @@ -168,7 +159,7 @@ void update_psensor_measures(struct ui_psensor *ui) amd_psensor_list_update(sensors); #endif - log_measures(sensors); + psensor_log_measures(sensors); g_mutex_unlock(ui->sensors_mutex); @@ -176,6 +167,31 @@ void update_psensor_measures(struct ui_psensor *ui) } } +static void indicators_update(struct ui_psensor *ui) +{ + struct psensor **sensor_cur = ui->sensors; + unsigned int attention = 0; + + while (*sensor_cur) { + struct psensor *s = *sensor_cur; + + if (s->alarm_enabled && s->alarm_raised) { + attention = 1; + break; + } + + sensor_cur++; + } + +#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) { struct config *cfg; @@ -187,17 +203,17 @@ gboolean ui_refresh_thread(gpointer data) g_mutex_lock(ui->sensors_mutex); - graph_update(ui->sensors, ui->w_graph, ui->config); + graph_update(ui->sensors, ui->w_graph, ui->config, ui->main_window); ui_sensorlist_update(ui); -#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029) - ui_appindicator_update(ui); -#endif + 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->unity_launcher_count_disabled, + cfg->temperature_unit == CELCIUS); #endif if (ui->graph_update_interval != cfg->graph_update_interval) { @@ -322,21 +338,56 @@ static void log_init() } static struct option long_options[] = { + {"use-libatasmart", no_argument, 0, 0}, {"version", no_argument, 0, 'v'}, {"help", no_argument, 0, 'h'}, {"url", required_argument, 0, 'u'}, - {"debug", no_argument, 0, 'd'}, + {"debug", required_argument, 0, 'd'}, {0, 0, 0, 0} }; +static gboolean initial_window_show(gpointer data) +{ + struct ui_psensor *ui; + + log_debug("initial_window_show()"); + + 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())) + ui_window_show(ui); + + ui_window_update(ui); + + return FALSE; +} + +static void log_glib_info() +{ + log_debug("Compiled with GLib %d.%d.%d", + GLIB_MAJOR_VERSION, + GLIB_MINOR_VERSION, + GLIB_MICRO_VERSION); + + log_debug("Running with GLib %d.%d.%d", + glib_major_version, + glib_minor_version, + glib_micro_version); +} + int main(int argc, char **argv) { struct ui_psensor ui; GError *error; GThread *thread; - int optc; + int optc, cmdok, opti, use_libatasmart; char *url = NULL; - int cmdok = 1; program_name = argv[0]; @@ -347,9 +398,16 @@ int main(int argc, char **argv) textdomain(PACKAGE); #endif - while ((optc = getopt_long(argc, argv, "vhdu:", long_options, - NULL)) != -1) { + use_libatasmart = 0; + + cmdok = 1; + while ((optc = getopt_long(argc, argv, "vhd:u:", long_options, + &opti)) != -1) { switch (optc) { + case 0: + if (!strcmp(long_options[opti].name, "use-libatasmart")) + use_libatasmart = 1; + break; case 'u': if (optarg) url = strdup(optarg); @@ -361,8 +419,8 @@ int main(int argc, char **argv) print_version(); exit(EXIT_SUCCESS); case 'd': - printf(_("Enables debug mode.\n")); - log_level = LOG_DEBUG; + log_level = atoi(optarg); + log_printf(LOG_INFO, _("Enables debug mode.")); break; default: cmdok = 0; @@ -378,16 +436,20 @@ int main(int argc, char **argv) log_init(); + log_glib_info(); +#if !(GLIB_CHECK_VERSION(2, 31, 0)) + /* + * Since GLib 2.31 g_thread_init call is deprecated and not + * needed. + */ + log_debug("Calling g_thread_init(NULL)"); g_thread_init(NULL); +#endif + gdk_threads_init(); - /* gdk_threads_enter(); */ gtk_init(NULL, NULL); -#ifdef HAVE_LIBNOTIFY - ui.notification_last_time = NULL; -#endif - ui.sensors_mutex = g_mutex_new(); config_init(); @@ -406,7 +468,7 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); #endif } else { - ui.sensors = get_all_sensors(600); + ui.sensors = get_all_sensors(use_libatasmart, 600); #ifdef HAVE_NVIDIA ui.sensors = nvidia_psensor_list_add(ui.sensors, 600); #endif @@ -422,6 +484,11 @@ int main(int argc, char **argv) associate_colors(ui.sensors); associate_cb_alarm_raised(ui.sensors, &ui); +#if !defined(HAVE_APPINDICATOR) && !defined(HAVE_APPINDICATOR_029) + ui_status_init(&ui); + ui_status_set_visible(1); +#endif + /* main window */ ui_window_create(&ui); ui.sensor_box = NULL; @@ -429,11 +496,11 @@ int main(int argc, char **argv) /* drawing box */ ui.w_graph = ui_graph_create(&ui); + ui_enable_alpha_channel(&ui); + /* sensor list */ ui_sensorlist_create(&ui); - ui_window_update(&ui); - thread = g_thread_create((GThreadFunc) update_psensor_measures, &ui, TRUE, &error); @@ -446,10 +513,16 @@ int main(int argc, char **argv) #if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029) ui_appindicator_init(&ui); -#else - ui_status_init(); #endif + /* + * show the window as soon as all gtk events have been processed + * in order to ensure that the status icon is attempted to be + * drawn before. If not, there is no way to detect that it is + * visible. + */ + g_idle_add((GSourceFunc)initial_window_show, &ui); + gdk_notify_startup_complete(); /* main loop */ @@ -474,10 +547,10 @@ int main(int argc, char **argv) #if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029) ui_appindicator_cleanup(); -#else - ui_status_cleanup(); #endif + ui_status_cleanup(); + g_mutex_unlock(ui.sensors_mutex); config_cleanup();