X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtktextbtree.c;h=2757c8ca40a51094186ef7a6b129a86c6affd0c1;hb=51be6b88dbff3ff6ed83d1247508ad58c0278df6;hp=8fb9dd1285dd3097dc8d1c14af1abe0891d039b7;hpb=10f047cf4ce86b7ff32050279214faac3c294f11;p=~andy%2Fgtk diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c index 8fb9dd128..2757c8ca4 100644 --- a/gtk/gtktextbtree.c +++ b/gtk/gtktextbtree.c @@ -1,5 +1,5 @@ /* - * gtktextbtree.c -- + * Gtktextbtree.c -- * * This file contains code that manages the B-tree representation * of text for the text buffer and implements character and @@ -52,13 +52,14 @@ * */ +#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API +#include "config.h" #include "gtktextbtree.h" #include -#include #include #include -#include "gtksignal.h" #include "gtktexttag.h" +#include "gtktexttagprivate.h" #include "gtktexttagtable.h" #include "gtktextlayout.h" #include "gtktextiterprivate.h" @@ -100,10 +101,15 @@ struct _NodeData { /* Height and width of this node */ gint height; - gint width : 24; + signed int width : 24; - /* boolean indicating whether the height/width need to be recomputed */ - gint valid : 8; + /* boolean indicating whether the lines below this node are in need of validation. + * However, width/height should always represent the current total width and + * max height for lines below this node; the valid flag indicates whether the + * width/height on the lines needs recomputing, not whether the totals + * need recomputing. + */ + guint valid : 8; /* Actually a boolean */ }; @@ -137,14 +143,14 @@ struct _GtkTextBTreeNode { int level; /* Level of this node in the B-tree. * 0 refers to the bottom of the tree * (children are lines, not nodes). */ + int num_lines; /* Total number of lines (leaves) in + * the subtree rooted here. */ + int num_chars; /* Number of chars below here */ + int num_children; /* Number of children of this node. */ union { /* First in linked list of children. */ struct _GtkTextBTreeNode *node; /* Used if level > 0. */ GtkTextLine *line; /* Used if level == 0. */ } children; - int num_children; /* Number of children of this node. */ - int num_lines; /* Total number of lines (leaves) in - * the subtree rooted here. */ - int num_chars; /* Number of chars below here */ NodeData *node_data; }; @@ -177,25 +183,35 @@ struct _GtkTextBTree { GtkTextBuffer *buffer; BTreeView *views; GSList *tag_infos; - guint tag_changed_handler; - guint tag_removed_handler; + gulong tag_changed_handler; + /* Incremented when a segment with a byte size > 0 - is added to or removed from the tree (i.e. the - length of a line may have changed, and lines may - have been added or removed). This invalidates - all outstanding iterators. - */ + * is added to or removed from the tree (i.e. the + * length of a line may have changed, and lines may + * have been added or removed). This invalidates + * all outstanding iterators. + */ guint chars_changed_stamp; /* Incremented when any segments are added or deleted; - this makes outstanding iterators recalculate their - pointed-to segment and segment offset. - */ + * this makes outstanding iterators recalculate their + * pointed-to segment and segment offset. + */ guint segments_changed_stamp; - GtkTextLine *end_iter_line; + /* Cache the last line in the buffer */ + GtkTextLine *last_line; + guint last_line_stamp; + /* Cache the next-to-last line in the buffer, + * containing the end iterator + */ + GtkTextLine *end_iter_line; + GtkTextLineSegment *end_iter_segment; + int end_iter_segment_byte_index; + int end_iter_segment_char_offset; guint end_iter_line_stamp; - + guint end_iter_segment_stamp; + GHashTable *child_anchor_table; }; @@ -265,7 +281,9 @@ static NodeData *node_data_find (NodeData *nd, gpointer view_id); static GtkTextBTreeNode *gtk_text_btree_node_new (void); +#if 0 static void gtk_text_btree_node_invalidate_downward (GtkTextBTreeNode *node); +#endif static void gtk_text_btree_node_invalidate_upward (GtkTextBTreeNode *node, gpointer view_id); static NodeData * gtk_text_btree_node_check_valid (GtkTextBTreeNode *node, @@ -299,9 +317,6 @@ static void tag_changed_cb (GtkTextTagTable *table, GtkTextTag *tag, gboolean size_changed, GtkTextBTree *tree); -static void tag_removed_cb (GtkTextTagTable *table, - GtkTextTag *tag, - GtkTextBTree *tree); static void cleanup_line (GtkTextLine *line); static void recompute_node_counts (GtkTextBTree *tree, GtkTextBTreeNode *node); @@ -327,7 +342,8 @@ static void gtk_text_btree_remove_tag_info (GtkTextBTree *tre static void redisplay_region (GtkTextBTree *tree, const GtkTextIter *start, - const GtkTextIter *end); + const GtkTextIter *end, + gboolean cursors_only); /* Inline thingies */ @@ -349,7 +365,7 @@ chars_changed (GtkTextBTree *tree) GtkTextBTree* _gtk_text_btree_new (GtkTextTagTable *table, - GtkTextBuffer *buffer) + GtkTextBuffer *buffer) { GtkTextBTree *tree; GtkTextBTreeNode *root_node; @@ -404,21 +420,22 @@ _gtk_text_btree_new (GtkTextTagTable *table, tree->chars_changed_stamp = g_random_int (); tree->segments_changed_stamp = g_random_int (); + tree->last_line_stamp = tree->chars_changed_stamp - 1; + tree->last_line = NULL; + tree->end_iter_line_stamp = tree->chars_changed_stamp - 1; + tree->end_iter_segment_stamp = tree->segments_changed_stamp - 1; tree->end_iter_line = NULL; + tree->end_iter_segment_byte_index = 0; + tree->end_iter_segment_char_offset = 0; + + g_object_ref (tree->table); - g_object_ref (G_OBJECT (tree->table)); - - tree->tag_changed_handler = g_signal_connect (G_OBJECT (tree->table), - "tag_changed", + tree->tag_changed_handler = g_signal_connect (tree->table, + "tag-changed", G_CALLBACK (tag_changed_cb), tree); - tree->tag_removed_handler = g_signal_connect (G_OBJECT (tree->table), - "tag_removed", - G_CALLBACK (tag_removed_cb), - tree); - tree->mark_table = g_hash_table_new (g_str_hash, g_str_equal); tree->child_anchor_table = NULL; @@ -458,8 +475,8 @@ _gtk_text_btree_new (GtkTextTagTable *table, seg->body.mark.not_deleteable = TRUE; - g_object_ref (G_OBJECT (tree->insert_mark)); - g_object_ref (G_OBJECT (tree->selection_bound_mark)); + g_object_ref (tree->insert_mark); + g_object_ref (tree->selection_bound_mark); } tree->refcount = 1; @@ -476,16 +493,6 @@ _gtk_text_btree_ref (GtkTextBTree *tree) tree->refcount += 1; } -static void -mark_destroy_foreach (gpointer key, gpointer value, gpointer user_data) -{ - GtkTextLineSegment *seg = value; - - g_return_if_fail (seg->body.mark.tree == NULL); - - g_object_unref (G_OBJECT (seg->body.mark.obj)); -} - void _gtk_text_btree_unref (GtkTextBTree *tree) { @@ -495,24 +502,29 @@ _gtk_text_btree_unref (GtkTextBTree *tree) tree->refcount -= 1; if (tree->refcount == 0) - { - gtk_text_btree_node_destroy (tree, tree->root_node); - - g_hash_table_foreach (tree->mark_table, - mark_destroy_foreach, - NULL); - g_hash_table_destroy (tree->mark_table); - - g_object_unref (G_OBJECT (tree->insert_mark)); - g_object_unref (G_OBJECT (tree->selection_bound_mark)); - - g_signal_handler_disconnect (G_OBJECT (tree->table), + { + g_signal_handler_disconnect (tree->table, tree->tag_changed_handler); - g_signal_handler_disconnect (G_OBJECT (tree->table), - tree->tag_removed_handler); - - g_object_unref (G_OBJECT (tree->table)); + g_object_unref (tree->table); + tree->table = NULL; + + gtk_text_btree_node_destroy (tree, tree->root_node); + tree->root_node = NULL; + + g_assert (g_hash_table_size (tree->mark_table) == 0); + g_hash_table_destroy (tree->mark_table); + tree->mark_table = NULL; + if (tree->child_anchor_table != NULL) + { + g_hash_table_destroy (tree->child_anchor_table); + tree->child_anchor_table = NULL; + } + + g_object_unref (tree->insert_mark); + tree->insert_mark = NULL; + g_object_unref (tree->selection_bound_mark); + tree->selection_bound_mark = NULL; g_free (tree); } @@ -547,20 +559,189 @@ _gtk_text_btree_segments_changed (GtkTextBTree *tree) * Indexable segment mutation */ +/* + * The following function is responsible for resolving the bidi direction + * for the lines between start and end. But it also calculates any + * dependent bidi direction for surrounding lines that change as a result + * of the bidi direction decisions within the range. The function is + * trying to do as little propagation as is needed. + */ +static void +gtk_text_btree_resolve_bidi (GtkTextIter *start, + GtkTextIter *end) +{ + GtkTextBTree *tree = _gtk_text_iter_get_btree (start); + GtkTextLine *start_line, *end_line, *start_line_prev, *end_line_next, *line; + PangoDirection last_strong, dir_above_propagated, dir_below_propagated; + + /* Resolve the strong bidi direction for all lines between + * start and end. + */ + start_line = _gtk_text_iter_get_text_line (start); + start_line_prev = _gtk_text_line_previous (start_line); + end_line = _gtk_text_iter_get_text_line (end); + end_line_next = _gtk_text_line_next (end_line); + + line = start_line; + while (line && line != end_line_next) + { + /* Loop through the segments and search for a strong character + */ + GtkTextLineSegment *seg = line->segments; + line->dir_strong = PANGO_DIRECTION_NEUTRAL; + + while (seg) + { + if (seg->type == >k_text_char_type && seg->byte_count > 0) + { + PangoDirection pango_dir; + + pango_dir = pango_find_base_dir (seg->body.chars, + seg->byte_count); + + if (pango_dir != PANGO_DIRECTION_NEUTRAL) + { + line->dir_strong = pango_dir; + break; + } + } + seg = seg->next; + } + + line = _gtk_text_line_next (line); + } + + /* Sweep forward */ + + /* The variable dir_above_propagated contains the forward propagated + * direction before start. It is neutral if start is in the beginning + * of the buffer. + */ + dir_above_propagated = PANGO_DIRECTION_NEUTRAL; + if (start_line_prev) + dir_above_propagated = start_line_prev->dir_propagated_forward; + + /* Loop forward and propagate the direction of each paragraph + * to all neutral lines. + */ + line = start_line; + last_strong = dir_above_propagated; + while (line != end_line_next) + { + if (line->dir_strong != PANGO_DIRECTION_NEUTRAL) + last_strong = line->dir_strong; + + line->dir_propagated_forward = last_strong; + + line = _gtk_text_line_next (line); + } + + /* Continue propagating as long as the previous resolved forward + * is different from last_strong. + */ + { + GtkTextIter end_propagate; + + while (line && + line->dir_strong == PANGO_DIRECTION_NEUTRAL && + line->dir_propagated_forward != last_strong) + { + GtkTextLine *prev = line; + line->dir_propagated_forward = last_strong; + + line = _gtk_text_line_next(line); + if (!line) + { + line = prev; + break; + } + } + + /* The last line to invalidate is the last line before the + * line with the strong character. Or in case of the end of the + * buffer, the last line of the buffer. (There seems to be an + * extra "virtual" last line in the buffer that must not be used + * calling _gtk_text_btree_get_iter_at_line (causes crash). Thus the + * _gtk_text_line_previous is ok in that case as well.) + */ + line = _gtk_text_line_previous (line); + _gtk_text_btree_get_iter_at_line (tree, &end_propagate, line, 0); + _gtk_text_btree_invalidate_region (tree, end, &end_propagate, FALSE); + } + + /* Sweep backward */ + + /* The variable dir_below_propagated contains the backward propagated + * direction after end. It is neutral if end is at the end of + * the buffer. + */ + dir_below_propagated = PANGO_DIRECTION_NEUTRAL; + if (end_line_next) + dir_below_propagated = end_line_next->dir_propagated_back; + + /* Loop backward and propagate the direction of each paragraph + * to all neutral lines. + */ + line = end_line; + last_strong = dir_below_propagated; + while (line != start_line_prev) + { + if (line->dir_strong != PANGO_DIRECTION_NEUTRAL) + last_strong = line->dir_strong; + + line->dir_propagated_back = last_strong; + + line = _gtk_text_line_previous (line); + } + + /* Continue propagating as long as the resolved backward dir + * is different from last_strong. + */ + { + GtkTextIter start_propagate; + + while (line && + line->dir_strong == PANGO_DIRECTION_NEUTRAL && + line->dir_propagated_back != last_strong) + { + GtkTextLine *prev = line; + line->dir_propagated_back = last_strong; + + line = _gtk_text_line_previous (line); + if (!line) + { + line = prev; + break; + } + } + + /* We only need to invalidate for backwards propagation if the + * line we ended up on didn't get a direction from forwards + * propagation. + */ + if (line && line->dir_propagated_forward == PANGO_DIRECTION_NEUTRAL) + { + _gtk_text_btree_get_iter_at_line (tree, &start_propagate, line, 0); + _gtk_text_btree_invalidate_region (tree, &start_propagate, start, FALSE); + } + } +} + void _gtk_text_btree_delete (GtkTextIter *start, - GtkTextIter *end) + GtkTextIter *end) { GtkTextLineSegment *prev_seg; /* The segment just before the start * of the deletion range. */ GtkTextLineSegment *last_seg; /* The segment just after the end * of the deletion range. */ - GtkTextLineSegment *seg, *next; + GtkTextLineSegment *seg, *next, *next2; GtkTextLine *curline; GtkTextBTreeNode *curnode, *node; GtkTextBTree *tree; GtkTextLine *start_line; GtkTextLine *end_line; + GtkTextLine *line; GtkTextLine *deleted_lines = NULL; /* List of lines we've deleted */ gint start_byte_offset; @@ -572,66 +753,13 @@ _gtk_text_btree_delete (GtkTextIter *start, gtk_text_iter_order (start, end); tree = _gtk_text_iter_get_btree (start); - - { - /* - * The code below is ugly, but it's needed to make sure there - * is always a dummy empty line at the end of the text. If the - * final newline of the file (just before the dummy line) is being - * deleted, then back up index to just before the newline. If - * there is a newline just before the first character being deleted, - * then back up the first index too, so that an even number of lines - * gets deleted. Furthermore, remove any tags that are present on - * the newline that isn't going to be deleted after all (this simulates - * deleting the newline and then adding a "clean" one back again). - */ - - gint line1; - gint line2; - - line1 = gtk_text_iter_get_line (start); - line2 = gtk_text_iter_get_line (end); - - if (line2 == _gtk_text_btree_line_count (tree)) - { - GtkTextTag** tags; - int array_size; - GtkTextIter orig_end; - - orig_end = *end; - gtk_text_iter_backward_char (end); - - --line2; - - if (gtk_text_iter_get_line_offset (start) == 0 && - line1 != 0) - { - gtk_text_iter_backward_char (start); - --line1; - } - - tags = _gtk_text_btree_get_tags (end, - &array_size); - - if (tags != NULL) - { - int i; - - i = 0; - while (i < array_size) - { - _gtk_text_btree_tag (end, &orig_end, tags[i], FALSE); - - ++i; - } - - g_free (tags); - } - } - } - + + if (gtk_get_debug_flags () & GTK_DEBUG_TEXT) + _gtk_text_btree_check (tree); + /* Broadcast the need for redisplay before we break the iterators */ - _gtk_text_btree_invalidate_region (tree, start, end); + DV (g_print ("invalidating due to deleting some text (%s)\n", G_STRLOC)); + _gtk_text_btree_invalidate_region (tree, start, end, FALSE); /* Save the byte offset so we can reset the iterators */ start_byte_offset = gtk_text_iter_get_line_index (start); @@ -701,6 +829,9 @@ _gtk_text_btree_delete (GtkTextIter *start, for (node = curnode; node != NULL; node = node->parent) { + /* Don't update node->num_chars, because + * that was done when we deleted the segments. + */ node->num_lines -= 1; } @@ -746,7 +877,7 @@ _gtk_text_btree_delete (GtkTextIter *start, next = seg->next; char_count = seg->char_count; - if ((*seg->type->deleteFunc)(seg, curline, 0) != 0) + if ((*seg->type->deleteFunc)(seg, curline, FALSE) != 0) { /* * This segment refuses to die. Move it to prev_seg and @@ -758,12 +889,30 @@ _gtk_text_btree_delete (GtkTextIter *start, seg->next = start_line->segments; start_line->segments = seg; } - else - { + else if (prev_seg->next && + prev_seg->next != last_seg && + seg->type == >k_text_toggle_off_type && + prev_seg->next->type == >k_text_toggle_on_type && + seg->body.toggle.info == prev_seg->next->body.toggle.info) + { + /* Try to match an off toggle 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. See bug 317125. + */ + next2 = prev_seg->next->next; + g_free ((char *)prev_seg->next); + prev_seg->next = next2; + g_free ((char *)seg); + seg = NULL; + } + else + { seg->next = prev_seg->next; prev_seg->next = seg; } - if (seg->type->leftGravity) + + if (seg && seg->type->leftGravity) { prev_seg = seg; } @@ -791,21 +940,32 @@ _gtk_text_btree_delete (GtkTextIter *start, { BTreeView *view; GtkTextBTreeNode *ancestor_node; - GtkTextLine *prevline; + int chars_moved; + /* last_seg was appended to start_line up at the top of this function */ + chars_moved = 0; for (seg = last_seg; seg != NULL; seg = seg->next) { + chars_moved += seg->char_count; if (seg->type->lineChangeFunc != NULL) { (*seg->type->lineChangeFunc)(seg, end_line); } } + + for (node = start_line->parent; node != NULL; + node = node->parent) + { + node->num_chars += chars_moved; + } + curnode = end_line->parent; for (node = curnode; node != NULL; node = node->parent) { + node->num_chars -= chars_moved; node->num_lines--; } curnode->num_children--; @@ -833,7 +993,6 @@ _gtk_text_btree_delete (GtkTextIter *start, view = tree->views; while (view) { - GtkTextLine *line; GtkTextLineData *ld; gint deleted_width = 0; @@ -851,24 +1010,27 @@ _gtk_text_btree_delete (GtkTextIter *start, deleted_height += ld->height; } - if (!view->next) - gtk_text_line_destroy (tree, line); - line = next_line; } if (deleted_width > 0 || deleted_height > 0) { ld = _gtk_text_line_get_data (start_line, view->view_id); - - /* FIXME: ld is _NOT_ necessarily non-null here, but there is currently - * no way to add ld without also validating the node, which would - * be improper at this point. - */ - /* This assertion does actually fail sometimes, must - fix before stable release -hp */ - g_assert (ld); - + + if (ld == NULL) + { + /* This means that start_line has never been validated. + * We don't really want to do the validation here but + * we do need to store our temporary sizes. So we + * create the line data and assume a line w/h of 0. + */ + ld = _gtk_text_line_data_new (view->layout, start_line); + _gtk_text_line_add_data (start_line, ld); + ld->width = 0; + ld->height = 0; + ld->valid = FALSE; + } + ld->width = MAX (deleted_width, ld->width); ld->height += deleted_height; ld->valid = FALSE; @@ -881,6 +1043,19 @@ _gtk_text_btree_delete (GtkTextIter *start, view = view->next; } + line = deleted_lines; + while (line) + { + GtkTextLine *next_line = line->next; + + gtk_text_line_destroy (tree, line); + + line = next_line; + } + + /* avoid dangling pointer */ + deleted_lines = NULL; + gtk_text_btree_rebalance (tree, curnode); } @@ -901,18 +1076,20 @@ _gtk_text_btree_delete (GtkTextIter *start, chars_changed (tree); segments_changed (tree); - if (gtk_debug_flags & GTK_DEBUG_TEXT) + if (gtk_get_debug_flags () & GTK_DEBUG_TEXT) _gtk_text_btree_check (tree); /* Re-initialize our iterators */ _gtk_text_btree_get_iter_at_line (tree, start, start_line, start_byte_offset); *end = *start; + + gtk_text_btree_resolve_bidi (start, end); } void _gtk_text_btree_insert (GtkTextIter *iter, - const gchar *text, - gint len) + const gchar *text, + gint len) { GtkTextLineSegment *prev_seg; /* The segment just before the first * new segment (NULL means new segment @@ -949,10 +1126,15 @@ _gtk_text_btree_insert (GtkTextIter *iter, /* extract iterator info */ tree = _gtk_text_iter_get_btree (iter); line = _gtk_text_iter_get_text_line (iter); + start_line = line; start_byte_index = gtk_text_iter_get_line_index (iter); - /* Get our insertion segment split */ + /* Get our insertion segment split. Note this assumes line allows + * char insertions, which isn't true of the "last" line. But iter + * should not be on that line, as we assert here. + */ + g_assert (!_gtk_text_line_is_last (line, tree)); prev_seg = gtk_text_line_segment_split (iter); cur_seg = prev_seg; @@ -1061,12 +1243,14 @@ _gtk_text_btree_insert (GtkTextIter *iter, above. FIXME */ gtk_text_iter_forward_chars (&end, char_count_delta); - _gtk_text_btree_invalidate_region (tree, - &start, &end); + DV (g_print ("invalidating due to inserting some text (%s)\n", G_STRLOC)); + _gtk_text_btree_invalidate_region (tree, &start, &end, FALSE); /* Convenience for the user */ *iter = end; + + gtk_text_btree_resolve_bidi (&start, &end); } } @@ -1109,7 +1293,8 @@ insert_pixbuf_or_widget_segment (GtkTextIter *iter, *iter = start; gtk_text_iter_forward_char (iter); /* skip forward past the segment */ - _gtk_text_btree_invalidate_region (tree, &start, iter); + DV (g_print ("invalidating due to inserting pixbuf/widget (%s)\n", G_STRLOC)); + _gtk_text_btree_invalidate_region (tree, &start, iter, FALSE); } void @@ -1139,6 +1324,7 @@ _gtk_text_btree_insert_child_anchor (GtkTextIter *iter, seg = _gtk_widget_segment_new (anchor); tree = seg->body.child.tree = _gtk_text_iter_get_btree (iter); + seg->body.child.line = _gtk_text_iter_get_text_line (iter); insert_pixbuf_or_widget_segment (iter, seg); @@ -1172,7 +1358,7 @@ find_line_by_y (GtkTextBTree *tree, BTreeView *view, { gint current_y = 0; - if (gtk_debug_flags & GTK_DEBUG_TEXT) + if (gtk_get_debug_flags () & GTK_DEBUG_TEXT) _gtk_text_btree_check (tree); if (node->level == 0) @@ -1370,6 +1556,12 @@ _gtk_text_btree_add_view (GtkTextBTree *tree, view->next = tree->views; view->prev = NULL; + if (tree->views) + { + g_assert (tree->views->prev == NULL); + tree->views->prev = view; + } + tree->views = view; /* The last line in the buffer has identity values for the per-view @@ -1428,13 +1620,17 @@ _gtk_text_btree_remove_view (GtkTextBTree *tree, gtk_text_btree_node_remove_view (view, tree->root_node, view_id); + view->layout = (gpointer) 0xdeadbeef; + view->view_id = (gpointer) 0xdeadbeef; + g_free (view); } void -_gtk_text_btree_invalidate_region (GtkTextBTree *tree, - const GtkTextIter *start, - const GtkTextIter *end) +_gtk_text_btree_invalidate_region (GtkTextBTree *tree, + const GtkTextIter *start, + const GtkTextIter *end, + gboolean cursors_only) { BTreeView *view; @@ -1442,7 +1638,10 @@ _gtk_text_btree_invalidate_region (GtkTextBTree *tree, while (view != NULL) { - gtk_text_layout_invalidate (view->layout, start, end); + if (cursors_only) + gtk_text_layout_invalidate_cursors (view->layout, start, end); + else + gtk_text_layout_invalidate (view->layout, start, end); view = view->next; } @@ -1475,7 +1674,7 @@ static IterStack* iter_stack_new (void) { IterStack *stack; - stack = g_new (IterStack, 1); + stack = g_slice_new (IterStack); stack->iters = NULL; stack->count = 0; stack->alloced = 0; @@ -1483,20 +1682,22 @@ iter_stack_new (void) } static void -iter_stack_push (IterStack *stack, const GtkTextIter *iter) +iter_stack_push (IterStack *stack, + const GtkTextIter *iter) { stack->count += 1; if (stack->count > stack->alloced) { stack->alloced = stack->count*2; stack->iters = g_realloc (stack->iters, - stack->alloced*sizeof (GtkTextIter)); + stack->alloced * sizeof (GtkTextIter)); } stack->iters[stack->count-1] = *iter; } static gboolean -iter_stack_pop (IterStack *stack, GtkTextIter *iter) +iter_stack_pop (IterStack *stack, + GtkTextIter *iter) { if (stack->count == 0) return FALSE; @@ -1512,7 +1713,7 @@ static void iter_stack_free (IterStack *stack) { g_free (stack->iters); - g_free (stack); + g_slice_free (IterStack, stack); } static void @@ -1544,12 +1745,13 @@ queue_tag_redisplay (GtkTextBTree *tree, { if (_gtk_text_tag_affects_size (tag)) { - _gtk_text_btree_invalidate_region (tree, start, end); + DV (g_print ("invalidating due to size-affecting tag (%s)\n", G_STRLOC)); + _gtk_text_btree_invalidate_region (tree, start, end, FALSE); } else if (_gtk_text_tag_affects_nonsize_appearance (tag)) { /* We only need to queue a redraw, not a relayout */ - redisplay_region (tree, start, end); + redisplay_region (tree, start, end, FALSE); } /* We don't need to do anything if the tag doesn't affect display */ @@ -1577,7 +1779,7 @@ _gtk_text_btree_tag (const GtkTextIter *start_orig, g_return_if_fail (GTK_IS_TEXT_TAG (tag)); g_return_if_fail (_gtk_text_iter_get_btree (start_orig) == _gtk_text_iter_get_btree (end_orig)); - g_return_if_fail (tag->table == _gtk_text_iter_get_btree (start_orig)->table); + g_return_if_fail (tag->priv->table == _gtk_text_iter_get_btree (start_orig)->table); #if 0 printf ("%s tag %s from %d to %d\n", @@ -1692,7 +1894,7 @@ _gtk_text_btree_tag (const GtkTextIter *start_orig, g_assert (seg != NULL); g_assert (indexable_seg != NULL); g_assert (seg != indexable_seg); - + if ( (seg->type == >k_text_toggle_on_type || seg->type == >k_text_toggle_off_type) && (seg->body.toggle.info == info) ) @@ -1806,7 +2008,9 @@ _gtk_text_btree_tag (const GtkTextIter *start_orig, segments_changed (tree); - if (gtk_debug_flags & GTK_DEBUG_TEXT) + queue_tag_redisplay (tree, tag, &start, &end); + + if (gtk_get_debug_flags () & GTK_DEBUG_TEXT) _gtk_text_btree_check (tree); } @@ -1815,10 +2019,11 @@ _gtk_text_btree_tag (const GtkTextIter *start_orig, * "Getters" */ -GtkTextLine* -_gtk_text_btree_get_line (GtkTextBTree *tree, - gint line_number, - gint *real_line_number) +static GtkTextLine* +get_line_internal (GtkTextBTree *tree, + gint line_number, + gint *real_line_number, + gboolean include_last) { GtkTextBTreeNode *node; GtkTextLine *line; @@ -1826,7 +2031,9 @@ _gtk_text_btree_get_line (GtkTextBTree *tree, int line_count; line_count = _gtk_text_btree_line_count (tree); - + if (!include_last) + line_count -= 1; + if (line_number < 0) { line_number = line_count; @@ -1881,25 +2088,52 @@ _gtk_text_btree_get_line (GtkTextBTree *tree, return line; } +GtkTextLine* +_gtk_text_btree_get_end_iter_line (GtkTextBTree *tree) +{ + return + _gtk_text_btree_get_line (tree, + _gtk_text_btree_line_count (tree) - 1, + NULL); +} + +GtkTextLine* +_gtk_text_btree_get_line (GtkTextBTree *tree, + gint line_number, + gint *real_line_number) +{ + return get_line_internal (tree, line_number, real_line_number, TRUE); +} + +GtkTextLine* +_gtk_text_btree_get_line_no_last (GtkTextBTree *tree, + gint line_number, + gint *real_line_number) +{ + return get_line_internal (tree, line_number, real_line_number, FALSE); +} + GtkTextLine* _gtk_text_btree_get_line_at_char (GtkTextBTree *tree, - gint char_index, - gint *line_start_index, - gint *real_char_index) + gint char_index, + gint *line_start_index, + gint *real_char_index) { GtkTextBTreeNode *node; GtkTextLine *line; GtkTextLineSegment *seg; int chars_left; int chars_in_line; - int bytes_in_line; node = tree->root_node; - /* Clamp to valid indexes (-1 is magic for "highest index") */ - if (char_index < 0 || char_index >= node->num_chars) + /* Clamp to valid indexes (-1 is magic for "highest index"), + * node->num_chars includes the two newlines that aren't really + * in the buffer. + */ + if (char_index < 0 || char_index >= (node->num_chars - 1)) { - char_index = node->num_chars - 1; + char_index = node->num_chars - 2; } *real_char_index = char_index; @@ -1935,7 +2169,6 @@ _gtk_text_btree_get_line_at_char (GtkTextBTree *tree, */ chars_in_line = 0; - bytes_in_line = 0; seg = NULL; for (line = node->children.line; line != NULL; line = line->next) { @@ -1965,6 +2198,8 @@ _gtk_text_btree_get_line_at_char (GtkTextBTree *tree, return line; } +/* It returns an array sorted by tags priority, ready to pass to + * _gtk_text_attributes_fill_from_tags() */ GtkTextTag** _gtk_text_btree_get_tags (const GtkTextIter *iter, gint *num_tags) @@ -1975,13 +2210,11 @@ _gtk_text_btree_get_tags (const GtkTextIter *iter, int src, dst, index; TagInfo tagInfo; GtkTextLine *line; - GtkTextBTree *tree; gint byte_index; #define NUM_TAG_INFOS 10 line = _gtk_text_iter_get_text_line (iter); - tree = _gtk_text_iter_get_btree (iter); byte_index = gtk_text_iter_get_line_index (iter); tagInfo.numTags = 0; @@ -2075,6 +2308,10 @@ _gtk_text_btree_get_tags (const GtkTextIter *iter, g_free (tagInfo.tags); return NULL; } + + /* Sort tags in ascending order of priority */ + _gtk_text_tag_array_sort (tagInfo.tags, dst); + return tagInfo.tags; } @@ -2153,8 +2390,8 @@ copy_segment (GString *string, if (copy) { g_string_append_len (string, - gtk_text_unknown_char_utf8, - 3); + _gtk_text_unknown_char_utf8, + GTK_TEXT_UNKNOWN_CHAR_UTF8_LEN); } } @@ -2169,7 +2406,6 @@ _gtk_text_btree_get_text (const GtkTextIter *start_orig, GtkTextLineSegment *seg; GtkTextLineSegment *end_seg; GString *retval; - GtkTextBTree *tree; gchar *str; GtkTextIter iter; GtkTextIter start; @@ -2185,9 +2421,7 @@ _gtk_text_btree_get_text (const GtkTextIter *start_orig, gtk_text_iter_order (&start, &end); - retval = g_string_new (""); - - tree = _gtk_text_iter_get_btree (&start); + retval = g_string_new (NULL); end_seg = _gtk_text_iter_get_indexable_segment (&end); iter = start; @@ -2220,8 +2454,10 @@ _gtk_text_btree_line_count (GtkTextBTree *tree) gint _gtk_text_btree_char_count (GtkTextBTree *tree) { - /* Exclude newline in bogus last line */ - return tree->root_node->num_chars - 1; + /* Exclude newline in bogus last line and the + * one in the last line that is after the end iterator + */ + return tree->root_node->num_chars - 2; } #define LOTSA_TAGS 1000 @@ -2230,7 +2466,7 @@ _gtk_text_btree_char_is_invisible (const GtkTextIter *iter) { gboolean invisible = FALSE; /* if nobody says otherwise, it's visible */ - int deftagCnts[LOTSA_TAGS]; + int deftagCnts[LOTSA_TAGS] = { 0, }; int *tagCnts = deftagCnts; GtkTextTag *deftags[LOTSA_TAGS]; GtkTextTag **tags = deftags; @@ -2248,20 +2484,15 @@ _gtk_text_btree_char_is_invisible (const GtkTextIter *iter) tree = _gtk_text_iter_get_btree (iter); byte_index = gtk_text_iter_get_line_index (iter); - numTags = gtk_text_tag_table_size (tree->table); + numTags = gtk_text_tag_table_get_size (tree->table); /* almost always avoid malloc, so stay out of system calls */ if (LOTSA_TAGS < numTags) { - tagCnts = g_new (int, numTags); + tagCnts = g_new0 (int, numTags); tags = g_new (GtkTextTag*, numTags); } - for (i=0; itype == >k_text_toggle_off_type)) { tag = seg->body.toggle.info->tag; - if (tag->invisible_set && tag->values->invisible) + if (tag->priv->invisible_set) { - tags[tag->priority] = tag; - tagCnts[tag->priority]++; + tags[tag->priv->priority] = tag; + tagCnts[tag->priv->priority]++; } } } @@ -2299,10 +2530,10 @@ _gtk_text_btree_char_is_invisible (const GtkTextIter *iter) || (seg->type == >k_text_toggle_off_type)) { tag = seg->body.toggle.info->tag; - if (tag->invisible_set && tag->values->invisible) + if (tag->priv->invisible_set) { - tags[tag->priority] = tag; - tagCnts[tag->priority]++; + tags[tag->priv->priority] = tag; + tagCnts[tag->priv->priority]++; } } } @@ -2328,10 +2559,10 @@ _gtk_text_btree_char_is_invisible (const GtkTextIter *iter) if (summary->toggle_count & 1) { tag = summary->info->tag; - if (tag->invisible_set && tag->values->invisible) + if (tag->priv->invisible_set) { - tags[tag->priority] = tag; - tagCnts[tag->priority] += summary->toggle_count; + tags[tag->priv->priority] = tag; + tagCnts[tag->priv->priority] += summary->toggle_count; } } } @@ -2358,7 +2589,7 @@ _gtk_text_btree_char_is_invisible (const GtkTextIter *iter) } #endif #endif - invisible = tags[i]->values->invisible; + invisible = tags[i]->priv->values->invisible; break; } } @@ -2380,7 +2611,8 @@ _gtk_text_btree_char_is_invisible (const GtkTextIter *iter) static void redisplay_region (GtkTextBTree *tree, const GtkTextIter *start, - const GtkTextIter *end) + const GtkTextIter *end, + gboolean cursors_only) { BTreeView *view; GtkTextLine *start_line, *end_line; @@ -2412,9 +2644,14 @@ redisplay_region (GtkTextBTree *tree, if (ld) end_y += ld->height; - gtk_text_layout_changed (view->layout, start_y, - end_y - start_y, - end_y - start_y); + if (cursors_only) + gtk_text_layout_cursors_changed (view->layout, start_y, + end_y - start_y, + end_y - start_y); + else + gtk_text_layout_changed (view->layout, start_y, + end_y - start_y, + end_y - start_y); view = view->next; } @@ -2425,6 +2662,7 @@ redisplay_mark (GtkTextLineSegment *mark) { GtkTextIter iter; GtkTextIter end; + gboolean cursor_only; _gtk_text_btree_get_iter_at_mark (mark->body.mark.tree, &iter, @@ -2433,8 +2671,9 @@ redisplay_mark (GtkTextLineSegment *mark) end = iter; gtk_text_iter_forward_char (&end); - _gtk_text_btree_invalidate_region (mark->body.mark.tree, - &iter, &end); + DV (g_print ("invalidating due to moving visible mark (%s)\n", G_STRLOC)); + cursor_only = mark == mark->body.mark.tree->insert_mark->segment; + _gtk_text_btree_invalidate_region (mark->body.mark.tree, &iter, &end, cursor_only); } static void @@ -2451,8 +2690,7 @@ ensure_not_off_end (GtkTextBTree *tree, GtkTextLineSegment *mark, GtkTextIter *iter) { - if (gtk_text_iter_get_line (iter) == - _gtk_text_btree_line_count (tree)) + if (gtk_text_iter_get_line (iter) == _gtk_text_btree_line_count (tree)) gtk_text_iter_backward_char (iter); } @@ -2473,7 +2711,12 @@ real_set_mark (GtkTextBTree *tree, g_return_val_if_fail (_gtk_text_iter_get_btree (where) == tree, NULL); if (existing_mark) - mark = existing_mark->segment; + { + if (gtk_text_mark_get_buffer (existing_mark) != NULL) + mark = existing_mark->segment; + else + mark = NULL; + } else if (name != NULL) mark = g_hash_table_lookup (tree->mark_table, name); @@ -2492,7 +2735,7 @@ real_set_mark (GtkTextBTree *tree, iter = *where; - if (gtk_debug_flags & GTK_DEBUG_TEXT) + if (gtk_get_debug_flags () & GTK_DEBUG_TEXT) _gtk_text_iter_check (&iter); if (mark != NULL) @@ -2505,7 +2748,7 @@ real_set_mark (GtkTextBTree *tree, _gtk_text_btree_get_iter_at_mark (tree, &old_pos, mark->body.mark.obj); - redisplay_region (tree, &old_pos, where); + redisplay_region (tree, &old_pos, where, TRUE); } /* @@ -2533,9 +2776,13 @@ real_set_mark (GtkTextBTree *tree, } else { - mark = _gtk_mark_segment_new (tree, - left_gravity, - name); + if (existing_mark) + g_object_ref (existing_mark); + else + existing_mark = gtk_text_mark_new (name, left_gravity); + + mark = existing_mark->segment; + _gtk_mark_segment_set_tree (mark, tree); mark->body.mark.line = _gtk_text_iter_get_text_line (&iter); @@ -2545,7 +2792,7 @@ real_set_mark (GtkTextBTree *tree, mark); } - if (gtk_debug_flags & GTK_DEBUG_TEXT) + if (gtk_get_debug_flags () & GTK_DEBUG_TEXT) _gtk_text_iter_check (&iter); /* Link mark into new location */ @@ -2560,10 +2807,10 @@ real_set_mark (GtkTextBTree *tree, redisplay_mark_if_visible (mark); - if (gtk_debug_flags & GTK_DEBUG_TEXT) + if (gtk_get_debug_flags () & GTK_DEBUG_TEXT) _gtk_text_iter_check (&iter); - if (gtk_debug_flags & GTK_DEBUG_TEXT) + if (gtk_get_debug_flags () & GTK_DEBUG_TEXT) _gtk_text_btree_check (tree); return mark; @@ -2627,18 +2874,39 @@ void _gtk_text_btree_place_cursor (GtkTextBTree *tree, const GtkTextIter *iter) { - GtkTextIter start, end; + _gtk_text_btree_select_range (tree, iter, iter); +} + +void +_gtk_text_btree_select_range (GtkTextBTree *tree, + const GtkTextIter *ins, + const GtkTextIter *bound) +{ + GtkTextIter old_ins, old_bound; + + _gtk_text_btree_get_iter_at_mark (tree, &old_ins, + tree->insert_mark); + _gtk_text_btree_get_iter_at_mark (tree, &old_bound, + tree->selection_bound_mark); - if (_gtk_text_btree_get_selection_bounds (tree, &start, &end)) - redisplay_region (tree, &start, &end); + /* Check if it's no-op since gtk_text_buffer_place_cursor() + * also calls this, and this will redraw the cursor line. */ + if (!gtk_text_iter_equal (&old_ins, ins) || + !gtk_text_iter_equal (&old_bound, bound)) + { + redisplay_region (tree, &old_ins, &old_bound, TRUE); - /* Move insert AND selection_bound before we redisplay */ - real_set_mark (tree, tree->insert_mark, - "insert", FALSE, iter, TRUE, FALSE); - real_set_mark (tree, tree->selection_bound_mark, - "selection_bound", FALSE, iter, TRUE, FALSE); + /* Move insert AND selection_bound before we redisplay */ + real_set_mark (tree, tree->insert_mark, + "insert", FALSE, ins, TRUE, FALSE); + real_set_mark (tree, tree->selection_bound_mark, + "selection_bound", FALSE, bound, TRUE, FALSE); + + redisplay_region (tree, ins, bound, TRUE); + } } + void _gtk_text_btree_remove_mark_by_name (GtkTextBTree *tree, const gchar *name) @@ -2654,9 +2922,26 @@ _gtk_text_btree_remove_mark_by_name (GtkTextBTree *tree, _gtk_text_btree_remove_mark (tree, mark); } +void +_gtk_text_btree_release_mark_segment (GtkTextBTree *tree, + GtkTextLineSegment *segment) +{ + + if (segment->body.mark.name) + g_hash_table_remove (tree->mark_table, segment->body.mark.name); + + segment->body.mark.tree = NULL; + segment->body.mark.line = NULL; + + /* Remove the ref on the mark, which frees segment as a side effect + * if this is the last reference. + */ + g_object_unref (segment->body.mark.obj); +} + void _gtk_text_btree_remove_mark (GtkTextBTree *tree, - GtkTextMark *mark) + GtkTextMark *mark) { GtkTextLineSegment *segment; @@ -2673,34 +2958,39 @@ _gtk_text_btree_remove_mark (GtkTextBTree *tree, /* This calls cleanup_line and segments_changed */ gtk_text_btree_unlink_segment (tree, segment, segment->body.mark.line); - - if (segment->body.mark.name) - g_hash_table_remove (tree->mark_table, segment->body.mark.name); - - /* Remove the ref on the mark that belonged to the segment. */ - g_object_unref (G_OBJECT (mark)); - - segment->body.mark.tree = NULL; - segment->body.mark.line = NULL; + + _gtk_text_btree_release_mark_segment (tree, segment); } gboolean _gtk_text_btree_mark_is_insert (GtkTextBTree *tree, - GtkTextMark *segment) + GtkTextMark *segment) { return segment == tree->insert_mark; } gboolean _gtk_text_btree_mark_is_selection_bound (GtkTextBTree *tree, - GtkTextMark *segment) + GtkTextMark *segment) { return segment == tree->selection_bound_mark; } +GtkTextMark * +_gtk_text_btree_get_insert (GtkTextBTree *tree) +{ + return tree->insert_mark; +} + +GtkTextMark * +_gtk_text_btree_get_selection_bound (GtkTextBTree *tree) +{ + return tree->selection_bound_mark; +} + GtkTextMark* _gtk_text_btree_get_mark_by_name (GtkTextBTree *tree, - const gchar *name) + const gchar *name) { GtkTextLineSegment *seg; @@ -2740,7 +3030,8 @@ gtk_text_mark_set_visible (GtkTextMark *mark, { seg->body.mark.visible = setting; - redisplay_mark (seg); + if (seg->body.mark.tree) + redisplay_mark (seg); } } @@ -2856,7 +3147,7 @@ _gtk_text_btree_last_could_contain_tag (GtkTextBTree *tree, at least not without complexity. So, we just return the last line. */ - return _gtk_text_btree_get_line (tree, -1, NULL); + return _gtk_text_btree_get_end_iter_line (tree); } } @@ -3052,9 +3343,9 @@ find_toggle_outside_current_line (GtkTextLine *line, /* FIXME this function is far too slow, for no good reason. */ gboolean _gtk_text_line_char_has_tag (GtkTextLine *line, - GtkTextBTree *tree, - gint char_in_line, - GtkTextTag *tag) + GtkTextBTree *tree, + gint char_in_line, + GtkTextTag *tag) { GtkTextLineSegment *toggle_seg; @@ -3076,9 +3367,9 @@ _gtk_text_line_char_has_tag (GtkTextLine *line, gboolean _gtk_text_line_byte_has_tag (GtkTextLine *line, - GtkTextBTree *tree, - gint byte_in_line, - GtkTextTag *tag) + GtkTextBTree *tree, + gint byte_in_line, + GtkTextTag *tag) { GtkTextLineSegment *toggle_seg; @@ -3100,11 +3391,93 @@ _gtk_text_line_byte_has_tag (GtkTextLine *line, gboolean _gtk_text_line_is_last (GtkTextLine *line, - GtkTextBTree *tree) + GtkTextBTree *tree) { return line == get_last_line (tree); } +static void +ensure_end_iter_line (GtkTextBTree *tree) +{ + if (tree->end_iter_line_stamp != tree->chars_changed_stamp) + { + gint real_line; + + /* n_lines is without the magic line at the end */ + g_assert (_gtk_text_btree_line_count (tree) >= 1); + + tree->end_iter_line = _gtk_text_btree_get_line_no_last (tree, -1, &real_line); + + tree->end_iter_line_stamp = tree->chars_changed_stamp; + } +} + +static void +ensure_end_iter_segment (GtkTextBTree *tree) +{ + if (tree->end_iter_segment_stamp != tree->segments_changed_stamp) + { + GtkTextLineSegment *seg; + GtkTextLineSegment *last_with_chars; + + ensure_end_iter_line (tree); + + last_with_chars = NULL; + + seg = tree->end_iter_line->segments; + while (seg != NULL) + { + if (seg->char_count > 0) + last_with_chars = seg; + seg = seg->next; + } + + tree->end_iter_segment = last_with_chars; + + /* We know the last char in the last line is '\n' */ + tree->end_iter_segment_byte_index = last_with_chars->byte_count - 1; + tree->end_iter_segment_char_offset = last_with_chars->char_count - 1; + + tree->end_iter_segment_stamp = tree->segments_changed_stamp; + + g_assert (tree->end_iter_segment->type == >k_text_char_type); + g_assert (tree->end_iter_segment->body.chars[tree->end_iter_segment_byte_index] == '\n'); + } +} + +gboolean +_gtk_text_line_contains_end_iter (GtkTextLine *line, + GtkTextBTree *tree) +{ + ensure_end_iter_line (tree); + + return line == tree->end_iter_line; +} + +gboolean +_gtk_text_btree_is_end (GtkTextBTree *tree, + GtkTextLine *line, + GtkTextLineSegment *seg, + int byte_index, + int char_offset) +{ + g_return_val_if_fail (byte_index >= 0 || char_offset >= 0, FALSE); + + /* Do this first to avoid walking segments in most cases */ + if (!_gtk_text_line_contains_end_iter (line, tree)) + return FALSE; + + ensure_end_iter_segment (tree); + + if (seg != tree->end_iter_segment) + return FALSE; + + if (byte_index >= 0) + return byte_index == tree->end_iter_segment_byte_index; + else + return char_offset == tree->end_iter_segment_char_offset; +} + GtkTextLine* _gtk_text_line_next (GtkTextLine *line) { @@ -3140,6 +3513,23 @@ _gtk_text_line_next (GtkTextLine *line) } } +GtkTextLine* +_gtk_text_line_next_excluding_last (GtkTextLine *line) +{ + GtkTextLine *next; + + next = _gtk_text_line_next (line); + + /* If we were on the end iter line, we can't go to + * the last line + */ + if (next && next->next == NULL && /* these checks are optimization only */ + _gtk_text_line_next (next) == NULL) + return NULL; + + return next; +} + GtkTextLine* _gtk_text_line_previous (GtkTextLine *line) { @@ -3197,9 +3587,27 @@ _gtk_text_line_previous (GtkTextLine *line) return NULL; } + +GtkTextLineData* +_gtk_text_line_data_new (GtkTextLayout *layout, + GtkTextLine *line) +{ + GtkTextLineData *line_data; + + line_data = g_new (GtkTextLineData, 1); + + line_data->view_id = layout; + line_data->next = NULL; + line_data->width = 0; + line_data->height = 0; + line_data->valid = FALSE; + + return line_data; +} + void _gtk_text_line_add_data (GtkTextLine *line, - GtkTextLineData *data) + GtkTextLineData *data) { g_return_if_fail (line != NULL); g_return_if_fail (data != NULL); @@ -3251,7 +3659,7 @@ _gtk_text_line_remove_data (GtkTextLine *line, gpointer _gtk_text_line_get_data (GtkTextLine *line, - gpointer view_id) + gpointer view_id) { GtkTextLineData *iter; @@ -3419,9 +3827,9 @@ _gtk_text_line_byte_to_segment (GtkTextLine *line, while (offset >= seg->byte_count) { - g_assert (seg != NULL); /* means an invalid byte index */ offset -= seg->byte_count; seg = seg->next; + g_assert (seg != NULL); /* means an invalid byte index */ } if (seg_offset) @@ -3445,9 +3853,9 @@ _gtk_text_line_char_to_segment (GtkTextLine *line, while (offset >= seg->char_count) { - g_assert (seg != NULL); /* means an invalid char index */ offset -= seg->char_count; seg = seg->next; + g_assert (seg != NULL); /* means an invalid char index */ } if (seg_offset) @@ -3471,9 +3879,9 @@ _gtk_text_line_byte_to_any_segment (GtkTextLine *line, while (offset > 0 && offset >= seg->byte_count) { - g_assert (seg != NULL); /* means an invalid byte index */ offset -= seg->byte_count; seg = seg->next; + g_assert (seg != NULL); /* means an invalid byte index */ } if (seg_offset) @@ -3497,9 +3905,9 @@ _gtk_text_line_char_to_any_segment (GtkTextLine *line, while (offset > 0 && offset >= seg->char_count) { - g_assert (seg != NULL); /* means an invalid byte index */ offset -= seg->char_count; seg = seg->next; + g_assert (seg != NULL); /* means an invalid byte index */ } if (seg_offset) @@ -3523,12 +3931,10 @@ _gtk_text_line_byte_to_char (GtkTextLine *line, while (byte_offset >= seg->byte_count) /* while (we need to go farther than the next segment) */ { - g_assert (seg != NULL); /* our byte_index was bogus if this happens */ - byte_offset -= seg->byte_count; char_offset += seg->char_count; - seg = seg->next; + g_assert (seg != NULL); /* our byte_index was bogus if this happens */ } g_assert (seg != NULL); @@ -3572,7 +3978,6 @@ _gtk_text_line_byte_locate (GtkTextLine *line, gint *line_byte_offset) { GtkTextLineSegment *seg; - GtkTextLineSegment *after_prev_indexable; GtkTextLineSegment *after_last_indexable; GtkTextLineSegment *last_indexable; gint offset; @@ -3589,7 +3994,6 @@ _gtk_text_line_byte_locate (GtkTextLine *line, last_indexable = NULL; after_last_indexable = line->segments; - after_prev_indexable = line->segments; seg = line->segments; /* The loop ends when we're inside a segment; @@ -3602,7 +4006,6 @@ _gtk_text_line_byte_locate (GtkTextLine *line, offset -= seg->byte_count; bytes_in_line += seg->byte_count; last_indexable = seg; - after_prev_indexable = after_last_indexable; after_last_indexable = last_indexable->next; } @@ -3652,7 +4055,6 @@ _gtk_text_line_char_locate (GtkTextLine *line, gint *line_char_offset) { GtkTextLineSegment *seg; - GtkTextLineSegment *after_prev_indexable; GtkTextLineSegment *after_last_indexable; GtkTextLineSegment *last_indexable; gint offset; @@ -3669,7 +4071,6 @@ _gtk_text_line_char_locate (GtkTextLine *line, last_indexable = NULL; after_last_indexable = line->segments; - after_prev_indexable = line->segments; seg = line->segments; /* The loop ends when we're inside a segment; @@ -3682,7 +4083,6 @@ _gtk_text_line_char_locate (GtkTextLine *line, offset -= seg->char_count; chars_in_line += seg->char_count; last_indexable = seg; - after_prev_indexable = after_last_indexable; after_last_indexable = last_indexable->next; } @@ -3799,16 +4199,16 @@ _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; - } + /* if in the last fourth of the segment walk backwards */ + if (seg->char_count - offset < seg->char_count / 4) + p = g_utf8_offset_to_pointer (seg->body.chars + seg->byte_count, + offset - seg->char_count); + else + 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); @@ -3918,9 +4318,9 @@ node_compare (GtkTextBTreeNode *lhs, /* remember that tag == NULL means "any tag" */ GtkTextLine* -_gtk_text_line_next_could_contain_tag (GtkTextLine *line, - GtkTextBTree *tree, - GtkTextTag *tag) +_gtk_text_line_next_could_contain_tag (GtkTextLine *line, + GtkTextBTree *tree, + GtkTextTag *tag) { GtkTextBTreeNode *node; GtkTextTagInfo *info; @@ -3928,7 +4328,7 @@ _gtk_text_line_next_could_contain_tag (GtkTextLine *line, g_return_val_if_fail (line != NULL, NULL); - if (gtk_debug_flags & GTK_DEBUG_TEXT) + if (gtk_get_debug_flags () & GTK_DEBUG_TEXT) _gtk_text_btree_check (tree); if (tag == NULL) @@ -3936,17 +4336,17 @@ _gtk_text_line_next_could_contain_tag (GtkTextLine *line, /* Right now we can only offer linear-search if the user wants * to know about any tag toggle at all. */ - return _gtk_text_line_next (line); + return _gtk_text_line_next_excluding_last (line); } /* Our tag summaries only have node precision, not line - precision. This means that if any line under a node could contain a - tag, then any of the others could also contain a tag. - - In the future we could have some mechanism to keep track of how - many toggles we've found under a node so far, since we have a - count of toggles under the node. But for now I'm going with KISS. - */ + * precision. This means that if any line under a node could contain a + * tag, then any of the others could also contain a tag. + * + * In the future we could have some mechanism to keep track of how + * many toggles we've found under a node so far, since we have a + * count of toggles under the node. But for now I'm going with KISS. + */ /* return same-node line, if any. */ if (line->next) @@ -4091,7 +4491,7 @@ _gtk_text_line_previous_could_contain_tag (GtkTextLine *line, g_return_val_if_fail (line != NULL, NULL); - if (gtk_debug_flags & GTK_DEBUG_TEXT) + if (gtk_get_debug_flags () & GTK_DEBUG_TEXT) _gtk_text_btree_check (tree); if (tag == NULL) @@ -4146,9 +4546,7 @@ _gtk_text_line_previous_could_contain_tag (GtkTextLine *line, line_ancestor = line->parent; line_ancestor_parent = line->parent->parent; - node = line_ancestor_parent->children.node; - while (node != line_ancestor && - line_ancestor != info->tag_root) + while (line_ancestor != info->tag_root) { GSList *child_nodes = NULL; GSList *tmp; @@ -4156,8 +4554,12 @@ _gtk_text_line_previous_could_contain_tag (GtkTextLine *line, /* Create reverse-order list of nodes before * line_ancestor */ - while (node != line_ancestor - && node != NULL) + if (line_ancestor_parent != NULL) + node = line_ancestor_parent->children.node; + else + node = line_ancestor; + + while (node != line_ancestor && node != NULL) { child_nodes = g_slist_prepend (child_nodes, node); @@ -4187,8 +4589,6 @@ _gtk_text_line_previous_could_contain_tag (GtkTextLine *line, /* Didn't find anything on this level; go up one level. */ line_ancestor = line_ancestor_parent; line_ancestor_parent = line_ancestor->parent; - - node = line_ancestor_parent->children.node; } /* No dice. */ @@ -4286,19 +4686,13 @@ _gtk_text_line_previous_could_contain_tag (GtkTextLine *line, static void summary_list_destroy (Summary *summary) { - Summary *next; - while (summary != NULL) - { - next = summary->next; - summary_destroy (summary); - summary = next; - } + g_slice_free_chain (Summary, summary, next); } static GtkTextLine* get_last_line (GtkTextBTree *tree) { - if (tree->end_iter_line_stamp != tree->chars_changed_stamp) + if (tree->last_line_stamp != tree->chars_changed_stamp) { gint n_lines; GtkTextLine *line; @@ -4310,11 +4704,11 @@ get_last_line (GtkTextBTree *tree) line = _gtk_text_btree_get_line (tree, n_lines, &real_line); - tree->end_iter_line_stamp = tree->chars_changed_stamp; - tree->end_iter_line = line; + tree->last_line_stamp = tree->chars_changed_stamp; + tree->last_line = line; } - return tree->end_iter_line; + return tree->last_line; } /* @@ -4326,7 +4720,10 @@ gtk_text_line_new (void) { GtkTextLine *line; - line = g_new0(GtkTextLine, 1); + line = g_slice_new0 (GtkTextLine); + line->dir_strong = PANGO_DIRECTION_NEUTRAL; + line->dir_propagated_forward = PANGO_DIRECTION_NEUTRAL; + line->dir_propagated_back = PANGO_DIRECTION_NEUTRAL; return line; } @@ -4354,7 +4751,7 @@ gtk_text_line_destroy (GtkTextBTree *tree, GtkTextLine *line) ld = next; } - g_free (line); + g_slice_free (GtkTextLine, line); } static void @@ -4387,16 +4784,20 @@ cleanup_line (GtkTextLine *line) while (changed) { changed = FALSE; - for (prev_p = &line->segments, seg = *prev_p; - seg != NULL; - prev_p = &(*prev_p)->next, seg = *prev_p) + prev_p = &line->segments; + for (seg = *prev_p; seg != NULL; seg = *prev_p) { if (seg->type->cleanupFunc != NULL) { *prev_p = (*seg->type->cleanupFunc)(seg, line); if (seg != *prev_p) - changed = TRUE; + { + changed = TRUE; + continue; + } } + + prev_p = &(*prev_p)->next; } } } @@ -4410,7 +4811,7 @@ node_data_new (gpointer view_id) { NodeData *nd; - nd = g_new (NodeData, 1); + nd = g_slice_new (NodeData); nd->view_id = view_id; nd->next = NULL; @@ -4424,26 +4825,18 @@ node_data_new (gpointer view_id) static void node_data_destroy (NodeData *nd) { - g_free (nd); + g_slice_free (NodeData, nd); } static void node_data_list_destroy (NodeData *nd) { - NodeData *iter; - NodeData *next; - - iter = nd; - while (iter != NULL) - { - next = iter->next; - node_data_destroy (iter); - iter = next; - } + g_slice_free_chain (NodeData, nd, next); } static NodeData* -node_data_find (NodeData *nd, gpointer view_id) +node_data_find (NodeData *nd, + gpointer view_id) { while (nd != NULL) { @@ -4461,7 +4854,7 @@ summary_destroy (Summary *summary) summary->info = (void*)0x1; summary->toggle_count = 567; summary->next = (void*)0x1; - g_free (summary); + g_slice_free (Summary, summary); } static GtkTextBTreeNode* @@ -4469,7 +4862,7 @@ gtk_text_btree_node_new (void) { GtkTextBTreeNode *node; - node = g_new (GtkTextBTreeNode, 1); + node = g_slice_new (GtkTextBTreeNode); node->node_data = NULL; @@ -4499,7 +4892,7 @@ gtk_text_btree_node_adjust_toggle_count (GtkTextBTreeNode *node, { /* didn't find a summary for our tag. */ g_return_if_fail (adjust > 0); - summary = g_new (Summary, 1); + summary = g_slice_new (Summary); summary->info = info; summary->toggle_count = adjust; summary->next = node->summary; @@ -4529,6 +4922,7 @@ gtk_text_btree_node_has_tag (GtkTextBTreeNode *node, GtkTextTag *tag) } /* Add node and all children to the damage region. */ +#if 0 static void gtk_text_btree_node_invalidate_downward (GtkTextBTreeNode *node) { @@ -4574,6 +4968,7 @@ gtk_text_btree_node_invalidate_downward (GtkTextBTreeNode *node) } } } +#endif static void gtk_text_btree_node_invalidate_upward (GtkTextBTreeNode *node, gpointer view_id) @@ -4868,7 +5263,7 @@ _gtk_text_btree_validate (GtkTextBTree *tree, if (new_height) *new_height = state.new_height; - if (gtk_debug_flags & GTK_DEBUG_TEXT) + if (gtk_get_debug_flags () & GTK_DEBUG_TEXT) _gtk_text_btree_check (tree); return TRUE; @@ -5089,14 +5484,7 @@ gtk_text_btree_node_destroy (GtkTextBTree *tree, GtkTextBTreeNode *node) seg = line->segments; line->segments = seg->next; - if (GTK_IS_TEXT_MARK_SEGMENT (seg)) - { - /* Set the mark as deleted */ - seg->body.mark.tree = NULL; - seg->body.mark.line = NULL; - } - - (*seg->type->deleteFunc) (seg, line, 1); + (*seg->type->deleteFunc) (seg, line, TRUE); } gtk_text_line_destroy (tree, line); } @@ -5125,7 +5513,7 @@ gtk_text_btree_node_free_empty (GtkTextBTree *tree, summary_list_destroy (node->summary); node_data_list_destroy (node->node_data); - g_free (node); + g_slice_free (GtkTextBTreeNode, node); } static NodeData* @@ -5273,8 +5661,8 @@ tag_changed_cb (GtkTextTagTable *table, { /* Must be a last toggle if there was a first one. */ _gtk_text_btree_get_iter_at_last_toggle (tree, &end, tag); - _gtk_text_btree_invalidate_region (tree, - &start, &end); + DV (g_print ("invalidating due to tag change (%s)\n", G_STRLOC)); + _gtk_text_btree_invalidate_region (tree, &start, &end, FALSE); } } @@ -5297,10 +5685,9 @@ tag_changed_cb (GtkTextTagTable *table, } } -static void -tag_removed_cb (GtkTextTagTable *table, - GtkTextTag *tag, - GtkTextBTree *tree) +void +_gtk_text_btree_notify_will_remove_tag (GtkTextBTree *tree, + GtkTextTag *tag) { /* Remove the tag from the tree */ @@ -5585,7 +5972,7 @@ post_insert_fixup (GtkTextBTree *tree, gtk_text_btree_rebalance (tree, node); } - if (gtk_debug_flags & GTK_DEBUG_TEXT) + if (gtk_get_debug_flags () & GTK_DEBUG_TEXT) _gtk_text_btree_check (tree); } @@ -5622,14 +6009,20 @@ gtk_text_btree_get_tag_info (GtkTextBTree *tree, { /* didn't find it, create. */ - info = g_new (GtkTextTagInfo, 1); + info = g_slice_new (GtkTextTagInfo); info->tag = tag; - g_object_ref (G_OBJECT (tag)); + g_object_ref (tag); info->tag_root = NULL; info->toggle_count = 0; tree->tag_infos = g_slist_prepend (tree->tag_infos, info); + +#if 0 + g_print ("Created tag info %p for tag %s(%p)\n", + info, info->tag->name ? info->tag->name : "anon", + info->tag); +#endif } return info; @@ -5650,6 +6043,12 @@ gtk_text_btree_remove_tag_info (GtkTextBTree *tree, info = list->data; if (info->tag == tag) { +#if 0 + g_print ("Removing tag info %p for tag %s(%p)\n", + info, info->tag->name ? info->tag->name : "anon", + info->tag); +#endif + if (prev != NULL) { prev->next = list->next; @@ -5661,17 +6060,15 @@ gtk_text_btree_remove_tag_info (GtkTextBTree *tree, list->next = NULL; g_slist_free (list); - g_object_unref (G_OBJECT (info->tag)); + g_object_unref (info->tag); - g_free (info); + g_slice_free (GtkTextTagInfo, info); return; } + prev = list; list = g_slist_next (list); } - - g_assert_not_reached (); - return; } static void @@ -5965,7 +6362,7 @@ _gtk_change_node_toggle_count (GtkTextBTreeNode *node, */ GtkTextBTreeNode *rootnode = info->tag_root; - summary = (Summary *) g_malloc (sizeof (Summary)); + summary = g_slice_new (Summary); summary->info = info; summary->toggle_count = info->toggle_count - delta; summary->next = rootnode->summary; @@ -5974,7 +6371,7 @@ _gtk_change_node_toggle_count (GtkTextBTreeNode *node, rootLevel = rootnode->level; info->tag_root = rootnode; } - summary = (Summary *) g_malloc (sizeof (Summary)); + summary = g_slice_new (Summary); summary->info = info; summary->toggle_count = delta; summary->next = node->summary; @@ -6141,7 +6538,7 @@ gtk_text_btree_link_segment (GtkTextLineSegment *seg, cleanup_line (line); segments_changed (tree); - if (gtk_debug_flags & GTK_DEBUG_TEXT) + if (gtk_get_debug_flags () & GTK_DEBUG_TEXT) _gtk_text_btree_check (tree); } @@ -6263,9 +6660,20 @@ gtk_text_btree_node_view_check_consistency (GtkTextBTree *tree, gtk_text_btree_node_compute_view_aggregates (node, nd->view_id, &width, &height, &valid); + + /* valid aggregate not checked the same as width/height, because on + * btree rebalance we can have invalid nodes where all lines below + * them are actually valid, due to moving lines around between + * nodes. + * + * The guarantee is that if there are invalid lines the node is + * invalid - we don't guarantee that if the node is invalid there + * are invalid lines. + */ + if (nd->width != width || nd->height != height || - !nd->valid != !valid) + (nd->valid && !valid)) { g_error ("Node aggregates for view %p are invalid:\n" "Are (%d,%d,%s), should be (%d,%d,%s)", @@ -6391,7 +6799,7 @@ gtk_text_btree_node_check_consistency (GtkTextBTree *tree, break; } g_error ("gtk_text_btree_node_check_consistency: GtkTextBTreeNode tag \"%s\" not %s", - summary->info->tag->name, + summary->info->tag->priv->name, "present in parent summaries"); } if (summary->info == summary2->info) @@ -6427,7 +6835,7 @@ gtk_text_btree_node_check_consistency (GtkTextBTree *tree, if (summary->info->toggle_count == summary->toggle_count) { g_error ("gtk_text_btree_node_check_consistency: found unpruned root for \"%s\"", - summary->info->tag->name); + summary->info->tag->priv->name); } toggle_count = 0; if (node->level == 0) @@ -6481,7 +6889,7 @@ gtk_text_btree_node_check_consistency (GtkTextBTree *tree, if (summary2->info == summary->info) { g_error ("gtk_text_btree_node_check_consistency: duplicated GtkTextBTreeNode tag: %s", - summary->info->tag->name); + summary->info->tag->priv->name); } } } @@ -6513,15 +6921,15 @@ _gtk_text_btree_check (GtkTextBTree *tree) GtkTextLine *line; GtkTextLineSegment *seg; GtkTextTag *tag; - GSList *taglist = NULL; + GSList *all_tags, *taglist = NULL; int count; GtkTextTagInfo *info; /* * Make sure that the tag toggle counts and the tag root pointers are OK. */ - for (taglist = list_of_tags (tree->table); - taglist != NULL ; taglist = taglist->next) + all_tags = list_of_tags (tree->table); + for (taglist = all_tags; taglist != NULL ; taglist = taglist->next) { tag = taglist->data; info = gtk_text_btree_get_existing_tag_info (tree, tag); @@ -6533,19 +6941,19 @@ _gtk_text_btree_check (GtkTextBTree *tree) if (info->toggle_count != 0) { g_error ("_gtk_text_btree_check found \"%s\" with toggles (%d) but no root", - tag->name, info->toggle_count); + tag->priv->name, info->toggle_count); } continue; /* no ranges for the tag */ } else if (info->toggle_count == 0) { g_error ("_gtk_text_btree_check found root for \"%s\" with no toggles", - tag->name); + tag->priv->name); } else if (info->toggle_count & 1) { g_error ("_gtk_text_btree_check found odd toggle count for \"%s\" (%d)", - tag->name, info->toggle_count); + tag->priv->name, info->toggle_count); } for (summary = node->summary; summary != NULL; summary = summary->next) @@ -6573,7 +6981,7 @@ _gtk_text_btree_check (GtkTextBTree *tree) } else { - GtkTextLineSegmentClass * last = NULL; + const GtkTextLineSegmentClass *last = NULL; for (line = node->children.line ; line != NULL ; line = line->next) @@ -6600,13 +7008,12 @@ _gtk_text_btree_check (GtkTextBTree *tree) if (count != info->toggle_count) { g_error ("_gtk_text_btree_check toggle_count (%d) wrong for \"%s\" should be (%d)", - info->toggle_count, tag->name, count); + info->toggle_count, tag->priv->name, count); } } } - g_slist_free (taglist); - taglist = NULL; + g_slist_free (all_tags); /* * Call a recursive procedure to do the main body of checks. @@ -6710,7 +7117,7 @@ _gtk_text_btree_spew (GtkTextBTree *tree) info = list->data; printf (" tag `%s': root at %p, toggle count %d\n", - info->tag->name, info->tag_root, info->toggle_count); + info->tag->priv->name, info->tag_root, info->toggle_count); list = g_slist_next (list); } @@ -6776,7 +7183,7 @@ _gtk_text_btree_spew_line_short (GtkTextLine *line, int indent) seg->type == >k_text_toggle_off_type) { printf ("%s tag `%s' %s\n", - spaces, seg->body.toggle.info->tag->name, + spaces, seg->body.toggle.info->tag->priv->name, seg->type == >k_text_toggle_off_type ? "off" : "on"); } @@ -6803,7 +7210,7 @@ _gtk_text_btree_spew_node (GtkTextBTreeNode *node, int indent) while (s) { printf ("%s %d toggles of `%s' below this node\n", - spaces, s->toggle_count, s->info->tag->name); + spaces, s->toggle_count, s->info->tag->priv->name); s = s->next; } @@ -6878,9 +7285,7 @@ _gtk_text_btree_spew_segment (GtkTextBTree* tree, GtkTextLineSegment * seg) seg->type == >k_text_toggle_off_type) { printf (" tag `%s' priority %d\n", - seg->body.toggle.info->tag->name, - seg->body.toggle.info->tag->priority); + seg->body.toggle.info->tag->priv->name, + seg->body.toggle.info->tag->priv->priority); } } - -