diff options
author | Cyrille Bagard <nocbos@gmail.com> | 2016-11-11 21:22:38 (GMT) |
---|---|---|
committer | Cyrille Bagard <nocbos@gmail.com> | 2016-11-11 21:22:38 (GMT) |
commit | db934f20598340772f8c0256c8a8119790a1821e (patch) | |
tree | d03e57cc5fc953fc3e7653da74a8c58fd310de5d /src/gtkext/gtkbufferview.c | |
parent | 2df715e74d6600ed0a5688a43f6ecd873957326a (diff) |
Prepared the new organization of display widgets.
Diffstat (limited to 'src/gtkext/gtkbufferview.c')
-rw-r--r-- | src/gtkext/gtkbufferview.c | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/src/gtkext/gtkbufferview.c b/src/gtkext/gtkbufferview.c index 1f4399a..bafb15d 100644 --- a/src/gtkext/gtkbufferview.c +++ b/src/gtkext/gtkbufferview.c @@ -110,7 +110,7 @@ static gboolean gtk_buffer_view_refresh_caret(GtkBufferView *); /* Détermine le type du composant d'affichage de tampon de lignes. */ -G_DEFINE_TYPE(GtkBufferView, gtk_buffer_view, GTK_TYPE_VIEW_PANEL) +G_DEFINE_TYPE(GtkBufferView, gtk_buffer_view, GTK_TYPE_DISPLAY_PANEL) /****************************************************************************** @@ -129,11 +129,11 @@ static void gtk_buffer_view_class_init(GtkBufferViewClass *class) { GObjectClass *object; /* Autre version de la classe */ GtkWidgetClass *widget_class; /* Classe version Widget */ - GtkViewPanelClass *panel_class; /* Classe parente */ + GtkDisplayPanelClass *panel_class; /* Classe parente */ object = G_OBJECT_CLASS(class); widget_class = GTK_WIDGET_CLASS(class); - panel_class = GTK_VIEW_PANEL_CLASS(class); + panel_class = GTK_DISPLAY_PANEL_CLASS(class); object->dispose = (GObjectFinalizeFunc/* ! */)gtk_buffer_view_dispose; object->finalize = (GObjectFinalizeFunc)gtk_buffer_view_finalize; @@ -295,7 +295,7 @@ static gboolean gtk_buffer_view_button_press(GtkWidget *widget, GdkEventButton * real_x = event->x; real_y = event->y; - gtk_view_panel_compute_real_coord(GTK_VIEW_PANEL(view), &real_x, &real_y); + gtk_display_panel_compute_real_coord(GTK_DISPLAY_PANEL(view), &real_x, &real_y); printf(" !mouse! :: (%g ; %g) -> (%d ; %d)\n", event->x, event->y, @@ -337,7 +337,7 @@ static gboolean gtk_buffer_view_button_press(GtkWidget *widget, GdkEventButton * static gboolean gtk_buffer_view_draw(GtkWidget *widget, cairo_t *cr) { GtkBufferView *view; /* Autre version du composant */ - GtkViewPanel *pview; /* Autre version du composant */ + GtkDisplayPanel *panel; /* Autre version du composant */ GdkWindow *window; /* Fenêtre à redessiner */ cairo_region_t *region; /* Région visible à redessiner */ cairo_rectangle_int_t area; /* Surface correspondante */ @@ -349,7 +349,7 @@ static gboolean gtk_buffer_view_draw(GtkWidget *widget, cairo_t *cr) gint *selected; /* Ordonnée d'une sélection */ view = GTK_BUFFER_VIEW(widget); - pview = GTK_VIEW_PANEL(widget); + panel = GTK_DISPLAY_PANEL(widget); window = gtk_widget_get_window(widget); @@ -362,9 +362,9 @@ static gboolean gtk_buffer_view_draw(GtkWidget *widget, cairo_t *cr) context = gtk_widget_get_style_context(widget); - if (pview->show_border) + if (panel->show_border) { - gtk_view_panel_define_border_path(pview, cr, 0, 0); + gtk_display_panel_define_border_path(panel, cr, 0, 0); cairo_clip(cr); } @@ -418,8 +418,8 @@ static gboolean gtk_buffer_view_draw(GtkWidget *widget, cairo_t *cr) /* Eventuelle bordure globale */ - if (pview->show_border) - gtk_view_panel_draw_border(pview, cr); + if (panel->show_border) + gtk_display_panel_draw_border(panel, cr); /* Impression du désassemblage */ @@ -427,7 +427,7 @@ static gboolean gtk_buffer_view_draw(GtkWidget *widget, cairo_t *cr) { 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); g_generic_config_get_value(get_main_configuration(), MPK_SELECTION_LINE, &sel_line); sel_line &= gtk_widget_has_focus(widget); @@ -437,7 +437,7 @@ static gboolean gtk_buffer_view_draw(GtkWidget *widget, cairo_t *cr) else selected = &view->caret.y; - g_buffer_view_draw(view->buffer_view, cr, fake_x, fake_y, &area, pview->display, selected); + g_buffer_view_draw(view->buffer_view, cr, fake_x, fake_y, &area, panel->display, selected); } @@ -473,7 +473,7 @@ static gboolean gtk_buffer_view_key_press(GtkWidget *widget, GdkEventKey *event) { gboolean result; /* Suites à renvoyer */ GtkBufferView *view; /* Autre version du composant */ - GtkViewPanel *pview; /* Autre version du composant */ + GtkDisplayPanel *panel; /* Autre version du composant */ bool ctrl; /* Statut de la touche Contrôle*/ GdkScrollDirection dir; /* Direction du déplacement */ GdkRectangle area; /* Emplacement de curseur */ @@ -482,7 +482,7 @@ static gboolean gtk_buffer_view_key_press(GtkWidget *widget, GdkEventKey *event) result = FALSE; view = GTK_BUFFER_VIEW(widget); - pview = GTK_VIEW_PANEL(widget); + panel = GTK_DISPLAY_PANEL(widget); switch (event->keyval) { @@ -516,12 +516,12 @@ static gboolean gtk_buffer_view_key_press(GtkWidget *widget, GdkEventKey *event) area = view->caret; ctrl = (event->state & GDK_CONTROL_MASK); - addr = g_buffer_view_move_caret(view->buffer_view, &area, ctrl, dir, pview->display); + addr = g_buffer_view_move_caret(view->buffer_view, &area, ctrl, dir, panel->display); if (addr != NULL) { gtk_buffer_view_relocate_caret(view, &area, addr); - _gtk_view_panel_scroll_to_address(pview, addr, SPT_RAW, false); + _gtk_display_panel_scroll_to_address(panel, addr, SPT_RAW, false); } else g_signal_emit_by_name(view, "reach-limit", dir); @@ -589,11 +589,11 @@ static gboolean gtk_buffer_view_query_tooltip(GtkWidget *widget, gint x, gint y, real_x = x; real_y = y; - gtk_view_panel_compute_real_coord(GTK_VIEW_PANEL(view), &real_x, &real_y); + gtk_display_panel_compute_real_coord(GTK_DISPLAY_PANEL(view), &real_x, &real_y); line = g_buffer_view_find_line_and_creator_at(view->buffer_view, &real_x, real_y, NULL, - GTK_VIEW_PANEL(view)->display, &creator); + GTK_DISPLAY_PANEL(view)->display, &creator); if (line == NULL || creator == NULL) goto no_tooltip; @@ -619,7 +619,7 @@ static gboolean gtk_buffer_view_query_tooltip(GtkWidget *widget, gint x, gint y, /* Construction du contenu textuel */ - format = G_BIN_FORMAT(g_loaded_binary_get_format(GTK_VIEW_PANEL(view)->binary)); + format = G_BIN_FORMAT(g_loaded_binary_get_format(GTK_DISPLAY_PANEL(view)->binary)); if (!g_binary_format_find_symbol_at(format, &addr, &target_sym)) goto no_tooltip; @@ -634,7 +634,7 @@ static gboolean gtk_buffer_view_query_tooltip(GtkWidget *widget, gint x, gint y, * celui propre au bloc basique courant. */ - buffer = g_loaded_binary_get_disassembled_buffer(GTK_VIEW_PANEL(view)->binary); + buffer = g_loaded_binary_get_disassembled_buffer(GTK_DISPLAY_PANEL(view)->binary); if (g_binary_format_find_next_symbol_at(format, &addr, &next_sym)) stop_addr = get_mrange_addr(g_binary_symbol_get_range(next_sym)); @@ -721,7 +721,7 @@ static void gtk_buffer_view_compute_requested_size(GtkBufferView *view, gint *wi if (width != NULL) { if (view->buffer_view != NULL) - *width = g_buffer_view_get_width(view->buffer_view, GTK_VIEW_PANEL(view)->display); + *width = g_buffer_view_get_width(view->buffer_view, GTK_DISPLAY_PANEL(view)->display); else *width = 0; } @@ -762,7 +762,7 @@ static void gtk_buffer_view_compute_scroll_inc(GtkBufferView *view, gint size, G } else - GTK_VIEW_PANEL_CLASS(gtk_buffer_view_parent_class)->compute_inc(GTK_VIEW_PANEL(view), + GTK_DISPLAY_PANEL_CLASS(gtk_buffer_view_parent_class)->compute_inc(GTK_DISPLAY_PANEL(view), size, orientation, step, page); } @@ -841,7 +841,7 @@ static bool gtk_buffer_view_get_address_coordinates(const GtkBufferView *view, c if (result) { - *x += g_buffer_view_get_margin(view->buffer_view, GTK_VIEW_PANEL(view)->display); + *x += g_buffer_view_get_margin(view->buffer_view, GTK_DISPLAY_PANEL(view)->display); height = gtk_widget_get_allocated_height(GTK_WIDGET(view)); @@ -895,7 +895,7 @@ static bool gtk_buffer_view_get_position(const GtkBufferView *view, GBufferLine *line = g_buffer_view_find_line_and_creator_at(view->buffer_view, (gint []){ view->caret.x }, view->caret.y, NULL, - GTK_VIEW_PANEL(view)->display, &obj); + GTK_DISPLAY_PANEL(view)->display, &obj); if (creator != NULL) *creator = obj; @@ -969,7 +969,7 @@ void gtk_buffer_view_attach_buffer(GtkBufferView *view, GBufferView *buffer) /* Validation finale */ - width = g_buffer_view_get_width(view->buffer_view, GTK_VIEW_PANEL(view)->display); + width = g_buffer_view_get_width(view->buffer_view, GTK_DISPLAY_PANEL(view)->display); height = g_buffer_view_get_height(view->buffer_view); width += -view->left_text + 1; @@ -1027,7 +1027,7 @@ static bool _gtk_buffer_view_move_caret_to(GtkBufferView *view, gint x, gint y) { size_t index; /* Indice de ligne de tampon */ GBufferLine *line; /* Ligne à la position courante*/ - GtkViewPanel *pview; /* Autre version du composant */ + GtkDisplayPanel *panel; /* Autre version du composant */ const vmpa2t *addr; /* Position mémoire associée */ GdkRectangle new; /* Nouvel emplacement calculé */ @@ -1036,9 +1036,9 @@ static bool _gtk_buffer_view_move_caret_to(GtkBufferView *view, gint x, gint y) line = g_buffer_view_find_line_at(view->buffer_view, y, &index); if (line == NULL) return false; - pview = GTK_VIEW_PANEL(view); + panel = GTK_DISPLAY_PANEL(view); - addr = g_buffer_view_compute_caret_full(view->buffer_view, line, index, x, pview->display, &new); + addr = g_buffer_view_compute_caret_full(view->buffer_view, line, index, x, panel->display, &new); if (addr != NULL) gtk_buffer_view_relocate_caret(view, &new, addr); @@ -1128,7 +1128,7 @@ static void gtk_buffer_view_relocate_caret(GtkBufferView *view, const GdkRectang else if (clear_old) { - gtk_view_panel_compute_relative_coords(GTK_VIEW_PANEL(view), &old_area.x, &old_area.y); + gtk_display_panel_compute_relative_coords(GTK_DISPLAY_PANEL(view), &old_area.x, &old_area.y); gtk_widget_queue_draw_area(GTK_WIDGET(view), old_area.x, old_area.y, old_area.width, old_area.height); @@ -1209,7 +1209,7 @@ static gboolean gtk_buffer_view_refresh_caret(GtkBufferView *view) } area = view->caret; - gtk_view_panel_compute_relative_coords(GTK_VIEW_PANEL(view), &area.x, &area.y); + gtk_display_panel_compute_relative_coords(GTK_DISPLAY_PANEL(view), &area.x, &area.y); /* Réinitialisation de la surface */ if (view->show_caret) |