summaryrefslogtreecommitdiff
path: root/src/gtkext/gtkgraphview.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/gtkext/gtkgraphview.c')
-rw-r--r--src/gtkext/gtkgraphview.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/src/gtkext/gtkgraphview.c b/src/gtkext/gtkgraphview.c
index fc307a2..469bc46 100644
--- a/src/gtkext/gtkgraphview.c
+++ b/src/gtkext/gtkgraphview.c
@@ -29,7 +29,7 @@
#include "gtkblockview.h"
#include "gtkbufferview.h"
-#include "gtkviewpanel-int.h"
+#include "gtkdisplaypanel-int.h"
#include "graph/cluster.h"
#include "../analysis/blocks/flow.h"
#include "../gui/editem.h"
@@ -39,7 +39,7 @@
/* Composant d'affichage sous forme graphique (instance) */
struct _GtkGraphView
{
- GtkViewPanel parent; /* A laisser en premier */
+ GtkDisplayPanel parent; /* A laisser en premier */
GtkWidget *support; /* Support des vues en bloc */
GtkWidget *extender; /* Force la taille du support */
@@ -67,7 +67,7 @@ struct _GtkGraphView
/* Composant d'affichage sous forme graphique (classe) */
struct _GtkGraphViewClass
{
- GtkViewPanelClass parent; /* A laisser en premier */
+ GtkDisplayPanelClass parent; /* A laisser en premier */
};
@@ -145,7 +145,7 @@ static void gtk_graph_view_reach_caret_limit(GtkBufferView *, GdkScrollDirection
/* Détermine le type du composant d'affichage en graphique. */
-G_DEFINE_TYPE(GtkGraphView, gtk_graph_view, GTK_TYPE_VIEW_PANEL)
+G_DEFINE_TYPE(GtkGraphView, gtk_graph_view, GTK_TYPE_DISPLAY_PANEL)
/******************************************************************************
@@ -164,7 +164,7 @@ static void gtk_graph_view_class_init(GtkGraphViewClass *class)
{
GObjectClass *object; /* Autre version de la classe */
GtkWidgetClass *widget_class; /* Classe de haut niveau */
- GtkViewPanelClass *panel_class; /* Classe parente */
+ GtkDisplayPanelClass *panel_class; /* Classe parente */
object = G_OBJECT_CLASS(class);
@@ -175,7 +175,7 @@ static void gtk_graph_view_class_init(GtkGraphViewClass *class)
widget_class->size_allocate = gtk_graph_view_size_allocate;
- panel_class = GTK_VIEW_PANEL_CLASS(class);
+ panel_class = GTK_DISPLAY_PANEL_CLASS(class);
panel_class->compute_size = (compute_requested_size_fc)gtk_graph_view_compute_requested_size;
panel_class->adjust = (adjust_scroll_value_fc)gtk_graph_view_adjust_scroll_value;
@@ -203,12 +203,12 @@ static void gtk_graph_view_class_init(GtkGraphViewClass *class)
static void gtk_graph_view_init(GtkGraphView *view)
{
- GtkViewPanel *viewpanel; /* Instance parente #1 */
+ GtkDisplayPanel *panel; /* Instance parente #1 */
//GtkBinView *binview; /* Instance parente #2 */
- viewpanel = GTK_VIEW_PANEL(view);
+ panel = GTK_DISPLAY_PANEL(view);
- viewpanel->resize = (prepare_resize_fc)gtk_graph_view_prepare_resize;
+ panel->resize = (prepare_resize_fc)gtk_graph_view_prepare_resize;
////////viewpanel->get_coordinates = (get_addr_coordinates_fc)gtk_graph_view_get_address_coordinates;
//binview = GTK_BIN_VIEW(view);
@@ -426,7 +426,7 @@ static void gtk_graph_view_adjust_scroll_value(GtkGraphView *view, GtkAdjustment
fake_x = 0;
fake_y = 0;
- gtk_view_panel_compute_fake_coord(GTK_VIEW_PANEL(view), &fake_x, &fake_y);
+ gtk_display_panel_compute_fake_coord(GTK_DISPLAY_PANEL(view), &fake_x, &fake_y);
gtk_fixed_move(GTK_FIXED(view), view->support, fake_x, -fake_y);
@@ -463,13 +463,13 @@ static gboolean gtk_graph_view_draw(GtkWidget *widget, cairo_t *cr, GtkGraphView
{
cairo_push_group(cr);
- gtk_view_panel_define_border_path(GTK_VIEW_PANEL(child), cr, alloc.x + j, alloc.y + j);
+ gtk_display_panel_define_border_path(GTK_DISPLAY_PANEL(child), cr, alloc.x + j, alloc.y + j);
cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 1.0);
cairo_fill(cr);
cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
- gtk_view_panel_define_border_path(GTK_VIEW_PANEL(child), cr, alloc.x, alloc.y);
+ gtk_display_panel_define_border_path(GTK_DISPLAY_PANEL(child), cr, alloc.x, alloc.y);
cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.0);
cairo_fill(cr);
@@ -657,7 +657,7 @@ static void gtk_graph_view_prepare_resize(GtkGraphView *view)
g_graph_layout_place(view->layout, view);
*/
- change_editor_items_current_view_content(GTK_VIEW_PANEL(view));
+ change_editor_items_current_view_content(GTK_DISPLAY_PANEL(view));
}
@@ -701,7 +701,7 @@ static void gtk_graph_view_define_main_address(GtkGraphView *view, const vmpa2t
{
gtk_graph_view_reset(view);
- format = g_loaded_binary_get_format(GTK_VIEW_PANEL(view)->binary);
+ format = g_loaded_binary_get_format(GTK_DISPLAY_PANEL(view)->binary);
routines = g_binary_format_get_routines(G_BIN_FORMAT(format), &routines_count);
for (i = 0; i < routines_count; i++)
@@ -716,7 +716,7 @@ static void gtk_graph_view_define_main_address(GtkGraphView *view, const vmpa2t
view->highlighted = init_segment_content_list();
/*
- view->children = gtk_graph_view_load_nodes(view, GTK_VIEW_PANEL(view)->binary,
+ view->children = gtk_graph_view_load_nodes(view, GTK_DISPLAY_PANEL(view)->binary,
routines[i]);
view->allocs = (GtkAllocation *)calloc(view->children_count,
@@ -736,12 +736,12 @@ static void gtk_graph_view_define_main_address(GtkGraphView *view, const vmpa2t
list = g_binary_routine_get_basic_blocks(routines[i]);
#if 0
- view->cluster = g_graph_cluster_new(GTK_VIEW_PANEL(view)->binary,
+ view->cluster = g_graph_cluster_new(GTK_DISPLAY_PANEL(view)->binary,
list, 0/* FIXME */, view->highlighted);
#endif
- view->cluster = bootstrap_graph_cluster(GTK_VIEW_PANEL(view)->binary,
+ view->cluster = bootstrap_graph_cluster(GTK_DISPLAY_PANEL(view)->binary,
list, view->highlighted);
@@ -780,7 +780,7 @@ static void gtk_graph_view_define_main_address(GtkGraphView *view, const vmpa2t
}
- change_editor_items_current_view_content(GTK_VIEW_PANEL(view));
+ change_editor_items_current_view_content(GTK_DISPLAY_PANEL(view));
g_object_unref(G_OBJECT(format));
@@ -851,7 +851,7 @@ static bool gtk_graph_view_move_caret_to(GtkGraphView *view, gint x, gint y)
{
bool result; /* Bilan à retourner */
size_t i; /* Boucle de parcours */
- GtkViewPanel *pview; /* Autre vision d'enfance */
+ GtkDisplayPanel *panel; /* Autre vision d'enfance */
gint sub_x; /* Abscisse relative à l'enfant*/
gint sub_y; /* Ordonnée relative à l'enfant*/
@@ -862,12 +862,12 @@ static bool gtk_graph_view_move_caret_to(GtkGraphView *view, gint x, gint y)
if (x < view->allocs[i].x || x >= (view->allocs[i].x + view->allocs[i].width)) continue;
if (y < view->allocs[i].y || y >= (view->allocs[i].y + view->allocs[i].height)) continue;
- pview = GTK_VIEW_PANEL(view->children[i]);
+ panel = GTK_DISPLAY_PANEL(view->children[i]);
sub_x = x - view->allocs[i].x;
sub_y = y - view->allocs[i].y;
- result = GTK_VIEW_PANEL_GET_CLASS(pview)->move_caret_to(pview, sub_x, sub_y);
+ result = GTK_DISPLAY_PANEL_GET_CLASS(panel)->move_caret_to(panel, sub_x, sub_y);
break;
}
@@ -904,7 +904,7 @@ static void gtk_graph_view_cache_glance(GtkGraphView *view, cairo_t *cairo, cons
sub_area.width = view->allocs[i].width * scale + 1;
sub_area.height = view->allocs[i].height * scale + 1;
- gtk_view_panel_cache_glance(GTK_VIEW_PANEL(view->children[i]), cairo, &sub_area, scale);
+ gtk_display_panel_cache_glance(GTK_DISPLAY_PANEL(view->children[i]), cairo, &sub_area, scale);
}
@@ -1140,9 +1140,9 @@ static GtkBufferView **gtk_graph_view_load_nodes(GtkGraphView *view, GLoadedBina
g_signal_connect(result[i], "highlight-changed", G_CALLBACK(gtk_graph_view_changed_highlights), view);
gtk_widget_show(GTK_WIDGET(result[i]));
- gtk_view_panel_attach_binary(GTK_VIEW_PANEL(result[i]), binary, BVW_GRAPH);
+ gtk_display_panel_attach_binary(GTK_DISPLAY_PANEL(result[i]), binary, BVW_GRAPH);
- gtk_view_panel_show_border(GTK_VIEW_PANEL(result[i]), true);
+ gtk_display_panel_show_border(GTK_DISPLAY_PANEL(result[i]), true);
g_flow_block_get_boundary_addresses(G_FLOW_BLOCK(blocks[i]), &first, &last);
@@ -1222,7 +1222,7 @@ static void gtk_graph_view_reach_caret_limit(GtkBufferView *node, GdkScrollDirec
range = g_binary_routine_get_range(view->routine);
- proc = g_loaded_binary_get_processor(GTK_VIEW_PANEL(view)->binary);
+ proc = g_loaded_binary_get_processor(GTK_DISPLAY_PANEL(view)->binary);
ref = NULL;