Imported Upstream version 1.2.0

[psensor-pkg-debian.git] / src / ui_sensorlist.c

diff --git a/src/ui_sensorlist.c b/src/ui_sensorlist.c
index d5a0240..9d4b748 100644 (file)
--- a/src/ui_sensorlist.c
+++ b/src/ui_sensorlist.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (C) 2010-2012 jeanfi@gmail.com
+ * Copyright (C) 2010-2016 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


@@ -19,13 +19,12 @@
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 

-#include "ui.h"
-#include "ui_pref.h"
-#include "ui_sensorlist.h"
-#include "ui_sensorpref.h"
-#include "cfg.h"
-#include "ui_color.h"
-#include "compat.h"
+#include <cfg.h>
+#include <ui.h>
+#include <ui_color.h>
+#include <ui_pref.h>
+#include <ui_sensorlist.h>
+#include <ui_sensorpref.h>

 
 enum {
        COL_NAME = 0,
 
 enum {
        COL_NAME = 0,


@@ -34,9 +33,10 @@ enum {
        COL_TEMP_MAX,
        COL_COLOR,
        COL_COLOR_STR,
        COL_TEMP_MAX,
        COL_COLOR,
        COL_COLOR_STR,

-       COL_ENABLED,
+       COL_GRAPH_ENABLED,

        COL_EMPTY,
        COL_EMPTY,

-       COLS_COUNT
+       COL_SENSOR,
+       COL_DISPLAY_ENABLED

 };
 
 struct cb_data {
 };
 
 struct cb_data {


@@ -47,47 +47,98 @@ struct cb_data {
 static int col_index_to_col(int idx)
 {
        if (idx == 5)
 static int col_index_to_col(int idx)
 {
        if (idx == 5)

-               return COL_ENABLED;
+               return COL_GRAPH_ENABLED;

        else if (idx > 5)
                return -1;
 
        return idx;
 }
 
        else if (idx > 5)
                return -1;
 
        return idx;
 }
 

-void ui_sensorlist_update(struct ui_psensor *ui)
+static void populate(struct ui_psensor *ui)

 {
        GtkTreeIter iter;
 {
        GtkTreeIter iter;

-       struct ui_sensorlist *ui_sl = ui->ui_sensorlist;
-       GtkTreeModel *model
-           = gtk_tree_view_get_model(ui_sl->treeview);
-       gboolean valid = gtk_tree_model_get_iter_first(model, &iter);
-       struct psensor **sensor = ui->sensors;
+       GtkListStore *store;
+       GdkRGBA *color;
+       char *scolor;
+       struct psensor **ordered_sensors, **s_cur, *s;
+       unsigned int enabled;
+
+       ordered_sensors = ui_get_sensors_ordered_by_position(ui->sensors);
+       store = ui->sensors_store;
+
+       gtk_list_store_clear(store);

 
 

-       while (valid && *sensor) {
-               struct psensor *s = *sensor;
+       for (s_cur = ordered_sensors; *s_cur; s_cur++) {
+               s = *s_cur;
+
+               gtk_list_store_append(store, &iter);

 
 

-               char *str;
+               color = config_get_sensor_color(s->id);

 
 

-               str = psensor_value_to_string(s->type,
-                                             s->measures[s->values_max_length -
-                                                         1].value.d_num);
+               scolor = gdk_rgba_to_string(color);

 
 

-               gtk_list_store_set(GTK_LIST_STORE(model), &iter, COL_TEMP, str,
+               enabled = config_is_sensor_enabled(s->id);
+               gtk_list_store_set(store, &iter,
+                                  COL_NAME, s->name,
+                                  COL_COLOR_STR, scolor,
+                                  COL_GRAPH_ENABLED,
+                                  config_is_sensor_graph_enabled(s->id),
+                                  COL_SENSOR, s,
+                                  COL_DISPLAY_ENABLED, enabled,

                                   -1);
                                   -1);

-               free(str);
+               free(scolor);
+               gdk_rgba_free(color);
+       }
+       free(ordered_sensors);
+}
+
+void ui_sensorlist_update(struct ui_psensor *ui, bool complete)
+{
+       char *value, *min, *max;
+       struct psensor *s;
+       GtkTreeIter iter;
+       GtkTreeModel *model;
+       gboolean valid;
+       int use_celsius;
+       GtkListStore *store;

 
 

-               str = psensor_value_to_string(s->type, s->min);
-               gtk_list_store_set(GTK_LIST_STORE(model), &iter,
-                                  COL_TEMP_MIN, str, -1);
-               free(str);
+       if (complete)
+               populate(ui);

 
 

-               str = psensor_value_to_string(s->type, s->max);
-               gtk_list_store_set(GTK_LIST_STORE(model), &iter,
-                                  COL_TEMP_MAX, str, -1);
-               free(str);
+       model = gtk_tree_view_get_model(ui->sensors_tree);
+       model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(model));
+
+       store = ui->sensors_store;
+
+       if (config_get_temperature_unit() == CELSIUS)
+               use_celsius = 1;
+       else
+               use_celsius = 0;
+
+       valid = gtk_tree_model_get_iter_first(model, &iter);
+       while (valid) {
+               gtk_tree_model_get(model, &iter, COL_SENSOR, &s, -1);
+
+               value = psensor_value_to_str(s->type,
+                                            psensor_get_current_value(s),
+                                            use_celsius);
+               min = psensor_value_to_str(s->type,
+                                          s->sess_lowest,
+                                          use_celsius);
+               max = psensor_value_to_str(s->type,
+                                          s->sess_highest,
+                                          use_celsius);
+
+               gtk_list_store_set(store, &iter,
+                                  COL_TEMP, value,
+                                  COL_TEMP_MIN, min,
+                                  COL_TEMP_MAX, max,
+                                  -1);
+               free(value);
+               free(min);
+               free(max);

 
                valid = gtk_tree_model_iter_next(model, &iter);
 
                valid = gtk_tree_model_iter_next(model, &iter);

-               sensor++;

        }
 }
 
        }
 }
 


@@ -98,16 +149,21 @@ void ui_sensorlist_update(struct ui_psensor *ui)
  * <null> if none.
  */
 static struct psensor *
  * <null> if none.
  */
 static struct psensor *

-get_sensor_at_pos(GtkTreeView *view, int x, int y, struct psensor **sensors)
+get_sensor_at_pos(GtkTreeView *view, int x, int y, struct ui_psensor *ui)

 {
        GtkTreePath *path;
 {
        GtkTreePath *path;

+       GtkTreeModel *model;
+       GtkTreeIter iter;
+       struct psensor *s;

 
        gtk_tree_view_get_path_at_pos(view, x, y, &path, NULL, NULL, NULL);
 
        gtk_tree_view_get_path_at_pos(view, x, y, &path, NULL, NULL, NULL);

+       model = gtk_tree_view_get_model(ui->sensors_tree);

 
        if (path) {
 
        if (path) {

-               gint *i = gtk_tree_path_get_indices(path);
-               if (i)
-                       return *(sensors + *i);
+               if (gtk_tree_model_get_iter(model, &iter, path)) {
+                       gtk_tree_model_get(model, &iter, COL_SENSOR, &s, -1);
+                       return s;
+               }

        }
        return NULL;
 }
        }
        return NULL;
 }


@@ -120,19 +176,21 @@ get_sensor_at_pos(GtkTreeView *view, int x, int y, struct psensor **sensors)
  */
 static int get_col_index_at_pos(GtkTreeView *view, int x)
 {
  */
 static int get_col_index_at_pos(GtkTreeView *view, int x)
 {

-       GList *columns = gtk_tree_view_get_columns(view);
-       GList *node;
-       int colx = 0;
-       int coli = 0;
-
-       for (node = columns; node; node = node->next) {
-               GtkTreeViewColumn *checkcol = (GtkTreeViewColumn *) node->data;
-
-               if (x >= colx &&
-                   x < (colx + gtk_tree_view_column_get_width(checkcol)))
+       GList *cols, *node;
+       int colx, coli;
+       GtkTreeViewColumn *checkcol;
+
+       cols = gtk_tree_view_get_columns(view);
+       colx = 0;
+       coli = 0;
+       for (node = cols; node; node = node->next) {
+               checkcol = (GtkTreeViewColumn *)node->data;
+
+               if (x >= colx
+                   && x < (colx + gtk_tree_view_column_get_width(checkcol)))

                        return coli;
                        return coli;

-               else
-                       colx += gtk_tree_view_column_get_width(checkcol);
+
+               colx += gtk_tree_view_column_get_width(checkcol);

 
                coli++;
        }
 
                coli++;
        }


@@ -140,53 +198,54 @@ static int get_col_index_at_pos(GtkTreeView *view, int x)
        return -1;
 }
 
        return -1;
 }
 

-void ui_sensorlist_update_sensors_preferences(struct ui_psensor *ui)
+static void preferences_activated_cbk(GtkWidget *menu_item, gpointer data)

 {
 {

-       GtkTreeIter iter;
-       GtkTreeModel *model
-           = gtk_tree_view_get_model(ui->ui_sensorlist->treeview);
-       gboolean valid = gtk_tree_model_get_iter_first(model, &iter);
-       struct psensor **sensor = ui->ui_sensorlist->sensors;
-
-       while (valid && *sensor) {
-               GdkColor color;
-               gchar *scolor;
-
-               color.red = (*sensor)->color->red;
-               color.green = (*sensor)->color->green;
-               color.blue = (*sensor)->color->blue;
+       struct cb_data *cb_data;

 
 

-               scolor = gdk_color_to_string(&color);
-
-               gtk_list_store_set(GTK_LIST_STORE(model),
-                                  &iter, COL_NAME, (*sensor)->name, -1);
-
-               gtk_list_store_set(GTK_LIST_STORE(model),
-                                  &iter, COL_COLOR_STR, scolor, -1);
-
-               gtk_list_store_set(GTK_LIST_STORE(model),
-                                  &iter, COL_ENABLED, (*sensor)->enabled, -1);
-
-               free(scolor);
+       cb_data = data;
+       ui_sensorpref_dialog_run(cb_data->sensor, cb_data->ui);
+       free(cb_data);
+}

 
 

+static void hide_activated_cbk(GtkWidget *menu_item, gpointer data)
+{
+       struct psensor *s, *s2;
+       GtkTreeModel *model, *fmodel;
+       GtkTreeIter iter;
+       struct cb_data *cb_data;
+       gboolean valid;
+
+       log_fct_enter();
+
+       cb_data = data;
+       s = cb_data->sensor;
+       config_set_sensor_enabled(s->id, false);
+       config_sync();
+
+       fmodel = gtk_tree_view_get_model(cb_data->ui->sensors_tree);
+       model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(fmodel));
+       valid = gtk_tree_model_get_iter_first(model, &iter);
+       while (valid) {
+               gtk_tree_model_get(model, &iter, COL_SENSOR, &s2, -1);
+
+               if (s == s2)
+                       gtk_list_store_set(cb_data->ui->sensors_store,
+                                          &iter,
+                                          COL_DISPLAY_ENABLED,
+                                          false,
+                                          -1);

                valid = gtk_tree_model_iter_next(model, &iter);
                valid = gtk_tree_model_iter_next(model, &iter);

-               sensor++;

        }
        }

-}

 
 

-static void on_preferences_activated(GtkWidget *menu_item, gpointer data)
-{
-       struct cb_data *cb_data = data;
+       free(cb_data);

 
 

-       ui_sensorpref_dialog_run(cb_data->sensor, cb_data->ui);
+       log_fct_exit();

 }
 
 }
 

-static GtkWidget *create_sensor_popup(struct ui_psensor *ui,
-                                     struct psensor *sensor)
+static GtkWidget *
+create_sensor_popup(struct ui_psensor *ui, struct psensor *sensor)

 {
 {

-       GtkWidget *menu;
-       GtkWidget *item;
-       GtkWidget *separator;
+       GtkWidget *menu, *item, *separator;

        struct cb_data *data;
 
        menu = gtk_menu_new();
        struct cb_data *data;
 
        menu = gtk_menu_new();


@@ -197,202 +256,131 @@ static GtkWidget *create_sensor_popup(struct ui_psensor *ui,
        separator = gtk_separator_menu_item_new();
        gtk_menu_shell_append(GTK_MENU_SHELL(menu), separator);
 
        separator = gtk_separator_menu_item_new();
        gtk_menu_shell_append(GTK_MENU_SHELL(menu), separator);
 

-       item = gtk_menu_item_new_with_label(_("Preferences"));
+       item = gtk_menu_item_new_with_label(_("Hide"));

        gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 
        data = malloc(sizeof(struct cb_data));
        data->ui = ui;
        data->sensor = sensor;
        gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 
        data = malloc(sizeof(struct cb_data));
        data->ui = ui;
        data->sensor = sensor;

+       g_signal_connect(item,
+                        "activate",
+                        G_CALLBACK(hide_activated_cbk), data);
+
+       item = gtk_menu_item_new_with_label(_("Preferences"));
+       gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);

 
 

+       data = malloc(sizeof(struct cb_data));
+       data->ui = ui;
+       data->sensor = sensor;

        g_signal_connect(item,
                         "activate",
        g_signal_connect(item,
                         "activate",

-                        G_CALLBACK(on_preferences_activated), data);
+                        G_CALLBACK(preferences_activated_cbk), data);

 
        gtk_widget_show_all(menu);
 
        return menu;
 }
 
 
        gtk_widget_show_all(menu);
 
        return menu;
 }
 

-static int on_clicked(GtkWidget *widget, GdkEventButton *event, gpointer data)
+static int clicked_cbk(GtkWidget *widget, GdkEventButton *event, gpointer data)

 {
 {

-       struct ui_psensor *ui = (struct ui_psensor *)data;
-       GtkTreeView *view = ui->ui_sensorlist->treeview;
+       GtkWidget *menu;
+       struct ui_psensor *ui;
+       GtkTreeView *view;
+       struct psensor *s;
+       int coli;
+       GdkRGBA *color;

 
 

-       struct psensor *sensor = get_sensor_at_pos(view,
-                                                  event->x,
-                                                  event->y,
-                                                  ui->sensors);
+       ui = (struct ui_psensor *)data;
+       view = ui->sensors_tree;

 
 

-       if (sensor) {
-               int coli = col_index_to_col(get_col_index_at_pos(view,
-                                                                event->x));
+       s = get_sensor_at_pos(view, event->x, event->y, ui);
+
+       if (s) {
+               coli = col_index_to_col(get_col_index_at_pos(view, event->x));

 
                if (coli == COL_COLOR) {
 
                if (coli == COL_COLOR) {

-                       if (ui_change_color(_("Select foreground color"),
-                                           sensor->color)) {
-                               ui_sensorlist_update_sensors_preferences(ui);
-                               config_set_sensor_color(sensor->id,
-                                                       sensor->color);
+                       color = config_get_sensor_color(s->id);
+                       if (ui_change_color(_("Select sensor color"),
+                                           color,
+                                           GTK_WINDOW(ui->main_window))) {
+                               config_set_sensor_color(s->id, color);
+                               ui_sensorlist_update(ui, 1);
+                               config_sync();

                        }
                        }

-               } else if (coli >= 0 && coli != COL_ENABLED) {
-                       GtkWidget *menu = create_sensor_popup(ui,
-                                                             sensor);
+                       gdk_rgba_free(color);
+                       return TRUE;
+               } else if (coli >= 0 && coli != COL_GRAPH_ENABLED) {
+                       menu = create_sensor_popup(ui, s);

 
                        gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
                                       event->button, event->time);
 
                        gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL,
                                       event->button, event->time);

-
+                       return TRUE;

                }
 
        }
        return FALSE;
 }
 
                }
 
        }
        return FALSE;
 }
 

