projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed compat.h because gtk2 is no more supported since a while
[psensor.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index
5824b72
..
67c1d6a
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
3
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,7
@@
#include "ui_sensorlist.h"
#include "ui_color.h"
#include "lmsensor.h"
#include "ui_sensorlist.h"
#include "ui_color.h"
#include "lmsensor.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
+68,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
+79,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
3
");
}
static void print_help()
}
static void print_help()
@@
-144,7
+143,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
+166,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
+206,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);
@@
-227,7
+226,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,
@@
-322,6
+321,8
@@
static void associate_preferences(struct psensor **sensors)
s->name = n;
}
s->name = n;
}
+ s->appindicator_enabled = config_is_appindicator_enabled(s->id);
+
sensor_cur++;
}
}
sensor_cur++;
}
}
@@
-404,7
+405,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...");
@@
-429,7
+430,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();
@@
-515,7
+516,7
@@
int main(int argc, char **argv)
exit(EXIT_SUCCESS);
case 'd':
log_level = atoi(optarg);
exit(EXIT_SUCCESS);
case 'd':
log_level = atoi(optarg);
- log_
printf(LOG_INFO,
_("Enables debug mode."));
+ log_
info(
_("Enables debug mode."));
break;
case 'n':
new_instance = 1;
break;
case 'n':
new_instance = 1;
@@
-560,7
+561,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();
@@
-569,6
+570,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);
@@
-576,16
+583,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);
@@
-604,20
+604,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;
}