#include "config.h"
#include "cfg.h"
+#include <hdd.h>
#include "psensor.h"
#include "graph.h"
#include "ui.h"
" -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);
-
lmsensor_psensor_list_update(sensors);
#ifdef HAVE_REMOTE_SUPPORT
remote_psensor_list_update(sensors);
#ifdef HAVE_GTOP
gtop2_psensor_list_update(sensors);
#endif
+#ifdef HAVE_ATASMART
+ atasmart_psensor_list_update(sensors);
+#endif
+
+ hddtemp_psensor_list_update(sensors);
psensor_log_measures(sensors);
sensor_cur++;
}
-#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
+#if defined(HAVE_APPINDICATOR)
if (is_appindicator_supported())
ui_appindicator_update(ui, attention);
#endif
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 */
+ GdkRGBA rgba;
+ /* copied from the default colors of the gtk color color
+ * chooser. */
+ const char *default_colors[27] = {
+ "#ef2929", /* Scarlet Red */
+ "#fcaf3e", /* Orange */
+ "#fce94f", /* Butter */
+ "#8ae234", /* Chameleon */
+ "#729fcf", /* Sky Blue */
+ "#ad7fa8", /* Plum */
+ "#e9b96e", /* Chocolate */
+ "#888a85", /* Aluminum 1 */
+ "#eeeeec", /* Aluminum 2 */
+ "#cc0000",
+ "#f57900",
+ "#edd400",
+ "#73d216",
+ "#3465a4",
+ "#75507b",
+ "#c17d11",
+ "#555753",
+ "#d3d7cf",
+ "#a40000",
+ "#ce5c00",
+ "#c4a000",
+ "#4e9a06",
+ "#204a87",
+ "#5c3566",
+ "#8f5902",
+ "#2e3436",
+ "#babdb6"
};
- struct psensor **cur;
int i;
+ struct psensor **cur;
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]);
+ gdk_rgba_parse(&rgba, default_colors[i % 27]);
+ c.red = rgba.red;
+ c.green = rgba.green;
+ c.blue = rgba.blue;
(*cur)->color = config_get_sensor_color((*cur)->id, &c);
}
}
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'},
log_debug("Cleanup...");
- psensor_cleanup();
-
#ifdef HAVE_NVIDIA
nvidia_cleanup();
#endif
psensor_list_free(ui->sensors);
ui->sensors = NULL;
-#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
+#if defined(HAVE_APPINDICATOR)
ui_appindicator_cleanup();
#endif
* 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;
exit(EXIT_FAILURE);
#endif
} 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);
+
+#ifdef HAVE_ATASMART
+ if (config_is_libatasmart_enabled())
+ atasmart_psensor_list_append(&sensors, 600);
+#endif
+
#ifdef HAVE_NVIDIA
if (config_is_nvctrl_enabled())
nvidia_psensor_list_append(&sensors, 600);
#endif
#ifdef HAVE_LIBATIADL
if (config_is_atiadlsdk_enabled())
- sensors = amd_psensor_list_add(sensors, 600);
+ amd_psensor_list_append(&sensors, 600);
#endif
#ifdef HAVE_GTOP
if (config_is_gtop2_enabled())
{
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)
+#if !defined(HAVE_APPINDICATOR)
ui_status_init(&ui);
ui_status_set_visible(1);
#endif
g_timeout_add(1000 * ui.graph_update_interval, ui_refresh_thread, &ui);
-#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029)
+#if defined(HAVE_APPINDICATOR)
ui_appindicator_init(&ui);
#endif
projects / psensor.git / blobdiff