Introduce properties for the GtkHexView widget.

3 files changed, 260 insertions, 85 deletions

diff --git a/src/gtkext/hexview.c b/src/gtkext/hexview.c
index 5a8dd04..95b592e 100644
--- a/src/gtkext/hexview.c
+++ b/src/gtkext/hexview.c
@@ -37,6 +37,22 @@
 /* ------------------------- BASES D'UN COMPOSANT GRAPHIQUE ------------------------- */
 
 
+/* Liste des propriétés */
+
+typedef enum _HexViewProperty {
+
+    PROP_0,                                 /* Réservé                     */
+
+    PROP_SHOW_OFFSETS,                      /* Affichage des positions     */
+    PROP_CONTENT,                           /* Contenu binaire affiché     */
+
+    N_PROPERTIES
+
+} HexViewProperty;
+
+static GParamSpec *_hex_view_properties[N_PROPERTIES] = { NULL, };
+
+
 /* Initialise la classe des afficheurs de tampons bruts. */
 static void gtk_hex_view_class_init(GtkHexViewClass *);
 
@@ -44,10 +60,10 @@ static void gtk_hex_view_class_init(GtkHexViewClass *);
 static void gtk_hex_view_init(GtkHexView *);
 
 /* Supprime toutes les références externes. */
-static void gtk_hex_view_dispose(GtkHexView *);
+static void gtk_hex_view_dispose(GObject *);
 
 /* Procède à la libération totale de la mémoire. */
-static void gtk_hex_view_finalize(GtkHexView *);
+static void gtk_hex_view_finalize(GObject *);
 
 /* Procède à l'actualisation de l'affichage d'un sous-composant. */
 static void gtk_hex_view_dispatch_sub_snapshot(GtkWidget *, GtkSnapshot *, GtkWidget *);
@@ -57,14 +73,14 @@ static void gtk_hex_view_populate_cache(GtkHexView *);
 
 
 
-void demo_snapshot (GtkWidget *widget, GtkSnapshot *snapshot, GtkWidget *parent);
-
-
-
+/* --------------------- IMPLEMENTATION DES FONCTIONS DE CLASSE --------------------- */
 
 
-/* --------------------- IMPLEMENTATION DES FONCTIONS DE CLASSE --------------------- */
+/* Met à jour une propriété d'instance GObject. */
+static void gtk_hex_view_set_property(GObject *, guint, const GValue *, GParamSpec *);
 
+/* Fournit la valeur d'une propriété d'instance GObject. */
+static void gtk_hex_view_get_property(GObject *, guint, GValue *, GParamSpec *);
 
 /* Prend acte de la taille allouée au composant d'affichage. */
 static void gtk_hex_view_size_allocate(GtkWidget *, int, int, int);
@@ -105,12 +121,26 @@ static void gtk_hex_view_class_init(GtkHexViewClass *class)
 
     object = G_OBJECT_CLASS(class);
 
-    object->dispose = (GObjectFinalizeFunc/* ! */)gtk_hex_view_dispose;
-    object->finalize = (GObjectFinalizeFunc)gtk_hex_view_finalize;
+    object->dispose = gtk_hex_view_dispose;
+    object->finalize = gtk_hex_view_finalize;
+    object->set_property = gtk_hex_view_set_property;
+    object->get_property = gtk_hex_view_get_property;
+
+    _hex_view_properties[PROP_SHOW_OFFSETS] =
+        g_param_spec_boolean("show-offsets", NULL, NULL,
+                             TRUE,
+                             G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
+
+    _hex_view_properties[PROP_CONTENT] =
+        g_param_spec_object("content", NULL, NULL,
+                            G_TYPE_BIN_CONTENT,
+                            G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY);
+
+    g_object_class_install_properties(object, N_PROPERTIES, _hex_view_properties);
 
     widget = GTK_WIDGET_CLASS(class);
 
-    // REMME gtk_widget_class_set_css_name(widget, "GtkHexView");
+    gtk_widget_class_set_css_name(widget, "hexview");
 
     g_type_ensure(GTK_TYPE_COMPOSING_AREA);
 
@@ -167,12 +197,14 @@ static void gtk_hex_view_init(GtkHexView *view)
 
     view->generator = NULL;
 
+    gtk_hex_view_create(view, NULL);
+
 }
 
 
 /******************************************************************************
 *                                                                             *
-*  Paramètres  : view = instance d'objet GLib à traiter.                      *
+*  Paramètres  : object = instance d'objet GLib à traiter.                    *
 *                                                                             *
 *  Description : Supprime toutes les références externes.                     *
 *                                                                             *
@@ -182,20 +214,24 @@ static void gtk_hex_view_init(GtkHexView *view)
 *                                                                             *
 ******************************************************************************/
 
