X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fui.c;h=c0a5cb673645474e763158e67348274e018e32b8;hb=37afe949c5c7aff3abe6e030161c64c8603877b2;hp=b444d1063c551c7a4931ab7744d316f7b53b10db;hpb=b6211b9c17d3c35702adcbb69d9c5884cb85f028;p=psensor.git

diff --git a/src/ui.c b/src/ui.c
index b444d10..c0a5cb6 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301 USA
  */
+#include <stdlib.h>
+
 #include "cfg.h"
 #include "slog.h"
 #include "ui.h"
@@ -150,20 +152,18 @@ void ui_enable_alpha_channel(struct ui_psensor *ui)
 	}
 }
 
-static void on_slog_enabled_cb(GConfClient *client,
-			       guint cnxn_id,
-			       GConfEntry *entry,
-			       gpointer user_data)
+static void
+slog_enabled_cbk(GConfClient *client, guint id, GConfEntry *e, gpointer data)
 {
 	struct ui_psensor *ui;
 	struct psensor **sensors;
 	pthread_mutex_t *mutex;
 
-	ui = (struct ui_psensor *)user_data;
+	ui = (struct ui_psensor *)data;
 	sensors = ui->sensors;
 	mutex = &ui->sensors_mutex;
 
-	log_debug("cbk_slog_enabled");
+	log_debug("slog_enabled_cbk");
 
 	if (is_slog_enabled())
 		slog_activate(NULL, sensors, mutex, config_get_slog_interval());
@@ -203,7 +203,7 @@ void ui_window_create(struct ui_psensor *ui)
 				cfg->window_x,
 				cfg->window_y);
 
-	config_slog_enabled_notify_add(on_slog_enabled_cb, ui);
+	config_slog_enabled_notify_add(slog_enabled_cbk, ui);
 
 	gtk_window_set_default_size(GTK_WINDOW(window),
 				    cfg->window_w,
@@ -235,12 +235,15 @@ void ui_window_create(struct ui_psensor *ui)
 							"graph"));
 	ui_graph_create(ui);
 
-	ui->sensor_box = GTK_WIDGET(gtk_builder_get_object(builder,
-							   "sensor_box"));
+	ui->sensor_box = GTK_PANED(gtk_builder_get_object(builder,
+							  "sensor_box"));
 	ui->sensors_store = GTK_LIST_STORE(gtk_builder_get_object
 					   (builder, "sensors_store"));
 	ui->sensors_tree = GTK_TREE_VIEW(gtk_builder_get_object
 					 (builder, "sensors_tree"));
+	ui->sensors_scrolled_tree
+		= GTK_SCROLLED_WINDOW(gtk_builder_get_object
+				      (builder, "sensors_scrolled_tree"));
 
 	ui_sensorlist_create(ui);
 
@@ -249,7 +252,6 @@ void ui_window_create(struct ui_psensor *ui)
 
 	g_object_unref(G_OBJECT(builder));
 
-
 	log_debug("ui_window_create() ends");
 }
 
