/*
- * Copyright (C) 2010-2012 jeanfi@gmail.com
+ * Copyright (C) 2010-2014 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
#include "ui_sensorlist.h"
#include "ui_color.h"
#include "lmsensor.h"
+#include "notify_cmd.h"
+#include "slog.h"
#include "ui_pref.h"
#include "ui_graph.h"
#include "ui_status.h"
#include "cpu.h"
#endif
-#include "compat.h"
-
static const char *program_name;
static void print_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 "
+ "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");
+ "2010-2014");
}
static void print_help()
{
printf(_("Usage: %s [OPTION]...\n"), program_name);
- puts(_("psensor is a GTK application for monitoring hardware sensors, "
+ puts(_("Psensor is a GTK+ application for monitoring hardware sensors, "
"including temperatures and fan speeds."));
puts("");
puts("");
- 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(_(
+" -u, --url=URL the URL of the psensor-server,\n"
+" example: http://hostname:3131"));
+ puts(_(
+" --use-libatasmart use atasmart library for disk monitoring instead of\n"
+" hddtemp daemon"));
+ puts(_(
+" -n, --new-instance force the creation of a new Psensor application"));
puts("");
puts(_(" -d, --debug=LEVEL "
}
/*
- Updates the size of the sensor values if different than the
- configuration.
+ * Updates the size of the sensor values if different than the
+ * configuration.
*/
-void
+static void
update_psensor_values_size(struct psensor **sensors, struct config *cfg)
{
- struct psensor **cur;
+ struct psensor **cur, *s;
- cur = sensors;
- while (*cur) {
- struct psensor *s = *cur;
+ for (cur = sensors; *cur; cur++) {
+ s = *cur;
if (s->values_max_length != cfg->sensor_values_max_length)
psensor_values_resize(s,
cfg->sensor_values_max_length);
-
- cur++;
}
}
cfg = ui->config;
while (1) {
- g_mutex_lock(ui->sensors_mutex);
+ pthread_mutex_lock(&ui->sensors_mutex);
sensors = ui->sensors;
if (!sensors)
period = cfg->sensor_update_interval;
- g_mutex_unlock(ui->sensors_mutex);
+ pthread_mutex_unlock(&ui->sensors_mutex);
sleep(period);
}
ret = TRUE;
cfg = ui->config;
- g_mutex_lock(ui->sensors_mutex);
+ pthread_mutex_lock(&ui->sensors_mutex);
graph_update(ui->sensors, ui->w_graph, ui->config, ui->main_window);
- ui_sensorlist_update(ui);
+ ui_sensorlist_update(ui, 0);
if (is_appindicator_supported() || is_status_supported())
indicators_update(ui);
#ifdef HAVE_UNITY
ui_unity_launcher_entry_update(ui->sensors,
!cfg->unity_launcher_count_disabled,
- cfg->temperature_unit == CELCIUS);
+ cfg->temperature_unit == CELSIUS);
#endif
if (ui->graph_update_interval != cfg->graph_update_interval) {
ret = FALSE;
}
- g_mutex_unlock(ui->sensors_mutex);
+ pthread_mutex_unlock(&ui->sensors_mutex);
if (ret == FALSE)
g_timeout_add(1000 * ui->graph_update_interval,
static void cb_alarm_raised(struct psensor *sensor, void *data)
{
#ifdef HAVE_LIBNOTIFY
- if (sensor->enabled)
+ if (sensor->alarm_enabled)
ui_notify(sensor, (struct ui_psensor *)data);
#endif
+
+ notify_cmd(sensor);
}
static void associate_colors(struct psensor **sensors)
{0x0000, 0x0000, 0x7fff}, /* dark blue */
{0x0000, 0x7fff, 0x0000} /* dark green */
};
+ struct psensor **cur;
+ int i;
+ struct color c;
- struct psensor **sensor_cur = sensors;
- int i = 0;
- while (*sensor_cur) {
- struct color default_color;
- color_set(&default_color,
+ for (cur = sensors, i = 0; *cur; cur++, i++) {
+ color_set(&c,
colors[i % COLORS_COUNT][0],
colors[i % COLORS_COUNT][1],
colors[i % COLORS_COUNT][2]);
- (*sensor_cur)->color
- = config_get_sensor_color((*sensor_cur)->id,
- &default_color);
-
- sensor_cur++;
- i++;
+ (*cur)->color = config_get_sensor_color((*cur)->id, &c);
}
}
s->cb_alarm_raised = cb_alarm_raised;
s->cb_alarm_raised_data = ui;
- if (is_temp_type(s->type)) {
- s->alarm_limit
- = config_get_sensor_alarm_limit(s->id, 60);
+ s->alarm_high_threshold
+ = config_get_sensor_alarm_high_threshold(s->id);
+ s->alarm_low_threshold
+ = config_get_sensor_alarm_low_threshold(s->id);
+
+ if (is_temp_type(s->type) || is_fan_type(s->type)) {
s->alarm_enabled
= config_get_sensor_alarm_enabled(s->id);
} else {
- s->alarm_limit = 0;
+ s->alarm_high_threshold = 0;
s->alarm_enabled = 0;
}
char *n;
struct psensor *s = *sensor_cur;
- s->enabled = config_is_sensor_enabled(s->id);
+ s->graph_enabled = config_is_sensor_enabled(s->id);
n = config_get_sensor_name(s->id);
s->name = n;
}
+ s->appindicator_enabled = config_is_appindicator_enabled(s->id);
+
sensor_cur++;
}
}
static void log_init()
{
- char *home, *path, *dir;
+ const char *dir;
+ char *path;
- home = getenv("HOME");
+ dir = get_psensor_user_dir();
- if (!home)
+ if (!dir)
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 void cleanup(struct ui_psensor *ui)
{
- g_mutex_lock(ui->sensors_mutex);
+ pthread_mutex_lock(&ui->sensors_mutex);
log_debug("Cleanup...");
ui_status_cleanup();
- g_mutex_unlock(ui->sensors_mutex);
+ pthread_mutex_unlock(&ui->sensors_mutex);
config_cleanup();
log_debug("Cleanup done, closing log");
-
- log_close();
}
/*
rsensor_init();
sensors = get_remote_sensors(url, 600);
#else
- fprintf(stderr,
- _("ERROR: Not compiled with remote sensor support.\n"));
+ log_err(_("Psensor has not been compiled with remote "
+ "sensor support."));
exit(EXIT_FAILURE);
#endif
} else {
exit(EXIT_SUCCESS);
case 'd':
log_level = atoi(optarg);
- log_printf(LOG_INFO, _("Enables debug mode."));
+ log_info(_("Enables debug mode."));
break;
case 'n':
new_instance = 1;
if (!new_instance && g_application_get_is_remote(app)) {
g_application_activate(app);
- log_warn(_("Psensor instance already exists"));
+ log_warn(_("A Psensor instance already exists."));
exit(EXIT_SUCCESS);
}
g_thread_init(NULL);
#endif
+#ifdef HAVE_APPINDICATOR_029
+ /* gdk_thread_enter/leave only used to workaround mutex bug
+ * of appindicator < 0.2.9, so do not call gdk_threads_init
+ * if useless. Calling this function leads to
+ * crash "Attempt to unlock mutex that was not locked" with
+ * GLib 2.41.2 (new checking) probably due to bugs in GTK
+ * itself.
+ */
gdk_threads_init();
+#endif
gtk_init(NULL, NULL);
- ui.sensors_mutex = g_mutex_new();
+ pthread_mutex_init(&ui.sensors_mutex, NULL);
ui.config = config_load();
ui.sensors = create_sensors_list(url, use_libatasmart);
associate_cb_alarm_raised(ui.sensors, &ui);
+ if (ui.config->slog_enabled)
+ slog_activate(NULL,
+ ui.sensors,
+ &ui.sensors_mutex,
+ config_get_slog_interval());
+
#if !defined(HAVE_APPINDICATOR) && !defined(HAVE_APPINDICATOR_029)
ui_status_init(&ui);
ui_status_set_visible(1);
/* main window */
ui_window_create(&ui);
- ui.sensor_box = NULL;
-
- /* drawing box */
- ui.w_graph = ui_graph_create(&ui);
ui_enable_alpha_channel(&ui);
- /* sensor list */
- ui_sensorlist_create(&ui);
-
thread = g_thread_create((GThreadFunc) update_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();
+ /*
+ * hack, did not find a cleaner solution.
+ * wait 30s to ensure that the status icon is attempted to be
+ * drawn before determining whether the main window must be
+ * show.
+ */
+ if (ui.config->hide_on_startup)
+ g_timeout_add(30000, (GSourceFunc)initial_window_show, &ui);
+ else
+ initial_window_show(&ui);
+
/* main loop */
gtk_main();
- g_object_ref(app);
+ g_object_unref(app);
cleanup(&ui);
+
log_debug("Quitting...");
+ log_close();
+
+ if (url)
+ free(url);
return 0;
}
projects / psensor.git / blobdiff