#include "rsensor.h"
#endif
-#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
#include "ui_appindicator.h"
-#endif
#ifdef HAVE_LIBNOTIFY
#include "ui_notify.h"
}
}
+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;
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,
{0, 0, 0, 0}
};
+static gboolean initial_window_show(gpointer data)
+{
+ struct ui_psensor *ui;
+
+ ui = (struct ui_psensor *)data;
+
+ log_printf(LOG_DEBUG,
+ "is_status_supported: %d\n", is_status_supported());
+
+ 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;
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;
/* sensor list */
ui_sensorlist_create(&ui);
- ui_window_update(&ui);
+ /*
+ * 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);
thread = g_thread_create((GThreadFunc) update_psensor_measures,
&ui, TRUE, &error);
ui_appindicator_init(&ui);
#endif
- ui_status_init();
-
gdk_notify_startup_complete();
/* main loop */