diff options
Diffstat (limited to 'src/gtkext/gtkbufferview.c')
| -rw-r--r-- | src/gtkext/gtkbufferview.c | 89 |
1 files changed, 4 insertions, 85 deletions
diff --git a/src/gtkext/gtkbufferview.c b/src/gtkext/gtkbufferview.c index f54ecff..86a738a 100644 --- a/src/gtkext/gtkbufferview.c +++ b/src/gtkext/gtkbufferview.c @@ -287,7 +287,7 @@ static gboolean gtk_buffer_view_button_press(GtkWidget *widget, GdkEventButton * real_x = event->x; real_y = event->y; - gtk_buffer_view_compute_real_coord(view, &real_x, &real_y); + gtk_view_panel_compute_real_coord(GTK_VIEW_PANEL(view), &real_x, &real_y); printf(" !mouse! :: (%g ; %g) -> (%d ; %d)\n", event->x, event->y, @@ -313,54 +313,6 @@ static gboolean gtk_buffer_view_button_press(GtkWidget *widget, GdkEventButton * /****************************************************************************** * * -* Paramètres : view = composant GTK à consulter. * -* event = informations liées à l'événement. * -* * -* Description : Transcrit les coordonnées à l'écran en coordonnées absolues. * -* * -* Retour : - * -* * -* Remarques : - * -* * -******************************************************************************/ - -void gtk_buffer_view_compute_fake_coord(GtkBufferView *view, gint *x, gint *y) -{ - if (GTK_VIEW_PANEL(view)->hadjustment != NULL) - *x -= gtk_adjustment_get_value(GTK_VIEW_PANEL(view)->hadjustment); - - if (GTK_VIEW_PANEL(view)->vadjustment != NULL) - *y += gtk_adjustment_get_value(GTK_VIEW_PANEL(view)->vadjustment); - -} - - -/****************************************************************************** -* * -* Paramètres : view = composant GTK à consulter. * -* event = informations liées à l'événement. * -* * -* Description : Transcrit les coordonnées absolues en coordonnées à l'écran. * -* * -* Retour : - * -* * -* Remarques : - * -* * -******************************************************************************/ - -void gtk_buffer_view_compute_real_coord(GtkBufferView *view, gint *x, gint *y) -{ - if (x != NULL && GTK_VIEW_PANEL(view)->hadjustment != NULL) - *x += gtk_adjustment_get_value(GTK_VIEW_PANEL(view)->hadjustment); - - if (y != NULL && GTK_VIEW_PANEL(view)->vadjustment != NULL) - *y += gtk_adjustment_get_value(GTK_VIEW_PANEL(view)->vadjustment); - -} - - -/****************************************************************************** -* * * Paramètres : widget = composant GTK à redessiner. * * cr = contexte graphique associé à l'événement. * * * @@ -420,7 +372,7 @@ static gboolean gtk_buffer_view_draw(GtkWidget *widget, cairo_t *cr) { fake_x = 0; fake_y = 0; - gtk_buffer_view_compute_fake_coord(view, &fake_x, &fake_y); + gtk_view_panel_compute_fake_coord(GTK_VIEW_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); @@ -806,39 +758,6 @@ GBufferView *gtk_buffer_view_get_buffer(const GtkBufferView *view) - - -/* ---------------------------------------------------------------------------------- */ -/* CONVERSIONS DE COORDONNEES */ -/* ---------------------------------------------------------------------------------- */ - - -/****************************************************************************** -* * -* Paramètres : view = composant GTK à consulter. * -* x = abscisse à ajuster. [OUT] * -* x = ordonnée à ajuster. [OUT] * -* * -* Description : Transcrit les coordonnées absolues en coordonnées à l'écran. * -* * -* Retour : - * -* * -* Remarques : - * -* * -******************************************************************************/ - -void gtk_buffer_view_compute_relative_coords(GtkBufferView *view, gint *x, gint *y) -{ - if (x != NULL && GTK_VIEW_PANEL(view)->hadjustment != NULL) - *x -= gtk_adjustment_get_value(GTK_VIEW_PANEL(view)->hadjustment); - - if (y != NULL && GTK_VIEW_PANEL(view)->vadjustment != NULL) - *y -= gtk_adjustment_get_value(GTK_VIEW_PANEL(view)->vadjustment); - -} - - - /* ---------------------------------------------------------------------------------- */ /* ANIMATION DU CURSEUR */ /* ---------------------------------------------------------------------------------- */ @@ -963,7 +882,7 @@ static void gtk_buffer_view_relocate_caret(GtkBufferView *view, const GdkRectang else if (clear_old) { - gtk_buffer_view_compute_relative_coords(view, &old_area.x, &old_area.y); + gtk_view_panel_compute_relative_coords(GTK_VIEW_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); @@ -1063,7 +982,7 @@ static gboolean gtk_buffer_view_refresh_caret(GtkBufferView *view) } area = view->caret; - gtk_buffer_view_compute_relative_coords(view, &area.x, &area.y); + gtk_view_panel_compute_relative_coords(GTK_VIEW_PANEL(view), &area.x, &area.y); /* Réinitialisation de la surface */ if (view->show_caret) |