/*
- * Copyright (C) 2010-2011 jeanfi@gmail.com
+ * 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
"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");
+ "2010-2012");
}
static void print_help()
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 "
}
}
-static void log_measures(struct psensor **sensors)
-{
- if (log_level == LOG_DEBUG)
- while (*sensors) {
- log_debug("Measure: %s %.2f",
- (*sensors)->name,
- psensor_get_current_value(*sensors));
-
- sensors++;
- }
-}
-
void update_psensor_measures(struct ui_psensor *ui)
{
struct psensor **sensors = ui->sensors;
amd_psensor_list_update(sensors);
#endif
- log_measures(sensors);
+ psensor_log_measures(sensors);
g_mutex_unlock(ui->sensors_mutex);
g_mutex_lock(ui->sensors_mutex);
- 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);
#ifdef HAVE_UNITY
ui_unity_launcher_entry_update(ui->sensors,
- !cfg->unity_launcher_count_disabled);
+ !cfg->unity_launcher_count_disabled,
+ cfg->temperature_unit == CELCIUS);
#endif
if (ui->graph_update_interval != cfg->graph_update_interval) {
}
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'},
struct ui_psensor ui;
GError *error;
GThread *thread;
- int optc, cmdok;
+ int optc, cmdok, opti, use_libatasmart;
char *url = NULL;
program_name = argv[0];
textdomain(PACKAGE);
#endif
+ use_libatasmart = 0;
+
cmdok = 1;
while ((optc = getopt_long(argc, argv, "vhd:u:", long_options,
- NULL)) != -1) {
+ &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);
log_init();
log_glib_info();
-#if !(GLIB_CHECK_VERSION(2, 32, 0))
+#if !(GLIB_CHECK_VERSION(2, 31, 0))
/*
- * Since GLib 2.3.32 g_thread_init call is deprecated and not
- * needed. Documentation of this method is not clear whether
- * it is also useless with 2.3.31.
+ * Since GLib 2.31 g_thread_init call is deprecated and not
+ * needed.
*/
log_debug("Calling g_thread_init(NULL)");
g_thread_init(NULL);
exit(EXIT_FAILURE);
#endif
} else {
- ui.sensors = get_all_sensors(600);
+ ui.sensors = get_all_sensors(use_libatasmart, 600);
#ifdef HAVE_NVIDIA
ui.sensors = nvidia_psensor_list_add(ui.sensors, 600);
#endif
#if !defined(HAVE_APPINDICATOR) && !defined(HAVE_APPINDICATOR_029)
ui_status_init(&ui);
+ ui_status_set_visible(1);
#endif
/* main window */
/* drawing box */
ui.w_graph = ui_graph_create(&ui);
+ ui_enable_alpha_channel(&ui);
+
/* sensor list */
ui_sensorlist_create(&ui);