Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace manual offset calculations by g_utf8_offset_to_pointer().

Browse Source 
2005-11-02  Matthias Clasen  <mclasen@redhat.com>

	* 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)
This commit is contained in:
Matthias Clasen
2005-11-02 05:11:13 +00:00
committed by Matthias Clasen
parent 3e2b7e6e73
commit a57007f3dc
4 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
2005-11-02 Matthias Clasen <mclasen@redhat.com>
* 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 <tml@novell.com>
* gdk/win32/gdkprivate-win32.h

7
ChangeLog.pre-2-10
View File

@@ -1,3 +1,10 @@
2005-11-02 Matthias Clasen <mclasen@redhat.com>
* 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 <tml@novell.com>
* gdk/win32/gdkprivate-win32.h

13
gtk/gtktextbtree.c
View File

@@ -4157,16 +4157,11 @@ _gtk_text_line_char_to_byte_offsets (GtkTextLine *line,
if (seg->type == &gtk_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);

13
gtk/gtktextiter.c
View File

@@ -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;
}