X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=442a03f5be065ca0247f3c7ba2aeaa02bf86dc9d;hb=45c8086f97097df36ba8cd0552f152be80f79b12;hp=3ef715453e82f7b80ef264ea96c268e88046df08;hpb=f51bc6299cb7a2439b21f3ba43185f56e2311092;p=psensor.git diff --git a/src/main.c b/src/main.c index 3ef7154..442a03f 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-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 + */ #include #include @@ -40,6 +39,7 @@ #include "lmsensor.h" #include "ui_pref.h" #include "ui_graph.h" +#include "ui_status.h" #ifdef HAVE_UNITY #include "ui_unity.h" @@ -57,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" @@ -135,7 +133,7 @@ static void log_measures(struct psensor **sensors) { if (log_level == LOG_DEBUG) while (*sensors) { - log_printf(LOG_DEBUG, "%s %.2f", + log_debug("Measure: %s %.2f", (*sensors)->name, psensor_get_current_value(*sensors)); @@ -175,6 +173,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; @@ -190,9 +213,8 @@ gboolean ui_refresh_thread(gpointer data) 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, @@ -314,7 +336,7 @@ static void log_init() path = malloc(strlen(dir)+1+strlen("log")+1); sprintf(path, "%s/%s", dir, "log"); - log_open(path, LOG_INFO); + log_open(path); free(dir); free(path); @@ -328,6 +350,28 @@ static struct option long_options[] = { {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; +} + int main(int argc, char **argv) { struct ui_psensor ui; @@ -346,10 +390,6 @@ int main(int argc, char **argv) textdomain(PACKAGE); #endif -#if TUTU - printf("coucou\n"); -#endif - while ((optc = getopt_long(argc, argv, "vhdu:", long_options, NULL)) != -1) { switch (optc) { @@ -387,10 +427,6 @@ int main(int argc, char **argv) gtk_init(NULL, NULL); -#ifdef HAVE_LIBNOTIFY - ui.notification_last_time = NULL; -#endif - ui.sensors_mutex = g_mutex_new(); config_init(); @@ -425,6 +461,10 @@ 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); +#endif + /* main window */ ui_window_create(&ui); ui.sensor_box = NULL; @@ -435,8 +475,6 @@ int main(int argc, char **argv) /* sensor list */ ui_sensorlist_create(&ui); - ui_window_update(&ui); - thread = g_thread_create((GThreadFunc) update_psensor_measures, &ui, TRUE, &error); @@ -451,6 +489,14 @@ int main(int argc, char **argv) ui_appindicator_init(&ui); #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 */ @@ -466,10 +512,19 @@ int main(int argc, char **argv) #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(); + g_mutex_unlock(ui.sensors_mutex); config_cleanup();