Restore the definition of main operands.gtk4

3 files changed, 73 insertions, 2 deletions

diff --git a/src/glibext/comparable.c b/src/glibext/comparable.c
index 95e7de7..40fd110 100644
--- a/src/glibext/comparable.c
+++ b/src/glibext/comparable.c
@@ -25,6 +25,7 @@
 
 
 #include "comparable-int.h"
+#include "../common/sort.h"
 
 
 
@@ -72,11 +73,24 @@ static void g_comparable_object_default_init(GComparableObjectInterface *iface)
 int g_comparable_object_compare(const GComparableObject *object, const GComparableObject *other)
 {
     int result;                             /* Bilan à retourner           */
+    GType type_a;                           /* Type de l'object A          */
+    GType type_b;                           /* Type de l'object B          */
     GComparableObjectInterface *iface;      /* Interface utilisée          */
 
-    iface = G_COMPARABLE_OBJECT_GET_IFACE(object);
+    type_a = G_OBJECT_TYPE(G_OBJECT(object));
+    type_b = G_OBJECT_TYPE(G_OBJECT(other));
 
-    result = iface->compare(object, other);
+    assert(sizeof(GType) <= sizeof(unsigned long));
+
+    result = sort_unsigned_long(type_a, type_b);
+
+    if (result == 0)
+    {
+        iface = G_COMPARABLE_OBJECT_GET_IFACE(object);
+
+        result = iface->compare(object, other);
+
+    }
 
     return result;
 
diff --git a/src/glibext/options/Makefile.am b/src/glibext/options/Makefile.am
index 448de7b..19881cf 100644
--- a/src/glibext/options/Makefile.am
+++ b/src/glibext/options/Makefile.am
@@ -3,6 +3,7 @@ noinst_LTLIBRARIES  = libglibextoptions.la
 
 
 libglibextoptions_la_SOURCES =			\
+	disass.h		\
 	hex.h hex.c
 
 libglibextoptions_la_CFLAGS = $(TOOLKIT_CFLAGS)
diff --git a/src/glibext/options/disass.h b/src/glibext/options/disass.h
new file mode 100644
index 0000000..e916083
--- /dev/null
+++ b/src/glibext/options/disass.h
@@ -0,0 +1,56 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * disass.h - prototypes pour les options de rendus de code désassemblé
+ *
+ * Copyright (C) 2025 Cyrille Bagard
+ *
+ *  This file is part of Chrysalide.
+ *
+ *  Chrysalide is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Chrysalide is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Chrysalide.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef _GLIBEXT_OPTIONS_DISASS_H
+#define _GLIBEXT_OPTIONS_DISASS_H
+
+
+#include "../helpers.h"
+
+
+
+/* Liste des colonnes en options */
+typedef enum _DisassColumnOptions
+{
+    ACO_OFFSET,                             /* Position                    */
+
+    ACO_COUNT
+
+} DisassColumnOptions;
+
+
+#define ACO_ASSEMBLY (ACO_COUNT + 0)              /* Code pour assembleur        */
+
+
+#if 0
+#define G_TYPE_HEX_OPTIONS (g_hex_options_get_type())
+
+DECLARE_GTYPE(GHexOptions, g_hex_options, G, HEX_OPTIONS);
+
+
+/* Crée un groupe d'options pour le rendu d'hexadécimal. */
+GHexOptions *g_hex_options_new(void);
+#endif
+
+
+#endif  /* _GLIBEXT_OPTIONS_HEX_H */