#include <gtk/gtk.h>
-#include "config.h"
-
-#include "cfg.h"
-#include "psensor.h"
-#include "graph.h"
-#include "ui.h"
-#include "ui_sensorlist.h"
-#include "ui_color.h"
-#include "lmsensor.h"
-#include "notify_cmd.h"
+#include <config.h>
+
+#include <amd.h>
+#include <cfg.h>
+#include <graph.h>
+#include <hdd.h>
+#include <lmsensor.h>
+#include <notify_cmd.h>
+#include <nvidia.h>
+#include <pgtop2.h>
#include <pmutex.h>
+#include <psensor.h>
#include <pudisks2.h>
-#include "slog.h"
-#include "ui_pref.h"
-#include "ui_graph.h"
-#include "ui_status.h"
-
-#ifdef HAVE_UNITY
-#include "ui_unity.h"
-#endif
-
-#ifdef HAVE_NVIDIA
-#include "nvidia.h"
-#endif
-
-#ifdef HAVE_LIBATIADL
-#include "amd.h"
-#endif
-
-#ifdef HAVE_REMOTE_SUPPORT
-#include "rsensor.h"
-#endif
-
-#include "ui_appindicator.h"
-
-#ifdef HAVE_LIBNOTIFY
-#include "ui_notify.h"
-#endif
-
-#ifdef HAVE_GTOP
-#include <pgtop2.h>
-#endif
+#include <rsensor.h>
+#include <slog.h>
+#include <ui.h>
+#include <ui_appindicator.h>
+#include <ui_color.h>
+#include <ui_graph.h>
+#include <ui_notify.h>
+#include <ui_pref.h>
+#include <ui_sensorlist.h>
+#include <ui_status.h>
+#include <ui_unity.h>
static const char *program_name;
-static void print_version()
+static void print_version(void)
{
printf("psensor %s\n", VERSION);
printf(_("Copyright (C) %s jeanfi@gmail.com\n"
"2010-2014");
}
-static void print_help()
+static void print_help(void)
{
printf(_("Usage: %s [OPTION]...\n"), program_name);
" -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("");
update_psensor_values_size(sensors, cfg);
- psensor_list_update_measures(sensors);
-#ifdef HAVE_REMOTE_SUPPORT
+ lmsensor_psensor_list_update(sensors);
+
remote_psensor_list_update(sensors);
-#endif
-#ifdef HAVE_NVIDIA
nvidia_psensor_list_update(sensors);
-#endif
-#ifdef HAVE_LIBATIADL
amd_psensor_list_update(sensors);
-#endif
-#ifdef HAVE_LIBUDISKS2
udisks2_psensor_list_update(sensors);
-#endif
-#ifdef HAVE_GTOP
gtop2_psensor_list_update(sensors);
-#endif
+ atasmart_psensor_list_update(sensors);
+ hddtemp_psensor_list_update(sensors);
psensor_log_measures(sensors);
static void indicators_update(struct ui_psensor *ui)
{
- struct psensor **sensor_cur = ui->sensors;
- unsigned int attention = 0;
+ struct psensor **ss, *s;
+ bool attention;
- while (*sensor_cur) {
- struct psensor *s = *sensor_cur;
+ attention = false;
+ ss = ui->sensors;
+ while (*ss) {
+ s = *ss;
- if (s->alarm_enabled && s->alarm_raised) {
- attention = 1;
+ if (s->alarm_raised && config_get_sensor_alarm_enabled(s->id)) {
+ attention = true;
break;
}
- sensor_cur++;
+ ss++;
}
-#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)
+static gboolean ui_refresh_thread(gpointer data)
{
struct config *cfg;
gboolean ret;
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 == CELSIUS);
-#endif
if (ui->graph_update_interval != cfg->graph_update_interval) {
ui->graph_update_interval = cfg->graph_update_interval;
static void cb_alarm_raised(struct psensor *sensor, void *data)
{
-#ifdef HAVE_LIBNOTIFY
- if (sensor->alarm_enabled)
+ if (config_get_sensor_alarm_enabled(sensor->id)) {
ui_notify(sensor, (struct ui_psensor *)data);
-#endif
-
- notify_cmd(sensor);
-}
-
-static void associate_colors(struct psensor **sensors)
-{
- /* number of uniq colors */
-#define COLORS_COUNT 8
-
- double colors[COLORS_COUNT][3] = {
- {0, 0, 0}, /* black */
- {1, 0, 0}, /* red */
- {0, 0, 1}, /* blue */
- {0, 1, 0}, /* green */
-
- {0.5, 0.5, 0.5},/* grey */
- {0.5, 0, 0}, /* dark red */
- {0, 0, 0.5}, /* dark blue */
- {0, 0.5, 0} /* dark green */
- };
- struct psensor **cur;
- int i;
- struct color c;
-
- 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]);
-
- (*cur)->color = config_get_sensor_color((*cur)->id, &c);
+ notify_cmd(sensor);
}
}
static void
associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui)
{
- struct psensor **sensor_cur = sensors;
+ bool ret;
+ struct psensor *s;
- while (*sensor_cur) {
- struct psensor *s = *sensor_cur;
+ while (*sensors) {
+ s = *sensors;
s->cb_alarm_raised = cb_alarm_raised;
s->cb_alarm_raised_data = ui;
- s->alarm_high_threshold
- = config_get_sensor_alarm_high_threshold(s->id);
- s->alarm_low_threshold
- = config_get_sensor_alarm_low_threshold(s->id);
+ ret = config_get_sensor_alarm_high_threshold
+ (s->id, &s->alarm_high_threshold);
- s->alarm_enabled
- = config_get_sensor_alarm_enabled(s->id);
+ if (!ret && s->max != UNKNOWN_DBL_VALUE)
+ s->alarm_high_threshold = s->max;
- sensor_cur++;
+ ret = config_get_sensor_alarm_low_threshold
+ (s->id, &s->alarm_low_threshold);
+
+ if (!ret && s->min != UNKNOWN_DBL_VALUE)
+ s->alarm_low_threshold = s->min;
+
+ sensors++;
}
}
char *n;
struct psensor *s = *sensor_cur;
- s->graph_enabled = config_is_sensor_graph_enabled(s->id);
-
n = config_get_sensor_name(s->id);
if (n) {
s->name = n;
}
- s->appindicator_enabled = config_is_appindicator_enabled(s->id);
-
sensor_cur++;
}
}
-static void log_init()
+static void log_init(void)
{
const char *dir;
char *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'},
- {"new-instance", no_argument, 0, 'n'},
- {0, 0, 0, 0}
+ {"version", no_argument, NULL, 'v'},
+ {"help", no_argument, NULL, 'h'},
+ {"url", required_argument, NULL, 'u'},
+ {"debug", required_argument, NULL, 'd'},
+ {"new-instance", no_argument, NULL, 'n'},
+ {NULL, 0, NULL, 0}
};
static gboolean initial_window_show(gpointer data)
return FALSE;
}
-static void log_glib_info()
+static void log_glib_info(void)
{
log_debug("Compiled with GLib %d.%d.%d",
GLIB_MAJOR_VERSION,
log_debug("Cleanup...");
- 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();
* Creates the list of sensors.
*
* 'url': remote psensor server url, null for local monitoring.
- * 'use_libatasmart': whether the libatasmart must be used.
*/
-static struct psensor **create_sensors_list(const char *url,
- unsigned int use_libatasmart)
+static struct psensor **create_sensors_list(const char *url)
{
struct psensor **sensors;
if (url) {
-#ifdef HAVE_REMOTE_SUPPORT
- rsensor_init();
- sensors = get_remote_sensors(url, 600);
-#else
- log_err(_("Psensor has not been compiled with remote "
- "sensor support."));
- exit(EXIT_FAILURE);
-#endif
+ if (rsensor_is_supported()) {
+ rsensor_init();
+ sensors = get_remote_sensors(url, 600);
+ } else {
+ log_err(_("Psensor has not been compiled with remote "
+ "sensor support."));
+ exit(EXIT_FAILURE);
+ }
} else {
- sensors = get_all_sensors(use_libatasmart, 600);
+ sensors = malloc(sizeof(struct psensor *));
+ *sensors = NULL;
+
+ if (config_is_lmsensor_enabled())
+ lmsensor_psensor_list_append(&sensors, 600);
+
+ if (config_is_hddtemp_enabled())
+ hddtemp_psensor_list_append(&sensors, 600);
+
+ if (config_is_libatasmart_enabled())
+ atasmart_psensor_list_append(&sensors, 600);
-#ifdef HAVE_NVIDIA
if (config_is_nvctrl_enabled())
- sensors = nvidia_psensor_list_add(sensors, 600);
-#endif
-#ifdef HAVE_LIBATIADL
+ nvidia_psensor_list_append(&sensors, 600);
+
if (config_is_atiadlsdk_enabled())
- sensors = amd_psensor_list_add(sensors, 600);
-#endif
-#ifdef HAVE_GTOP
+ amd_psensor_list_append(&sensors, 600);
+
if (config_is_gtop2_enabled())
gtop2_psensor_list_append(&sensors, 600);
-#endif
-#ifdef HAVE_LIBUDISKS2
+
if (config_is_udisks2_enabled())
udisks2_psensor_list_append(&sensors, 600);
-#endif
}
associate_preferences(sensors);
- associate_colors(sensors);
return sensors;
}
{
struct ui_psensor ui;
pthread_t thread;
- int optc, cmdok, opti, use_libatasmart, new_instance, ret;
+ int optc, cmdok, opti, new_instance, ret;
char *url = NULL;
GApplication *app;
textdomain(PACKAGE);
#endif
- use_libatasmart = new_instance = 0;
+ new_instance = 0;
cmdok = 1;
while ((optc = getopt_long(argc, argv, "vhd:u:n", 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);
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);
pmutex_init(&ui.sensors_mutex);
ui.config = config_load();
- psensor_init();
-
- ui.sensors = create_sensors_list(url, use_libatasmart);
+ ui.sensors = create_sensors_list(url);
associate_cb_alarm_raised(ui.sensors, &ui);
if (ui.config->slog_enabled)
&ui.sensors_mutex,
config_get_slog_interval());
-#if !defined(HAVE_APPINDICATOR) && !defined(HAVE_APPINDICATOR_029)
ui_status_init(&ui);
ui_status_set_visible(1);
-#endif
/* main window */
ui_window_create(&ui);
g_timeout_add(1000 * ui.graph_update_interval, ui_refresh_thread, &ui);
-#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
ui_appindicator_init(&ui);
-#endif
gdk_notify_startup_complete();
else
initial_window_show(&ui);
- log_debug("translators: %s\n", _("translator-credits"));
-
/* main loop */
gtk_main();
projects / psensor.git / blobdiff