diff options
author | Cyrille Bagard <nocbos@gmail.com> | 2018-07-14 11:48:54 (GMT) |
---|---|---|
committer | Cyrille Bagard <nocbos@gmail.com> | 2018-07-14 11:48:54 (GMT) |
commit | bea3337108fa5b59b8f6fdbe016d5ed6a6300bc6 (patch) | |
tree | 517abf46e76b2a6cc8ddb3ac2dec5ffacc28a128 /src/glibext/gbufferview.c | |
parent | e0af5dc9c01a5b9649c68ec63109ba98b6843329 (diff) |
Begun to switch to abstract locations in internal rendering buffers.
Diffstat (limited to 'src/glibext/gbufferview.c')
-rw-r--r-- | src/glibext/gbufferview.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/glibext/gbufferview.c b/src/glibext/gbufferview.c index af7d7ac..0eff4d8 100644 --- a/src/glibext/gbufferview.c +++ b/src/glibext/gbufferview.c @@ -77,7 +77,7 @@ static void g_buffer_view_finalize(GBufferView *); static void on_buffer_cache_size_changed(const GBufferCache *, bool, size_t, size_t, GBufferView *); /* Calcule la position idéale de curseur pour un point donné. */ -bool _g_buffer_view_compute_caret_full(GBufferView *, gint, GBufferLine *, size_t, const bool *, cairo_rectangle_int_t *, vmpa2t *); +bool _g_buffer_view_compute_caret_full(GBufferView *, gint, GBufferLine *, size_t, const bool *, cairo_rectangle_int_t *, GLineCursor **); /* Déplace le curseur au sein d'une vue de tampon. */ static bool _g_buffer_view_move_caret(GBufferView *, const GBufferLine *, size_t, cairo_rectangle_int_t *, bool, GdkScrollDirection, const bool *); @@ -565,7 +565,7 @@ gint g_buffer_view_get_height(const GBufferView *view) * y = ordonnée proposée pour le nouvel emplacement. * * display = règles d'affichage des colonnes modulables. * * caret = position du curseur à construire. [OUT] * -* addr = adresse correspondant à cette même position. [OUT] * +* cursor = emplacement correspondant à cette position. [OUT] * * * * Description : Calcule la position idéale de curseur pour un point donné. * * * @@ -575,7 +575,7 @@ gint g_buffer_view_get_height(const GBufferView *view) * * ******************************************************************************/ -bool g_buffer_view_compute_caret_full(GBufferView *view, gint x, gint y, const bool *display, cairo_rectangle_int_t *caret, vmpa2t *addr) +bool g_buffer_view_compute_caret_full(GBufferView *view, gint x, gint y, const bool *display, cairo_rectangle_int_t *caret, GLineCursor **cursor) { bool result; /* Bilan à retourner */ gint lheight; /* Hauteur d'une ligne */ @@ -600,7 +600,7 @@ bool g_buffer_view_compute_caret_full(GBufferView *view, gint x, gint y, const b /* Calcul d'une position */ - result = _g_buffer_view_compute_caret_full(view, x, line, index, display, caret, addr); + result = _g_buffer_view_compute_caret_full(view, x, line, index, display, caret, cursor); g_object_unref(G_OBJECT(line)); @@ -619,7 +619,7 @@ bool g_buffer_view_compute_caret_full(GBufferView *view, gint x, gint y, const b * index = indice de cette même ligne dans le tampon. * * display = règles d'affichage des colonnes modulables. * * caret = position du curseur à construire. [OUT] * -* addr = adresse correspondant à cette même position. [OUT] * +* cursor = emplacement correspondant à cette position. [OUT] * * * * Description : Calcule la position idéale de curseur pour un point donné. * * * @@ -629,7 +629,7 @@ bool g_buffer_view_compute_caret_full(GBufferView *view, gint x, gint y, const b * * ******************************************************************************/ -bool _g_buffer_view_compute_caret_full(GBufferView *view, gint x, GBufferLine *line, size_t index, const bool *display, cairo_rectangle_int_t *caret, vmpa2t *addr) +bool _g_buffer_view_compute_caret_full(GBufferView *view, gint x, GBufferLine *line, size_t index, const bool *display, cairo_rectangle_int_t *caret, GLineCursor **cursor) { bool result; /* Bilan à retourner */ gint text_pos; /* Abscisse de départ du texte */ @@ -670,7 +670,7 @@ bool _g_buffer_view_compute_caret_full(GBufferView *view, gint x, GBufferLine *l caret->width = 2; caret->height = lheight; - g_buffer_cache_get_line_addr(view->cache, index, caret->x, addr); + g_buffer_cache_get_line_cursor(view->cache, index, caret->x, cursor); result = true; @@ -764,7 +764,7 @@ static bool _g_buffer_view_move_caret(GBufferView *view, const GBufferLine *line * dir = direction du parcours. * * display = règles d'affichage des colonnes modulables. * * caret = position du curseur à faire évoluer. [OUT] * -* addr = adresse correspondant à cette même position. [OUT] * +* cursor = emplacement correspondant à cette position. [OUT] * * * * Description : Déplace le curseur au sein d'une vue de tampon. * * * @@ -774,7 +774,7 @@ static bool _g_buffer_view_move_caret(GBufferView *view, const GBufferLine *line * * ******************************************************************************/ -bool g_buffer_view_move_caret(GBufferView *view, bool ctrl, GdkScrollDirection dir, const bool *display, cairo_rectangle_int_t *caret, vmpa2t *addr) +bool g_buffer_view_move_caret(GBufferView *view, bool ctrl, GdkScrollDirection dir, const bool *display, cairo_rectangle_int_t *caret, GLineCursor **cursor) { bool result; /* Bilan à retourner */ size_t index; /* Indice de ligne de tampon */ @@ -802,7 +802,7 @@ bool g_buffer_view_move_caret(GBufferView *view, bool ctrl, GdkScrollDirection d index--; other = g_buffer_cache_find_line_by_index(view->cache, index); - result = _g_buffer_view_compute_caret_full(view, caret->x, other, index, display, caret, addr); + result = _g_buffer_view_compute_caret_full(view, caret->x, other, index, display, caret, cursor); g_object_unref(G_OBJECT(other)); } @@ -816,7 +816,7 @@ bool g_buffer_view_move_caret(GBufferView *view, bool ctrl, GdkScrollDirection d index++; other = g_buffer_cache_find_line_by_index(view->cache, index); - result = _g_buffer_view_compute_caret_full(view, caret->x, other, index, display, caret, addr); + result = _g_buffer_view_compute_caret_full(view, caret->x, other, index, display, caret, cursor); g_object_unref(G_OBJECT(other)); } @@ -829,7 +829,7 @@ bool g_buffer_view_move_caret(GBufferView *view, bool ctrl, GdkScrollDirection d if (moved) { - g_buffer_cache_get_line_addr(view->cache, index, caret->x, addr); + g_buffer_cache_get_line_cursor(view->cache, index, caret->x, cursor); result = true; } @@ -838,7 +838,7 @@ bool g_buffer_view_move_caret(GBufferView *view, bool ctrl, GdkScrollDirection d index--; other = g_buffer_cache_find_line_by_index(view->cache, index); - result = _g_buffer_view_compute_caret_full(view, INT_MAX, other, index, display, caret, addr); + result = _g_buffer_view_compute_caret_full(view, INT_MAX, other, index, display, caret, cursor); g_object_unref(G_OBJECT(other)); } @@ -851,7 +851,7 @@ bool g_buffer_view_move_caret(GBufferView *view, bool ctrl, GdkScrollDirection d if (moved) { - g_buffer_cache_get_line_addr(view->cache, index, caret->x, addr); + g_buffer_cache_get_line_cursor(view->cache, index, caret->x, cursor); result = true; } @@ -862,7 +862,7 @@ bool g_buffer_view_move_caret(GBufferView *view, bool ctrl, GdkScrollDirection d text_pos = g_buffer_cache_get_text_position(view->cache); other = g_buffer_cache_find_line_by_index(view->cache, index); - result = _g_buffer_view_compute_caret_full(view, text_pos, other, index, display, caret, addr); + result = _g_buffer_view_compute_caret_full(view, text_pos, other, index, display, caret, cursor); g_object_unref(G_OBJECT(other)); } |