*/
#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
-#include <config.h>
+#include "config.h"
#include "gtkmarshalers.h"
#include "gtktextlayout.h"
#include "gtktextbtree.h"
#include "gtktextiterprivate.h"
+#include "gtktextutil.h"
#include "gtkintl.h"
#include "gtkalias.h"
static void gtk_text_layout_real_invalidate (GtkTextLayout *layout,
const GtkTextIter *start,
const GtkTextIter *end);
+static void gtk_text_layout_real_invalidate_cursors(GtkTextLayout *layout,
+ const GtkTextIter *start,
+ const GtkTextIter *end);
static void gtk_text_layout_invalidate_cache (GtkTextLayout *layout,
- GtkTextLine *line);
-static void gtk_text_layout_invalidate_cursor_line (GtkTextLayout *layout);
+ GtkTextLine *line,
+ gboolean cursors_only);
+static void gtk_text_layout_invalidate_cursor_line (GtkTextLayout *layout,
+ gboolean cursors_only);
static void gtk_text_layout_real_free_line_data (GtkTextLayout *layout,
GtkTextLine *line,
GtkTextLineData *line_data);
klass->wrap = gtk_text_layout_real_wrap;
klass->invalidate = gtk_text_layout_real_invalidate;
+ klass->invalidate_cursors = gtk_text_layout_real_invalidate_cursors;
klass->free_line_data = gtk_text_layout_real_free_line_data;
signals[INVALIDATED] =
G_TYPE_INT);
signals[ALLOCATE_CHILD] =
- g_signal_new (I_("allocate_child"),
+ g_signal_new (I_("allocate-child"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextLayoutClass, allocate_child),
}
- (* G_OBJECT_CLASS (gtk_text_layout_parent_class)->finalize) (object);
+ G_OBJECT_CLASS (gtk_text_layout_parent_class)->finalize (object);
}
void
_gtk_text_btree_add_view (_gtk_text_buffer_get_btree (buffer), layout);
/* Bind to all signals that move the insert mark. */
- g_signal_connect_after (layout->buffer, "mark_set",
+ g_signal_connect_after (layout->buffer, "mark-set",
G_CALLBACK (gtk_text_layout_mark_set_handler), layout);
- g_signal_connect_after (layout->buffer, "insert_text",
+ g_signal_connect_after (layout->buffer, "insert-text",
G_CALLBACK (gtk_text_layout_buffer_insert_text), layout);
- g_signal_connect_after (layout->buffer, "delete_range",
+ g_signal_connect_after (layout->buffer, "delete-range",
G_CALLBACK (gtk_text_layout_buffer_delete_range), layout);
gtk_text_layout_update_cursor_line (layout);
gtk_text_layout_invalidate_all (layout);
}
+/**
+ * gtk_text_layout_set_overwrite_mode:
+ * @layout: a #GtkTextLayout
+ * @overwrite: overwrite mode
+ *
+ * Sets overwrite mode
+ **/
+void
+gtk_text_layout_set_overwrite_mode (GtkTextLayout *layout,
+ gboolean overwrite)
+{
+ overwrite = overwrite != 0;
+ if (overwrite != layout->overwrite_mode)
+ {
+ layout->overwrite_mode = overwrite;
+ gtk_text_layout_invalidate_cursor_line (layout, TRUE);
+ }
+}
+
/**
* gtk_text_layout_set_cursor_direction:
* @direction: the new direction(s) for which to draw cursors.
if (direction != layout->cursor_direction)
{
layout->cursor_direction = direction;
- gtk_text_layout_invalidate_cursor_line (layout);
+ gtk_text_layout_invalidate_cursor_line (layout, TRUE);
}
}
if (keyboard_dir != layout->keyboard_direction)
{
layout->keyboard_direction = keyboard_dir;
- gtk_text_layout_invalidate_cursor_line (layout);
+ gtk_text_layout_invalidate_cursor_line (layout, TRUE);
}
}
/* Now queue a redraw on the paragraph containing the cursor
*/
gtk_text_buffer_get_iter_at_mark (layout->buffer, &iter,
- gtk_text_buffer_get_mark (layout->buffer, "insert"));
+ gtk_text_buffer_get_insert (layout->buffer));
gtk_text_layout_get_line_yrange (layout, &iter, &y, &height);
gtk_text_layout_emit_changed (layout, y, height, height);
- gtk_text_layout_invalidate_cache (layout, _gtk_text_iter_get_text_line (&iter));
+ gtk_text_layout_invalidate_cache (layout, _gtk_text_iter_get_text_line (&iter), TRUE);
}
}
g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
g_return_if_fail (preedit_attrs != NULL || preedit_string == NULL);
- if (layout->preedit_string)
- g_free (layout->preedit_string);
+ g_free (layout->preedit_string);
if (layout->preedit_attrs)
pango_attr_list_unref (layout->preedit_attrs);
layout->preedit_cursor = 0;
}
- gtk_text_layout_invalidate_cursor_line (layout);
+ gtk_text_layout_invalidate_cursor_line (layout, FALSE);
}
void
g_signal_emit (layout, signals[CHANGED], 0, y, old_height, new_height);
}
-void
-gtk_text_layout_changed (GtkTextLayout *layout,
- gint y,
- gint old_height,
- gint new_height)
+static void
+text_layout_changed (GtkTextLayout *layout,
+ gint y,
+ gint old_height,
+ gint new_height,
+ gboolean cursors_only)
{
/* Check if the range intersects our cached line display,
* and invalidate the cached line if so.
gint cache_height = layout->one_display_cache->height;
if (cache_y + cache_height > y && cache_y < y + old_height)
- gtk_text_layout_invalidate_cache (layout, line);
+ gtk_text_layout_invalidate_cache (layout, line, cursors_only);
}
-
+
gtk_text_layout_emit_changed (layout, y, old_height, new_height);
}
+void
+gtk_text_layout_changed (GtkTextLayout *layout,
+ gint y,
+ gint old_height,
+ gint new_height)
+{
+ text_layout_changed (layout, y, old_height, new_height, FALSE);
+}
+
+void
+gtk_text_layout_cursors_changed (GtkTextLayout *layout,
+ gint y,
+ gint old_height,
+ gint new_height)
+{
+ text_layout_changed (layout, y, old_height, new_height, TRUE);
+}
+
void
gtk_text_layout_free_line_data (GtkTextLayout *layout,
GtkTextLine *line,
GtkTextLineData *line_data)
{
- (* GTK_TEXT_LAYOUT_GET_CLASS (layout)->free_line_data)
- (layout, line, line_data);
+ GTK_TEXT_LAYOUT_GET_CLASS (layout)->free_line_data (layout, line, line_data);
}
void
const GtkTextIter *start_index,
const GtkTextIter *end_index)
{
- (* GTK_TEXT_LAYOUT_GET_CLASS (layout)->invalidate)
- (layout, start_index, end_index);
+ GTK_TEXT_LAYOUT_GET_CLASS (layout)->invalidate (layout, start_index, end_index);
+}
+
+void
+gtk_text_layout_invalidate_cursors (GtkTextLayout *layout,
+ const GtkTextIter *start_index,
+ const GtkTextIter *end_index)
+{
+ GTK_TEXT_LAYOUT_GET_CLASS (layout)->invalidate_cursors (layout, start_index, end_index);
}
GtkTextLineData*
/* may be NULL */
GtkTextLineData *line_data)
{
- return (* GTK_TEXT_LAYOUT_GET_CLASS (layout)->wrap) (layout, line, line_data);
+ return GTK_TEXT_LAYOUT_GET_CLASS (layout)->wrap (layout, line, line_data);
}
GSList*
static void
gtk_text_layout_invalidate_cache (GtkTextLayout *layout,
- GtkTextLine *line)
+ GtkTextLine *line,
+ gboolean cursors_only)
{
if (layout->one_display_cache && line == layout->one_display_cache->line)
{
- GtkTextLineDisplay *tmp_display = layout->one_display_cache;
- layout->one_display_cache = NULL;
- gtk_text_layout_free_line_display (layout, tmp_display);
+ GtkTextLineDisplay *display = layout->one_display_cache;
+
+ if (cursors_only)
+ {
+ g_slist_foreach (display->cursors, (GFunc)g_free, NULL);
+ g_slist_free (display->cursors);
+ display->cursors = NULL;
+ display->cursors_invalid = TRUE;
+ display->has_block_cursor = FALSE;
+ }
+ else
+ {
+ layout->one_display_cache = NULL;
+ gtk_text_layout_free_line_display (layout, display);
+ }
}
}
/* Now invalidate the paragraph containing the cursor
*/
static void
-gtk_text_layout_invalidate_cursor_line (GtkTextLayout *layout)
+gtk_text_layout_invalidate_cursor_line (GtkTextLayout *layout,
+ gboolean cursors_only)
{
GtkTextLayoutPrivate *priv = GTK_TEXT_LAYOUT_GET_PRIVATE (layout);
GtkTextLineData *line_data;
line_data = _gtk_text_line_get_data (priv->cursor_line, layout);
if (line_data)
{
- gtk_text_layout_invalidate_cache (layout, priv->cursor_line);
- _gtk_text_line_invalidate_wrap (priv->cursor_line, line_data);
+ if (cursors_only)
+ gtk_text_layout_invalidate_cache (layout, priv->cursor_line, TRUE);
+ else
+ {
+ gtk_text_layout_invalidate_cache (layout, priv->cursor_line, FALSE);
+ _gtk_text_line_invalidate_wrap (priv->cursor_line, line_data);
+ }
+
gtk_text_layout_invalidated (layout);
}
}
GtkTextIter iter;
gtk_text_buffer_get_iter_at_mark (layout->buffer, &iter,
- gtk_text_buffer_get_mark (layout->buffer, "insert"));
-
+ gtk_text_buffer_get_insert (layout->buffer));
+
priv->cursor_line = _gtk_text_iter_get_text_line (&iter);
}
{
GtkTextLineData *line_data = _gtk_text_line_get_data (line, layout);
- gtk_text_layout_invalidate_cache (layout, line);
+ gtk_text_layout_invalidate_cache (layout, line, FALSE);
if (line_data)
_gtk_text_line_invalidate_wrap (line, line_data);
gtk_text_layout_invalidated (layout);
}
+static void
+gtk_text_layout_real_invalidate_cursors (GtkTextLayout *layout,
+ const GtkTextIter *start,
+ const GtkTextIter *end)
+{
+ /* Check if the range intersects our cached line display,
+ * and invalidate the cached line if so.
+ */
+ if (layout->one_display_cache)
+ {
+ GtkTextIter line_start, line_end;
+ GtkTextLine *line = layout->one_display_cache->line;
+
+ _gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
+ &line_start, line, 0);
+ line_end = line_start;
+ if (!gtk_text_iter_ends_line (&line_end))
+ gtk_text_iter_forward_to_line_end (&line_end);
+
+ if (gtk_text_iter_compare (start, end) > 0)
+ {
+ const GtkTextIter *tmp = start;
+ start = end;
+ end = tmp;
+ }
+
+ if (gtk_text_iter_compare (&line_start, end) <= 0 &&
+ gtk_text_iter_compare (start, &line_end) <= 0)
+ {
+ gtk_text_layout_invalidate_cache (layout, line, TRUE);
+ }
+ }
+
+ gtk_text_layout_invalidated (layout);
+}
+
static void
gtk_text_layout_real_free_line_data (GtkTextLayout *layout,
GtkTextLine *line,
GtkTextLineData *line_data)
{
- gtk_text_layout_invalidate_cache (layout, line);
+ gtk_text_layout_invalidate_cache (layout, line, FALSE);
g_free (line_data);
}
-
-
/**
* gtk_text_layout_is_valid:
* @layout: a #GtkTextLayout
release_style () to free it. */
static GtkTextAttributes*
get_style (GtkTextLayout *layout,
- const GtkTextIter *iter)
+ GPtrArray *tags)
{
- GtkTextTag** tags;
- gint tag_count = 0;
GtkTextAttributes *style;
/* If we have the one-style cache, then it means
g_assert (layout->one_style_cache == NULL);
- /* Get the tags at this spot */
- tags = _gtk_text_btree_get_tags (iter, &tag_count);
-
/* No tags, use default style */
- if (tags == NULL || tag_count == 0)
+ if (tags == NULL || tags->len == 0)
{
/* One ref for the return value, one ref for the
layout->one_style_cache reference */
gtk_text_attributes_ref (layout->default_style);
layout->one_style_cache = layout->default_style;
- if (tags)
- g_free (tags);
-
return layout->default_style;
}
- /* Sort tags in ascending order of priority */
- _gtk_text_tag_array_sort (tags, tag_count);
-
style = gtk_text_attributes_new ();
gtk_text_attributes_copy_values (layout->default_style,
style);
_gtk_text_attributes_fill_from_tags (style,
- tags,
- tag_count);
-
- g_free (tags);
+ (GtkTextTag**) tags->pdata,
+ tags->len);
g_assert (style->refcount == 1);
GtkTextLineDisplay *display)
{
PangoAlignment pango_align = PANGO_ALIGN_LEFT;
- int layout_width;
+ PangoWrapMode pango_wrap = PANGO_WRAP_WORD;
switch (base_dir)
{
pango_align = PANGO_ALIGN_CENTER;
break;
case GTK_JUSTIFY_FILL:
- g_warning ("FIXME we don't support GTK_JUSTIFY_FILL yet");
+ pango_align = (base_dir == PANGO_DIRECTION_LTR) ? PANGO_ALIGN_LEFT : PANGO_ALIGN_RIGHT;
+ pango_layout_set_justify (display->layout, TRUE);
break;
default:
g_assert_not_reached ();
switch (style->wrap_mode)
{
case GTK_WRAP_CHAR:
- layout_width = layout->screen_width - display->left_margin - display->right_margin;
- pango_layout_set_width (display->layout, layout_width * PANGO_SCALE);
- pango_layout_set_wrap (display->layout, PANGO_WRAP_CHAR);
+ pango_wrap = PANGO_WRAP_CHAR;
break;
case GTK_WRAP_WORD:
- layout_width = layout->screen_width - display->left_margin - display->right_margin;
- pango_layout_set_width (display->layout, layout_width * PANGO_SCALE);
- pango_layout_set_wrap (display->layout, PANGO_WRAP_WORD);
+ pango_wrap = PANGO_WRAP_WORD;
break;
case GTK_WRAP_WORD_CHAR:
- layout_width = layout->screen_width - display->left_margin - display->right_margin;
- pango_layout_set_width (display->layout, layout_width * PANGO_SCALE);
- pango_layout_set_wrap (display->layout, PANGO_WRAP_WORD_CHAR);
+ pango_wrap = PANGO_WRAP_WORD_CHAR;
break;
case GTK_WRAP_NONE:
break;
}
+ if (style->wrap_mode != GTK_WRAP_NONE)
+ {
+ int layout_width = (layout->screen_width - display->left_margin - display->right_margin);
+ pango_layout_set_width (display->layout, layout_width * PANGO_SCALE);
+ pango_layout_set_wrap (display->layout, pango_wrap);
+ }
+
display->total_width = MAX (layout->screen_width, layout->width) - display->left_margin - display->right_margin;
if (style->pg_bg_color)
appearance1->underline == appearance2->underline &&
appearance1->strikethrough == appearance2->strikethrough &&
appearance1->draw_bg == appearance2->draw_bg);
-
}
/**
return (PangoAttribute *)result;
}
-
static void
add_generic_attrs (GtkTextLayout *layout,
GtkTextAppearance *appearance,
pango_attr_list_insert (attrs, attr);
}
+/**
+ * get_block_cursor:
+ * @layout: a #GtkTextLayout
+ * @display: a #GtkTextLineDisplay
+ * @insert_iter: iter pointing to the cursor location
+ * @insert_index: cursor offset in the @display's layout, it may
+ * be different from @insert_iter's offset in case when preedit
+ * string is present.
+ * @pos: location to store cursor position
+ * @cursor_at_line_end: whether cursor is at the end of line
+ *
+ * Checks whether layout should display block cursor at given position.
+ * For this layout must be in overwrite mode and text at @insert_iter
+ * must be editable.
+ **/
+static gboolean
+get_block_cursor (GtkTextLayout *layout,
+ GtkTextLineDisplay *display,
+ const GtkTextIter *insert_iter,
+ gint insert_index,
+ GdkRectangle *pos,
+ gboolean *cursor_at_line_end)
+{
+ PangoRectangle pango_pos;
+
+ if (layout->overwrite_mode &&
+ gtk_text_iter_editable (insert_iter, TRUE) &&
+ _gtk_text_util_get_block_cursor_location (display->layout,
+ insert_index,
+ &pango_pos,
+ cursor_at_line_end))
+ {
+ if (pos)
+ {
+ pos->x = PANGO_PIXELS (pango_pos.x);
+ pos->y = PANGO_PIXELS (pango_pos.y);
+ pos->width = PANGO_PIXELS (pango_pos.width);
+ pos->height = PANGO_PIXELS (pango_pos.height);
+ }
+
+ return TRUE;
+ }
+ else
+ return FALSE;
+}
+
static void
add_cursor (GtkTextLayout *layout,
GtkTextLineDisplay *display,
gtk_text_buffer_get_selection_bounds (layout->buffer, NULL, NULL)))
return;
+ if (layout->overwrite_mode &&
+ _gtk_text_btree_mark_is_insert (_gtk_text_buffer_get_btree (layout->buffer),
+ seg->body.mark.obj))
+ {
+ GtkTextIter iter;
+ gboolean cursor_at_line_end;
+
+ _gtk_text_btree_get_iter_at_mark (_gtk_text_buffer_get_btree (layout->buffer),
+ &iter, seg->body.mark.obj);
+
+ if (get_block_cursor (layout, display, &iter, start,
+ &display->block_cursor,
+ &cursor_at_line_end))
+ {
+ display->has_block_cursor = TRUE;
+ display->cursor_at_line_end = cursor_at_line_end;
+ return;
+ }
+ }
+
pango_layout_get_cursor_pos (display->layout, start, &strong_pos, &weak_pos);
if (layout->cursor_direction == GTK_TEXT_DIR_NONE)
/* shaped_object is NULL for child anchors with no
* widgets stored at them
*/
- if (shaped_object && GTK_IS_WIDGET (shaped_object))
+ if (GTK_IS_WIDGET (shaped_object))
{
PangoRectangle extents;
pango_attr_iterator_destroy (iter);
}
+/* Iterate over the line and fill in display->cursors.
+ * It's a stripped copy of gtk_text_layout_get_line_display() */
+static void
+update_text_display_cursors (GtkTextLayout *layout,
+ GtkTextLine *line,
+ GtkTextLineDisplay *display)
+{
+ GtkTextLineSegment *seg;
+ GtkTextIter iter;
+ gint layout_byte_offset, buffer_byte_offset;
+ GSList *cursor_byte_offsets = NULL;
+ GSList *cursor_segs = NULL;
+ GSList *tmp_list1, *tmp_list2;
+
+ if (!display->cursors_invalid)
+ return;
+
+ display->cursors_invalid = FALSE;
+
+ _gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
+ &iter, line, 0);
+
+ /* Special-case optimization for completely
+ * invisible lines; makes it faster to deal
+ * with sequences of invisible lines.
+ */
+ if (totally_invisible_line (layout, line, &iter))
+ return;
+
+ /* Iterate over segments */
+ layout_byte_offset = 0; /* position in the layout text (includes preedit, does not include invisible text) */
+ buffer_byte_offset = 0; /* position in the buffer line */
+ seg = _gtk_text_iter_get_any_segment (&iter);
+ while (seg != NULL)
+ {
+ /* Displayable segments */
+ if (seg->type == >k_text_char_type ||
+ seg->type == >k_text_pixbuf_type ||
+ seg->type == >k_text_child_type)
+ {
+ _gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
+ &iter, line,
+ buffer_byte_offset);
+
+ if (!_gtk_text_btree_char_is_invisible (&iter))
+ layout_byte_offset += seg->byte_count;
+
+ buffer_byte_offset += seg->byte_count;
+ }
+
+ /* Marks */
+ else if (seg->type == >k_text_right_mark_type ||
+ seg->type == >k_text_left_mark_type)
+ {
+ gint cursor_offset = 0;
+
+ /* At the insertion point, add the preedit string, if any */
+
+ if (_gtk_text_btree_mark_is_insert (_gtk_text_buffer_get_btree (layout->buffer),
+ seg->body.mark.obj))
+ {
+ display->insert_index = layout_byte_offset;
+
+ if (layout->preedit_len > 0)
+ {
+ layout_byte_offset += layout->preedit_len;
+ /* DO NOT increment the buffer byte offset for preedit */
+ cursor_offset = layout->preedit_cursor - layout->preedit_len;
+ }
+ }
+
+ /* Display visible marks */
+
+ if (seg->body.mark.visible)
+ {
+ cursor_byte_offsets = g_slist_prepend (cursor_byte_offsets,
+ GINT_TO_POINTER (layout_byte_offset + cursor_offset));
+ cursor_segs = g_slist_prepend (cursor_segs, seg);
+ }
+ }
+
+ /* Toggles */
+ else if (seg->type == >k_text_toggle_on_type ||
+ seg->type == >k_text_toggle_off_type)
+ {
+ }
+
+ else
+ g_error ("Unknown segment type: %s", seg->type->name);
+
+ seg = seg->next;
+ }
+
+ tmp_list1 = cursor_byte_offsets;
+ tmp_list2 = cursor_segs;
+ while (tmp_list1)
+ {
+ add_cursor (layout, display, tmp_list2->data,
+ GPOINTER_TO_INT (tmp_list1->data));
+ tmp_list1 = tmp_list1->next;
+ tmp_list2 = tmp_list2->next;
+ }
+ g_slist_free (cursor_byte_offsets);
+ g_slist_free (cursor_segs);
+}
+
+/* Same as _gtk_text_btree_get_tags(), except it returns GPtrArray,
+ * to be used in gtk_text_layout_get_line_display(). */
+static GPtrArray *
+get_tags_array_at_iter (GtkTextIter *iter)
+{
+ GtkTextTag **tags;
+ GPtrArray *array = NULL;
+ gint n_tags;
+
+ tags = _gtk_text_btree_get_tags (iter, &n_tags);
+
+ if (n_tags > 0)
+ {
+ array = g_ptr_array_sized_new (n_tags);
+ g_ptr_array_set_size (array, n_tags);
+ memcpy (array->pdata, tags, n_tags * sizeof (GtkTextTag*));
+ }
+
+ g_free (tags);
+ return array;
+}
+
+/* Add the tag to the array if it's not there already, and remove
+ * it otherwise. It keeps the array sorted by tags priority. */
+static GPtrArray *
+tags_array_toggle_tag (GPtrArray *array,
+ GtkTextTag *tag)
+{
+ gint pos;
+ GtkTextTag **tags;
+
+ if (array == NULL)
+ array = g_ptr_array_new ();
+
+ tags = (GtkTextTag**) array->pdata;
+
+ for (pos = 0; pos < array->len && tags[pos]->priority < tag->priority; pos++) ;
+
+ if (pos < array->len && tags[pos] == tag)
+ g_ptr_array_remove_index (array, pos);
+ else
+ {
+ g_ptr_array_set_size (array, array->len + 1);
+ if (pos < array->len - 1)
+ memmove (array->pdata + pos + 1, array->pdata + pos,
+ (array->len - pos - 1) * sizeof (GtkTextTag*));
+ array->pdata[pos] = tag;
+ }
+
+ return array;
+}
+
GtkTextLineDisplay *
gtk_text_layout_get_line_display (GtkTextLayout *layout,
GtkTextLine *line,
GSList *tmp_list1, *tmp_list2;
gboolean saw_widget = FALSE;
PangoDirection base_dir;
+ GPtrArray *tags;
+ gboolean initial_toggle_segments;
g_return_val_if_fail (line != NULL, NULL);
{
if (line == layout->one_display_cache->line &&
(size_only || !layout->one_display_cache->size_only))
- return layout->one_display_cache;
+ {
+ if (!size_only)
+ update_text_display_cursors (layout, line, layout->one_display_cache);
+ return layout->one_display_cache;
+ }
else
{
GtkTextLineDisplay *tmp_display = layout->one_display_cache;
}
}
+ DV (g_print ("creating one line display cache (%s)\n", G_STRLOC));
+
display = g_new0 (GtkTextLineDisplay, 1);
display->size_only = size_only;
attrs = pango_attr_list_new ();
- /* Iterate over segments, creating display chunks for them. */
+ /* Iterate over segments, creating display chunks for them, and updating the tags array. */
layout_byte_offset = 0; /* current length of layout text (includes preedit, does not include invisible text) */
buffer_byte_offset = 0; /* position in the buffer line */
seg = _gtk_text_iter_get_any_segment (&iter);
+ tags = get_tags_array_at_iter (&iter);
+ initial_toggle_segments = TRUE;
while (seg != NULL)
{
/* Displayable segments */
seg->type == >k_text_pixbuf_type ||
seg->type == >k_text_child_type)
{
- _gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
- &iter, line,
- buffer_byte_offset);
- style = get_style (layout, &iter);
+ style = get_style (layout, tags);
+ initial_toggle_segments = FALSE;
/* We have to delay setting the paragraph values until we
* hit the first pixbuf or text segment because toggles at
{
cursor_byte_offsets = g_slist_prepend (cursor_byte_offsets, GINT_TO_POINTER (layout_byte_offset));
cursor_segs = g_slist_prepend (cursor_segs, seg);
+ if (_gtk_text_btree_mark_is_insert (_gtk_text_buffer_get_btree (layout->buffer),
+ seg->body.mark.obj))
+ display->insert_index = layout_byte_offset;
}
}
else
/* Style may have changed, drop our
current cached style */
invalidate_cached_style (layout);
+ /* Add the tag only after we have seen some non-toggle non-mark segment,
+ * otherwise the tag is already accounted for by _gtk_text_btree_get_tags(). */
+ if (!initial_toggle_segments)
+ tags = tags_array_toggle_tag (tags, seg->body.toggle.info->tag);
}
/* Marks */
text_allocated += layout->preedit_len;
text = g_realloc (text, text_allocated);
- style = get_style (layout, &iter);
+ style = get_style (layout, tags);
add_preedit_attrs (layout, style, attrs, layout_byte_offset, size_only);
release_style (layout, style);
if (!para_values_set)
{
- style = get_style (layout, &iter);
+ style = get_style (layout, tags);
set_para_values (layout, base_dir, style, display);
release_style (layout, style);
}
g_free (text);
pango_attr_list_unref (attrs);
+ if (tags != NULL)
+ g_ptr_array_free (tags, TRUE);
layout->one_display_cache = display;
line, layout);
gtk_text_buffer_get_iter_at_mark (layout->buffer, &insert_iter,
- gtk_text_buffer_get_mark (layout->buffer,
- "insert"));
+ gtk_text_buffer_get_insert (layout->buffer));
if (gtk_text_iter_equal (iter, &insert_iter))
index += layout->preedit_cursor - layout->preedit_len;
gtk_text_layout_free_line_display (layout, display);
}
+/**
+ * _gtk_text_layout_get_block_cursor:
+ * @layout: a #GtkTextLayout
+ * @pos: a #GdkRectangle to store block cursor position
+ *
+ * If layout is to display a block cursor, calculates its position
+ * and returns %TRUE. Otherwise it returns %FALSE. In case when
+ * cursor is visible, it simply returns the position stored in
+ * the line display, otherwise it has to compute the position
+ * (see get_block_cursor()).
+ **/
+gboolean
+_gtk_text_layout_get_block_cursor (GtkTextLayout *layout,
+ GdkRectangle *pos)
+{
+ GtkTextLine *line;
+ GtkTextLineDisplay *display;
+ GtkTextIter iter;
+ GdkRectangle rect;
+ gboolean block = FALSE;
+
+ g_return_val_if_fail (layout != NULL, FALSE);
+
+ gtk_text_buffer_get_iter_at_mark (layout->buffer, &iter,
+ gtk_text_buffer_get_insert (layout->buffer));
+ line = _gtk_text_iter_get_text_line (&iter);
+ display = gtk_text_layout_get_line_display (layout, line, FALSE);
+
+ if (display->has_block_cursor)
+ {
+ block = TRUE;
+ rect = display->block_cursor;
+ }
+ else
+ {
+ gint index = display->insert_index;
+
+ if (index < 0)
+ index = gtk_text_iter_get_line_index (&iter);
+
+ if (get_block_cursor (layout, display, &iter, index, &rect, NULL))
+ block = TRUE;
+ }
+
+ if (block && pos)
+ {
+ gint line_top;
+
+ line_top = _gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer),
+ line, layout);
+
+ *pos = rect;
+ pos->x += display->x_offset;
+ pos->y += line_top + display->top_margin;
+ }
+
+ gtk_text_layout_free_line_display (layout, display);
+ return block;
+}
+
/**
* gtk_text_layout_get_line_yrange:
* @layout: a #GtkTextLayout
gtk_text_layout_free_line_display (layout, display);
display = gtk_text_layout_get_line_display (layout, line, FALSE);
- new_index = _gtk_text_line_byte_count (line);
+ gtk_text_iter_forward_to_line_end (&lineiter);
+ new_index = gtk_text_iter_get_visible_line_index (&lineiter);
}
else if (new_index > byte_count)
{
projects / ~andy / gtk / blobdiff