#include "ui_sensorlist.h"
#include "ui_color.h"
#include "lmsensor.h"
+#include "slog.h"
#include "ui_pref.h"
#include "ui_graph.h"
#include "ui_status.h"
{
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++;
}
}
psensor_log_measures(sensors);
+ if (cfg->slog_enabled)
+ slog_write_sensors(sensors);
+
period = cfg->sensor_update_interval;
g_mutex_unlock(ui->sensors_mutex);
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
}
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;
}
s->name = n;
}
+ s->appindicator_enabled = config_is_appindicator_enabled(s->id);
+
sensor_cur++;
}
}
{"help", no_argument, 0, 'h'},
{"url", required_argument, 0, 'u'},
{"debug", required_argument, 0, 'd'},
+ {"new-instance", no_argument, 0, 'n'},
{0, 0, 0, 0}
};
glib_micro_version);
}
-static void activate(GApplication *application,
- gpointer data)
+static void cb_activate(GApplication *application,
+ gpointer data)
{
ui_window_show((struct ui_psensor *)data);
}
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 {
struct ui_psensor ui;
GError *error;
GThread *thread;
- int optc, cmdok, opti, use_libatasmart;
+ int optc, cmdok, opti, use_libatasmart, new_instance;
char *url = NULL;
GApplication *app;
textdomain(PACKAGE);
#endif
- use_libatasmart = 0;
+ use_libatasmart = new_instance = 0;
cmdok = 1;
- while ((optc = getopt_long(argc, argv, "vhd:u:", long_options,
+ while ((optc = getopt_long(argc, argv, "vhd:u:n", long_options,
&opti)) != -1) {
switch (optc) {
case 0:
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;
break;
default:
cmdok = 0;
log_init();
app = g_application_new("wpitchoune.psensor", 0);
+
g_application_register(app, NULL, NULL);
- if (g_application_get_is_remote(app)) {
+ if (!new_instance && g_application_get_is_remote(app)) {
g_application_activate(app);
- log_debug(_("Psensor instance already exists"));
+ log_warn(_("A Psensor instance already exists."));
exit(EXIT_SUCCESS);
}
- g_signal_connect(app, "activate", G_CALLBACK(activate), &ui);
+ g_signal_connect(app, "activate", G_CALLBACK(cb_activate), &ui);
log_glib_info();
#if !(GLIB_CHECK_VERSION(2, 31, 0))
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 2s to ensure that the status icon is attempted to be
+ * drawn before determining whether the main window must be
+ * show.
+ */
+ g_timeout_add(2000, (GSourceFunc)initial_window_show, &ui);
+
/* main loop */
gtk_main();
+ g_object_ref(app);
cleanup(&ui);
+
log_debug("Quitting...");
+ log_close();
return 0;
}