Commit bacb35ba authored by Havoc Pennington's avatar Havoc Pennington Committed by Havoc Pennington

Put _ in front of every function in this header file

2000-12-13  Havoc Pennington  <hp@pobox.com>

* gtk/gtktextbtree.h: Put _ in front of every function in this
header file

* gtk/gtktext*.[hc]: update to reflect renamed btree functions
parent 02eac1c6
2000-12-13 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.h: Put _ in front of every function in this
header file
* gtk/gtktext*.[hc]: update to reflect renamed btree functions
2000-12-13 <alexl@redhat.com>
* gdk/linux-fb/gdkmouse-fb.c (mouse_devs):
......
2000-12-13 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.h: Put _ in front of every function in this
header file
* gtk/gtktext*.[hc]: update to reflect renamed btree functions
2000-12-13 <alexl@redhat.com>
* gdk/linux-fb/gdkmouse-fb.c (mouse_devs):
......
2000-12-13 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.h: Put _ in front of every function in this
header file
* gtk/gtktext*.[hc]: update to reflect renamed btree functions
2000-12-13 <alexl@redhat.com>
* gdk/linux-fb/gdkmouse-fb.c (mouse_devs):
......
2000-12-13 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.h: Put _ in front of every function in this
header file
* gtk/gtktext*.[hc]: update to reflect renamed btree functions
2000-12-13 <alexl@redhat.com>
* gdk/linux-fb/gdkmouse-fb.c (mouse_devs):
......
2000-12-13 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.h: Put _ in front of every function in this
header file
* gtk/gtktext*.[hc]: update to reflect renamed btree functions
2000-12-13 <alexl@redhat.com>
* gdk/linux-fb/gdkmouse-fb.c (mouse_devs):
......
2000-12-13 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.h: Put _ in front of every function in this
header file
* gtk/gtktext*.[hc]: update to reflect renamed btree functions
2000-12-13 <alexl@redhat.com>
* gdk/linux-fb/gdkmouse-fb.c (mouse_devs):
......
2000-12-13 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbtree.h: Put _ in front of every function in this
header file
* gtk/gtktext*.[hc]: update to reflect renamed btree functions
2000-12-13 <alexl@redhat.com>
* gdk/linux-fb/gdkmouse-fb.c (mouse_devs):
......
This diff is collapsed.
This diff is collapsed.
......@@ -288,7 +288,7 @@ gtk_text_buffer_finalize (GObject *object)
if (buffer->btree)
{
gtk_text_btree_unref (buffer->btree);
_gtk_text_btree_unref (buffer->btree);
buffer->btree = NULL;
}
......@@ -318,7 +318,7 @@ static GtkTextBTree*
get_btree (GtkTextBuffer *buffer)
{
if (buffer->btree == NULL)
buffer->btree = gtk_text_btree_new (gtk_text_buffer_get_tag_table (buffer),
buffer->btree = _gtk_text_btree_new (gtk_text_buffer_get_tag_table (buffer),
buffer);
return buffer->btree;
......@@ -403,7 +403,7 @@ gtk_text_buffer_real_insert_text (GtkTextBuffer *buffer,
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
g_return_if_fail (iter != NULL);
gtk_text_btree_insert (iter, text, len);
_gtk_text_btree_insert (iter, text, len);
gtk_signal_emit (GTK_OBJECT (buffer), signals[CHANGED]);
}
......@@ -1046,7 +1046,7 @@ gtk_text_buffer_real_delete_text (GtkTextBuffer *buffer,
g_return_if_fail (start != NULL);
g_return_if_fail (end != NULL);
gtk_text_btree_delete (start, end);
_gtk_text_btree_delete (start, end);
/* may have deleted the selection... */
gtk_text_buffer_update_primary_selection (buffer);
......@@ -1330,7 +1330,7 @@ gtk_text_buffer_insert_pixbuf (GtkTextBuffer *buffer,
g_return_if_fail (iter != NULL);
g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
gtk_text_btree_insert_pixbuf (iter, pixbuf);
__gtk_text_btree_insert_pixbuf (iter, pixbuf);
/* FIXME pixbuf-specific signal like insert_text */
......@@ -1350,7 +1350,7 @@ gtk_text_buffer_create_child_anchor (GtkTextBuffer *buffer,
g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
g_return_val_if_fail (iter != NULL, NULL);
anchor = gtk_text_btree_create_child_anchor (iter);
anchor = _gtk_text_btree_create_child_anchor (iter);
/* FIXME child-anchor-specific signal */
......@@ -1414,20 +1414,20 @@ gtk_text_buffer_set_mark (GtkTextBuffer *buffer,
GtkTextIter location;
GtkTextMark *mark;
mark = gtk_text_btree_set_mark (get_btree (buffer),
mark = _gtk_text_btree_set_mark (get_btree (buffer),
existing_mark,
mark_name,
left_gravity,
iter,
should_exist);
if (gtk_text_btree_mark_is_insert (get_btree (buffer), mark) ||
gtk_text_btree_mark_is_selection_bound (get_btree (buffer), mark))
if (_gtk_text_btree_mark_is_insert (get_btree (buffer), mark) ||
_gtk_text_btree_mark_is_selection_bound (get_btree (buffer), mark))
{
gtk_text_buffer_update_primary_selection (buffer);
}
gtk_text_btree_get_iter_at_mark (get_btree (buffer),
_gtk_text_btree_get_iter_at_mark (get_btree (buffer),
&location,
mark);
......@@ -1513,7 +1513,7 @@ gtk_text_buffer_get_iter_at_mark (GtkTextBuffer *buffer,
g_return_if_fail (!gtk_text_mark_get_deleted (mark));
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
gtk_text_btree_get_iter_at_mark (get_btree (buffer),
_gtk_text_btree_get_iter_at_mark (get_btree (buffer),
iter,
mark);
}
......@@ -1543,7 +1543,7 @@ gtk_text_buffer_delete_mark (GtkTextBuffer *buffer,
g_object_ref (G_OBJECT (mark));
gtk_text_btree_remove_mark (get_btree (buffer), mark);
_gtk_text_btree_remove_mark (get_btree (buffer), mark);
/* See rationale above for MARK_SET on why we emit this after
* removing the mark, rather than removing the mark in a default
......@@ -1574,7 +1574,7 @@ gtk_text_buffer_get_mark (GtkTextBuffer *buffer,
g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
g_return_val_if_fail (name != NULL, NULL);
mark = gtk_text_btree_get_mark_by_name (get_btree (buffer), name);
mark = _gtk_text_btree_get_mark_by_name (get_btree (buffer), name);
return mark;
}
......@@ -1599,7 +1599,7 @@ gtk_text_buffer_move_mark_by_name (GtkTextBuffer *buffer,
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
g_return_if_fail (name != NULL);
mark = gtk_text_btree_get_mark_by_name (get_btree (buffer), name);
mark = _gtk_text_btree_get_mark_by_name (get_btree (buffer), name);
if (mark == NULL)
{
......@@ -1627,7 +1627,7 @@ gtk_text_buffer_delete_mark_by_name (GtkTextBuffer *buffer,
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
g_return_if_fail (name != NULL);
mark = gtk_text_btree_get_mark_by_name (get_btree (buffer), name);
mark = _gtk_text_btree_get_mark_by_name (get_btree (buffer), name);
if (mark == NULL)
{
......@@ -1695,7 +1695,7 @@ gtk_text_buffer_get_iter_at_child_anchor (GtkTextBuffer *buffer,
g_return_if_fail (GTK_IS_TEXT_CHILD_ANCHOR (anchor));
g_return_if_fail (!gtk_text_child_anchor_get_deleted (anchor));
gtk_text_btree_get_iter_at_child_anchor (get_btree (buffer),
_gtk_text_btree_get_iter_at_child_anchor (get_btree (buffer),
iter,
anchor);
}
......@@ -1726,7 +1726,7 @@ gtk_text_buffer_place_cursor (GtkTextBuffer *buffer,
if (gtk_text_iter_is_last (&real))
gtk_text_iter_backward_char (&real);
gtk_text_btree_place_cursor (get_btree (buffer), &real);
_gtk_text_btree_place_cursor (get_btree (buffer), &real);
gtk_text_buffer_mark_set (buffer, &real,
gtk_text_buffer_get_mark (buffer,
"insert"));
......@@ -1774,7 +1774,7 @@ gtk_text_buffer_real_apply_tag (GtkTextBuffer *buffer,
const GtkTextIter *start,
const GtkTextIter *end)
{
gtk_text_btree_tag (start, end, tag, TRUE);
_gtk_text_btree_tag (start, end, tag, TRUE);
}
static void
......@@ -1783,7 +1783,7 @@ gtk_text_buffer_real_remove_tag (GtkTextBuffer *buffer,
const GtkTextIter *start,
const GtkTextIter *end)
{
gtk_text_btree_tag (start, end, tag, FALSE);
_gtk_text_btree_tag (start, end, tag, FALSE);
}
static void
......@@ -1909,7 +1909,7 @@ gtk_text_buffer_get_iter_at_line_offset (GtkTextBuffer *buffer,
g_return_if_fail (iter != NULL);
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
gtk_text_btree_get_iter_at_line_char (get_btree (buffer),
__gtk_text_btree_get_iter_at_line_char (get_btree (buffer),
iter, line_number, char_offset);
}
......@@ -1922,7 +1922,7 @@ gtk_text_buffer_get_iter_at_line_index (GtkTextBuffer *buffer,
g_return_if_fail (iter != NULL);
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
gtk_text_btree_get_iter_at_line_byte (get_btree (buffer),
__gtk_text_btree_get_iter_at_line_byte (get_btree (buffer),
iter, line_number, byte_index);
}
......@@ -1945,7 +1945,7 @@ gtk_text_buffer_get_iter_at_offset (GtkTextBuffer *buffer,
g_return_if_fail (iter != NULL);
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
gtk_text_btree_get_iter_at_char (get_btree (buffer), iter, char_offset);
_gtk_text_btree_get_iter_at_char (get_btree (buffer), iter, char_offset);
}
void
......@@ -1955,7 +1955,7 @@ gtk_text_buffer_get_last_iter (GtkTextBuffer *buffer,
g_return_if_fail (iter != NULL);
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
gtk_text_btree_get_last_iter (get_btree (buffer), iter);
_gtk_text_btree_get_last_iter (get_btree (buffer), iter);
}
void
......@@ -1967,8 +1967,8 @@ gtk_text_buffer_get_bounds (GtkTextBuffer *buffer,
g_return_if_fail (end != NULL);
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
gtk_text_btree_get_iter_at_char (get_btree (buffer), start, 0);
gtk_text_btree_get_last_iter (get_btree (buffer), end);
_gtk_text_btree_get_iter_at_char (get_btree (buffer), start, 0);
_gtk_text_btree_get_last_iter (get_btree (buffer), end);
}
/*
......@@ -2012,7 +2012,7 @@ gtk_text_buffer_get_line_count (GtkTextBuffer *buffer)
{
g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), 0);
return gtk_text_btree_line_count (get_btree (buffer));
return _gtk_text_btree_line_count (get_btree (buffer));
}
gint
......@@ -2020,7 +2020,7 @@ gtk_text_buffer_get_char_count (GtkTextBuffer *buffer)
{
g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), 0);
return gtk_text_btree_char_count (get_btree (buffer));
return _gtk_text_btree_char_count (get_btree (buffer));
}
/* Called when we lose the primary selection.
......@@ -2613,7 +2613,7 @@ gtk_text_buffer_get_selection_bounds (GtkTextBuffer *buffer,
{
g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
return gtk_text_btree_get_selection_bounds (get_btree (buffer), start, end);
return _gtk_text_btree_get_selection_bounds (get_btree (buffer), start, end);
}
/*
......@@ -2725,10 +2725,10 @@ _gtk_text_buffer_get_line_log_attrs (GtkTextBuffer *buffer,
{
buffer->log_attr_cache = g_new0 (GtkTextLogAttrCache, 1);
buffer->log_attr_cache->chars_changed_stamp =
gtk_text_btree_get_chars_changed_stamp (get_btree (buffer));
_gtk_text_btree_get_chars_changed_stamp (get_btree (buffer));
}
else if (buffer->log_attr_cache->chars_changed_stamp !=
gtk_text_btree_get_chars_changed_stamp (get_btree (buffer)))
_gtk_text_btree_get_chars_changed_stamp (get_btree (buffer)))
{
clear_log_attr_cache (buffer->log_attr_cache);
}
......@@ -2773,7 +2773,7 @@ _gtk_text_buffer_get_line_log_attrs (GtkTextBuffer *buffer,
void
_gtk_text_buffer_spew (GtkTextBuffer *buffer)
{
gtk_text_btree_spew (get_btree (buffer));
_gtk_text_btree_spew (get_btree (buffer));
}
......
......@@ -142,7 +142,7 @@ child_segment_delete_func (GtkTextLineSegment *seg,
GSList *tmp_list;
GSList *copy;
gtk_text_btree_unregister_child_anchor (seg->body.child.obj);
_gtk_text_btree_unregister_child_anchor (seg->body.child.obj);
seg->body.child.tree = NULL;
seg->body.child.line = NULL;
......
......@@ -741,12 +741,12 @@ gtk_text_layout_draw (GtkTextLayout *layout,
if (have_selection)
{
GtkTextIter line_start, line_end;
gint byte_count = gtk_text_line_byte_count (line);
gint byte_count = _gtk_text_line_byte_count (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),
&line_start,
line, 0);
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),
&line_end,
line, byte_count - 1);
......
This diff is collapsed.
......@@ -277,7 +277,7 @@ gtk_text_layout_set_buffer (GtkTextLayout *layout,
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));
......@@ -291,7 +291,7 @@ gtk_text_layout_set_buffer (GtkTextLayout *layout,
gtk_object_sink (GTK_OBJECT (buffer));
gtk_object_ref (GTK_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);
}
}
......@@ -464,11 +464,11 @@ gtk_text_layout_set_preedit_string (GtkTextLayout *layout,
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);
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_line_invalidate_wrap (line, line_data);
gtk_text_layout_invalidated (layout);
}
}
......@@ -547,7 +547,7 @@ gtk_text_layout_get_lines (GtkTextLayout *layout,
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)
{
......@@ -558,17 +558,17 @@ gtk_text_layout_get_lines (GtkTextLayout *layout,
/* -1 since bottom_y is one past */
last_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, 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,
_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);
GtkTextLineData *ld = _gtk_text_line_get_data (last_btree_line, layout);
if (ld->height == 0)
G_BREAKPOINT ();
}
......@@ -583,7 +583,7 @@ gtk_text_layout_get_lines (GtkTextLayout *layout,
if (line == last_btree_line)
break;
line = gtk_text_line_next (line);
line = _gtk_text_line_next (line);
}
retval = g_slist_reverse (retval);
......@@ -675,19 +675,19 @@ gtk_text_layout_real_invalidate (GtkTextLayout *layout,
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 (line);
}
gtk_text_layout_invalidated (layout);
......@@ -724,14 +724,14 @@ 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);
}
......@@ -779,14 +779,14 @@ gtk_text_layout_validate_yrange (GtkTextLayout *layout,
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),
__gtk_text_btree_validate_line (_gtk_text_buffer_get_btree (layout->buffer),
line, layout);
line_data = gtk_text_line_get_data (line, layout);
line_data = _gtk_text_line_get_data (line, layout);
delta_height += line_data->height - old_height;
......@@ -800,7 +800,7 @@ gtk_text_layout_validate_yrange (GtkTextLayout *layout,
}
seen += line_data->height;
line = gtk_text_line_previous (line);
line = _gtk_text_line_previous (line);
}
/* Validate forwards to y1 */
......@@ -808,14 +808,14 @@ gtk_text_layout_validate_yrange (GtkTextLayout *layout,
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),
__gtk_text_btree_validate_line (_gtk_text_buffer_get_btree (layout->buffer),
line, layout);
line_data = gtk_text_line_get_data (line, layout);
line_data = _gtk_text_line_get_data (line, layout);
delta_height += line_data->height - old_height;
......@@ -829,7 +829,7 @@ gtk_text_layout_validate_yrange (GtkTextLayout *layout,
}
seen += line_data->height;
line = gtk_text_line_next (line);
line = _gtk_text_line_next (line);
}
/* If we found and validated any invalid lines, update size and
......@@ -841,7 +841,7 @@ gtk_text_layout_validate_yrange (GtkTextLayout *layout,
update_layout_size (layout);
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),
first_line, layout);
gtk_text_layout_changed (layout,
......@@ -870,7 +870,7 @@ gtk_text_layout_validate (GtkTextLayout *layout,
g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
while (max_pixels > 0 &&
gtk_text_btree_validate (_gtk_text_buffer_get_btree (layout->buffer),
_gtk_text_btree_validate (_gtk_text_buffer_get_btree (layout->buffer),
layout, max_pixels,
&y, &old_height, &new_height))
{
......@@ -894,7 +894,7 @@ gtk_text_layout_real_wrap (GtkTextLayout *layout,
if (line_data == NULL)
{
line_data = gtk_text_line_data_new (layout, line);
gtk_text_line_add_data (line, line_data);
_gtk_text_line_add_data (line, line_data);
}
display = gtk_text_layout_get_line_display (layout, line, TRUE);
......@@ -933,7 +933,7 @@ get_style (GtkTextLayout *layout,
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)
......@@ -1010,10 +1010,10 @@ totally_invisible_line (GtkTextLayout *layout,
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;
}
......@@ -1396,7 +1396,7 @@ add_cursor (GtkTextLayout *layout,
/* 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)))
......@@ -1622,7 +1622,7 @@ gtk_text_layout_get_line_display (GtkTextLayout *layout,
display->line = line;
display->insert_index = -1;
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);
/* Special-case optimization for completely
......@@ -1634,7 +1634,7 @@ gtk_text_layout_get_line_display (GtkTextLayout *layout,
/* Allocate space for flat text for buffer
*/
byte_count = gtk_text_line_byte_count (line);
byte_count = _gtk_text_line_byte_count (line);
text = g_malloc (byte_count);
attrs = pango_attr_list_new ();
......@@ -1649,7 +1649,7 @@ gtk_text_layout_get_line_display (GtkTextLayout *layout,
seg->type == &gtk_text_pixbuf_type ||
seg->type == &gtk_text_child_type)
{
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,
byte_offset);
style = get_style (layout, &iter);
......@@ -1700,7 +1700,7 @@ gtk_text_layout_get_line_display (GtkTextLayout *layout,
*/
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;
......@@ -1778,7 +1778,7 @@ gtk_text_layout_get_line_display (GtkTextLayout *layout,
/* 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;
......@@ -1942,7 +1942,7 @@ line_display_index_to_iter (GtkTextLayout *layout,
trailing = 0;
}
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, display->line, index);
gtk_text_iter_forward_chars (iter, trailing);
}
......@@ -1976,15 +1976,15 @@ get_line_at_y (GtkTextLayout *layout,
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_line (_gtk_text_buffer_get_btree (layout->buffer),
_gtk_text_btree_line_count (_gtk_text_buffer_get_btree (layout->buffer)) - 1, NULL);
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);
}
}
......@@ -2012,7 +2012,7 @@ gtk_text_layout_get_line_at_y (GtkTextLayout *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);
}
......@@ -2052,7 +2052,7 @@ gtk_text_layout_get_iter_at_pixel (GtkTextLayout *layout,
if (!pango_layout_xy_to_index (display->layout, x * PANGO_SCALE, y * PANGO_SCALE,
&byte_index, &trailing))
{
byte_index = gtk_text_line_byte_count (line);
byte_index = _gtk_text_line_byte_count (line);
trailing = 0;
}
......@@ -2098,7 +2098,7 @@ gtk_text_layout_get_cursor_locations (GtkTextLayout *layout,
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,
......@@ -2150,11 +2150,11 @@ gtk_text_layout_get_line_yrange (GtkTextLayout *layout,
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
......@@ -2183,7 +2183,7 @@ gtk_text_layout_get_iter_location (GtkTextLayout *layout,
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;
......@@ -2215,16 +2215,16 @@ find_display_line_below (GtkTextLayout *layout,
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,
_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),
_gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer),
line, layout);
}
......@@ -2260,14 +2260,14 @@ find_display_line_below (GtkTextLayout *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 (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);
}
......@@ -2285,12 +2285,12 @@ find_display_line_above (GtkTextLayout *layout,
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_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);
}
while (line && !found_line)
......@@ -2331,13 +2331,13 @@ find_display_line_above (GtkTextLayout *layout,
gtk_text_layout_free_line_display (layout, display);
line = gtk_text_line_previous (line);
line = _gtk_text_line_previous (line);
}