Prepared the new organization of display widgets.

4 files changed, 41 insertions, 41 deletions

diff --git a/src/gui/panels/bookmarks.c b/src/gui/panels/bookmarks.c
index 893c1bd..13b952e 100644
--- a/src/gui/panels/bookmarks.c
+++ b/src/gui/panels/bookmarks.c
@@ -662,7 +662,7 @@ static void on_bookmarks_selection_change(GtkTreeSelection *selection, GBookmark
     GtkTreeModel *model;                    /* Modèle de gestion           */
     GDbBookmark *bookmark;                  /* Signet en cours d'étude     */
     const vmpa2t *addr;                     /* Adressse associée au signet */
-    GtkViewPanel *vpanel;                   /* Afficheur effectif de code  */
+    GtkDisplayPanel *display;               /* Afficheur effectif de code  */
 
     if (gtk_tree_selection_get_selected(selection, &model, &iter))
     {
@@ -670,8 +670,8 @@ static void on_bookmarks_selection_change(GtkTreeSelection *selection, GBookmark
 
         addr = g_db_bookmark_get_address(bookmark);
 
-        vpanel = g_editor_item_get_current_view(G_EDITOR_ITEM(panel));
-        gtk_view_panel_request_move(vpanel, addr);
+        display = g_editor_item_get_current_view(G_EDITOR_ITEM(panel));
+        gtk_display_panel_request_move(display, addr);
 
         g_object_unref(G_OBJECT(bookmark));
 
@@ -1047,7 +1047,7 @@ static gboolean on_button_press_over_bookmarks(GtkWidget *widget, GdkEventButton
     GtkTreeModel *model;                    /* Modèle de gestion           */
     GDbBookmark *bookmark;                  /* Signet en cours d'étude     */
     const vmpa2t *addr;                     /* Adressse associée au signet */
-    GtkViewPanel *vpanel;                   /* Afficheur effectif de code  */
+    GtkDisplayPanel *display;               /* Afficheur effectif de code  */
 
     switch (event->button)
     {
@@ -1061,8 +1061,8 @@ static gboolean on_button_press_over_bookmarks(GtkWidget *widget, GdkEventButton
 
                 addr = g_db_bookmark_get_address(bookmark);
 
-                vpanel = g_editor_item_get_current_view(G_EDITOR_ITEM(panel));
-                gtk_view_panel_request_move(vpanel, addr);
+                display = g_editor_item_get_current_view(G_EDITOR_ITEM(panel));
+                gtk_display_panel_request_move(display, addr);
 
                 g_object_unref(G_OBJECT(bookmark));
 
diff --git a/src/gui/panels/glance.c b/src/gui/panels/glance.c
index 272cc4f..153d623 100644
--- a/src/gui/panels/glance.c
+++ b/src/gui/panels/glance.c
@@ -38,7 +38,7 @@ struct _GGlancePanel
 {
     GPanelItem parent;                      /* A laisser en premier        */
 
-    GtkViewPanel *view;                     /* Vue à représenter           */
+    GtkDisplayPanel *display;               /* Vue à représenter           */
     GtkRequisition req;                     /* Pleine taille de la source  */
     GtkScrolledWindow *support;             /* Support défilant associé    */
 
@@ -87,7 +87,7 @@ static void g_glance_panel_dispose(GGlancePanel *);
 static void g_glance_panel_finalize(GGlancePanel *);
 
 /* Lance une actualisation du fait d'un changement de support. */
-static void update_glance_panel_for_view(GGlancePanel *, GtkViewPanel *);
+static void update_glance_panel_for_view(GGlancePanel *, GtkDisplayPanel *);
 
 /* Réagit à la préparation du défilement du support original. */
 static void on_view_scroll_setup(GtkAdjustment *, GGlancePanel *);
@@ -102,7 +102,7 @@ static void on_glance_resize(GtkWidget *, GdkRectangle *, GGlancePanel *);
 static void compute_glance_scale(GGlancePanel *);
 
 /* Lance une actualisation du fait d'un changement de vue. */
-static void update_glance_panel_for_view_content(GGlancePanel *, GtkViewPanel *);
+static void update_glance_panel_for_view_content(GGlancePanel *, GtkDisplayPanel *);
 
 /* Met à jour l'affichage de l'aperçu rapide à présenter. */
 static gboolean redraw_glance_area(GtkWidget *, cairo_t *, GGlancePanel *);
@@ -281,8 +281,8 @@ GPanelItem *g_glance_panel_new(void)
 
 /******************************************************************************
 *                                                                             *
-*  Paramètres  : panel = panneau à actualiser.                                *
-*                view  = nouveau panneau d'affichage actif.                   *
+*  Paramètres  : panel    = panneau à actualiser.                             *
+*                display  = nouveau panneau d'affichage actif.                *
 *                                                                             *
 *  Description : Lance une actualisation du fait d'un changement de support.  *
 *                                                                             *
@@ -292,15 +292,15 @@ GPanelItem *g_glance_panel_new(void)
 *                                                                             *
 ******************************************************************************/
 
-static void update_glance_panel_for_view(GGlancePanel *panel, GtkViewPanel *view)
+static void update_glance_panel_for_view(GGlancePanel *panel, GtkDisplayPanel *display)
 {
     GtkWidget *parent;                      /* Support défilant de la vue  */
     GtkAdjustment *adj;                     /* Gestionnaire du défilement  */
 
-    if (panel->view != NULL)
+    if (panel->display != NULL)
     {
-        g_object_unref(panel->view);
-        panel->view = NULL;
+        g_object_unref(panel->display);
+        panel->display = NULL;
 
         g_object_unref(panel->support);
         panel->support = NULL;
@@ -318,11 +318,11 @@ static void update_glance_panel_for_view(GGlancePanel *panel, GtkViewPanel *view
      * de la fonction mcb_view_change_support().
      */
 
-    parent = gtk_widget_get_parent(GTK_WIDGET(view));
+    parent = gtk_widget_get_parent(GTK_WIDGET(display));
     if (!GTK_IS_SCROLLED_WINDOW(parent)) return;
 
-    panel->view = view;
-    g_object_ref(panel->view);
+    panel->display = display;
+    g_object_ref(panel->display);
 
     panel->support = GTK_SCROLLED_WINDOW(parent);
     g_object_ref(panel->support);
@@ -362,13 +362,13 @@ static void on_view_scroll_setup(GtkAdjustment *adj, GGlancePanel *panel)
     if (gtk_adjustment_get_page_size(hadj) == 0 || gtk_adjustment_get_page_size(vadj) == 0)
         return;
 
-    gtk_widget_get_preferred_size(GTK_WIDGET(panel->view), NULL, &panel->req);
+    gtk_widget_get_preferred_size(GTK_WIDGET(panel->display), NULL, &panel->req);
 
     compute_glance_scale(panel);
 
     on_view_scrolled(adj, panel);
 
-    update_glance_panel_for_view_content(panel, panel->view);
+    update_glance_panel_for_view_content(panel, panel->display);
 
 }
 
@@ -423,10 +423,10 @@ static void on_view_scrolled(GtkAdjustment *adj, GGlancePanel *panel)
 
 static void on_glance_resize(GtkWidget *widget, GdkRectangle *allocation, GGlancePanel *panel)
 {
-    if (panel->view != NULL)
+    if (panel->display != NULL)
     {
         on_view_scroll_setup(NULL, panel);
-        update_glance_panel_for_view_content(panel, panel->view);
+        update_glance_panel_for_view_content(panel, panel->display);
     }
 
 }
@@ -508,8 +508,8 @@ static void compute_glance_scale(GGlancePanel *panel)
 
 /******************************************************************************
 *                                                                             *
-*  Paramètres  : panel = panneau à actualiser.                                *
-*                view  = nouveau panneau d'affichage actif.                   *
+*  Paramètres  : panel   = panneau à actualiser.                              *
+*                display = nouveau panneau d'affichage actif.                 *
 *                                                                             *
 *  Description : Lance une actualisation du fait d'un changement de vue.      *
 *                                                                             *
@@ -519,7 +519,7 @@ static void compute_glance_scale(GGlancePanel *panel)
 *                                                                             *
 ******************************************************************************/
 
-static void update_glance_panel_for_view_content(GGlancePanel *panel, GtkViewPanel *view)
+static void update_glance_panel_for_view_content(GGlancePanel *panel, GtkDisplayPanel *display)
 {
     cairo_t *cairo;                         /* Assistant pour le dessin    */
     GtkAllocation area;                     /* Dimension de la surface     */
@@ -542,7 +542,7 @@ static void update_glance_panel_for_view_content(GGlancePanel *panel, GtkViewPan
     area.width = panel->painting.width;
     area.height = panel->painting.height;
 
-    gtk_view_panel_cache_glance(view, cairo, &area, panel->scale);
+    gtk_display_panel_cache_glance(display, cairo, &area, panel->scale);
 
     cairo_destroy(cairo);
 
@@ -708,7 +708,7 @@ static gboolean on_button_press_over_glance(GtkWidget *widget, GdkEventButton *e
     GtkAdjustment *vadj;                    /* Gestionnaire du défilement  */
     GdkCursor *cursor;                      /* Pointeur pour la surface    */
 
-    if (panel->view != NULL && event->button == 1)
+    if (panel->display != NULL && event->button == 1)
     {
         panel->start_x = event->x;
         panel->start_y = event->y;
@@ -754,7 +754,7 @@ static gboolean on_button_press_over_glance(GtkWidget *widget, GdkEventButton *e
 
 static gboolean on_button_release_over_glance(GtkWidget *widget, GdkEventButton *event, GGlancePanel *panel)
 {
-    if (panel->view != NULL && event->button == 1)
+    if (panel->display != NULL && event->button == 1)
     {
         if (panel->valid)
             gdk_window_set_cursor(gtk_widget_get_window(widget), NULL);
@@ -788,7 +788,7 @@ static gboolean on_mouse_motion_over_glance(GtkWidget *widget, GdkEventMotion *e
     GtkAdjustment *vadj;                    /* Gestionnaire du défilement  */
     gdouble value;                          /* Nouvelle valeur bornée      */
 
-    if (panel->view != NULL && event->state & GDK_BUTTON1_MASK && panel->valid)
+    if (panel->display != NULL && event->state & GDK_BUTTON1_MASK && panel->valid)
     {
         diff_x = (event->x - panel->start_x) / panel->scale;
         diff_y = (event->y - panel->start_y) / panel->scale;
diff --git a/src/gui/panels/strings.c b/src/gui/panels/strings.c
index a651fff..7a927df 100644
--- a/src/gui/panels/strings.c
+++ b/src/gui/panels/strings.c
@@ -586,7 +586,7 @@ static void on_strings_selection_change(GtkTreeSelection *selection, GStringsPan
     GtkTreeModel *model;                    /* Modèle de gestion           */
     GBinSymbol *symbol;                     /* Symbole en cours d'étude    */
     const vmpa2t *addr;                     /* Adressse associée au signet */
-    GtkViewPanel *vpanel;                   /* Afficheur effectif de code  */
+    GtkDisplayPanel *display;               /* Afficheur effectif de code  */
 
     if (gtk_tree_selection_get_selected(selection, &model, &iter))
     {
@@ -594,8 +594,8 @@ static void on_strings_selection_change(GtkTreeSelection *selection, GStringsPan
 
         addr = get_mrange_addr(g_binary_symbol_get_range(symbol));
 
-        vpanel = g_editor_item_get_current_view(G_EDITOR_ITEM(panel));
-        gtk_view_panel_request_move(vpanel, addr);
+        display = g_editor_item_get_current_view(G_EDITOR_ITEM(panel));
+        gtk_display_panel_request_move(display, addr);
 
         g_object_unref(G_OBJECT(symbol));
 
@@ -816,7 +816,7 @@ static gboolean on_button_event_over_strings(GtkWidget *widget, GdkEventButton *
     GtkTreeModel *model;                    /* Modèle de gestion           */
     GBinSymbol *symbol;                     /* Symbole en cours d'étude    */
     const vmpa2t *addr;                     /* Adressse associée au signet */
-    GtkViewPanel *vpanel;                   /* Afficheur effectif de code  */
+    GtkDisplayPanel *display;               /* Afficheur effectif de code  */
 
     switch (event->button)
     {
@@ -833,8 +833,8 @@ static gboolean on_button_event_over_strings(GtkWidget *widget, GdkEventButton *
 
                 addr = get_mrange_addr(g_binary_symbol_get_range(symbol));
 
-                vpanel = g_editor_item_get_current_view(G_EDITOR_ITEM(panel));
-                gtk_view_panel_request_move(vpanel, addr);
+                display = g_editor_item_get_current_view(G_EDITOR_ITEM(panel));
+                gtk_display_panel_request_move(display, addr);
 
                 g_object_unref(G_OBJECT(symbol));
 
@@ -1034,7 +1034,7 @@ static void mcb_strings_panel_find_refs(GtkMenuItem *menuitem, GStringsPanel *pa
     GObject *ref;                           /* Espace de référencements    */
     GtkWidget *dialog;                      /* Boîte de dialogue à montrer */
     vmpa2t *addr;                           /* Adresse de destination      */
-    GtkViewPanel *vpanel;                   /* Afficheur effectif de code  */
+    GtkDisplayPanel *display;               /* Afficheur effectif de code  */
 
     symbol = get_selected_panel_symbol(panel->treeview, NULL);
     if (symbol == NULL) return;
@@ -1059,8 +1059,8 @@ static void mcb_strings_panel_find_refs(GtkMenuItem *menuitem, GStringsPanel *pa
     {
         addr = get_address_from_gotox_dialog(dialog);
 
-        vpanel = g_editor_item_get_current_view(G_EDITOR_ITEM(panel));
-        gtk_view_panel_request_move(vpanel, addr);
+        display = g_editor_item_get_current_view(G_EDITOR_ITEM(panel));
+        gtk_display_panel_request_move(display, addr);
 
         delete_vmpa(addr);
 
diff --git a/src/gui/panels/symbols.c b/src/gui/panels/symbols.c
index 4fffe35..170d19b 100644
--- a/src/gui/panels/symbols.c
+++ b/src/gui/panels/symbols.c
@@ -550,7 +550,7 @@ static void on_symbols_selection_change(GtkTreeSelection *selection, GSymbolsPan
     GtkTreeModel *model;                    /* Modèle de gestion           */
     GBinSymbol *symbol;                     /* Symbole à traiter           */
     const mrange_t *range;                  /* Couverture dudit symbole    */
-    GtkViewPanel *vpanel;                   /* Afficheur effectif de code  */
+    GtkDisplayPanel *display;               /* Afficheur effectif de code  */
 
     if (gtk_tree_selection_get_selected(selection, &model, &iter))
     {
@@ -560,8 +560,8 @@ static void on_symbols_selection_change(GtkTreeSelection *selection, GSymbolsPan
         {
             range = g_binary_symbol_get_range(symbol);
 
-            vpanel = g_editor_item_get_current_view(G_EDITOR_ITEM(panel));
-            gtk_view_panel_request_move(vpanel, get_mrange_addr(range));
+            display = g_editor_item_get_current_view(G_EDITOR_ITEM(panel));
+            gtk_display_panel_request_move(display, get_mrange_addr(range));
 
             g_object_unref(G_OBJECT(symbol));