X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=ab5627a86268eb9014d0f76ec530c24eef708532;hb=632c94e114ac5a4e8e16ba248c147a0c83454b25;hp=91b7b1e08f2b46bd07bc849e3d6c338930838c0c;hpb=d5691e85f6c758624df014a2b4008d356518ba43;p=psensor.git diff --git a/src/main.c b/src/main.c index 91b7b1e..ab5627a 100644 --- a/src/main.c +++ b/src/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2012 jeanfi@gmail.com + * Copyright (C) 2010-2014 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 @@ -37,6 +37,9 @@ #include "ui_sensorlist.h" #include "ui_color.h" #include "lmsensor.h" +#include "notify_cmd.h" +#include +#include #include "slog.h" #include "ui_pref.h" #include "ui_graph.h" @@ -68,8 +71,6 @@ #include "cpu.h" #endif -#include "compat.h" - static const char *program_name; static void print_version() @@ -78,10 +79,10 @@ static void print_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 " + "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"); + "2010-2014"); } static void print_help() @@ -136,20 +137,22 @@ update_psensor_values_size(struct psensor **sensors, struct config *cfg) } } -static void update_measures(struct ui_psensor *ui) +static void *update_measures(void *data) { struct psensor **sensors; struct config *cfg; int period; + struct ui_psensor *ui; + ui = (struct ui_psensor *)data; cfg = ui->config; while (1) { - pthread_mutex_lock(&ui->sensors_mutex); + pmutex_lock(&ui->sensors_mutex); sensors = ui->sensors; if (!sensors) - return; + pthread_exit(NULL); update_psensor_values_size(sensors, cfg); @@ -163,12 +166,15 @@ static void update_measures(struct ui_psensor *ui) #ifdef HAVE_LIBATIADL amd_psensor_list_update(sensors); #endif +#ifdef HAVE_LIBUDISKS2 + udisks2_psensor_list_update(sensors); +#endif psensor_log_measures(sensors); period = cfg->sensor_update_interval; - pthread_mutex_unlock(&ui->sensors_mutex); + pmutex_unlock(&ui->sensors_mutex); sleep(period); } @@ -208,11 +214,11 @@ gboolean ui_refresh_thread(gpointer data) ret = TRUE; cfg = ui->config; - pthread_mutex_lock(&ui->sensors_mutex); + pmutex_lock(&ui->sensors_mutex); graph_update(ui->sensors, ui->w_graph, ui->config, ui->main_window); - ui_sensorlist_update(ui); + ui_sensorlist_update(ui, 0); if (is_appindicator_supported() || is_status_supported()) indicators_update(ui); @@ -220,7 +226,7 @@ gboolean ui_refresh_thread(gpointer data) #ifdef HAVE_UNITY ui_unity_launcher_entry_update(ui->sensors, !cfg->unity_launcher_count_disabled, - cfg->temperature_unit == CELCIUS); + cfg->temperature_unit == CELSIUS); #endif if (ui->graph_update_interval != cfg->graph_update_interval) { @@ -228,7 +234,7 @@ gboolean ui_refresh_thread(gpointer data) ret = FALSE; } - pthread_mutex_unlock(&ui->sensors_mutex); + pmutex_unlock(&ui->sensors_mutex); if (ret == FALSE) g_timeout_add(1000 * ui->graph_update_interval, @@ -243,6 +249,8 @@ static void cb_alarm_raised(struct psensor *sensor, void *data) if (sensor->alarm_enabled) ui_notify(sensor, (struct ui_psensor *)data); #endif + + notify_cmd(sensor); } static void associate_colors(struct psensor **sensors) @@ -250,33 +258,28 @@ static void associate_colors(struct psensor **sensors) /* number of uniq colors */ #define COLORS_COUNT 8 - unsigned int colors[COLORS_COUNT][3] = { - {0x0000, 0x0000, 0x0000}, /* black */ - {0xffff, 0x0000, 0x0000}, /* red */ - {0x0000, 0x0000, 0xffff}, /* blue */ - {0x0000, 0xffff, 0x0000}, /* green */ + double colors[COLORS_COUNT][3] = { + {0, 0, 0}, /* black */ + {1, 0, 0}, /* red */ + {0, 0, 1}, /* blue */ + {0, 1, 0}, /* green */ - {0x7fff, 0x7fff, 0x7fff}, /* grey */ - {0x7fff, 0x0000, 0x0000}, /* dark red */ - {0x0000, 0x0000, 0x7fff}, /* dark blue */ - {0x0000, 0x7fff, 0x0000} /* dark green */ + {0.5, 0.5, 0.5},/* grey */ + {0.5, 0, 0}, /* dark red */ + {0, 0, 0.5}, /* dark blue */ + {0, 0.5, 0} /* dark green */ }; + struct psensor **cur; + int i; + struct color c; - struct psensor **sensor_cur = sensors; - int i = 0; - while (*sensor_cur) { - struct color default_color; - color_set(&default_color, + for (cur = sensors, i = 0; *cur; cur++, i++) { + color_set(&c, colors[i % COLORS_COUNT][0], colors[i % COLORS_COUNT][1], colors[i % COLORS_COUNT][2]); - (*sensor_cur)->color - = config_get_sensor_color((*sensor_cur)->id, - &default_color); - - sensor_cur++; - i++; + (*cur)->color = config_get_sensor_color((*cur)->id, &c); } } @@ -284,6 +287,7 @@ static void associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui) { struct psensor **sensor_cur = sensors; + while (*sensor_cur) { struct psensor *s = *sensor_cur; @@ -295,13 +299,8 @@ associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui) s->alarm_low_threshold = config_get_sensor_alarm_low_threshold(s->id); - if (is_temp_type(s->type) || is_fan_type(s->type)) { - s->alarm_enabled + s->alarm_enabled = config_get_sensor_alarm_enabled(s->id); - } else { - s->alarm_high_threshold = 0; - s->alarm_enabled = 0; - } sensor_cur++; } @@ -310,11 +309,12 @@ associate_cb_alarm_raised(struct psensor **sensors, struct ui_psensor *ui) static void associate_preferences(struct psensor **sensors) { struct psensor **sensor_cur = sensors; + while (*sensor_cur) { char *n; struct psensor *s = *sensor_cur; - s->enabled = config_is_sensor_enabled(s->id); + s->graph_enabled = config_is_sensor_graph_enabled(s->id); n = config_get_sensor_name(s->id); @@ -331,23 +331,19 @@ static void associate_preferences(struct psensor **sensors) static void log_init() { - char *home, *path, *dir; - - home = getenv("HOME"); + const char *dir; + char *path; - if (!home) - return ; + dir = get_psensor_user_dir(); - dir = malloc(strlen(home)+1+strlen(".psensor")+1); - sprintf(dir, "%s/%s", home, ".psensor"); - mkdir(dir, 0777); + if (!dir) + return; path = malloc(strlen(dir)+1+strlen("log")+1); sprintf(path, "%s/%s", dir, "log"); log_open(path); - free(dir); free(path); } @@ -407,7 +403,7 @@ static void cb_activate(GApplication *application, */ static void cleanup(struct ui_psensor *ui) { - pthread_mutex_lock(&ui->sensors_mutex); + pmutex_lock(&ui->sensors_mutex); log_debug("Cleanup..."); @@ -432,7 +428,7 @@ static void cleanup(struct ui_psensor *ui) ui_status_cleanup(); - pthread_mutex_unlock(&ui->sensors_mutex); + pmutex_unlock(&ui->sensors_mutex); config_cleanup(); @@ -470,6 +466,9 @@ static struct psensor **create_sensors_list(const char *url, #ifdef HAVE_GTOP sensors = cpu_psensor_list_add(sensors, 600); #endif +#ifdef HAVE_LIBUDISKS2 + udisks2_psensor_list_add(&sensors, 600); +#endif } associate_preferences(sensors); @@ -481,9 +480,8 @@ static struct psensor **create_sensors_list(const char *url, int main(int argc, char **argv) { struct ui_psensor ui; - GError *error; - GThread *thread; - int optc, cmdok, opti, use_libatasmart, new_instance; + pthread_t thread; + int optc, cmdok, opti, use_libatasmart, new_instance, ret; char *url = NULL; GApplication *app; @@ -559,11 +557,20 @@ int main(int argc, char **argv) g_thread_init(NULL); #endif +#ifdef HAVE_APPINDICATOR_029 + /* gdk_thread_enter/leave only used to workaround mutex bug + * of appindicator < 0.2.9, so do not call gdk_threads_init + * if useless. Calling this function leads to + * crash "Attempt to unlock mutex that was not locked" with + * GLib 2.41.2 (new checking) probably due to bugs in GTK + * itself. + */ gdk_threads_init(); +#endif gtk_init(NULL, NULL); - pthread_mutex_init(&ui.sensors_mutex, NULL); + pmutex_init(&ui.sensors_mutex); ui.config = config_load(); @@ -585,21 +592,13 @@ int main(int argc, char **argv) /* main window */ ui_window_create(&ui); - ui.sensor_box = NULL; - - /* drawing box */ - ui.w_graph = ui_graph_create(&ui); ui_enable_alpha_channel(&ui); - /* sensor list */ - ui_sensorlist_create(&ui); - - thread = g_thread_create((GThreadFunc) update_measures, - &ui, TRUE, &error); + ret = pthread_create(&thread, NULL, update_measures, &ui); - if (!thread) - g_error_free(error); + if (ret) + log_err(_("Failed to create thread for monitoring sensors")); ui.graph_update_interval = ui.config->graph_update_interval; @@ -613,20 +612,28 @@ int main(int argc, char **argv) /* * hack, did not find a cleaner solution. - * wait 2s to ensure that the status icon is attempted to be + * wait 30s to ensure that the status icon is attempted to be * drawn before determining whether the main window must be * show. */ - g_timeout_add(2000, (GSourceFunc)initial_window_show, &ui); + if (ui.config->hide_on_startup) + g_timeout_add(30000, (GSourceFunc)initial_window_show, &ui); + else + initial_window_show(&ui); + + log_debug("translators: %s\n", _("translator-credits")); /* main loop */ gtk_main(); - g_object_ref(app); + g_object_unref(app); cleanup(&ui); log_debug("Quitting..."); log_close(); + if (url) + free(url); + return 0; }