X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fmain.c;h=0aafa15440396c69628cd4b4706c7f80c7504d7e;hb=1410f23801330c83c83caf21353860ff2bc18399;hp=539d4020e7ea1ee83cbaf76158ffa24194fd7963;hpb=b0fbaa0cc4cdc38bc86e3739e5bc78d73ca063ec;p=psensor.git

diff --git a/src/main.c b/src/main.c
index 539d402..0aafa15 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2012 jeanfi@gmail.com
+ * Copyright (C) 2010-2013 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 "slog.h"
 #include "ui_pref.h"
 #include "ui_graph.h"
 #include "ui_status.h"
@@ -67,8 +68,6 @@
 #include "cpu.h"
 #endif
 
-#include "compat.h"
-
 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"),
-	       "2010-2012");
+	       "2010-2013");
 }
 
 static void print_help()
@@ -144,7 +143,7 @@ static void update_measures(struct ui_psensor *ui)
 	cfg = ui->config;
 
 	while (1) {
-		g_mutex_lock(ui->sensors_mutex);
+		pthread_mutex_lock(&ui->sensors_mutex);
 
 		sensors = ui->sensors;
 		if (!sensors)
@@ -167,7 +166,7 @@ static void update_measures(struct ui_psensor *ui)
 
 		period = cfg->sensor_update_interval;
 
-		g_mutex_unlock(ui->sensors_mutex);
+		pthread_mutex_unlock(&ui->sensors_mutex);
 
 		sleep(period);
 	}
@@ -207,11 +206,11 @@ gboolean ui_refresh_thread(gpointer data)
 	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);
 
-	ui_sensorlist_update(ui);
+	ui_sensorlist_update(ui, 0);
 
 	if (is_appindicator_supported() || is_status_supported())
 		indicators_update(ui);
@@ -227,7 +226,7 @@ gboolean ui_refresh_thread(gpointer data)
 		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,
@@ -260,22 +259,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++) {
+		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);
 	}
 }
 
@@ -313,7 +307,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);
 
@@ -406,7 +400,7 @@ static void cb_activate(GApplication *application,
  */
 static void cleanup(struct ui_psensor *ui)
 {
-	g_mutex_lock(ui->sensors_mutex);
+	pthread_mutex_lock(&ui->sensors_mutex);
 
 	log_debug("Cleanup...");
 
@@ -431,7 +425,7 @@ static void cleanup(struct ui_psensor *ui)
 
 	ui_status_cleanup();
 
-	g_mutex_unlock(ui->sensors_mutex);
+	pthread_mutex_unlock(&ui->sensors_mutex);
 
 	config_cleanup();
 
@@ -517,7 +511,7 @@ int main(int argc, char **argv)
 			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;
@@ -562,7 +556,7 @@ int main(int argc, char **argv)
 
 	gtk_init(NULL, NULL);
 
-	ui.sensors_mutex = g_mutex_new();
+	pthread_mutex_init(&ui.sensors_mutex, NULL);
 
 	ui.config = config_load();
 
@@ -571,6 +565,12 @@ int main(int argc, char **argv)
 	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);
@@ -578,16 +578,9 @@ 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);
 
@@ -606,20 +599,26 @@ 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);
 
 	/* 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;
 }