/*
- 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 <locale.h>
#include <getopt.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <sys/stat.h>
+#include <sys/types.h>
#include <gtk/gtk.h>
-#include <sensors/sensors.h>
-#include <sensors/error.h>
-
#include "config.h"
#include "cfg.h"
-#include "hdd.h"
#include "psensor.h"
#include "graph.h"
#include "ui.h"
#include "lmsensor.h"
#include "ui_pref.h"
#include "ui_graph.h"
+#include "ui_status.h"
#ifdef HAVE_UNITY
#include "ui_unity.h"
#include "nvidia.h"
#endif
+#ifdef HAVE_LIBATIADL
+#include "amd.h"
+#endif
+
#ifdef HAVE_REMOTE_SUPPORT
#include "rsensor.h"
#endif
-#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
#include "ui_appindicator.h"
-#endif
#ifdef HAVE_LIBNOTIFY
#include "ui_notify.h"
#endif
+#ifdef HAVE_GTOP
+#include "cpu.h"
+#endif
+
#include "compat.h"
static const char *program_name;
-void print_version()
+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"),
- "2010-2011");
+ 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-2012");
}
-void print_help()
+static void print_help()
{
printf(_("Usage: %s [OPTION]...\n"), program_name);
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(_(" --use-libatasmart "
+ "use atasmart library for disk monitoring "
+ "instead of hddtemp daemon"));
+ puts("");
+
+ puts(_(" -d, --debug=LEVEL "
+ "set the debug level, integer between 0 and 3"));
puts("");
struct config *cfg = ui->config;
while (1) {
- /*gdk_threads_enter();*/
g_mutex_lock(ui->sensors_mutex);
if (!sensors)
#ifdef HAVE_NVIDIA
nvidia_psensor_list_update(sensors);
#endif
+#ifdef HAVE_LIBATIADL
+ amd_psensor_list_update(sensors);
+#endif
+
+ psensor_log_measures(sensors);
- /*gdk_threads_leave();*/
g_mutex_unlock(ui->sensors_mutex);
sleep(cfg->sensor_update_interval);
}
}
+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;
cfg = ui->config;
g_mutex_lock(ui->sensors_mutex);
- /*gdk_threads_enter();*/
- 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->ui_sensorlist);
+ 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);
+ ui_unity_launcher_entry_update(ui->sensors,
+ !cfg->unity_launcher_count_disabled,
+ cfg->temperature_unit == CELCIUS);
#endif
if (ui->graph_update_interval != cfg->graph_update_interval) {
}
g_mutex_unlock(ui->sensors_mutex);
- /*gdk_threads_leave();*/
if (ret == FALSE)
g_timeout_add(1000 * ui->graph_update_interval,
#endif
}
-void associate_colors(struct psensor **sensors)
+static void associate_colors(struct psensor **sensors)
{
/* number of uniq colors */
#define COLORS_COUNT 8
}
}
-void
+static void
associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
{
struct psensor **sensor_cur = sensors;
}
}
-void associate_preferences(struct psensor **sensors)
+static void associate_preferences(struct psensor **sensors)
{
struct psensor **sensor_cur = sensors;
while (*sensor_cur) {
}
}
+static void log_init()
+{
+ char *home, *path, *dir;
+
+ home = getenv("HOME");
+
+ if (!home)
+ return ;
+
+ dir = malloc(strlen(home)+1+strlen(".psensor")+1);
+ sprintf(dir, "%s/%s", home, ".psensor");
+ mkdir(dir, 0777);
+
+ path = malloc(strlen(dir)+1+strlen("log")+1);
+ sprintf(path, "%s/%s", dir, "log");
+
+ log_open(path);
+
+ free(dir);
+ free(path);
+}
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", 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 err, optc;
+ int optc, cmdok, opti, use_libatasmart;
char *url = NULL;
- int cmdok = 1;
program_name = argv[0];
textdomain(PACKAGE);
#endif
- while ((optc = getopt_long(argc, argv, "vhu:", 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);
case 'v':
print_version();
exit(EXIT_SUCCESS);
+ case 'd':
+ log_level = atoi(optarg);
+ log_printf(LOG_INFO, _("Enables debug mode."));
+ break;
default:
cmdok = 0;
break;
exit(EXIT_FAILURE);
}
+ 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);
- gdk_threads_init();
- /* gdk_threads_enter(); */
+#endif
- gtk_init(&argc, &argv);
+ gdk_threads_init();
-#ifdef HAVE_LIBNOTIFY
- ui.notification_last_time = NULL;
-#endif
+ gtk_init(NULL, NULL);
ui.sensors_mutex = g_mutex_new();
ui.config = config_load();
- err = lmsensor_init();
- if (!err) {
- fprintf(stderr, _("ERROR: lmsensor init failure: %s\n"),
- sensors_strerror(err));
- exit(EXIT_FAILURE);
- }
+ psensor_init();
if (url) {
#ifdef HAVE_REMOTE_SUPPORT
exit(EXIT_FAILURE);
#endif
} else {
+ ui.sensors = get_all_sensors(use_libatasmart, 600);
#ifdef HAVE_NVIDIA
- struct psensor **tmp;
-
- tmp = get_all_sensors(600);
- ui.sensors = nvidia_psensor_list_add(tmp, 600);
-
- if (tmp != ui.sensors)
- free(tmp);
-#else
- ui.sensors = get_all_sensors(600);
+ ui.sensors = nvidia_psensor_list_add(ui.sensors, 600);
+#endif
+#ifdef HAVE_LIBATIADL
+ ui.sensors = amd_psensor_list_add(ui.sensors, 600);
+#endif
+#ifdef HAVE_GTOP
+ ui.sensors = cpu_psensor_list_add(ui.sensors, 600);
#endif
}
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.main_window = ui_window_create(&ui);
+ ui_window_create(&ui);
ui.sensor_box = NULL;
/* drawing box */
ui.w_graph = ui_graph_create(&ui);
- /* sensor list */
- ui.ui_sensorlist = ui_sensorlist_create(ui.sensors);
-
- ui_sensor_box_create(&ui);
+ ui_enable_alpha_channel(&ui);
- gtk_widget_show_all(ui.main_window);
+ /* sensor list */
+ ui_sensorlist_create(&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 */
gtk_main();
- sensors_cleanup();
+ g_mutex_lock(ui.sensors_mutex);
+
+ psensor_cleanup();
+
+#ifdef HAVE_NVIDIA
+ nvidia_cleanup();
+#endif
+#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();
- /* gdk_threads_leave(); */
+ log_close();
return 0;
}
projects / psensor.git / blobdiff