-static void
-on_toggled(GtkCellRendererToggle *cell, gchar *path_str, gpointer data)
+void ui_sensorlist_cb_graph_toggled(GtkCellRendererToggle *cell,
+                                   gchar *path_str,
+                                   gpointer data)

 {
 {

-       struct ui_sensorlist *list = (struct ui_sensorlist *)data;
-       GtkTreeModel *model
-           = gtk_tree_view_get_model(list->treeview);
+       struct ui_psensor *ui;
+       GtkTreeModel *model, *fmodel;

        GtkTreeIter iter;
        GtkTreeIter iter;

-       GtkTreePath *path = gtk_tree_path_new_from_string(path_str);
-       gboolean fixed;
-       gint *i;
-
-       gtk_tree_model_get_iter(model, &iter, path);
-       gtk_tree_model_get(model, &iter, COL_ENABLED, &fixed, -1);
-
-       fixed ^= 1;
-
-       i = gtk_tree_path_get_indices(path);
-       if (i) {
-               int n = *i;
-               struct psensor **sensor = list->sensors;
-               while (n--)
-                       sensor++;
-               (*sensor)->enabled = fixed;
-               config_set_sensor_enabled((*sensor)->id, (*sensor)->enabled);
-       }
+       GtkTreePath *path;
+       struct psensor *s, *s2;
+       gboolean valid;
+       bool b;

 
 

-       gtk_list_store_set(GTK_LIST_STORE(model),
-                          &iter, COL_ENABLED, fixed, -1);
+       ui = (struct ui_psensor *)data;
+       fmodel = gtk_tree_view_get_model(ui->sensors_tree);

 
 

-       gtk_tree_path_free(path);
-}
+       path = gtk_tree_path_new_from_string(path_str);

 
 

-static void create_widget(struct ui_psensor *ui)
-{
-       GtkListStore *store;
-       GtkCellRenderer *renderer;
-       struct psensor **s_cur = ui->sensors;
-       struct ui_sensorlist *ui_sl = ui->ui_sensorlist;
-
-       store = gtk_list_store_new(COLS_COUNT,
-                                  G_TYPE_STRING,
-                                  G_TYPE_STRING,
-                                  G_TYPE_STRING,
-                                  G_TYPE_STRING,
-                                  G_TYPE_STRING,
-                                  G_TYPE_STRING,
-                                  G_TYPE_BOOLEAN, G_TYPE_STRING);
-
-       ui_sl->treeview = GTK_TREE_VIEW
-               (gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)));
-
-       gtk_tree_selection_set_mode
-               (gtk_tree_view_get_selection(ui_sl->treeview),
-                GTK_SELECTION_NONE);
-
-       renderer = gtk_cell_renderer_text_new();
-       gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
-                                                   -1,
-                                                   _("Sensor"),
-                                                   renderer,
-                                                   "text", COL_NAME, NULL);
-
-       gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
-                                                   -1,
-                                                   _("Value"),
-                                                   renderer,
-                                                   "text", COL_TEMP, NULL);
-
-       gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
-                                                   -1,
-                                                   _("Min"),
-                                                   renderer,
-                                                   "text", COL_TEMP_MIN, NULL);
-
-       gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
-                                                   -1,
-                                                   _("Max"),
-                                                   renderer,
-                                                   "text", COL_TEMP_MAX, NULL);
-
-       renderer = gtk_cell_renderer_text_new();
-       gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
-                                                   -1,
-                                                   _("Color"),
-                                                   renderer,
-                                                   "text", COL_COLOR,
-                                                   "background", COL_COLOR_STR,
-                                                   NULL);
-
-       g_signal_connect(ui_sl->treeview,
-                        "button-press-event", (GCallback) on_clicked, ui);
-
-       renderer = gtk_cell_renderer_toggle_new();
-       gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
-                                                   -1,
-                                                   _("Enabled"),
-                                                   renderer,
-                                                   "active", COL_ENABLED,
-                                                   NULL);
-       g_signal_connect(G_OBJECT(renderer),
-                        "toggled", (GCallback) on_toggled, ui_sl);
-
-       renderer = gtk_cell_renderer_text_new();
-       gtk_tree_view_insert_column_with_attributes(ui_sl->treeview,
-                                                   -1,
-                                                   "",
-                                                   renderer,
-                                                   "text", COL_EMPTY, NULL);
-
-       while (*s_cur) {
-               GtkTreeIter iter;
-               GdkColor color;
-               gchar *scolor;
-               struct psensor *s = *s_cur;
-
-               color.red = s->color->red;
-               color.green = s->color->green;
-               color.blue = s->color->blue;
-
-               scolor = gdk_color_to_string(&color);
+       gtk_tree_model_get_iter(fmodel, &iter, path);

 
 

-               gtk_list_store_append(store, &iter);
-               gtk_list_store_set(store, &iter,
-                                  COL_NAME, s->name,
-                                  COL_TEMP, _("N/A"),
-                                  COL_TEMP_MIN, _("N/A"),
-                                  COL_TEMP_MAX, _("N/A"),
-                                  COL_COLOR_STR, scolor,
-                                  COL_ENABLED, s->enabled, -1);
+       gtk_tree_model_get(fmodel, &iter, COL_SENSOR, &s, -1);

 
 

-               free(scolor);
+       b = config_is_sensor_graph_enabled(s->id) ^ 1;
+       config_set_sensor_graph_enabled(s->id, b);

 
 

-               s_cur++;
-       }
+       config_sync();

 
 