-static void gtk_hex_view_dispose(GtkHexView *view)
+static void gtk_hex_view_dispose(GObject *object)
 {
-    gtk_widget_dispose_template(GTK_WIDGET(view), GTK_TYPE_HEX_VIEW);
+    GtkHexView *view;                       /* Version spécialisée         */
+
+    gtk_widget_dispose_template(GTK_WIDGET(object), GTK_TYPE_HEX_VIEW);
+
+    view = GTK_HEX_VIEW(object);
 
     g_clear_object(&view->generator);
 
-    G_OBJECT_CLASS(gtk_hex_view_parent_class)->dispose(G_OBJECT(view));
+    G_OBJECT_CLASS(gtk_hex_view_parent_class)->dispose(object);
 
 }
 
 
 /******************************************************************************
 *                                                                             *
-*  Paramètres  : view = instance d'objet GLib à traiter.                      *
+*  Paramètres  : object = instance d'objet GLib à traiter.                    *
 *                                                                             *
 *  Description : Procède à la libération totale de la mémoire.                *
 *                                                                             *
@@ -205,9 +241,9 @@ static void gtk_hex_view_dispose(GtkHexView *view)
 *                                                                             *
 ******************************************************************************/
 
-static void gtk_hex_view_finalize(GtkHexView *view)
+static void gtk_hex_view_finalize(GObject *object)
 {
-    G_OBJECT_CLASS(gtk_hex_view_parent_class)->finalize(G_OBJECT(view));
+    G_OBJECT_CLASS(gtk_hex_view_parent_class)->finalize(object);
 
 }
 
@@ -263,13 +299,43 @@ bool gtk_hex_view_create(GtkHexView *view, GBinContent *content)
 
     parent = GTK_BUFFER_VIEW(view);
 
-    cache = g_buffer_cache_new(1, 2);
+    cache = g_buffer_cache_new(1 /* opt_count */, 2 /* reg_count */);
 
     parent->view = g_buffer_view_new(cache, parent->style);
 
     unref_object(cache);
 
-    view->generator = g_hex_generator_new(content);
+
+
+    gtk_hex_view_set_content(view, content);
+
+
+
+    return result;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : view = composant d'affichage à consulter.                    *
+*                                                                             *
+*  Description : Fournit le contenu associé au composant d'affichage.         *
+*                                                                             *
+*  Retour      : Contenu dans lequel puise le générateur pour les lignes.     *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+GBinContent *gtk_hex_view_get_content(const GtkHexView *view)
+{
+    GBinContent *result;                    /* Référence à retourner       */
+
+    if (view->generator != NULL)
+        result = g_hex_generator_get_content(view->generator);
+    else
+        result = NULL;
 
     return result;
 
@@ -278,6 +344,61 @@ bool gtk_hex_view_create(GtkHexView *view, GBinContent *content)
 
 /******************************************************************************
 *                                                                             *
+*  Paramètres  : view    = composant d'affichage à modifier.                  *
+*                content = nouveau contenu pour source de génération.         *
+*                                                                             *
+*  Description : Définit le contenu associé au composant d'affichage.         *
+*                                                                             *
+*  Retour      : -                                                            *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+void gtk_hex_view_set_content(GtkHexView *view, GBinContent *content)
+{
+    GBinContent *old;                       /* Ancienne valeur             */
+    GBufferCache *cache;                    /* Tampon à représenter        */
+
+    old = gtk_hex_view_get_content(view);
+
+    assert((old == NULL && view->generator == NULL) || (old != NULL && view->generator != NULL));
+
+    if (old != content)
+    {
+        if (view->generator != NULL)
+        {
+            cache = g_buffer_view_get_cache(GTK_BUFFER_VIEW(view)->view);
+
+            g_buffer_cache_wlock(cache);
+
+            g_buffer_cache_truncate(cache, 0);
+
+            g_buffer_cache_wunlock(cache);
+
+            unref_object(cache);
+
+            g_clear_object(&view->generator);
+
+        }
+
+        if (content != NULL)
+            view->generator = g_hex_generator_new(content);
+
+        g_object_notify_by_pspec(G_OBJECT(view), _hex_view_properties[PROP_CONTENT]);
+
+        assert(content != NULL);
+        gtk_widget_queue_resize(GTK_WIDGET(view));
+
+    }
+
+    g_clear_object(&old);
+
+}
+
+
+/******************************************************************************
+*                                                                             *
 *  Paramètres  : widget   = composant GTK à redessiner.                       *
 *                snapshot = gestionnaire de noeuds de rendu à solliciter.     *
 *                parent   = composant GTK parent et cadre de l'appel.         *
@@ -380,60 +501,101 @@ static void gtk_hex_view_populate_cache(GtkHexView *view)
 
     /* Mise à jour de l'affichage ? */
 
