X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=95163e0085d88a5fe8022f83fe3cdf9490be2d76;hb=40f68c37206c95bb29c310b6f4337d45b0ea8ea0;hp=48e314e91431fa3cb775196ce7bfabc4dda59a50;hpb=26004eb3b93f0cf2e46f378bf646475618170ed3;p=psensor.git diff --git a/src/main.c b/src/main.c index 48e314e..95163e0 100644 --- a/src/main.c +++ b/src/main.c @@ -1,5 +1,5 @@ /* - * 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 @@ -74,12 +74,13 @@ static const char *program_name; static void print_version() { printf("psensor %s\n", VERSION); - printf(_("Copyright (C) %s jeanfi@gmail.com\n\ -License GPLv2: GNU GPL version 2 or later \ -\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-2011"); + printf(_("Copyright (C) %s jeanfi@gmail.com\n" + "License GPLv2: GNU GPL version 2 or later " + "\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-2012"); } static void print_help() @@ -91,21 +92,20 @@ static void print_help() puts(""); puts(_("Options:")); - puts(_("\ - -h, --help display this help and exit\n\ - -v, --version display version information and exit")); + puts(_(" -h, --help display this help and exit\n" + " -v, --version display version information and exit")); puts(""); - 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 \ -set the debug level, integer between 0 and 3")); + puts(_(" -d, --debug=LEVEL " + "set the debug level, integer between 0 and 3")); puts(""); @@ -135,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; @@ -171,7 +159,7 @@ void update_psensor_measures(struct ui_psensor *ui) amd_psensor_list_update(sensors); #endif - log_measures(sensors); + psensor_log_measures(sensors); g_mutex_unlock(ui->sensors_mutex); @@ -215,7 +203,7 @@ gboolean ui_refresh_thread(gpointer data) 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); @@ -224,7 +212,8 @@ gboolean ui_refresh_thread(gpointer data) #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) { @@ -349,6 +338,7 @@ static void log_init() } 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'}, @@ -378,14 +368,26 @@ static gboolean initial_window_show(gpointer data) return FALSE; } +static void log_glib_info() +{ + log_debug("Compiled with GLib %d.%d.%d", + GLIB_MAJOR_VERSION, + GLIB_MINOR_VERSION, + GLIB_MICRO_VERSION); + + log_debug("Running with GLib %d.%d.%d", + glib_major_version, + glib_minor_version, + glib_micro_version); +} + int main(int argc, char **argv) { struct ui_psensor ui; GError *error; GThread *thread; - int optc; + int optc, cmdok, opti, use_libatasmart; char *url = NULL; - int cmdok = 1; program_name = argv[0]; @@ -396,9 +398,16 @@ int main(int argc, char **argv) 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); @@ -410,8 +419,8 @@ int main(int argc, char **argv) print_version(); exit(EXIT_SUCCESS); case 'd': - printf(_("Enables debug mode.\n")); log_level = atoi(optarg); + log_printf(LOG_INFO, _("Enables debug mode.")); break; default: cmdok = 0; @@ -427,9 +436,17 @@ int main(int argc, char **argv) log_init(); + log_glib_info(); +#if !(GLIB_CHECK_VERSION(2, 31, 0)) + /* + * Since GLib 2.31 g_thread_init call is deprecated and not + * needed. + */ + log_debug("Calling g_thread_init(NULL)"); g_thread_init(NULL); +#endif + gdk_threads_init(); - /* gdk_threads_enter(); */ gtk_init(NULL, NULL); @@ -451,7 +468,7 @@ int main(int argc, char **argv) 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 @@ -469,6 +486,7 @@ int main(int argc, char **argv) #if !defined(HAVE_APPINDICATOR) && !defined(HAVE_APPINDICATOR_029) ui_status_init(&ui); + ui_status_set_visible(1); #endif /* main window */ @@ -478,6 +496,8 @@ int main(int argc, char **argv) /* drawing box */ ui.w_graph = ui_graph_create(&ui); + ui_enable_alpha_channel(&ui); + /* sensor list */ ui_sensorlist_create(&ui);