projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed typo (celcius/celsius)
[psensor.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index
a5e7878
..
3d93fd0
100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2010-201
2
jeanfi@gmail.com
+ * Copyright (C) 2010-201
4
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
*
* 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,8
@@
#include "ui_sensorlist.h"
#include "ui_color.h"
#include "lmsensor.h"
#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"
#include "ui_status.h"
#include "ui_pref.h"
#include "ui_graph.h"
#include "ui_status.h"
@@
-67,8
+69,6
@@
#include "cpu.h"
#endif
#include "cpu.h"
#endif
-#include "compat.h"
-
static const char *program_name;
static void print_version()
static const char *program_name;
static void print_version()
@@
-80,7
+80,7
@@
static void print_version()
"This is free software: you are free to change and "
" redistribute it.\n"
"There is NO WARRANTY, to the extent permitted by law.\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-201
2
");
+ "2010-201
4
");
}
static void print_help()
}
static void print_help()
@@
-144,7
+144,7
@@
static void update_measures(struct ui_psensor *ui)
cfg = ui->config;
while (1) {
cfg = ui->config;
while (1) {
-
g_mutex_lock(
ui->sensors_mutex);
+
pthread_mutex_lock(&
ui->sensors_mutex);
sensors = ui->sensors;
if (!sensors)
sensors = ui->sensors;
if (!sensors)
@@
-167,7
+167,7
@@
static void update_measures(struct ui_psensor *ui)
period = cfg->sensor_update_interval;
period = cfg->sensor_update_interval;
-
g_mutex_unlock(
ui->sensors_mutex);
+
pthread_mutex_unlock(&
ui->sensors_mutex);
sleep(period);
}
sleep(period);
}
@@
-207,11
+207,11
@@
gboolean ui_refresh_thread(gpointer data)
ret = TRUE;
cfg = ui->config;
ret = TRUE;
cfg = ui->config;
-
g_mutex_lock(
ui->sensors_mutex);
+
pthread_mutex_lock(&
ui->sensors_mutex);
graph_update(ui->sensors, ui->w_graph, ui->config, ui->main_window);
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);
if (is_appindicator_supported() || is_status_supported())
indicators_update(ui);
@@
-219,7
+219,7
@@
gboolean ui_refresh_thread(gpointer data)
#ifdef HAVE_UNITY
ui_unity_launcher_entry_update(ui->sensors,
!cfg->unity_launcher_count_disabled,
#ifdef HAVE_UNITY
ui_unity_launcher_entry_update(ui->sensors,
!cfg->unity_launcher_count_disabled,
- cfg->temperature_unit == CEL
C
IUS);
+ cfg->temperature_unit == CEL
S
IUS);
#endif
if (ui->graph_update_interval != cfg->graph_update_interval) {
#endif
if (ui->graph_update_interval != cfg->graph_update_interval) {
@@
-227,7
+227,7
@@
gboolean ui_refresh_thread(gpointer data)
ret = FALSE;
}
ret = FALSE;
}
-
g_mutex_unlock(
ui->sensors_mutex);
+
pthread_mutex_unlock(&
ui->sensors_mutex);
if (ret == FALSE)
g_timeout_add(1000 * ui->graph_update_interval,
if (ret == FALSE)
g_timeout_add(1000 * ui->graph_update_interval,
@@
-242,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
if (sensor->alarm_enabled)
ui_notify(sensor, (struct ui_psensor *)data);
#endif
+
+ notify_cmd(sensor);
}
static void associate_colors(struct psensor **sensors)
}
static void associate_colors(struct psensor **sensors)
@@
-260,22
+262,17
@@
static void associate_colors(struct psensor **sensors)
{0x0000, 0x0000, 0x7fff}, /* dark blue */
{0x0000, 0x7fff, 0x0000} /* dark green */
};
{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++) {
+ color_set(&c,
colors[i % COLORS_COUNT][0],
colors[i % COLORS_COUNT][1],
colors[i % COLORS_COUNT][2]);
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);
}
}
}
}
@@
-313,7
+310,7
@@
static void associate_preferences(struct psensor **sensors)
char *n;
struct psensor *s = *sensor_cur;
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);
n = config_get_sensor_name(s->id);
@@
-406,7
+403,7
@@
static void cb_activate(GApplication *application,
*/
static void cleanup(struct ui_psensor *ui)
{
*/
static void cleanup(struct ui_psensor *ui)
{
-
g_mutex_lock(
ui->sensors_mutex);
+
pthread_mutex_lock(&
ui->sensors_mutex);
log_debug("Cleanup...");
log_debug("Cleanup...");
@@
-431,7
+428,7
@@
static void cleanup(struct ui_psensor *ui)
ui_status_cleanup();
ui_status_cleanup();
-
g_mutex_unlock(
ui->sensors_mutex);
+
pthread_mutex_unlock(&
ui->sensors_mutex);
config_cleanup();
config_cleanup();
@@
-562,7
+559,7
@@
int main(int argc, char **argv)
gtk_init(NULL, NULL);
gtk_init(NULL, NULL);
-
ui.sensors_mutex = g_mutex_new(
);
+
pthread_mutex_init(&ui.sensors_mutex, NULL
);
ui.config = config_load();
ui.config = config_load();
@@
-571,6
+568,12
@@
int main(int argc, char **argv)
ui.sensors = create_sensors_list(url, use_libatasmart);
associate_cb_alarm_raised(ui.sensors, &ui);
ui.sensors = create_sensors_list(url, use_libatasmart);
associate_cb_alarm_raised(ui.sensors, &ui);
+ if (ui.config->slog_enabled)
+ slog_activate(NULL,
+ ui.sensors,
+ &ui.sensors_mutex,
+ config_get_slog_interval());
+
#if !defined(HAVE_APPINDICATOR) && !defined(HAVE_APPINDICATOR_029)
ui_status_init(&ui);
ui_status_set_visible(1);
#if !defined(HAVE_APPINDICATOR) && !defined(HAVE_APPINDICATOR_029)
ui_status_init(&ui);
ui_status_set_visible(1);
@@
-578,16
+581,9
@@
int main(int argc, char **argv)
/* main window */
ui_window_create(&ui);
/* main window */
ui_window_create(&ui);
- ui.sensor_box = NULL;
-
- /* drawing box */
- ui.w_graph = ui_graph_create(&ui);
ui_enable_alpha_channel(&ui);
ui_enable_alpha_channel(&ui);
- /* sensor list */
- ui_sensorlist_create(&ui);
-
thread = g_thread_create((GThreadFunc) update_measures,
&ui, TRUE, &error);
thread = g_thread_create((GThreadFunc) update_measures,
&ui, TRUE, &error);
@@
-606,20
+602,26
@@
int main(int argc, char **argv)
/*
* hack, did not find a cleaner solution.
/*
* hack, did not find a cleaner solution.
- * wait
2
s to ensure that the status icon is attempted to be
+ * wait
30
s to ensure that the status icon is attempted to be
* drawn before determining whether the main window must be
* show.
*/
* 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);
/* main loop */
gtk_main();
/* main loop */
gtk_main();
- g_object_ref(app);
+ g_object_
un
ref(app);
cleanup(&ui);
log_debug("Quitting...");
log_close();
cleanup(&ui);
log_debug("Quitting...");
log_close();
+ if (url)
+ free(url);
+
return 0;
}
return 0;
}