+    /*
     if (needed != count)
         gtk_widget_queue_resize(GTK_WIDGET(view));
+    */
 
 }
 
 
 
+/* ---------------------------------------------------------------------------------- */
+/*                       IMPLEMENTATION DES FONCTIONS DE CLASSE                       */
+/* ---------------------------------------------------------------------------------- */
 
 
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : object  = instance d'objet GLib à mamnipuler.                *
+*                prop_id = identifiant de la propriété visée.                 *
+*                value   = valeur à prendre en compte.                        *
+*                pspec   = définition de la propriété.                        *
+*                                                                             *
+*  Description : Met à jour une propriété d'instance GObject.                 *
+*                                                                             *
+*  Retour      : -                                                            *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
 
-
-void demo_snapshot (GtkWidget *widget, GtkSnapshot *snapshot, GtkWidget *parent)
+static void gtk_hex_view_set_property(GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec)
 {
-  GdkRGBA red, green, yellow, blue;
-  float w, h;
-
-  gdk_rgba_parse (&red, "red");
-  gdk_rgba_parse (&green, "green");
-  gdk_rgba_parse (&yellow, "yellow");
-  gdk_rgba_parse (&blue, "blue");
+    GtkHexView *view;                       /* Version spécialisée         */
+    GObject *content;                       /* Contenu sous forme simple   */
 
-  w = gtk_widget_get_width (widget) / 2.0;
-  h = gtk_widget_get_height (widget) / 2.0;
+    view = GTK_HEX_VIEW(object);
 
-  h /= 2.0;
+    switch (prop_id)
+    {
+        case PROP_SHOW_OFFSETS:
+            g_display_options_set(GTK_CONTENT_VIEW(view)->options, HCO_OFFSET, g_value_get_boolean(value));
+            gtk_widget_set_visible(view->offsets, g_value_get_boolean(value));
+            break;
 
-  gtk_snapshot_append_color (snapshot, &red,
-                             &GRAPHENE_RECT_INIT(0, 0, w, h));
-  gtk_snapshot_append_color (snapshot, &green,
-                             &GRAPHENE_RECT_INIT(w, 0, w, h));
-  gtk_snapshot_append_color (snapshot, &yellow,
-                             &GRAPHENE_RECT_INIT(0, h, w, h));
-  gtk_snapshot_append_color (snapshot, &blue,
-                             &GRAPHENE_RECT_INIT(w, h, w, h));
+        case PROP_CONTENT:
+            content = g_value_get_object(value);
+            gtk_hex_view_set_content(view, G_BIN_CONTENT(content));
+            break;
 
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+            break;
 
+    }
 
 }
 
 
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : object  = instance d'objet GLib à mamnipuler.                *
+*                prop_id = identifiant de la propriété visée.                 *
+*                value   = valeur à transmettre. [OUT]                        *
+*                pspec   = définition de la propriété.                        *
+*                                                                             *
+*  Description : Fournit la valeur d'une propriété d'instance GObject.        *
+*                                                                             *
+*  Retour      : -                                                            *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
 
+static void gtk_hex_view_get_property(GObject *object, guint prop_id, GValue *value, GParamSpec *pspec)
+{
+    GtkHexView *view;                       /* Version spécialisée         */
 
+    view = GTK_HEX_VIEW(object);
 
+    switch (prop_id)
+    {
+        case PROP_SHOW_OFFSETS:
+            g_value_set_boolean(value, gtk_widget_get_visible(view->offsets));
+            break;
 
+        case PROP_CONTENT:
+            g_value_take_object(value, gtk_hex_view_get_content(view));
+            break;
 
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+            break;
 
+    }
 
-
-
-
-
-/* ---------------------------------------------------------------------------------- */
-/*                       IMPLEMENTATION DES FONCTIONS DE CLASSE                       */
-/* ---------------------------------------------------------------------------------- */
+}
 
 
 /******************************************************************************
@@ -467,7 +629,13 @@ static void gtk_hex_view_size_allocate(GtkWidget *widget, int width, int height,
     final_widths = alloca(_CHILDREN_COUNT * sizeof(int));
 
     for (i = 0; i < _CHILDREN_COUNT; i++)
-        gtk_widget_measure(view->children[i], GTK_ORIENTATION_HORIZONTAL, -1, &min_widths[i], NULL, NULL, NULL);
+    {
+        if (!gtk_widget_get_visible(view->children[i]))
+            min_widths[i] = 0;
+        else
+            gtk_widget_measure(view->children[i], GTK_ORIENTATION_HORIZONTAL, -1, &min_widths[i], NULL, NULL, NULL);
+
+    }
 
     /* Passe 1 : tentative sans défilement vertical */
 
