callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try to match an off toggle here with the matching on toggle if it

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

	* gtk/gtktextbtree.c (_gtk_text_btree_delete): Try to match an off
	toggle here with the matching on toggle if it immediately follows.
	This is a common case, and handling it here prevents quadratic blowup
	in cleanup_line() below.  (#317125)

	* gtk/gtktextsegment.h:
	* gtk/gtktextsegment.c (_gtk_char_segment_new_from_two_strings): Pass
	the character counts into this function instead of computing them
	again.
This commit is contained in:
Matthias Clasen
2005-10-11 14:39:17 +00:00
committed by Matthias Clasen
parent 8ad0abb867
commit a07a5ecba7
5 changed files with 70 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
gtk/gtktextsegment.c
View File

@ -211,8 +211,12 @@ _gtk_char_segment_new (const gchar *text, guint len)
}
GtkTextLineSegment*
_gtk_char_segment_new_from_two_strings (const gchar *text1, guint len1,
const gchar *text2, guint len2)
_gtk_char_segment_new_from_two_strings (const gchar *text1,
guint len1,
guint chars1,
const gchar *text2,
guint len2,
guint chars2)
{
GtkTextLineSegment *seg;
@ -227,9 +231,7 @@ _gtk_char_segment_new_from_two_strings (const gchar *text1, guint len1,
memcpy (seg->body.chars + len1, text2, len2);
seg->body.chars[len1+len2] = '\0';
/* In principle this function could probably take chars1 and chars2
as args, since it's typically used to merge two char segments */
seg->char_count = g_utf8_strlen (seg->body.chars, seg->byte_count);
seg->char_count = chars1 + chars2;
if (gtk_debug_flags & GTK_DEBUG_TEXT)
char_segment_self_check (seg);
@ -326,8 +328,12 @@ char_segment_cleanup_func (segPtr, line)
}
newPtr =
_gtk_char_segment_new_from_two_strings (segPtr->body.chars, segPtr->byte_count,
segPtr2->body.chars, segPtr2->byte_count);
_gtk_char_segment_new_from_two_strings (segPtr->body.chars,
segPtr->byte_count,
segPtr->char_count,
segPtr2->body.chars,
segPtr2->byte_count,
segPtr2->char_count);
newPtr->next = segPtr2->next;