Defined general rendering options using a GLib object.

git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@89 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a

1 files changed, 5 insertions, 30 deletions

diff --git a/src/analysis/line.h b/src/analysis/line.h
index 981cf90..4a293cf 100644
--- a/src/analysis/line.h
+++ b/src/analysis/line.h
@@ -25,27 +25,14 @@
 #define _ANALYSIS_LINE_H
 
 
-#include <stdbool.h>
 #include <gtk/gtk.h>
 
 
-#include "../arch/processor.h"
-#include "../format/exe_format.h"
-
-
-
-/* Support principal de lignes */
-typedef enum _LinesMainOwner
-{
-    LMO_BLOCK,                              /* Unique bloc de code         */
-    LMO_GRAPH,                              /* Graphique de blocs de code  */
-
-    LMO_COUNT
-
-} LinesMainOwner;
+#include "roptions.h"
 
 
 
+/* ------------------------ TRAITEMENT INDIVIDUEL DES LIGNES ------------------------ */
 
 
 /* Définitions des types de ligne */
@@ -67,18 +54,6 @@ typedef enum _RenderingLineFlag
 
 } RenderingLineFlag;
 
-/* Passage de paramètres compact */
-typedef struct _disass_options
-{
-    bool show_address;                      /* Affichage de l'adresse ?    */
-    bool show_code;                         /* Affichage du code brut ?    */
-
-    exe_format *format;                     /* Format du contenu bianire   */
-    GArchProcessor *proc;                   /* Architecture utilisée       */
-
-} disass_options;
-
-
 
 #define G_TYPE_RENDERING_LINE               g_rendering_line_get_type()
 #define G_RENDERING_LINE(obj)               (G_TYPE_CHECK_INSTANCE_CAST((obj), g_rendering_line_get_type(), GRenderingLine))
@@ -128,7 +103,7 @@ bool g_rendering_line_has_destination(const GRenderingLine *);
 GRenderingLine *g_rendering_line_get_destination(const GRenderingLine *, InstructionLinkType *);
 
 /* Procède à l'initialisation des bases d'une représentation. */
-void g_rendering_line_draw(GRenderingLine *, GdkDrawable *, GdkGC *, gint, gint, gint, gint, LinesMainOwner);
+void g_rendering_line_draw(GRenderingLine *, GdkDrawable *, GdkGC *, gint, gint, gint, gint, MainRendering);
 
 
 
@@ -145,10 +120,10 @@ void g_rendering_line_insert_into_lines(GRenderingLine **, GRenderingLine *, boo
 GRenderingLine *g_rendering_line_get_next_iter(GRenderingLine *, const GRenderingLine *, const GRenderingLine *);
 
 /* Met à jour le nombre d'octets maximal par instruction. */
-void g_rendering_line_update_bin_len(GRenderingLine *, GRenderingLine *, LinesMainOwner);
+void g_rendering_line_update_bin_len(GRenderingLine *, GRenderingLine *, MainRendering);
 
 /* Fournit les dimensions de lignes de représentation. */
-void g_rendering_line_get_size(GRenderingLine *, const GRenderingLine *, LinesMainOwner, int *, int *, int *);
+void g_rendering_line_get_size(GRenderingLine *, const GRenderingLine *, MainRendering, int *, int *, int *);
 
 /* Recherche une ligne d'après sa position à l'écran. */
 GRenderingLine *g_rendering_line_find_by_y(GRenderingLine *, const GRenderingLine *, gdouble *);