reorderable sensors list for the sensors pref dialog

[psensor.git] / src / ui.c

diff --git a/src/ui.c b/src/ui.c
index b41c956..bbb6cc2 100644 (file)
--- 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,
@@ -277,8 +277,7 @@ void ui_window_update(struct ui_psensor *ui)
        gtk_container_remove(GTK_CONTAINER(ui->sensor_box),
                             GTK_WIDGET(ui->sensors_scrolled_tree));
 
-       gtk_container_remove(GTK_CONTAINER(ui->sensor_box),
-                            ui->w_graph);
+       gtk_container_remove(GTK_CONTAINER(ui->sensor_box), ui->w_graph);
 
        gtk_container_remove(GTK_CONTAINER(ui->main_box),
                             GTK_WIDGET(ui->sensor_box));
@@ -329,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(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;
+}