X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=fb534d82cce211f902e723e8e85ba32afb39ff5d;hb=2b51051578ef29b031d0927388c4d62baa3c525e;hp=ee6c2e0b477e85c33eff47a4d84ca3769f915f4a;hpb=9bd9180fd11373d098b2d6ed98e0485e4942ca87;p=psensor.git diff --git a/src/main.c b/src/main.c index ee6c2e0..fb534d8 100644 --- a/src/main.c +++ b/src/main.c @@ -1,22 +1,21 @@ /* - Copyright (C) 2010-2011 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 published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA -*/ - + * 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 + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ #include #include @@ -24,6 +23,8 @@ #include #include #include +#include +#include #include @@ -38,6 +39,7 @@ #include "lmsensor.h" #include "ui_pref.h" #include "ui_graph.h" +#include "ui_status.h" #ifdef HAVE_UNITY #include "ui_unity.h" @@ -55,9 +57,7 @@ #include "rsensor.h" #endif -#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029) #include "ui_appindicator.h" -#endif #ifdef HAVE_LIBNOTIFY #include "ui_notify.h" @@ -71,18 +71,19 @@ static const char *program_name; -void print_version() +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"); } -void print_help() +static void print_help() { printf(_("Usage: %s [OPTION]...\n"), program_name); @@ -91,15 +92,18 @@ 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(""); - puts(_("\ - -u, --url=URL \ -the URL of the psensor-server, example: http://hostname:3131")); + puts(_(" -d, --debug=LEVEL " + "set the debug level, integer between 0 and 3")); puts(""); @@ -129,6 +133,18 @@ 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; @@ -152,12 +168,40 @@ void update_psensor_measures(struct ui_psensor *ui) #ifdef HAVE_LIBATIADL amd_psensor_list_update(sensors); #endif + + log_measures(sensors); + g_mutex_unlock(ui->sensors_mutex); sleep(cfg->sensor_update_interval); } } +static void indicators_update(struct ui_psensor *ui) +{ + struct psensor **sensor_cur = ui->sensors; + unsigned int attention = 0; + + while (*sensor_cur) { + struct psensor *s = *sensor_cur; + + if (s->alarm_enabled && s->alarm_raised) { + attention = 1; + break; + } + + sensor_cur++; + } + +#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) { struct config *cfg; @@ -173,9 +217,8 @@ gboolean ui_refresh_thread(gpointer data) ui_sensorlist_update(ui); -#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029) - ui_appindicator_update(ui); -#endif + if (is_appindicator_supported() || is_status_supported()) + indicators_update(ui); #ifdef HAVE_UNITY ui_unity_launcher_entry_update(ui->sensors, @@ -204,7 +247,7 @@ void cb_alarm_raised(struct psensor *sensor, void *data) #endif } -void associate_colors(struct psensor **sensors) +static void associate_colors(struct psensor **sensors) { /* number of uniq colors */ #define COLORS_COUNT 8 @@ -239,7 +282,7 @@ void associate_colors(struct psensor **sensors) } } -void +static void associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui) { struct psensor **sensor_cur = sensors; @@ -263,7 +306,7 @@ associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui) } } -void associate_preferences(struct psensor **sensors) +static void associate_preferences(struct psensor **sensors) { struct psensor **sensor_cur = sensors; while (*sensor_cur) { @@ -281,22 +324,78 @@ void associate_preferences(struct psensor **sensors) } } +static void log_init() +{ + char *home, *path, *dir; + + home = getenv("HOME"); + + if (!home) + return ; + + dir = malloc(strlen(home)+1+strlen(".psensor")+1); + sprintf(dir, "%s/%s", home, ".psensor"); + mkdir(dir, 0777); + + path = malloc(strlen(dir)+1+strlen("log")+1); + sprintf(path, "%s/%s", dir, "log"); + + log_open(path); + + free(dir); + free(path); +} static struct option long_options[] = { {"version", no_argument, 0, 'v'}, {"help", no_argument, 0, 'h'}, {"url", required_argument, 0, 'u'}, + {"debug", required_argument, 0, 'd'}, {0, 0, 0, 0} }; +static gboolean initial_window_show(gpointer data) +{ + struct ui_psensor *ui; + + log_debug("initial_window_show()"); + + ui = (struct ui_psensor *)data; + + log_debug("is_status_supported: %d", is_status_supported()); + log_debug("is_appindicator_supported: %d", + is_appindicator_supported()); + log_debug("hide_on_startup: %d", ui->config->hide_on_startup); + + if (!ui->config->hide_on_startup + || (!is_appindicator_supported() && !is_status_supported())) + ui_window_show(ui); + + ui_window_update(ui); + + 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; char *url = NULL; - int cmdok = 1; program_name = argv[0]; @@ -307,7 +406,8 @@ int main(int argc, char **argv) textdomain(PACKAGE); #endif - while ((optc = getopt_long(argc, argv, "vhu:", long_options, + cmdok = 1; + while ((optc = getopt_long(argc, argv, "vhd:u:", long_options, NULL)) != -1) { switch (optc) { case 'u': @@ -320,6 +420,10 @@ int main(int argc, char **argv) case 'v': print_version(); exit(EXIT_SUCCESS); + case 'd': + log_level = atoi(optarg); + log_printf(LOG_INFO, _("Enables debug mode.")); + break; default: cmdok = 0; break; @@ -332,16 +436,22 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } + 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); -#ifdef HAVE_LIBNOTIFY - ui.notification_last_time = NULL; -#endif - ui.sensors_mutex = g_mutex_new(); config_init(); @@ -376,6 +486,10 @@ int main(int argc, char **argv) associate_colors(ui.sensors); associate_cb_alarm_raised(ui.sensors, &ui); +#if !defined(HAVE_APPINDICATOR) && !defined(HAVE_APPINDICATOR_029) + ui_status_init(&ui); +#endif + /* main window */ ui_window_create(&ui); ui.sensor_box = NULL; @@ -386,8 +500,6 @@ int main(int argc, char **argv) /* sensor list */ ui_sensorlist_create(&ui); - ui_window_update(&ui); - thread = g_thread_create((GThreadFunc) update_psensor_measures, &ui, TRUE, &error); @@ -402,6 +514,16 @@ int main(int argc, char **argv) ui_appindicator_init(&ui); #endif + /* + * show the window as soon as all gtk events have been processed + * in order to ensure that the status icon is attempted to be + * drawn before. If not, there is no way to detect that it is + * visible. + */ + g_idle_add((GSourceFunc)initial_window_show, &ui); + + gdk_notify_startup_complete(); + /* main loop */ gtk_main(); @@ -415,13 +537,24 @@ int main(int argc, char **argv) #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(); + g_mutex_unlock(ui.sensors_mutex); config_cleanup(); + log_close(); + return 0; }