From a57007f3dc1e21ef55d8ff5d63d2a994aa354eff Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 2 Nov 2005 05:11:13 +0000 Subject: [PATCH] Replace manual offset calculations by g_utf8_offset_to_pointer(). 2005-11-02 Matthias Clasen * gtk/gtktextbtree.c (_gtk_text_line_char_to_byte_offsets): * gtk/gtktextiter.c (gtk_text_iter_backward_chars): Replace manual offset calculations by g_utf8_offset_to_pointer(). (#320360, Paolo Borelli) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ gtk/gtktextbtree.c | 13 ++++--------- gtk/gtktextiter.c | 13 ++++--------- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index e177c1824a..42bf11c2b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-11-02 Matthias Clasen + + * gtk/gtktextbtree.c (_gtk_text_line_char_to_byte_offsets): + * gtk/gtktextiter.c (gtk_text_iter_backward_chars): Replace + manual offset calculations by g_utf8_offset_to_pointer(). + (#320360, Paolo Borelli) + 2005-11-01 Tor Lillqvist * gdk/win32/gdkprivate-win32.h diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e177c1824a..42bf11c2b4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2005-11-02 Matthias Clasen + + * gtk/gtktextbtree.c (_gtk_text_line_char_to_byte_offsets): + * gtk/gtktextiter.c (gtk_text_iter_backward_chars): Replace + manual offset calculations by g_utf8_offset_to_pointer(). + (#320360, Paolo Borelli) + 2005-11-01 Tor Lillqvist * gdk/win32/gdkprivate-win32.h diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c index e10d4eba6f..1950ae16c7 100644 --- a/gtk/gtktextbtree.c +++ b/gtk/gtktextbtree.c @@ -4157,16 +4157,11 @@ _gtk_text_line_char_to_byte_offsets (GtkTextLine *line, if (seg->type == >k_text_char_type) { - *seg_byte_offset = 0; - while (offset > 0) - { - gint bytes; - const char * start = seg->body.chars + *seg_byte_offset; + const char *p; - bytes = g_utf8_next_char (start) - start; - *seg_byte_offset += bytes; - offset -= 1; - } + p = g_utf8_offset_to_pointer (seg->body.chars, offset); + + *seg_byte_offset = p - seg->body.chars; g_assert (*seg_byte_offset < seg->byte_count); diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c index ffebb29688..6a7fc09559 100644 --- a/gtk/gtktextiter.c +++ b/gtk/gtktextiter.c @@ -2394,19 +2394,14 @@ gtk_text_iter_backward_chars (GtkTextIter *iter, gint count) if (real->line_byte_offset >= 0) { + const char *p; gint new_byte_offset; gint i; - new_byte_offset = 0; - i = 0; - while (i < real->segment_char_offset) - { - const char * start = real->segment->body.chars + new_byte_offset; - new_byte_offset += g_utf8_next_char (start) - start; - - ++i; - } + p = g_utf8_offset_to_pointer (real->segment->body.chars, + real->segment_char_offset); + new_byte_offset = p - real->segment->body.chars; real->line_byte_offset -= (real->segment_byte_offset - new_byte_offset); real->segment_byte_offset = new_byte_offset; }