@@ -264,64 +266,60 @@ static void menu_bar_show(unsigned int show, struct ui_psensor *ui)
 void ui_window_update(struct ui_psensor *ui)
 {
 	struct config *cfg;
-	/*int init = 1;*/
 
 	log_debug("ui_window_update()");
 
 	cfg = ui->config;
-	/*
-	if (ui->sensor_box) {
-		g_object_ref(GTK_WIDGET(ui->ui_sensorlist->widget));
-
-		if (ui->ui_sensorlist && ui->ui_sensorlist->widget) {
-			printf("remove sensor_list\n");
-			gtk_container_remove(GTK_CONTAINER(ui->sensor_box),
-					     ui->ui_sensorlist->widget);
-		}
 
-		gtk_container_remove(GTK_CONTAINER(ui->sensor_box),
-				     ui->w_graph);
+	g_object_ref(GTK_WIDGET(ui->sensors_scrolled_tree));
+	g_object_ref(GTK_WIDGET(ui->w_graph));
 
-		gtk_container_remove(GTK_CONTAINER(ui->main_box),
-				     ui->sensor_box);
+	gtk_container_remove(GTK_CONTAINER(ui->sensor_box),
+			     GTK_WIDGET(ui->sensors_scrolled_tree));
 
-		init = 0;
-	}
+	gtk_container_remove(GTK_CONTAINER(ui->sensor_box), ui->w_graph);
+
+	gtk_container_remove(GTK_CONTAINER(ui->main_box),
+			     GTK_WIDGET(ui->sensor_box));
 
 	if (cfg->sensorlist_position == SENSORLIST_POSITION_RIGHT
 	    || cfg->sensorlist_position == SENSORLIST_POSITION_LEFT)
-		ui->sensor_box = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
+		ui->sensor_box
+			= GTK_PANED(gtk_paned_new(GTK_ORIENTATION_HORIZONTAL));
 	else
-		ui->sensor_box = gtk_paned_new(GTK_ORIENTATION_VERTICAL);
+		ui->sensor_box
+			= GTK_PANED(gtk_paned_new(GTK_ORIENTATION_VERTICAL));
 
-	gtk_box_pack_end(GTK_BOX(ui->main_box), ui->sensor_box, TRUE, TRUE, 2);
+	gtk_box_pack_end(GTK_BOX(ui->main_box),
+			 GTK_WIDGET(ui->sensor_box), TRUE, TRUE, 2);
 
 	if (cfg->sensorlist_position == SENSORLIST_POSITION_RIGHT
 	    || cfg->sensorlist_position == SENSORLIST_POSITION_BOTTOM) {
-		gtk_paned_pack1(GTK_PANED(ui->sensor_box),
+		gtk_paned_pack1(ui->sensor_box,
 				GTK_WIDGET(ui->w_graph), TRUE, TRUE);
-		gtk_paned_pack2(GTK_PANED(ui->sensor_box),
-				ui->ui_sensorlist->widget, FALSE, TRUE);
+		gtk_paned_pack2(ui->sensor_box,
+				GTK_WIDGET(ui->sensors_scrolled_tree),
+				FALSE, TRUE);
 	} else {
-		gtk_paned_pack1(GTK_PANED(ui->sensor_box),
-				ui->ui_sensorlist->widget, FALSE, TRUE);
-		gtk_paned_pack2(GTK_PANED(ui->sensor_box),
+		gtk_paned_pack1(ui->sensor_box,
+				GTK_WIDGET(ui->sensors_scrolled_tree),
+				FALSE, TRUE);
+		gtk_paned_pack2(ui->sensor_box,
 				GTK_WIDGET(ui->w_graph), TRUE, TRUE);
 	}
 
 	if (cfg->window_restore_enabled)
-		gtk_paned_set_position(GTK_PANED(ui->sensor_box),
-				       ui->config->window_divider_pos);
+		gtk_paned_set_position(ui->sensor_box, cfg->window_divider_pos);
 
-	if (!init)
-	g_object_unref(GTK_WIDGET(ui->ui_sensorlist->widget));*/
+	g_object_unref(GTK_WIDGET(ui->sensors_scrolled_tree));
+	g_object_unref(GTK_WIDGET(ui->w_graph));
 
-	/*	gtk_widget_show_all(ui->sensor_box);*/
+	gtk_widget_show_all(GTK_WIDGET(ui->sensor_box));
 
 	if (cfg->menu_bar_disabled)
 		menu_bar_show(0, ui);
 	else
-	menu_bar_show(1, ui);
+		menu_bar_show(1, ui);
 }
 
 void ui_window_show(struct ui_psensor *ui)
@@ -330,3 +328,30 @@ void ui_window_show(struct ui_psensor *ui)
 	ui_window_update(ui);
 	gtk_window_present(GTK_WINDOW(ui->main_window));
 }
+
+static int cmp_sensors(const void *p1, const void *p2)
+{
+	const struct psensor *s1, *s2;
+	int pos1, pos2;
+
+	s1 = *(void **)p1;
+	s2 = *(void **)p2;
+
+	pos1 = config_get_sensor_position(s1->id);
+	pos2 = config_get_sensor_position(s2->id);
+
+	return pos1 - pos2;
+}
+
+struct psensor **ui_get_sensors_ordered_by_position(const struct ui_psensor *ui)
+{
+	struct psensor **result;
+
+	result = psensor_list_copy(ui->sensors);
+	qsort(result,
+	      psensor_list_size(result),
+	      sizeof(struct psensor *),
+	      cmp_sensors);
+
+	return result;
+}