X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=442a03f5be065ca0247f3c7ba2aeaa02bf86dc9d;hb=45c8086f97097df36ba8cd0552f152be80f79b12;hp=3a092a80efa8a78ac21da2cc66ee066dc712d374;hpb=609664bb77874990e10f8073e54bb7f1645c8d72;p=psensor.git diff --git a/src/main.c b/src/main.c index 3a092a8..442a03f 100644 --- a/src/main.c +++ b/src/main.c @@ -1,22 +1,21 @@ /* - Copyright (C) 2010-2011 wpitchoune@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-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 + */ #include #include @@ -24,16 +23,14 @@ #include #include #include +#include +#include #include -#include -#include - #include "config.h" #include "cfg.h" -#include "hdd.h" #include "psensor.h" #include "graph.h" #include "ui.h" @@ -42,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" @@ -51,26 +49,32 @@ #include "nvidia.h" #endif +#ifdef HAVE_LIBATIADL +#include "amd.h" +#endif + #ifdef HAVE_REMOTE_SUPPORT #include "rsensor.h" #endif -#if defined(HAVE_APPINDICATOR) || defined(HAVE_APPINDICATOR_029) #include "ui_appindicator.h" -#endif #ifdef HAVE_LIBNOTIFY #include "ui_notify.h" #endif +#ifdef HAVE_GTOP +#include "cpu.h" +#endif + #include "compat.h" static const char *program_name; -void print_version() +static void print_version() { printf("psensor %s\n", VERSION); - printf(_("Copyright (C) %s wpitchoune@gmail.com\n\ + 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\ @@ -78,7 +82,7 @@ There is NO WARRANTY, to the extent permitted by law.\n"), "2010-2011"); } -void print_help() +static void print_help() { printf(_("Usage: %s [OPTION]...\n"), program_name); @@ -125,13 +129,24 @@ 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; struct config *cfg = ui->config; while (1) { - /*gdk_threads_enter();*/ g_mutex_lock(ui->sensors_mutex); if (!sensors) @@ -146,14 +161,43 @@ void update_psensor_measures(struct ui_psensor *ui) #ifdef HAVE_NVIDIA nvidia_psensor_list_update(sensors); #endif +#ifdef HAVE_LIBATIADL + amd_psensor_list_update(sensors); +#endif + + log_measures(sensors); - /*gdk_threads_leave();*/ 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; @@ -164,18 +208,17 @@ gboolean ui_refresh_thread(gpointer data) cfg = ui->config; g_mutex_lock(ui->sensors_mutex); - /*gdk_threads_enter();*/ graph_update(ui->sensors, ui->w_graph, ui->config); - ui_sensorlist_update(ui->ui_sensorlist); + 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); + ui_unity_launcher_entry_update(ui->sensors, + !cfg->unity_launcher_count_disabled); #endif if (ui->graph_update_interval != cfg->graph_update_interval) { @@ -184,7 +227,6 @@ gboolean ui_refresh_thread(gpointer data) } g_mutex_unlock(ui->sensors_mutex); - /*gdk_threads_leave();*/ if (ret == FALSE) g_timeout_add(1000 * ui->graph_update_interval, @@ -201,7 +243,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 @@ -236,7 +278,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; @@ -260,7 +302,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) { @@ -278,20 +320,64 @@ 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", no_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; +} + int main(int argc, char **argv) { struct ui_psensor ui; GError *error; GThread *thread; - int err, optc; + int optc; char *url = NULL; int cmdok = 1; @@ -304,7 +390,7 @@ int main(int argc, char **argv) textdomain(PACKAGE); #endif - while ((optc = getopt_long(argc, argv, "vhu:", long_options, + while ((optc = getopt_long(argc, argv, "vhdu:", long_options, NULL)) != -1) { switch (optc) { case 'u': @@ -317,6 +403,10 @@ int main(int argc, char **argv) case 'v': print_version(); exit(EXIT_SUCCESS); + case 'd': + printf(_("Enables debug mode.\n")); + log_level = LOG_DEBUG; + break; default: cmdok = 0; break; @@ -329,15 +419,13 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } + log_init(); + g_thread_init(NULL); gdk_threads_init(); /* gdk_threads_enter(); */ - gtk_init(&argc, &argv); - -#ifdef HAVE_LIBNOTIFY - ui.notification_last_time = NULL; -#endif + gtk_init(NULL, NULL); ui.sensors_mutex = g_mutex_new(); @@ -345,12 +433,7 @@ int main(int argc, char **argv) ui.config = config_load(); - err = lmsensor_init(); - if (!err) { - fprintf(stderr, _("ERROR: lmsensor init failure: %s\n"), - sensors_strerror(err)); - exit(EXIT_FAILURE); - } + psensor_init(); if (url) { #ifdef HAVE_REMOTE_SUPPORT @@ -362,16 +445,15 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); #endif } else { -#ifdef HAVE_NVIDIA - struct psensor **tmp; - - tmp = get_all_sensors(600); - ui.sensors = nvidia_psensor_list_add(tmp, 600); - - if (tmp != ui.sensors) - free(tmp); -#else ui.sensors = get_all_sensors(600); +#ifdef HAVE_NVIDIA + ui.sensors = nvidia_psensor_list_add(ui.sensors, 600); +#endif +#ifdef HAVE_LIBATIADL + ui.sensors = amd_psensor_list_add(ui.sensors, 600); +#endif +#ifdef HAVE_GTOP + ui.sensors = cpu_psensor_list_add(ui.sensors, 600); #endif } @@ -379,19 +461,19 @@ 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.main_window = ui_window_create(&ui); - ui.main_box = NULL; + ui_window_create(&ui); + ui.sensor_box = NULL; /* drawing box */ ui.w_graph = ui_graph_create(&ui); /* sensor list */ - ui.ui_sensorlist = ui_sensorlist_create(ui.sensors); - - ui_main_box_create(&ui); - - gtk_widget_show_all(ui.main_window); + ui_sensorlist_create(&ui); thread = g_thread_create((GThreadFunc) update_psensor_measures, &ui, TRUE, &error); @@ -407,14 +489,47 @@ 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(); - sensors_cleanup(); + g_mutex_lock(ui.sensors_mutex); + + psensor_cleanup(); + +#ifdef HAVE_NVIDIA + nvidia_cleanup(); +#endif +#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(); - /* gdk_threads_leave(); */ + log_close(); return 0; }