* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
#include "gtksignal.h"
+#include "gtkmarshalers.h"
#include "gtktextlayout.h"
#include "gtktextbtree.h"
#include "gtktextiterprivate.h"
#include <stdlib.h>
#include <string.h>
-static GtkTextLineData *gtk_text_line_data_new (GtkTextLayout *layout,
- GtkTextLine *line);
-
static GtkTextLineData *gtk_text_layout_real_wrap (GtkTextLayout *layout,
GtkTextLine *line,
/* may be NULL */
static void gtk_text_layout_invalidated (GtkTextLayout *layout);
-static void gtk_text_layout_real_invalidate (GtkTextLayout *layout,
- const GtkTextIter *start,
- const GtkTextIter *end);
-static void gtk_text_layout_invalidate_cache (GtkTextLayout *layout,
- GtkTextLine *line);
-static void gtk_text_layout_real_free_line_data (GtkTextLayout *layout,
- GtkTextLine *line,
- GtkTextLineData *line_data);
+static void gtk_text_layout_real_invalidate (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);
+static void gtk_text_layout_real_free_line_data (GtkTextLayout *layout,
+ GtkTextLine *line,
+ GtkTextLineData *line_data);
static void gtk_text_layout_invalidate_all (GtkTextLayout *layout);
LAST_ARG
};
-static void gtk_text_layout_init (GtkTextLayout *text_layout);
+static void gtk_text_layout_init (GtkTextLayout *text_layout);
static void gtk_text_layout_class_init (GtkTextLayoutClass *klass);
-static void gtk_text_layout_destroy (GtkObject *object);
-static void gtk_text_layout_finalize (GObject *object);
+static void gtk_text_layout_finalize (GObject *object);
static GtkObjectClass *parent_class = NULL;
PangoAttrType gtk_text_attr_appearance_type = 0;
-GtkType
+GType
gtk_text_layout_get_type (void)
{
- static GtkType our_type = 0;
+ static GType our_type = 0;
if (our_type == 0)
{
- static const GtkTypeInfo our_info =
+ static const GTypeInfo our_info =
{
- "GtkTextLayout",
- sizeof (GtkTextLayout),
sizeof (GtkTextLayoutClass),
- (GtkClassInitFunc) gtk_text_layout_class_init,
- (GtkObjectInitFunc) gtk_text_layout_init,
- /* reserved_1 */ NULL,
- /* reserved_2 */ NULL,
- (GtkClassInitFunc) NULL
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) gtk_text_layout_class_init,
+ NULL, /* class_finalize */
+ NULL, /* class_data */
+ sizeof (GtkTextLayout),
+ 0, /* n_preallocs */
+ (GInstanceInitFunc) gtk_text_layout_init
};
- our_type = gtk_type_unique (GTK_TYPE_OBJECT, &our_info);
+ our_type = g_type_register_static (G_TYPE_OBJECT,
+ "GtkTextLayout",
+ &our_info,
+ 0);
}
return our_type;
static void
gtk_text_layout_class_init (GtkTextLayoutClass *klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
- GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
+ GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+ parent_class = g_type_class_peek_parent (klass);
+
+ object_class->finalize = gtk_text_layout_finalize;
- parent_class = gtk_type_class (GTK_TYPE_OBJECT);
+ klass->wrap = gtk_text_layout_real_wrap;
+ klass->invalidate = gtk_text_layout_real_invalidate;
+ klass->free_line_data = gtk_text_layout_real_free_line_data;
signals[INVALIDATED] =
- gtk_signal_new ("invalidated",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkTextLayoutClass, invalidated),
- gtk_marshal_VOID__VOID,
- GTK_TYPE_NONE,
- 0);
+ g_signal_new ("invalidated",
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GtkTextLayoutClass, invalidated),
+ NULL, NULL,
+ _gtk_marshal_VOID__VOID,
+ GTK_TYPE_NONE,
+ 0);
signals[CHANGED] =
- gtk_signal_new ("changed",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkTextLayoutClass, changed),
- gtk_marshal_VOID__INT_INT_INT,
- GTK_TYPE_NONE,
- 3,
- GTK_TYPE_INT,
- GTK_TYPE_INT,
- GTK_TYPE_INT);
+ g_signal_new ("changed",
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GtkTextLayoutClass, changed),
+ NULL, NULL,
+ _gtk_marshal_VOID__INT_INT_INT,
+ GTK_TYPE_NONE,
+ 3,
+ GTK_TYPE_INT,
+ GTK_TYPE_INT,
+ GTK_TYPE_INT);
signals[ALLOCATE_CHILD] =
- gtk_signal_new ("allocate_child",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkTextLayoutClass, allocate_child),
- gtk_marshal_VOID__OBJECT_INT_INT,
- GTK_TYPE_NONE,
- 3,
- GTK_TYPE_OBJECT,
- GTK_TYPE_INT,
- GTK_TYPE_INT);
-
- gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
-
- object_class->destroy = gtk_text_layout_destroy;
- gobject_class->finalize = gtk_text_layout_finalize;
-
- klass->wrap = gtk_text_layout_real_wrap;
- klass->invalidate = gtk_text_layout_real_invalidate;
- klass->free_line_data = gtk_text_layout_real_free_line_data;
+ g_signal_new ("allocate_child",
+ G_OBJECT_CLASS_TYPE (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GtkTextLayoutClass, allocate_child),
+ NULL, NULL,
+ _gtk_marshal_VOID__OBJECT_INT_INT,
+ GTK_TYPE_NONE,
+ 3,
+ GTK_TYPE_OBJECT,
+ GTK_TYPE_INT,
+ GTK_TYPE_INT);
}
-void
+static void
gtk_text_layout_init (GtkTextLayout *text_layout)
{
text_layout->cursor_visible = TRUE;
GtkTextLayout*
gtk_text_layout_new (void)
{
- return GTK_TEXT_LAYOUT (gtk_type_new (gtk_text_layout_get_type ()));
+ return GTK_TEXT_LAYOUT (g_object_new (gtk_text_layout_get_type (), NULL));
}
static void
}
static void
-gtk_text_layout_destroy (GtkObject *object)
+gtk_text_layout_finalize (GObject *object)
{
GtkTextLayout *layout;
g_object_unref (G_OBJECT (layout->rtl_context));
layout->rtl_context = NULL;
}
-
- (* parent_class->destroy) (object);
-}
-
-static void
-gtk_text_layout_finalize (GObject *object)
-{
- GtkTextLayout *text_layout;
-
- text_layout = GTK_TEXT_LAYOUT (object);
-
+
(* G_OBJECT_CLASS (parent_class)->finalize) (object);
}
if (layout->buffer)
{
- gtk_text_btree_remove_view (_gtk_text_buffer_get_btree (layout->buffer),
+ _gtk_text_btree_remove_view (_gtk_text_buffer_get_btree (layout->buffer),
layout);
- gtk_object_unref (GTK_OBJECT (layout->buffer));
+ g_object_unref (G_OBJECT (layout->buffer));
layout->buffer = NULL;
}
{
layout->buffer = buffer;
- gtk_object_sink (GTK_OBJECT (buffer));
- gtk_object_ref (GTK_OBJECT (buffer));
+ g_object_ref (G_OBJECT (buffer));
- gtk_text_btree_add_view (_gtk_text_buffer_get_btree (buffer), layout);
+ _gtk_text_btree_add_view (_gtk_text_buffer_get_btree (buffer), layout);
}
}
{
g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
+ DV (g_print ("invalidating all due to default style change (%s)\n", G_STRLOC));
gtk_text_layout_invalidate_all (layout);
}
layout->rtl_context = rtl_context;
g_object_ref (G_OBJECT (rtl_context));
+ DV (g_print ("invalidating all due to new pango contexts (%s)\n", G_STRLOC));
gtk_text_layout_invalidate_all (layout);
}
+/**
+ * gtk_text_layout_set_cursor_direction:
+ * @direction: the new direction(s) for which to draw cursors.
+ * %GTK_TEXT_DIR_NONE means draw cursors for both
+ * left-to-right insertion and right-to-left insertion.
+ * (The two cursors will be visually distinguished.)
+ *
+ * Sets which text directions (left-to-right and/or right-to-left) for
+ * which cursors will be drawn for the insertion point. The visual
+ * point at which new text is inserted depends on whether the new
+ * text is right-to-left or left-to-right, so it may be desired to
+ * make the drawn position of the cursor depend on the keyboard state.
+ **/
+void
+gtk_text_layout_set_cursor_direction (GtkTextLayout *layout,
+ GtkTextDirection direction)
+{
+ if (direction != layout->cursor_direction)
+ {
+ layout->cursor_direction = direction;
+ gtk_text_layout_invalidate_cursor_line (layout);
+ }
+}
+
+/**
+ * gtk_text_layout_get_buffer:
+ * @layout: a #GtkTextLayout
+ *
+ * Gets the text buffer used by the layout. See
+ * gtk_text_layout_set_buffer().
+ *
+ * Return value: the text buffer used by the layout.
+ **/
+GtkTextBuffer *
+gtk_text_layout_get_buffer (GtkTextLayout *layout)
+{
+ g_return_val_if_fail (GTK_IS_TEXT_LAYOUT (layout), NULL);
+
+ return layout->buffer;
+}
+
void
gtk_text_layout_set_screen_width (GtkTextLayout *layout, gint width)
{
layout->screen_width = width;
+ DV (g_print ("invalidating all due to new screen width (%s)\n", G_STRLOC));
gtk_text_layout_invalidate_all (layout);
}
gtk_text_layout_get_line_yrange (layout, &iter, &y, &height);
gtk_text_layout_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));
}
}
PangoAttrList *preedit_attrs,
gint cursor_pos)
{
- GtkTextIter iter;
- GtkTextLine *line;
- GtkTextLineData *line_data;
-
g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
g_return_if_fail (preedit_attrs != NULL || preedit_string == NULL);
layout->preedit_cursor = 0;
}
- /* Now invalidate the paragraph containing the cursor
- */
- gtk_text_buffer_get_iter_at_mark (layout->buffer, &iter,
- gtk_text_buffer_get_mark (layout->buffer, "insert"));
-
- line = gtk_text_iter_get_text_line (&iter);
- line_data = gtk_text_line_get_data (line, layout);
- if (line_data)
- {
- gtk_text_layout_invalidate_cache (layout, line);
- gtk_text_line_invalidate_wrap (line, line_data);
- gtk_text_layout_invalidated (layout);
- }
+ gtk_text_layout_invalidate_cursor_line (layout);
}
void
static void
gtk_text_layout_invalidated (GtkTextLayout *layout)
{
- gtk_signal_emit (GTK_OBJECT (layout), signals[INVALIDATED]);
+ g_signal_emit (G_OBJECT (layout), signals[INVALIDATED], 0);
}
void
gint old_height,
gint new_height)
{
- gtk_signal_emit (GTK_OBJECT (layout), signals[CHANGED], y, old_height, new_height);
+ g_signal_emit (G_OBJECT (layout), signals[CHANGED], 0,
+ y, old_height, new_height);
}
void
retval = NULL;
first_btree_line =
- gtk_text_btree_find_line_by_y (_gtk_text_buffer_get_btree (layout->buffer),
+ _gtk_text_btree_find_line_by_y (_gtk_text_buffer_get_btree (layout->buffer),
layout, top_y, first_line_y);
if (first_btree_line == NULL)
{
- g_assert (top_y > 0);
/* off the bottom */
return NULL;
}
/* -1 since bottom_y is one past */
last_btree_line =
- gtk_text_btree_find_line_by_y (_gtk_text_buffer_get_btree (layout->buffer),
- layout, bottom_y - 1, NULL);
+ _gtk_text_btree_find_line_by_y (_gtk_text_buffer_get_btree (layout->buffer),
+ layout, bottom_y - 1, NULL);
if (!last_btree_line)
last_btree_line =
- gtk_text_btree_get_line (_gtk_text_buffer_get_btree (layout->buffer),
- gtk_text_btree_line_count (_gtk_text_buffer_get_btree (layout->buffer)) - 1,
- NULL);
-
- {
- GtkTextLineData *ld = gtk_text_line_get_data (last_btree_line, layout);
- if (ld->height == 0)
- G_BREAKPOINT ();
- }
+ _gtk_text_btree_get_end_iter_line (_gtk_text_buffer_get_btree (layout->buffer));
g_assert (last_btree_line != NULL);
if (line == last_btree_line)
break;
- line = gtk_text_line_next (line);
+ line = _gtk_text_line_next_excluding_last (line);
}
retval = g_slist_reverse (retval);
}
}
+/* Now invalidate the paragraph containing the cursor
+ */
+static void
+gtk_text_layout_invalidate_cursor_line (GtkTextLayout *layout)
+{
+ GtkTextIter iter;
+ GtkTextLine *line;
+ GtkTextLineData *line_data;
+
+ gtk_text_buffer_get_iter_at_mark (layout->buffer, &iter,
+ gtk_text_buffer_get_mark (layout->buffer, "insert"));
+
+ line = _gtk_text_iter_get_text_line (&iter);
+ line_data = _gtk_text_line_get_data (line, layout);
+ if (line_data)
+ {
+ gtk_text_layout_invalidate_cache (layout, line);
+ _gtk_text_line_invalidate_wrap (line, line_data);
+ gtk_text_layout_invalidated (layout);
+ }
+}
+
static void
gtk_text_layout_real_invalidate (GtkTextLayout *layout,
const GtkTextIter *start,
gtk_text_view_index_spew (end_index, "invalidate end");
#endif
- last_line = gtk_text_iter_get_text_line (end);
- line = gtk_text_iter_get_text_line (start);
+ last_line = _gtk_text_iter_get_text_line (end);
+ line = _gtk_text_iter_get_text_line (start);
while (TRUE)
{
- GtkTextLineData *line_data = gtk_text_line_get_data (line, layout);
+ GtkTextLineData *line_data = _gtk_text_line_get_data (line, layout);
if (line_data &&
(line != last_line || !gtk_text_iter_starts_line (end)))
{
gtk_text_layout_invalidate_cache (layout, line);
- gtk_text_line_invalidate_wrap (line, line_data);
+ _gtk_text_line_invalidate_wrap (line, line_data);
}
if (line == last_line)
break;
- line = gtk_text_line_next (line);
+ line = _gtk_text_line_next_excluding_last (line);
}
gtk_text_layout_invalidated (layout);
*
* Check if there are any invalid regions in a #GtkTextLayout's buffer
*
- * Return value: #TRUE if any invalid regions were found
+ * Return value: %TRUE if any invalid regions were found
**/
gboolean
gtk_text_layout_is_valid (GtkTextLayout *layout)
{
- g_return_val_if_fail (layout != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TEXT_LAYOUT (layout), FALSE);
- return gtk_text_btree_is_valid (_gtk_text_buffer_get_btree (layout->buffer),
+ return _gtk_text_btree_is_valid (_gtk_text_buffer_get_btree (layout->buffer),
layout);
}
static void
update_layout_size (GtkTextLayout *layout)
{
- gtk_text_btree_get_view_size (_gtk_text_buffer_get_btree (layout->buffer),
+ _gtk_text_btree_get_view_size (_gtk_text_buffer_get_btree (layout->buffer),
layout,
&layout->width, &layout->height);
}
gint first_line_y = 0; /* Quiet GCC */
gint last_line_y = 0; /* Quiet GCC */
- g_return_if_fail (layout != NULL);
g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
if (y0 > 0)
/* Validate backwards from the anchor line to y0
*/
- line = gtk_text_iter_get_text_line (anchor);
+ line = _gtk_text_iter_get_text_line (anchor);
seen = 0;
while (line && seen < -y0)
{
- GtkTextLineData *line_data = gtk_text_line_get_data (line, layout);
+ GtkTextLineData *line_data = _gtk_text_line_get_data (line, layout);
if (!line_data || !line_data->valid)
{
gint old_height = line_data ? line_data->height : 0;
- gtk_text_btree_validate_line (_gtk_text_buffer_get_btree (layout->buffer),
- line, layout);
- line_data = gtk_text_line_get_data (line, layout);
+ _gtk_text_btree_validate_line (_gtk_text_buffer_get_btree (layout->buffer),
+ line, layout);
+ line_data = _gtk_text_line_get_data (line, layout);
delta_height += line_data->height - old_height;
}
seen += line_data->height;
- line = gtk_text_line_previous (line);
+ line = _gtk_text_line_previous (line);
}
/* Validate forwards to y1 */
- line = gtk_text_iter_get_text_line (anchor);
+ line = _gtk_text_iter_get_text_line (anchor);
seen = 0;
while (line && seen < y1)
{
- GtkTextLineData *line_data = gtk_text_line_get_data (line, layout);
+ GtkTextLineData *line_data = _gtk_text_line_get_data (line, layout);
if (!line_data || !line_data->valid)
{
gint old_height = line_data ? line_data->height : 0;
- gtk_text_btree_validate_line (_gtk_text_buffer_get_btree (layout->buffer),
- line, layout);
- line_data = gtk_text_line_get_data (line, layout);
+ _gtk_text_btree_validate_line (_gtk_text_buffer_get_btree (layout->buffer),
+ line, layout);
+ line_data = _gtk_text_line_get_data (line, layout);
delta_height += line_data->height - old_height;
}
seen += line_data->height;
- line = gtk_text_line_next (line);
+ line = _gtk_text_line_next_excluding_last (line);
}
/* If we found and validated any invalid lines, update size and
update_layout_size (layout);
- line_top = gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer),
- first_line, layout);
+ line_top = _gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer),
+ first_line, layout);
gtk_text_layout_changed (layout,
line_top,
{
gint y, old_height, new_height;
- g_return_if_fail (layout != NULL);
g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
while (max_pixels > 0 &&
- gtk_text_btree_validate (_gtk_text_buffer_get_btree (layout->buffer),
- layout, max_pixels,
- &y, &old_height, &new_height))
+ _gtk_text_btree_validate (_gtk_text_buffer_get_btree (layout->buffer),
+ layout, max_pixels,
+ &y, &old_height, &new_height))
{
max_pixels -= new_height;
GtkTextLineDisplay *display;
g_return_val_if_fail (GTK_IS_TEXT_LAYOUT (layout), NULL);
-
+ g_return_val_if_fail (line != NULL, NULL);
+
if (line_data == NULL)
{
- line_data = gtk_text_line_data_new (layout, line);
- gtk_text_line_add_data (line, line_data);
+ line_data = _gtk_text_line_data_new (layout, line);
+ _gtk_text_line_add_data (line, line_data);
}
display = gtk_text_layout_get_line_display (layout, line, TRUE);
g_assert (layout->one_style_cache == NULL);
/* Get the tags at this spot */
- tags = gtk_text_btree_get_tags (iter, &tag_count);
+ tags = _gtk_text_btree_get_tags (iter, &tag_count);
/* No tags, use default style */
if (tags == NULL || tag_count == 0)
}
/* Sort tags in ascending order of priority */
- gtk_text_tag_array_sort (tags, tag_count);
+ _gtk_text_tag_array_sort (tags, tag_count);
style = gtk_text_attributes_new ();
- gtk_text_attributes_copy (layout->default_style,
- style);
+ gtk_text_attributes_copy_values (layout->default_style,
+ style);
- gtk_text_attributes_fill_from_tags (style,
- tags,
- tag_count);
+ _gtk_text_attributes_fill_from_tags (style,
+ tags,
+ tag_count);
g_free (tags);
int bytes = 0;
/* If we have a cached style, then we know it does actually apply
- and we can just see if it is invisible. */
+ * and we can just see if it is invisible.
+ */
if (layout->one_style_cache &&
!layout->one_style_cache->invisible)
return FALSE;
/* Without the cache, we check if the first char is visible, if so
- we are partially visible. Note that we have to check this since
- we don't know the current invisible/noninvisible toggle state; this
- function can use the whole btree to get it right. */
+ * we are partially visible. Note that we have to check this since
+ * we don't know the current invisible/noninvisible toggle state; this
+ * function can use the whole btree to get it right.
+ */
else
{
- gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
+ _gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
iter, line, 0);
- if (!gtk_text_btree_char_is_invisible (iter))
+ if (!_gtk_text_btree_char_is_invisible (iter))
return FALSE;
}
bytes += seg->byte_count;
/* Note that these two tests can cause us to bail out
- when we shouldn't, because a higher-priority tag
- may override these settings. However the important
- thing is to only invisible really-invisible lines, rather
- than to invisible all really-invisible lines. */
+ * when we shouldn't, because a higher-priority tag
+ * may override these settings. However the important
+ * thing is to only invisible really-invisible lines, rather
+ * than to invisible all really-invisible lines.
+ */
else if (seg->type == >k_text_toggle_on_type)
{
static void
set_para_values (GtkTextLayout *layout,
GtkTextAttributes *style,
- GtkTextLineDisplay *display,
- gdouble *align)
+ GtkTextLineDisplay *display)
{
PangoAlignment pango_align = PANGO_ALIGN_LEFT;
int layout_width;
else
display->layout = pango_layout_new (layout->rtl_context);
- switch (style->justify)
+ switch (style->justification)
{
case GTK_JUSTIFY_LEFT:
pango_align = (style->direction == GTK_TEXT_DIR_LTR) ? PANGO_ALIGN_LEFT : PANGO_ALIGN_RIGHT;
break;
}
- switch (pango_align)
- {
- case PANGO_ALIGN_LEFT:
- *align = 0.0;
- break;
- case PANGO_ALIGN_RIGHT:
- *align = 1.0;
- break;
- case PANGO_ALIGN_CENTER:
- *align = 0.5;
- break;
- }
-
pango_layout_set_alignment (display->layout, pango_align);
pango_layout_set_spacing (display->layout,
style->pixels_inside_wrap * PANGO_SCALE);
switch (style->wrap_mode)
{
- case GTK_WRAPMODE_CHAR:
- /* FIXME: Handle this; for now, fall-through */
- case GTK_WRAPMODE_WORD:
+ 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);
break;
- case GTK_WRAPMODE_NONE:
+
+ 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);
+ break;
+
+ case GTK_WRAP_NONE:
break;
}
{
PangoAttribute *attr;
- attr = pango_attr_font_desc_new (&style->font);
+ attr = pango_attr_font_desc_new (style->font);
attr->start_index = start;
attr->end_index = start + byte_count;
pango_attr_list_insert (attrs, attr);
+
+ if (style->font_scale != 1.0)
+ {
+ attr = pango_attr_scale_new (style->font_scale);
+
+ attr->start_index = start;
+ attr->end_index = start + byte_count;
+
+ pango_attr_list_insert (attrs, attr);
+ }
}
static void
if (tmp_list == NULL)
{
- /* No widget at this anchor in this display;
- * not an error.
+ /* If tmp_list == NULL then there is no widget at this anchor in
+ * this display; not an error. We make up an arbitrary size
+ * to use, just so the programmer can see the blank spot.
+ * We also put a NULL in the shaped objects list, to keep
+ * the correspondence between the list and the shaped chars in
+ * the layout. A bad hack, yes.
*/
- return;
- }
-
- if (layout->preedit_string)
- {
- g_free (layout->preedit_string);
- layout->preedit_string = NULL;
- }
+ width = 30;
+ height = 20;
- if (layout->preedit_attrs)
- {
- pango_attr_list_unref (layout->preedit_attrs);
- layout->preedit_attrs = NULL;
+ display->shaped_objects =
+ g_slist_append (display->shaped_objects, NULL);
}
logical_rect.x = 0;
gint start)
{
PangoRectangle strong_pos, weak_pos;
- GtkTextCursorDisplay *cursor;
-
+ GtkTextCursorDisplay *cursor = NULL; /* Quiet GCC */
+ gboolean add_weak = FALSE;
+ gboolean add_strong = FALSE;
+
/* Hide insertion cursor when we have a selection or the layout
* user has hidden the cursor.
*/
- if (gtk_text_btree_mark_is_insert (_gtk_text_buffer_get_btree (layout->buffer),
+ if (_gtk_text_btree_mark_is_insert (_gtk_text_buffer_get_btree (layout->buffer),
seg->body.mark.obj) &&
(!layout->cursor_visible ||
gtk_text_buffer_get_selection_bounds (layout->buffer, NULL, NULL)))
pango_layout_get_cursor_pos (display->layout, start, &strong_pos, &weak_pos);
- cursor = g_new (GtkTextCursorDisplay, 1);
-
- cursor->x = PANGO_PIXELS (strong_pos.x);
- cursor->y = PANGO_PIXELS (strong_pos.y);
- cursor->height = PANGO_PIXELS (strong_pos.height);
- cursor->is_strong = TRUE;
- display->cursors = g_slist_prepend (display->cursors, cursor);
-
- if (weak_pos.x == strong_pos.x)
- cursor->is_weak = TRUE;
- else
+ if (layout->cursor_direction == GTK_TEXT_DIR_NONE)
{
- cursor->is_weak = FALSE;
+ add_strong = TRUE;
+ add_weak = TRUE;
+ }
+ else if (display->direction == layout->cursor_direction)
+ add_strong = TRUE;
+ else
+ add_weak = TRUE;
+ if (add_strong)
+ {
cursor = g_new (GtkTextCursorDisplay, 1);
- cursor->x = PANGO_PIXELS (weak_pos.x);
- cursor->y = PANGO_PIXELS (weak_pos.y);
- cursor->height = PANGO_PIXELS (weak_pos.height);
- cursor->is_strong = FALSE;
- cursor->is_weak = TRUE;
+ cursor->x = PANGO_PIXELS (strong_pos.x);
+ cursor->y = PANGO_PIXELS (strong_pos.y);
+ cursor->height = PANGO_PIXELS (strong_pos.height);
+ cursor->is_strong = TRUE;
+ cursor->is_weak = (layout->cursor_direction == GTK_TEXT_DIR_NONE) ? FALSE : TRUE;
display->cursors = g_slist_prepend (display->cursors, cursor);
}
+
+ if (add_weak)
+ {
+ if (weak_pos.x == strong_pos.x && add_strong)
+ cursor->is_weak = TRUE;
+ else
+ {
+ cursor = g_new (GtkTextCursorDisplay, 1);
+
+ cursor->x = PANGO_PIXELS (weak_pos.x);
+ cursor->y = PANGO_PIXELS (weak_pos.y);
+ cursor->height = PANGO_PIXELS (weak_pos.height);
+ cursor->is_strong = (layout->cursor_direction == GTK_TEXT_DIR_NONE) ? FALSE : TRUE;
+ cursor->is_weak = TRUE;
+ display->cursors = g_slist_prepend (display->cursors, cursor);
+ }
+ }
}
static gboolean
is_shape (PangoLayoutRun *run)
{
- GSList *tmp_list = run->item->extra_attrs;
+ GSList *tmp_list = run->item->analysis.extra_attrs;
while (tmp_list)
{
GObject *shaped_object = shaped->data;
shaped = shaped->next;
- if (GTK_IS_WIDGET (shaped_object))
+ /* shaped_object is NULL for child anchors with no
+ * widgets stored at them
+ */
+ if (shaped_object && GTK_IS_WIDGET (shaped_object))
{
PangoRectangle extents;
pango_layout_iter_get_run_extents (iter,
NULL,
&extents);
-
- g_print ("extents at %d,%d\n", extents.x, extents.y);
- gtk_signal_emit (GTK_OBJECT (text_layout),
- signals[ALLOCATE_CHILD],
- shaped_object,
- PANGO_PIXELS (extents.x) + display->x_offset,
- PANGO_PIXELS (extents.y) + display->top_margin);
+ g_signal_emit (G_OBJECT (text_layout),
+ signals[ALLOCATE_CHILD],
+ 0,
+ shaped_object,
+ PANGO_PIXELS (extents.x) + display->x_offset,
+ PANGO_PIXELS (extents.y) + display->top_margin);
}
}
}
convert_color (GdkColor *result,
PangoAttrColor *attr)
{
- result->red = attr->red;
- result->blue = attr->blue;
- result->green = attr->green;
+ result->red = attr->color.red;
+ result->blue = attr->color.blue;
+ result->green = attr->color.green;
}
/* This function is used to convert the preedit string attributes, which are
do
{
GtkTextAppearance appearance = style->appearance;
- PangoFontDescription font_desc;
+ PangoFontDescription *font_desc = pango_font_description_copy_static (style->font);
PangoAttribute *insert_attr;
GSList *extra_attrs = NULL;
GSList *tmp_list;
+ PangoLanguage *language;
gint start, end;
pango_attr_iterator_range (iter, &start, &end);
if (end == G_MAXINT)
end = layout->preedit_len;
- pango_attr_iterator_get_font (iter, &style->font,
- &font_desc, &extra_attrs);
+ pango_attr_iterator_get_font (iter, font_desc, &language, &extra_attrs);
tmp_list = extra_attrs;
while (tmp_list)
g_slist_free (extra_attrs);
- insert_attr = pango_attr_font_desc_new (&font_desc);
+ insert_attr = pango_attr_font_desc_new (font_desc);
insert_attr->start_index = start + offset;
insert_attr->end_index = end + offset;
pango_attr_list_insert (attrs, insert_attr);
+ if (language)
+ {
+ insert_attr = pango_attr_language_new (language);
+ insert_attr->start_index = start + offset;
+ insert_attr->end_index = end + offset;
+
+ pango_attr_list_insert (attrs, insert_attr);
+ }
+
add_generic_attrs (layout, &appearance, end - start,
attrs, start + offset,
size_only, TRUE);
+
+ pango_font_description_free (font_desc);
}
while (pango_attr_iterator_next (iter));
GtkTextAttributes *style;
gchar *text;
PangoAttrList *attrs;
- gint byte_count, byte_offset;
- gdouble align;
+ gint text_allocated, layout_byte_offset, buffer_byte_offset;
PangoRectangle extents;
gboolean para_values_set = FALSE;
GSList *cursor_byte_offsets = NULL;
display->line = line;
display->insert_index = -1;
- gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
- &iter, line, 0);
+ _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
/* Allocate space for flat text for buffer
*/
- byte_count = gtk_text_line_byte_count (line);
- text = g_malloc (byte_count);
+ text_allocated = _gtk_text_line_byte_count (line);
+ text = g_malloc (text_allocated);
attrs = pango_attr_list_new ();
/* Iterate over segments, creating display chunks for them. */
- byte_offset = 0;
- seg = gtk_text_iter_get_any_segment (&iter);
+ 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);
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,
- byte_offset);
+ _gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
+ &iter, line,
+ buffer_byte_offset);
style = get_style (layout, &iter);
/* We have to delay setting the paragraph values until we
*/
if (!para_values_set)
{
- set_para_values (layout, style, display, &align);
+ set_para_values (layout, style, display);
para_values_set = TRUE;
}
{
if (seg->type == >k_text_char_type)
{
- memcpy (text + byte_offset, seg->body.chars, seg->byte_count);
- byte_offset += seg->byte_count;
+ memcpy (text + layout_byte_offset, seg->body.chars, seg->byte_count);
+ layout_byte_offset += seg->byte_count;
+ buffer_byte_offset += seg->byte_count;
bytes += seg->byte_count;
}
else if (seg->type == >k_text_right_mark_type ||
*/
if (layout->preedit_len > 0 &&
- gtk_text_btree_mark_is_insert (_gtk_text_buffer_get_btree (layout->buffer),
+ _gtk_text_btree_mark_is_insert (_gtk_text_buffer_get_btree (layout->buffer),
seg->body.mark.obj))
break;
if (seg->body.mark.visible)
{
- cursor_byte_offsets = g_slist_prepend (cursor_byte_offsets, GINT_TO_POINTER (byte_offset));
+ cursor_byte_offsets = g_slist_prepend (cursor_byte_offsets, GINT_TO_POINTER (layout_byte_offset));
cursor_segs = g_slist_prepend (cursor_segs, seg);
}
}
seg = prev_seg; /* Back up one */
add_generic_attrs (layout, &style->appearance,
bytes,
- attrs, byte_offset - bytes,
+ attrs, layout_byte_offset - bytes,
size_only, TRUE);
add_text_attrs (layout, style, bytes, attrs,
- byte_offset - bytes, size_only);
+ layout_byte_offset - bytes, size_only);
}
else if (seg->type == >k_text_pixbuf_type)
{
add_generic_attrs (layout,
&style->appearance,
seg->byte_count,
- attrs, byte_offset,
+ attrs, layout_byte_offset,
size_only, FALSE);
add_pixbuf_attrs (layout, display, style,
- seg, attrs, byte_offset);
- memcpy (text + byte_offset, gtk_text_unknown_char_utf8,
+ seg, attrs, layout_byte_offset);
+ memcpy (text + layout_byte_offset, gtk_text_unknown_char_utf8,
seg->byte_count);
- byte_offset += seg->byte_count;
+ layout_byte_offset += seg->byte_count;
+ buffer_byte_offset += seg->byte_count;
}
else if (seg->type == >k_text_child_type)
{
add_generic_attrs (layout, &style->appearance,
seg->byte_count,
- attrs, byte_offset,
+ attrs, layout_byte_offset,
size_only, FALSE);
add_child_attrs (layout, display, style,
- seg, attrs, byte_offset);
- memcpy (text + byte_offset, gtk_text_unknown_char_utf8,
+ seg, attrs, layout_byte_offset);
+ memcpy (text + layout_byte_offset, gtk_text_unknown_char_utf8,
seg->byte_count);
- byte_offset += seg->byte_count;
+ layout_byte_offset += seg->byte_count;
+ buffer_byte_offset += seg->byte_count;
}
else
{
+ /* We don't know this segment type */
g_assert_not_reached ();
}
+
+ } /* if (segment was visible) */
+ else
+ {
+ /* Invisible segment */
+ buffer_byte_offset += seg->byte_count;
}
release_style (layout, style);
/* At the insertion point, add the preedit string, if any */
- if (gtk_text_btree_mark_is_insert (_gtk_text_buffer_get_btree (layout->buffer),
+ if (_gtk_text_btree_mark_is_insert (_gtk_text_buffer_get_btree (layout->buffer),
seg->body.mark.obj))
{
- display->insert_index = byte_offset;
+ display->insert_index = layout_byte_offset;
if (layout->preedit_len > 0)
{
- byte_count += layout->preedit_len;
- text = g_realloc (text, byte_count);
+ text_allocated += layout->preedit_len;
+ text = g_realloc (text, text_allocated);
style = get_style (layout, &iter);
- add_preedit_attrs (layout, style, attrs, byte_offset, size_only);
+ add_preedit_attrs (layout, style, attrs, layout_byte_offset, size_only);
release_style (layout, style);
- memcpy (text + byte_offset, layout->preedit_string, layout->preedit_len);
- byte_offset += layout->preedit_len;
-
+ memcpy (text + layout_byte_offset, layout->preedit_string, layout->preedit_len);
+ layout_byte_offset += layout->preedit_len;
+ /* DO NOT increment the buffer byte offset for preedit */
+
cursor_offset = layout->preedit_cursor - layout->preedit_len;
}
}
if (seg->body.mark.visible)
{
cursor_byte_offsets = g_slist_prepend (cursor_byte_offsets,
- GINT_TO_POINTER (byte_offset + cursor_offset));
+ GINT_TO_POINTER (layout_byte_offset + cursor_offset));
cursor_segs = g_slist_prepend (cursor_segs, seg);
}
}
if (!para_values_set)
{
style = get_style (layout, &iter);
- set_para_values (layout, style, display, &align);
+ set_para_values (layout, style, display);
release_style (layout, style);
}
-
- g_assert (byte_offset == byte_count);
/* Pango doesn't want the trailing paragraph delimiters */
#define PARAGRAPH_SEPARATOR 0x2029
gunichar ch = 0;
- if (byte_offset > 0)
+ if (layout_byte_offset > 0)
{
- const char *prev = g_utf8_prev_char (text + byte_offset);
+ const char *prev = g_utf8_prev_char (text + layout_byte_offset);
ch = g_utf8_get_char (prev);
if (ch == PARAGRAPH_SEPARATOR || ch == '\r' || ch == '\n')
- byte_offset = prev - text; /* chop off */
+ layout_byte_offset = prev - text; /* chop off */
- if (ch == '\n' && byte_offset > 0)
+ if (ch == '\n' && layout_byte_offset > 0)
{
/* Possibly chop a CR as well */
- prev = g_utf8_prev_char (text + byte_offset);
+ prev = g_utf8_prev_char (text + layout_byte_offset);
if (*prev == '\r')
- --byte_offset;
+ --layout_byte_offset;
}
}
}
- pango_layout_set_text (display->layout, text, byte_offset);
+ pango_layout_set_text (display->layout, text, layout_byte_offset);
pango_layout_set_attributes (display->layout, attrs);
tmp_list1 = cursor_byte_offsets;
pango_layout_get_extents (display->layout, NULL, &extents);
- display->x_offset += (display->total_width - PANGO_PIXELS (extents.x + extents.width)) * align;
-
display->width = PANGO_PIXELS (extents.width) + display->left_margin + display->right_margin;
display->height += PANGO_PIXELS (extents.height);
-
+
/* Free this if we aren't in a loop */
if (layout->wrap_loop_count == 0)
invalidate_cached_style (layout);
{
if (display != layout->one_display_cache)
{
- g_object_unref (G_OBJECT (display->layout));
+ if (display->layout)
+ g_object_unref (G_OBJECT (display->layout));
if (display->cursors)
{
g_slist_foreach (display->cursors, (GFunc)g_free, NULL);
g_slist_free (display->cursors);
- g_slist_free (display->shaped_objects);
}
+ g_slist_free (display->shaped_objects);
g_free (display);
}
}
/* Functions to convert iter <=> index for the line of a GtkTextLineDisplay
- * taking into account the preedit string, if necessary.
+ * taking into account the preedit string and invisible text if necessary.
*/
-gint
+static gint
line_display_iter_to_index (GtkTextLayout *layout,
GtkTextLineDisplay *display,
const GtkTextIter *iter)
{
gint index;
- g_return_val_if_fail (gtk_text_iter_get_text_line (iter) == display->line, 0);
-
- index = gtk_text_iter_get_line_index (iter);
+ g_return_val_if_fail (_gtk_text_iter_get_text_line (iter) == display->line, 0);
+ index = gtk_text_iter_get_visible_line_index (iter);
+
if (index >= display->insert_index)
index += layout->preedit_len;
return index;
}
-void
+static void
line_display_index_to_iter (GtkTextLayout *layout,
GtkTextLineDisplay *display,
GtkTextIter *iter,
gint index,
gint trailing)
{
+ g_return_if_fail (!_gtk_text_line_is_last (display->line,
+ _gtk_text_buffer_get_btree (layout->buffer)));
+
if (index >= display->insert_index + layout->preedit_len)
index -= layout->preedit_len;
else if (index > display->insert_index)
index = display->insert_index;
trailing = 0;
}
-
- gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
- iter, display->line, index);
- gtk_text_iter_forward_chars (iter, trailing);
-}
-/* FIXME: This really doesn't belong in this file ... */
-static GtkTextLineData*
-gtk_text_line_data_new (GtkTextLayout *layout,
- GtkTextLine *line)
-{
- GtkTextLineData *line_data;
-
- line_data = g_new (GtkTextLineData, 1);
+ _gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
+ iter, display->line, 0);
- line_data->view_id = layout;
- line_data->next = NULL;
- line_data->width = 0;
- line_data->height = 0;
- line_data->valid = FALSE;
+ gtk_text_iter_set_visible_line_index (iter, index);
+
+ if (_gtk_text_iter_get_text_line (iter) != display->line)
+ {
+ /* Clamp to end of line - really this clamping should have been done
+ * before here, maybe in Pango, this is a broken band-aid I think
+ */
+ _gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
+ iter, display->line, 0);
- return line_data;
+ if (!gtk_text_iter_ends_line (iter))
+ gtk_text_iter_forward_to_line_end (iter);
+ }
+
+ gtk_text_iter_forward_chars (iter, trailing);
}
static void
if (y > layout->height)
y = layout->height;
- *line = gtk_text_btree_find_line_by_y (_gtk_text_buffer_get_btree (layout->buffer),
+ *line = _gtk_text_btree_find_line_by_y (_gtk_text_buffer_get_btree (layout->buffer),
layout, y, line_top);
if (*line == NULL)
{
- *line = gtk_text_btree_get_line (_gtk_text_buffer_get_btree (layout->buffer),
- gtk_text_btree_line_count (_gtk_text_buffer_get_btree (layout->buffer)) - 1, NULL);
+ *line = _gtk_text_btree_get_end_iter_line (_gtk_text_buffer_get_btree (layout->buffer));
+
if (line_top)
*line_top =
- gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer),
+ _gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer),
*line, layout);
}
}
g_return_if_fail (target_iter != NULL);
get_line_at_y (layout, y, &line, line_top);
- gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
+ _gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
target_iter, line, 0);
}
g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
g_return_if_fail (target_iter != NULL);
- /* Adjust pixels to be on-screen. This gives nice
- behavior if the user is dragging with a pointer grab.
- */
- if (x < 0)
- x = 0;
- if (x > layout->width)
- x = layout->width;
-
get_line_at_y (layout, y, &line, &line_top);
display = gtk_text_layout_get_line_display (layout, line, FALSE);
x -= display->x_offset;
y -= line_top + display->top_margin;
- /* We clamp y to the area of the actual layout so that the layouts
- * hit testing works OK on the space above and below the layout
+ /* If we are below the layout, position the cursor at the last character
+ * of the line.
*/
- y = CLAMP (y, 0, display->height - display->top_margin - display->bottom_margin - 1);
-
- if (!pango_layout_xy_to_index (display->layout, x * PANGO_SCALE, y * PANGO_SCALE,
- &byte_index, &trailing))
+ if (y > display->height - display->top_margin - display->bottom_margin)
{
- byte_index = gtk_text_line_byte_count (line);
+ byte_index = _gtk_text_line_byte_count (line);
trailing = 0;
}
+ else
+ {
+ /* Ignore the "outside" return value from pango. Pango is doing
+ * the right thing even if we are outside the layout in the
+ * x-direction.
+ */
+ pango_layout_xy_to_index (display->layout, x * PANGO_SCALE, y * PANGO_SCALE,
+ &byte_index, &trailing);
+ }
line_display_index_to_iter (layout, display, target_iter, byte_index, trailing);
g_return_if_fail (layout != NULL);
g_return_if_fail (iter != NULL);
- line = gtk_text_iter_get_text_line (iter);
+ line = _gtk_text_iter_get_text_line (iter);
display = gtk_text_layout_get_line_display (layout, line, FALSE);
index = line_display_iter_to_index (layout, display, iter);
- line_top = gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer),
+ line_top = _gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer),
line, layout);
pango_layout_get_cursor_pos (display->layout, index,
GtkTextLine *line;
g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
- g_return_if_fail (gtk_text_iter_get_btree (iter) == _gtk_text_buffer_get_btree (layout->buffer));
+ g_return_if_fail (_gtk_text_iter_get_btree (iter) == _gtk_text_buffer_get_btree (layout->buffer));
- line = gtk_text_iter_get_text_line (iter);
+ line = _gtk_text_iter_get_text_line (iter);
if (y)
- *y = gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer),
+ *y = _gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer),
line, layout);
if (height)
{
- GtkTextLineData *line_data = gtk_text_line_get_data (line, layout);
+ GtkTextLineData *line_data = _gtk_text_line_get_data (line, layout);
if (line_data)
*height = line_data->height;
else
}
}
+/**
+ * _gtk_text_layout_get_line_xrange:
+ * @layout: a #GtkTextLayout
+ * @iter: a #GtkTextIter
+ * @x: location to store the top of the paragraph in pixels,
+ * or %NULL.
+ * @width location to store the height of the paragraph in pixels,
+ * or %NULL.
+ *
+ * Find the range of X coordinates for the paragraph containing
+ * the given iter. Private for 2.0 due to API freeze, could
+ * be made public for 2.2.
+ **/
+void
+_gtk_text_layout_get_line_xrange (GtkTextLayout *layout,
+ const GtkTextIter *iter,
+ gint *x,
+ gint *width)
+{
+ GtkTextLine *line;
+
+ g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
+ g_return_if_fail (_gtk_text_iter_get_btree (iter) == _gtk_text_buffer_get_btree (layout->buffer));
+
+ line = _gtk_text_iter_get_text_line (iter);
+
+ if (x)
+ *x = 0; /* FIXME This is wrong; should represent the first available cursor position */
+
+ if (width)
+ {
+ GtkTextLineData *line_data = _gtk_text_line_get_data (line, layout);
+ if (line_data)
+ *width = line_data->width;
+ else
+ *width = 0;
+ }
+}
+
void
gtk_text_layout_get_iter_location (GtkTextLayout *layout,
const GtkTextIter *iter,
gint x_offset;
g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
- g_return_if_fail (gtk_text_iter_get_btree (iter) == _gtk_text_buffer_get_btree (layout->buffer));
+ g_return_if_fail (_gtk_text_iter_get_btree (iter) == _gtk_text_buffer_get_btree (layout->buffer));
g_return_if_fail (rect != NULL);
- tree = gtk_text_iter_get_btree (iter);
- line = gtk_text_iter_get_text_line (iter);
+ tree = _gtk_text_iter_get_btree (iter);
+ line = _gtk_text_iter_get_text_line (iter);
display = gtk_text_layout_get_line_display (layout, line, FALSE);
- rect->y = gtk_text_btree_find_line_top (tree, line, layout);
+ rect->y = _gtk_text_btree_find_line_top (tree, line, layout);
x_offset = display->x_offset * PANGO_SCALE;
gint line_top;
gint found_byte = 0;
- line = gtk_text_btree_find_line_by_y (_gtk_text_buffer_get_btree (layout->buffer),
+ line = _gtk_text_btree_find_line_by_y (_gtk_text_buffer_get_btree (layout->buffer),
layout, y, &line_top);
if (!line)
{
line =
- gtk_text_btree_get_line (_gtk_text_buffer_get_btree (layout->buffer),
- gtk_text_btree_line_count (_gtk_text_buffer_get_btree (layout->buffer)) - 1,
- NULL);
+ _gtk_text_btree_get_end_iter_line (_gtk_text_buffer_get_btree (layout->buffer));
+
line_top =
- gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer),
+ _gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer),
line, layout);
}
line_top += display->bottom_margin;
gtk_text_layout_free_line_display (layout, display);
- next = gtk_text_line_next (line);
+ next = _gtk_text_line_next_excluding_last (line);
if (!next)
found_line = line;
line = next;
}
- gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
+ _gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
iter, found_line, found_byte);
}
gint line_top;
gint found_byte = 0;
- line = gtk_text_btree_find_line_by_y (_gtk_text_buffer_get_btree (layout->buffer), layout, y, &line_top);
+ line = _gtk_text_btree_find_line_by_y (_gtk_text_buffer_get_btree (layout->buffer), layout, y, &line_top);
if (!line)
{
- line = gtk_text_btree_get_line (_gtk_text_buffer_get_btree (layout->buffer),
- gtk_text_btree_line_count (_gtk_text_buffer_get_btree (layout->buffer)) - 1, NULL);
- line_top = gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer), line, layout);
+ line = _gtk_text_btree_get_end_iter_line (_gtk_text_buffer_get_btree (layout->buffer));
+
+ line_top = _gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer), line, layout);
}
while (line && !found_line)
if (tmp_top < y)
{
found_line = line;
+ pango_layout_iter_free (layout_iter);
goto done;
}
}
gtk_text_layout_free_line_display (layout, display);
- line = gtk_text_line_previous (line);
+ line = _gtk_text_line_previous (line);
}
done:
if (found_line)
- gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
+ _gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
iter, found_line, found_byte);
else
gtk_text_buffer_get_iter_at_offset (layout->buffer, iter, 0);
}
/**
- * gtk_text_layout_move_iter_to_next_line:
+ * gtk_text_layout_move_iter_to_previous_line:
* @layout: a #GtkLayout
* @iter: a #GtkTextIter
*
GSList *tmp_list;
PangoLayoutLine *layout_line;
GtkTextIter orig;
+ gboolean update_byte = FALSE;
- g_return_val_if_fail (layout != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TEXT_LAYOUT (layout), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
orig = *iter;
-
- line = gtk_text_iter_get_text_line (iter);
+
+
+ line = _gtk_text_iter_get_text_line (iter);
display = gtk_text_layout_get_line_display (layout, line, FALSE);
line_byte = line_display_iter_to_index (layout, display, iter);
+ /* If display->height == 0 then the line is invisible, so don't
+ * move onto it.
+ */
+ while (display->height == 0)
+ {
+ GtkTextLine *prev_line;
+
+ prev_line = _gtk_text_line_previous (line);
+
+ if (prev_line == NULL)
+ {
+ line_display_index_to_iter (layout, display, iter, 0, 0);
+ goto out;
+ }
+
+ gtk_text_layout_free_line_display (layout, display);
+
+ line = prev_line;
+ display = gtk_text_layout_get_line_display (layout, prev_line, FALSE);
+ update_byte = TRUE;
+ }
+
tmp_list = pango_layout_get_lines (display->layout);
layout_line = tmp_list->data;
+ if (update_byte)
+ {
+ line_byte = layout_line->start_index + layout_line->length;
+ }
+
if (line_byte < layout_line->length || !tmp_list->next) /* first line of paragraph */
{
- GtkTextLine *prev_line = gtk_text_line_previous (line);
+ GtkTextLine *prev_line;
- if (prev_line)
+ prev_line = _gtk_text_line_previous (line);
+ while (prev_line)
{
gtk_text_layout_free_line_display (layout, display);
+
display = gtk_text_layout_get_line_display (layout, prev_line, FALSE);
- tmp_list = pango_layout_get_lines (display->layout);
-
- while (tmp_list->next)
+ if (display->height > 0)
{
+ tmp_list = g_slist_last (pango_layout_get_lines (display->layout));
layout_line = tmp_list->data;
- tmp_list = tmp_list->next;
+
+ line_display_index_to_iter (layout, display, iter,
+ layout_line->start_index + layout_line->length, 0);
+ break;
}
- line_display_index_to_iter (layout, display, iter,
- layout_line->start_index + layout_line->length, 0);
+ prev_line = _gtk_text_line_previous (prev_line);
}
- else
+
+ if (prev_line == NULL)
line_display_index_to_iter (layout, display, iter, 0, 0);
}
else
}
}
+ out:
+
gtk_text_layout_free_line_display (layout, display);
return
!gtk_text_iter_equal (iter, &orig) &&
- !gtk_text_iter_is_last (iter);
+ !gtk_text_iter_is_end (iter);
}
/**
gboolean found_after = FALSE;
gboolean first = TRUE;
- g_return_val_if_fail (layout != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TEXT_LAYOUT (layout), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
orig = *iter;
- line = gtk_text_iter_get_text_line (iter);
+ line = _gtk_text_iter_get_text_line (iter);
while (line && !found_after)
{
display = gtk_text_layout_get_line_display (layout, line, FALSE);
+ if (display->height == 0)
+ goto next;
+
if (first)
{
line_byte = line_display_iter_to_index (layout, display, iter);
tmp_list = tmp_list->next;
}
+ next:
+
gtk_text_layout_free_line_display (layout, display);
- line = gtk_text_line_next (line);
+ line = _gtk_text_line_next_excluding_last (line);
}
return
!gtk_text_iter_equal (iter, &orig) &&
- !gtk_text_iter_is_last (iter);
+ !gtk_text_iter_is_end (iter);
}
/**
GSList *tmp_list;
GtkTextIter orig;
- g_return_val_if_fail (layout != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TEXT_LAYOUT (layout), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
orig = *iter;
- line = gtk_text_iter_get_text_line (iter);
+ line = _gtk_text_iter_get_text_line (iter);
display = gtk_text_layout_get_line_display (layout, line, FALSE);
line_byte = line_display_iter_to_index (layout, display, iter);
return
!gtk_text_iter_equal (iter, &orig) &&
- !gtk_text_iter_is_last (iter);
+ !gtk_text_iter_is_end (iter);
}
gint line_byte;
GSList *tmp_list;
- g_return_val_if_fail (layout != NULL, FALSE);
g_return_val_if_fail (GTK_IS_TEXT_LAYOUT (layout), FALSE);
g_return_val_if_fail (iter != NULL, FALSE);
- line = gtk_text_iter_get_text_line (iter);
+ line = _gtk_text_iter_get_text_line (iter);
display = gtk_text_layout_get_line_display (layout, line, FALSE);
line_byte = line_display_iter_to_index (layout, display, iter);
if (line_byte < layout_line->start_index + layout_line->length ||
!tmp_list->next)
{
- /* We're located on this line of the para delimiters before
+ /* We're located on this line or the para delimiters before
* it
*/
gtk_text_layout_free_line_display (layout, display);
return FALSE;
}
+void
+gtk_text_layout_get_iter_at_line (GtkTextLayout *layout,
+ GtkTextIter *iter,
+ GtkTextLine *line,
+ gint byte_offset)
+{
+ _gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
+ iter, line, byte_offset);
+}
+
+
/**
* gtk_text_layout_move_iter_to_x:
* @layout: a #GtkTextLayout
gint line_byte;
PangoLayoutIter *layout_iter;
- g_return_if_fail (layout != NULL);
g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
g_return_if_fail (iter != NULL);
- line = gtk_text_iter_get_text_line (iter);
+ line = _gtk_text_iter_get_text_line (iter);
display = gtk_text_layout_get_line_display (layout, line, FALSE);
line_byte = line_display_iter_to_index (layout, display, iter);
while (count != 0)
{
- GtkTextLine *line = gtk_text_iter_get_text_line (iter);
+ GtkTextLine *line = _gtk_text_iter_get_text_line (iter);
gint line_byte;
gint extra_back = 0;
+ gboolean strong;
- int byte_count = gtk_text_line_byte_count (line);
+ int byte_count = _gtk_text_line_byte_count (line);
int new_index;
int new_trailing;
-
if (!display)
display = gtk_text_layout_get_line_display (layout, line, FALSE);
+
+ if (layout->cursor_direction == GTK_TEXT_DIR_NONE)
+ strong = TRUE;
+ else
+ strong = display->direction == layout->cursor_direction;
+
line_byte = line_display_iter_to_index (layout, display, iter);
if (count > 0)
{
- pango_layout_move_cursor_visually (display->layout, line_byte, 0, 1, &new_index, &new_trailing);
+ pango_layout_move_cursor_visually (display->layout, strong, line_byte, 0, 1, &new_index, &new_trailing);
count--;
}
else
{
- pango_layout_move_cursor_visually (display->layout, line_byte, 0, -1, &new_index, &new_trailing);
+ pango_layout_move_cursor_visually (display->layout, strong, line_byte, 0, -1, &new_index, &new_trailing);
count++;
}
if (new_index < 0 || (new_index == 0 && extra_back))
{
- line = gtk_text_line_previous (line);
+ line = _gtk_text_line_previous (line);
if (!line)
goto done;
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);
+ new_index = _gtk_text_line_byte_count (line);
}
else if (new_index > byte_count)
{
- line = gtk_text_line_next (line);
+ line = _gtk_text_line_next_excluding_last (line);
if (!line)
goto done;
return
!gtk_text_iter_equal (iter, &orig) &&
- !gtk_text_iter_is_last (iter);
+ !gtk_text_iter_is_end (iter);
}
void
projects / ~andy / gtk / blobdiff