X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=99d249e85eb1934f87e731a77f40fe352c5a6a1e;hb=7489cc10734e7ff49190f13337964d20489a480c;hp=90d26ac7d71df30a1bbc4e2d24b314c3a4629285;hpb=b6211b9c17d3c35702adcbb69d9c5884cb85f028;p=psensor.git diff --git a/src/main.c b/src/main.c index 90d26ac..99d249e 100644 --- a/src/main.c +++ b/src/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2013 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,7 @@ #include "ui_sensorlist.h" #include "ui_color.h" #include "lmsensor.h" +#include "notify_cmd.h" #include "slog.h" #include "ui_pref.h" #include "ui_graph.h" @@ -68,8 +69,6 @@ #include "cpu.h" #endif -#include "compat.h" - static const char *program_name; static void print_version() @@ -78,10 +77,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-2013"); + "2010-2014"); } static void print_help() @@ -212,7 +211,7 @@ gboolean ui_refresh_thread(gpointer data) 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 +219,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) { @@ -243,6 +242,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) @@ -261,22 +262,17 @@ static void associate_colors(struct psensor **sensors) {0x0000, 0x0000, 0x7fff}, /* dark blue */ {0x0000, 0x7fff, 0x0000} /* 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); } } @@ -314,7 +310,7 @@ static void associate_preferences(struct psensor **sensors) char *n; struct psensor *s = *sensor_cur; - s->enabled = config_is_sensor_enabled(s->id); + s->graph_enabled = config_is_sensor_enabled(s->id); n = config_get_sensor_name(s->id);