projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed --wdir option.
[psensor.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index
c246e76
..
95163e0
100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2010-201
1
jeanfi@gmail.com
+ * Copyright (C) 2010-201
2
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 program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@
-80,7
+80,7
@@
static void print_version()
"This is free software: you are free to change and "
" redistribute it.\n"
"There is NO WARRANTY, to the extent permitted by law.\n"),
"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-201
1
");
+ "2010-201
2
");
}
static void print_help()
}
static void print_help()
@@
-99,7
+99,9
@@
static void print_help()
puts(_(" -u, --url=URL "
"the URL of the psensor-server, example: http://hostname:3131"));
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 "
puts("");
puts(_(" -d, --debug=LEVEL "
@@
-133,18
+135,6
@@
update_psensor_values_size(struct psensor **sensors, struct config *cfg)
}
}
}
}
-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;
void update_psensor_measures(struct ui_psensor *ui)
{
struct psensor **sensors = ui->sensors;
@@
-169,7
+159,7
@@
void update_psensor_measures(struct ui_psensor *ui)
amd_psensor_list_update(sensors);
#endif
amd_psensor_list_update(sensors);
#endif
- log_measures(sensors);
+
psensor_
log_measures(sensors);
g_mutex_unlock(ui->sensors_mutex);
g_mutex_unlock(ui->sensors_mutex);
@@
-213,7
+203,7
@@
gboolean ui_refresh_thread(gpointer data)
g_mutex_lock(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);
ui_sensorlist_update(ui);
@@
-222,7
+212,8
@@
gboolean ui_refresh_thread(gpointer data)
#ifdef HAVE_UNITY
ui_unity_launcher_entry_update(ui->sensors,
#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) {
#endif
if (ui->graph_update_interval != cfg->graph_update_interval) {
@@
-347,6
+338,7
@@
static void log_init()
}
static struct option long_options[] = {
}
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'},
{"version", no_argument, 0, 'v'},
{"help", no_argument, 0, 'h'},
{"url", required_argument, 0, 'u'},
@@
-394,7
+386,7
@@
int main(int argc, char **argv)
struct ui_psensor ui;
GError *error;
GThread *thread;
struct ui_psensor ui;
GError *error;
GThread *thread;
- int optc, cmdok;
+ int optc, cmdok
, opti, use_libatasmart
;
char *url = NULL;
program_name = argv[0];
char *url = NULL;
program_name = argv[0];
@@
-406,10
+398,16
@@
int main(int argc, char **argv)
textdomain(PACKAGE);
#endif
textdomain(PACKAGE);
#endif
+ use_libatasmart = 0;
+
cmdok = 1;
while ((optc = getopt_long(argc, argv, "vhd:u:", long_options,
cmdok = 1;
while ((optc = getopt_long(argc, argv, "vhd:u:", long_options,
-
NULL
)) != -1) {
+
&opti
)) != -1) {
switch (optc) {
switch (optc) {
+ case 0:
+ if (!strcmp(long_options[opti].name, "use-libatasmart"))
+ use_libatasmart = 1;
+ break;
case 'u':
if (optarg)
url = strdup(optarg);
case 'u':
if (optarg)
url = strdup(optarg);
@@
-439,11
+437,10
@@
int main(int argc, char **argv)
log_init();
log_glib_info();
log_init();
log_glib_info();
-#if !(GLIB_CHECK_VERSION(2, 3
2
, 0))
+#if !(GLIB_CHECK_VERSION(2, 3
1
, 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);
*/
log_debug("Calling g_thread_init(NULL)");
g_thread_init(NULL);
@@
-471,7
+468,7
@@
int main(int argc, char **argv)
exit(EXIT_FAILURE);
#endif
} else {
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
#ifdef HAVE_NVIDIA
ui.sensors = nvidia_psensor_list_add(ui.sensors, 600);
#endif
@@
-489,6
+486,7
@@
int main(int argc, char **argv)
#if !defined(HAVE_APPINDICATOR) && !defined(HAVE_APPINDICATOR_029)
ui_status_init(&ui);
#if !defined(HAVE_APPINDICATOR) && !defined(HAVE_APPINDICATOR_029)
ui_status_init(&ui);
+ ui_status_set_visible(1);
#endif
/* main window */
#endif
/* main window */
@@
-498,6
+496,8
@@
int main(int argc, char **argv)
/* drawing box */
ui.w_graph = ui_graph_create(&ui);
/* drawing box */
ui.w_graph = ui_graph_create(&ui);
+ ui_enable_alpha_channel(&ui);
+
/* sensor list */
ui_sensorlist_create(&ui);
/* sensor list */
ui_sensorlist_create(&ui);