@@ -491,7 +659,10 @@ static void gtk_hex_view_size_allocate(GtkWidget *widget, int width, int height,
 
         for (i = 0; i < _CHILDREN_COUNT; i++)
         {
-            final_widths[i] += min_widths[i];
+            if (!gtk_widget_get_visible(view->children[i]))
+                final_widths[i] = 0;
+            else
+                final_widths[i] += min_widths[i];
 
             g_width_tracker_set_column_min_width(tracker, i, final_widths[i]);
 
@@ -531,17 +702,6 @@ static GtkSizeRequestMode gtk_hex_view_get_request_mode(GtkWidget *widget)
 }
 
 
-
-
-
-
-
-
-
-
-
-
-
 /******************************************************************************
 *                                                                             *
 *  Paramètres  : widget       = composant GTK à examiner.                     *
@@ -580,8 +740,12 @@ static void gtk_hex_view_measure(GtkWidget *widget, GtkOrientation orientation,
 
         for (i = 0; i < _CHILDREN_COUNT; i++)
         {
+            if (!gtk_widget_get_visible(view->children[i]))
+                continue;
+
             gtk_widget_measure(view->children[i], GTK_ORIENTATION_HORIZONTAL, -1, &min, NULL, NULL, NULL);
             requested += min;
+
         }
 
         for_size -= requested;
@@ -593,11 +757,14 @@ static void gtk_hex_view_measure(GtkWidget *widget, GtkOrientation orientation,
                                                                 GTK_BUFFER_VIEW(view)->style,
                                                                 for_size);
 
-            if (minimum != NULL) *minimum = 0;
+            if (minimum != NULL) *minimum = requested;
             if (natural != NULL) *natural = requested;
 
             for (i = 0; i < _CHILDREN_COUNT; i++)
             {
+                if (!gtk_widget_get_visible(view->children[i]))
+                    continue;
+
                 gtk_widget_measure(view->children[i], GTK_ORIENTATION_VERTICAL, -1, &min, &nat, NULL, NULL);
 
                 if (minimum != NULL && min > *minimum)
diff --git a/src/gtkext/hexview.h b/src/gtkext/hexview.h
index 2199786..0d2cd5a 100644
--- a/src/gtkext/hexview.h
+++ b/src/gtkext/hexview.h
@@ -41,6 +41,12 @@ DECLARE_GTYPE(GtkHexView, gtk_hex_view, GTK, HEX_VIEW);
 /* Crée un composant d'affichage d'octets bruts et imprimables. */
 GtkHexView *gtk_hex_view_new(GBinContent *);
 
+/* Fournit le contenu associé au composant d'affichage. */
+GBinContent *gtk_hex_view_get_content(const GtkHexView *);
+
+/* Définit le contenu associé au composant d'affichage. */
+void gtk_hex_view_set_content(GtkHexView *, GBinContent *);
+
 
 
 #endif  /* _GTKEXT_HEXVIEW_H */
diff --git a/src/gtkext/hexview.ui b/src/gtkext/hexview.ui
index ae4586c..9b42936 100644
--- a/src/gtkext/hexview.ui
+++ b/src/gtkext/hexview.ui
@@ -1,27 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="GtkHexView" parent="GtkBufferView">
-    <property name="css-name">GtkHexView</property>
-    <child>
-      <object class="GtkComposingArea" id="offsets">
-        <style>
-          <class name="gutter"/>
-        </style>
-      </object>
-    </child>
-    <child>
-      <object class="GtkComposingArea" id="hex">
-        <property name="hexpand">true</property>
-        <style>
-          <class name="custom-view"/>
-        </style>
-      </object>
-    </child>
-    <child>
-      <object class="GtkComposingArea" id="ascii">
-        <style>
-          <class name="custom-view"/>
-        </style>
-      </object>
-    </child>
-  </template>
+
+    <template class="GtkHexView" parent="GtkBufferView">
+        <child>
+            <object class="GtkComposingArea" id="offsets">
+                <style>
+                    <class name="gutter"/>
+                </style>
+            </object>
+        </child>
+        <child>
+            <object class="GtkComposingArea" id="hex">
+                <property name="hexpand">true</property>
+                <style>
+                    <class name="custom-view"/>
+                </style>
+            </object>
+        </child>
+        <child>
+            <object class="GtkComposingArea" id="ascii">
+                <style>
+                    <class name="custom-view"/>
+                </style>
+            </object>
+        </child>
+    </template>
+
 </interface>