-       ui_sl->widget = gtk_scrolled_window_new(NULL, NULL);
-       gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(ui_sl->widget),
-                                      GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
-       gtk_container_add(GTK_CONTAINER(ui_sl->widget),
-                         GTK_WIDGET(ui_sl->treeview));
+       gtk_tree_path_free(path);
+
+       model = gtk_tree_model_filter_get_model(GTK_TREE_MODEL_FILTER(fmodel));
+       valid = gtk_tree_model_get_iter_first(model, &iter);
+       while (valid) {
+               gtk_tree_model_get(model, &iter, COL_SENSOR, &s2, -1);
+
+               if (s == s2)
+                       gtk_list_store_set(ui->sensors_store,
+                                          &iter,
+                                          COL_GRAPH_ENABLED,
+                                          b,
+                                          -1);
+               valid = gtk_tree_model_iter_next(model, &iter);
+       }

 }
 
 void ui_sensorlist_create(struct ui_psensor *ui)
 {
 }
 
 void ui_sensorlist_create(struct ui_psensor *ui)
 {

-       ui->ui_sensorlist = malloc(sizeof(struct ui_sensorlist));
-       ui->ui_sensorlist->sensors = ui->sensors;
+       GtkTreeModel *fmodel, *model;
+
+       log_fct_enter();
+
+       model = gtk_tree_view_get_model(ui->sensors_tree);
+       fmodel = gtk_tree_model_filter_new(model, NULL);
+       gtk_tree_model_filter_set_visible_column(GTK_TREE_MODEL_FILTER(fmodel),
+                                                COL_DISPLAY_ENABLED);
+
+       gtk_tree_view_set_model(ui->sensors_tree, fmodel);
+
+       g_signal_connect(ui->sensors_tree,
+                        "button-press-event", (GCallback)clicked_cbk, ui);
+
+       ui_sensorlist_update(ui, 1);

 
 

-       create_widget(ui);
+       log_fct_exit();

 }
 }