status icon

[psensor.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index a88e25e..f5ff0b3 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -40,6 +40,7 @@
 #include "lmsensor.h"
 #include "ui_pref.h"
 #include "ui_graph.h"
+#include "ui_status.h"
 
 #ifdef HAVE_UNITY
 #include "ui_unity.h"
@@ -57,11 +58,7 @@
 #include "rsensor.h"
 #endif
 
-#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
 #include "ui_appindicator.h"
-#else
-#include "ui_status.h"
-#endif
 
 #ifdef HAVE_LIBNOTIFY
 #include "ui_notify.h"
@@ -137,7 +134,7 @@ static void log_measures(struct psensor **sensors)
 {
        if (log_level == LOG_DEBUG)
                while (*sensors) {
-                       log_printf(LOG_DEBUG, "%s %.2f",
+                       log_printf(LOG_DEBUG, "Measure: %s %.2f",
                                   (*sensors)->name,
                                   psensor_get_current_value(*sensors));
 
@@ -177,6 +174,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;
@@ -192,9 +214,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,
@@ -330,6 +351,30 @@ static struct option long_options[] = {
        {0, 0, 0, 0}
 };
 
+static gboolean initial_window_show(gpointer data)
+{
+       struct ui_psensor *ui;
+
+       log_printf(LOG_DEBUG, "initial_window_show()");
+
+       ui = (struct ui_psensor *)data;
+
+       log_printf(LOG_DEBUG,
+                  "is_status_supported: %d", is_status_supported());
+       log_printf(LOG_DEBUG,
+                  "is_appindicator_supported: %d", is_appindicator_supported());
+       log_printf(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;
@@ -385,10 +430,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();
@@ -423,6 +464,8 @@ int main(int argc, char **argv)
        associate_colors(ui.sensors);
        associate_cb_alarm_raised(ui.sensors, &ui);
 
+       ui_status_init(&ui);
+
        /* main window */
        ui_window_create(&ui);
        ui.sensor_box = NULL;
@@ -433,8 +476,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);
 
@@ -447,10 +488,16 @@ int main(int argc, char **argv)
 
 #if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
        ui_appindicator_init(&ui);
-#else
-       ui_status_create();
 #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 */
@@ -473,6 +520,12 @@ int main(int argc, char **argv)
        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();