/*
- 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 <locale.h>
#include <getopt.h>
#include "lmsensor.h"
#include "ui_pref.h"
#include "ui_graph.h"
+#include "ui_status.h"
#ifdef HAVE_UNITY
#include "ui_unity.h"
#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 print_version()
{
printf("psensor %s\n", VERSION);
- printf(_("Copyright (C) %s jeanfi@gmail.com\n\
-License GPLv2: GNU GPL version 2 or later \
-<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>\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"),
+ printf(_("Copyright (C) %s jeanfi@gmail.com\n"
+ "License GPLv2: GNU GPL version 2 or later "
+ "<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>\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");
}
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(_(" -u, --url=URL "
+ "the URL of the psensor-server, example: http://hostname:3131"));
+
+ puts("");
+
+ puts(_(" -d, --debug=LEVEL "
+ "set the debug level, integer between 0 and 3"));
puts("");
{
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));
}
}
+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,
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);
{"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;
char *url = NULL;
- int cmdok = 1;
program_name = argv[0];
textdomain(PACKAGE);
#endif
- while ((optc = getopt_long(argc, argv, "vhdu:", long_options,
+ cmdok = 1;
+ while ((optc = getopt_long(argc, argv, "vhd:u:", long_options,
NULL)) != -1) {
switch (optc) {
case 'u':
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;
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();
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;
/* sensor list */
ui_sensorlist_create(&ui);
- ui_window_update(&ui);
-
thread = g_thread_create((GThreadFunc) update_psensor_measures,
&ui, TRUE, &error);
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 */
#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();