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

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):
......
......@@ -72,7 +72,7 @@
/*
* The structure below is used to pass information between
* gtk_text_btree_get_tags and inc_count:
* _gtk_text_btree_get_tags and inc_count:
*/
typedef struct TagInfo {
......@@ -346,7 +346,7 @@ chars_changed (GtkTextBTree *tree)
*/
GtkTextBTree*
gtk_text_btree_new (GtkTextTagTable *table,
_gtk_text_btree_new (GtkTextTagTable *table,
GtkTextBuffer *buffer)
{
GtkTextBTree *tree;
......@@ -431,10 +431,10 @@ gtk_text_btree_new (GtkTextTagTable *table,
GtkTextIter start;
GtkTextLineSegment *seg;
gtk_text_btree_get_iter_at_line_char (tree, &start, 0, 0);
__gtk_text_btree_get_iter_at_line_char (tree, &start, 0, 0);
tree->insert_mark = gtk_text_btree_set_mark (tree,
tree->insert_mark = _gtk_text_btree_set_mark (tree,
NULL,
"insert",
FALSE,
......@@ -446,7 +446,7 @@ gtk_text_btree_new (GtkTextTagTable *table,
seg->body.mark.not_deleteable = TRUE;
seg->body.mark.visible = TRUE;
tree->selection_bound_mark = gtk_text_btree_set_mark (tree,
tree->selection_bound_mark = _gtk_text_btree_set_mark (tree,
NULL,
"selection_bound",
FALSE,
......@@ -467,7 +467,7 @@ gtk_text_btree_new (GtkTextTagTable *table,
}
void
gtk_text_btree_ref (GtkTextBTree *tree)
_gtk_text_btree_ref (GtkTextBTree *tree)
{
g_return_if_fail (tree != NULL);
g_return_if_fail (tree->refcount > 0);
......@@ -486,7 +486,7 @@ mark_destroy_foreach (gpointer key, gpointer value, gpointer user_data)
}
void
gtk_text_btree_unref (GtkTextBTree *tree)
_gtk_text_btree_unref (GtkTextBTree *tree)
{
g_return_if_fail (tree != NULL);
g_return_if_fail (tree->refcount > 0);
......@@ -518,25 +518,25 @@ gtk_text_btree_unref (GtkTextBTree *tree)
}
GtkTextBuffer*
gtk_text_btree_get_buffer (GtkTextBTree *tree)
_gtk_text_btree_get_buffer (GtkTextBTree *tree)
{
return tree->buffer;
}
guint
gtk_text_btree_get_chars_changed_stamp (GtkTextBTree *tree)
_gtk_text_btree_get_chars_changed_stamp (GtkTextBTree *tree)
{
return tree->chars_changed_stamp;
}
guint
gtk_text_btree_get_segments_changed_stamp (GtkTextBTree *tree)
_gtk_text_btree_get_segments_changed_stamp (GtkTextBTree *tree)
{
return tree->segments_changed_stamp;
}
void
gtk_text_btree_segments_changed (GtkTextBTree *tree)
_gtk_text_btree_segments_changed (GtkTextBTree *tree)
{
g_return_if_fail (tree != NULL);
segments_changed (tree);
......@@ -547,7 +547,7 @@ gtk_text_btree_segments_changed (GtkTextBTree *tree)
*/
void
gtk_text_btree_delete (GtkTextIter *start,
_gtk_text_btree_delete (GtkTextIter *start,
GtkTextIter *end)
{
GtkTextLineSegment *prev_seg; /* The segment just before the start
......@@ -591,7 +591,7 @@ gtk_text_btree_delete (GtkTextIter *start,
line1 = gtk_text_iter_get_line (start);
line2 = gtk_text_iter_get_line (end);
if (line2 == gtk_text_btree_line_count (tree))
if (line2 == _gtk_text_btree_line_count (tree))
{
GtkTextTag** tags;
int array_size;
......@@ -609,7 +609,7 @@ gtk_text_btree_delete (GtkTextIter *start,
--line1;
}
tags = gtk_text_btree_get_tags (end,
tags = _gtk_text_btree_get_tags (end,
&array_size);
if (tags != NULL)
......@@ -619,7 +619,7 @@ gtk_text_btree_delete (GtkTextIter *start,
i = 0;
while (i < array_size)
{
gtk_text_btree_tag (end, &orig_end, tags[i], FALSE);
_gtk_text_btree_tag (end, &orig_end, tags[i], FALSE);
++i;
}
......@@ -630,7 +630,7 @@ gtk_text_btree_delete (GtkTextIter *start,
}
/* Broadcast the need for redisplay before we break the iterators */
gtk_text_btree_invalidate_region (tree, start, end);
_gtk_text_btree_invalidate_region (tree, start, end);
/* Save the byte offset so we can reset the iterators */
start_byte_offset = gtk_text_iter_get_line_index (start);
......@@ -689,7 +689,7 @@ gtk_text_btree_delete (GtkTextIter *start,
* (unless it's the starting line for the range).
*/
nextline = gtk_text_line_next (curline);
nextline = _gtk_text_line_next (curline);
if (curline != start_line)
{
if (curnode == start_line->parent)
......@@ -842,7 +842,7 @@ gtk_text_btree_delete (GtkTextIter *start,
while (line)
{
GtkTextLine *next_line = line->next;
ld = gtk_text_line_get_data (line, view->view_id);
ld = _gtk_text_line_get_data (line, view->view_id);
if (ld)
{
......@@ -858,7 +858,7 @@ gtk_text_btree_delete (GtkTextIter *start,
if (deleted_width > 0 || deleted_height > 0)
{
ld = gtk_text_line_get_data (start_line, view->view_id);
ld = _gtk_text_line_get_data (start_line, view->view_id);
/* FIXME: ld is _NOT_ necessarily non-null here, but there is currently
* no way to add ld without also validating the node, which would
......@@ -901,15 +901,15 @@ gtk_text_btree_delete (GtkTextIter *start,
segments_changed (tree);
if (gtk_debug_flags & GTK_DEBUG_TEXT)
gtk_text_btree_check (tree);
_gtk_text_btree_check (tree);
/* Re-initialize our iterators */
gtk_text_btree_get_iter_at_line (tree, start, start_line, start_byte_offset);
_gtk_text_btree_get_iter_at_line (tree, start, start_line, start_byte_offset);
*end = *start;
}
void
gtk_text_btree_insert (GtkTextIter *iter,
_gtk_text_btree_insert (GtkTextIter *iter,
const gchar *text,
gint len)
{
......@@ -1039,7 +1039,7 @@ gtk_text_btree_insert (GtkTextIter *iter,
GtkTextIter end;
gtk_text_btree_get_iter_at_line (tree,
_gtk_text_btree_get_iter_at_line (tree,
&start,
start_line,
start_byte_index);
......@@ -1050,7 +1050,7 @@ gtk_text_btree_insert (GtkTextIter *iter,
above. FIXME */
gtk_text_iter_forward_chars (&end, char_count_delta);
gtk_text_btree_invalidate_region (tree,
_gtk_text_btree_invalidate_region (tree,
&start, &end);
......@@ -1093,16 +1093,16 @@ insert_pixbuf_or_widget_segment (GtkTextIter *iter,
/* reset *iter for the user, and invalidate tree nodes */
gtk_text_btree_get_iter_at_line (tree, &start, line, start_byte_offset);
_gtk_text_btree_get_iter_at_line (tree, &start, line, start_byte_offset);
*iter = start;
gtk_text_iter_forward_char (iter); /* skip forward past the segment */
gtk_text_btree_invalidate_region (tree, &start, iter);
_gtk_text_btree_invalidate_region (tree, &start, iter);
}
void
gtk_text_btree_insert_pixbuf (GtkTextIter *iter,
__gtk_text_btree_insert_pixbuf (GtkTextIter *iter,
GdkPixbuf *pixbuf)
{
GtkTextLineSegment *seg;
......@@ -1113,7 +1113,7 @@ gtk_text_btree_insert_pixbuf (GtkTextIter *iter,
}
GtkTextChildAnchor*
gtk_text_btree_create_child_anchor (GtkTextIter *iter)
_gtk_text_btree_create_child_anchor (GtkTextIter *iter)
{
GtkTextLineSegment *seg;
GtkTextBTree *tree;
......@@ -1135,7 +1135,7 @@ gtk_text_btree_create_child_anchor (GtkTextIter *iter)
}
void
gtk_text_btree_unregister_child_anchor (GtkTextChildAnchor *anchor)
_gtk_text_btree_unregister_child_anchor (GtkTextChildAnchor *anchor)
{
GtkTextLineSegment *seg;
......@@ -1157,7 +1157,7 @@ find_line_by_y (GtkTextBTree *tree, BTreeView *view,
gint current_y = 0;
if (gtk_debug_flags & GTK_DEBUG_TEXT)
gtk_text_btree_check (tree);
_gtk_text_btree_check (tree);
if (node->level == 0)
{
......@@ -1169,7 +1169,7 @@ find_line_by_y (GtkTextBTree *tree, BTreeView *view,
{
GtkTextLineData *ld;
ld = gtk_text_line_get_data (line, view->view_id);
ld = _gtk_text_line_get_data (line, view->view_id);
if (ld)
{
......@@ -1214,7 +1214,7 @@ find_line_by_y (GtkTextBTree *tree, BTreeView *view,
}
GtkTextLine *
gtk_text_btree_find_line_by_y (GtkTextBTree *tree,
_gtk_text_btree_find_line_by_y (GtkTextBTree *tree,
gpointer view_id,
gint ypixel,
gint *line_top_out)
......@@ -1252,7 +1252,7 @@ find_line_top_in_line_list (GtkTextBTree *tree,
if (line == target_line)
return y;
ld = gtk_text_line_get_data (line, view->view_id);
ld = _gtk_text_line_get_data (line, view->view_id);
if (ld)
y += ld->height;
......@@ -1266,7 +1266,7 @@ find_line_top_in_line_list (GtkTextBTree *tree,
}
gint
gtk_text_btree_find_line_top (GtkTextBTree *tree,
_gtk_text_btree_find_line_top (GtkTextBTree *tree,
GtkTextLine *target_line,
gpointer view_id)
{
......@@ -1337,7 +1337,7 @@ gtk_text_btree_find_line_top (GtkTextBTree *tree,
}
void
gtk_text_btree_add_view (GtkTextBTree *tree,
_gtk_text_btree_add_view (GtkTextBTree *tree,
GtkTextLayout *layout)
{
BTreeView *view;
......@@ -1369,11 +1369,11 @@ gtk_text_btree_add_view (GtkTextBTree *tree,
line_data->height = 0;
line_data->valid = TRUE;
gtk_text_line_add_data (last_line, line_data);
_gtk_text_line_add_data (last_line, line_data);
}
void
gtk_text_btree_remove_view (GtkTextBTree *tree,
_gtk_text_btree_remove_view (GtkTextBTree *tree,
gpointer view_id)
{
BTreeView *view;
......@@ -1407,7 +1407,7 @@ gtk_text_btree_remove_view (GtkTextBTree *tree,
* (Do this first, so that we don't try to call the view's line data destructor on it.)
*/
last_line = get_last_line (tree);
line_data = gtk_text_line_remove_data (last_line, view_id);
line_data = _gtk_text_line_remove_data (last_line, view_id);
g_free (line_data);
gtk_text_btree_node_remove_view (view, tree->root_node, view_id);
......@@ -1416,7 +1416,7 @@ gtk_text_btree_remove_view (GtkTextBTree *tree,
}
void
gtk_text_btree_invalidate_region (GtkTextBTree *tree,
_gtk_text_btree_invalidate_region (GtkTextBTree *tree,
const GtkTextIter *start,
const GtkTextIter *end)
{
......@@ -1433,7 +1433,7 @@ gtk_text_btree_invalidate_region (GtkTextBTree *tree,
}
void
gtk_text_btree_get_view_size (GtkTextBTree *tree,
_gtk_text_btree_get_view_size (GtkTextBTree *tree,
gpointer view_id,
gint *width,
gint *height)
......@@ -1528,7 +1528,7 @@ queue_tag_redisplay (GtkTextBTree *tree,
{
if (gtk_text_tag_affects_size (tag))
{
gtk_text_btree_invalidate_region (tree, start, end);
_gtk_text_btree_invalidate_region (tree, start, end);
}
else if (gtk_text_tag_affects_nonsize_appearance (tag))
......@@ -1541,7 +1541,7 @@ queue_tag_redisplay (GtkTextBTree *tree,
}
void
gtk_text_btree_tag (const GtkTextIter *start_orig,
_gtk_text_btree_tag (const GtkTextIter *start_orig,
const GtkTextIter *end_orig,
GtkTextTag *tag,
gboolean add)
......@@ -1788,7 +1788,7 @@ gtk_text_btree_tag (const GtkTextIter *start_orig,
segments_changed (tree);
if (gtk_debug_flags & GTK_DEBUG_TEXT)
gtk_text_btree_check (tree);
_gtk_text_btree_check (tree);
}
......@@ -1797,7 +1797,7 @@ gtk_text_btree_tag (const GtkTextIter *start_orig,
*/
GtkTextLine*
gtk_text_btree_get_line (GtkTextBTree *tree,
_gtk_text_btree_get_line (GtkTextBTree *tree,
gint line_number,
gint *real_line_number)
{
......@@ -1806,7 +1806,7 @@ gtk_text_btree_get_line (GtkTextBTree *tree,
int lines_left;
int line_count;
line_count = gtk_text_btree_line_count (tree);
line_count = _gtk_text_btree_line_count (tree);
if (line_number < 0)
{
......@@ -1863,7 +1863,7 @@ gtk_text_btree_get_line (GtkTextBTree *tree,
}
GtkTextLine*
gtk_text_btree_get_line_at_char (GtkTextBTree *tree,
__gtk_text_btree_get_line_at_char (GtkTextBTree *tree,
gint char_index,
gint *line_start_index,
gint *real_char_index)
......@@ -1947,7 +1947,7 @@ gtk_text_btree_get_line_at_char (GtkTextBTree *tree,
}
GtkTextTag**
gtk_text_btree_get_tags (const GtkTextIter *iter,
_gtk_text_btree_get_tags (const GtkTextIter *iter,
gint *num_tags)
{
GtkTextBTreeNode *node;
......@@ -2084,7 +2084,7 @@ copy_segment (GString *string,
/* Don't copy if we're invisible; segments are invisible/not
as a whole, no need to check each char */
if (!include_hidden &&
gtk_text_btree_char_is_invisible (start))
_gtk_text_btree_char_is_invisible (start))
{
copy = FALSE;
/* printf (" <invisible>\n"); */
......@@ -2126,7 +2126,7 @@ copy_segment (GString *string,
copy = FALSE;
}
else if (!include_hidden &&
gtk_text_btree_char_is_invisible (start))
_gtk_text_btree_char_is_invisible (start))
{
copy = FALSE;
}
......@@ -2142,7 +2142,7 @@ copy_segment (GString *string,
}
gchar*
gtk_text_btree_get_text (const GtkTextIter *start_orig,
_gtk_text_btree_get_text (const GtkTextIter *start_orig,
const GtkTextIter *end_orig,
gboolean include_hidden,
gboolean include_nonchars)
......@@ -2191,7 +2191,7 @@ gtk_text_btree_get_text (const GtkTextIter *start_orig,
}
gint
gtk_text_btree_line_count (GtkTextBTree *tree)
_gtk_text_btree_line_count (GtkTextBTree *tree)
{
/* Subtract bogus line at the end; we return a count
of usable lines. */
......@@ -2199,7 +2199,7 @@ gtk_text_btree_line_count (GtkTextBTree *tree)
}
gint
gtk_text_btree_char_count (GtkTextBTree *tree)
_gtk_text_btree_char_count (GtkTextBTree *tree)
{
/* Exclude newline in bogus last line */
return tree->root_node->num_chars - 1;
......@@ -2207,7 +2207,7 @@ gtk_text_btree_char_count (GtkTextBTree *tree)
#define LOTSA_TAGS 1000
gboolean
gtk_text_btree_char_is_invisible (const GtkTextIter *iter)
_gtk_text_btree_char_is_invisible (const GtkTextIter *iter)
{
gboolean invisible = FALSE; /* if nobody says otherwise, it's visible */
......@@ -2382,14 +2382,14 @@ redisplay_region (GtkTextBTree *tree,
gint start_y, end_y;
GtkTextLineData *ld;
start_y = gtk_text_btree_find_line_top (tree, start_line, view->view_id);
start_y = _gtk_text_btree_find_line_top (tree, start_line, view->view_id);
if (end_line == start_line)
end_y = start_y;
else
end_y = gtk_text_btree_find_line_top (tree, end_line, view->view_id);
end_y = _gtk_text_btree_find_line_top (tree, end_line, view->view_id);
ld = gtk_text_line_get_data (end_line, view->view_id);
ld = _gtk_text_line_get_data (end_line, view->view_id);
if (ld)
end_y += ld->height;
......@@ -2407,14 +2407,14 @@ redisplay_mark (GtkTextLineSegment *mark)
GtkTextIter iter;
GtkTextIter end;
gtk_text_btree_get_iter_at_mark (mark->body.mark.tree,
_gtk_text_btree_get_iter_at_mark (mark->body.mark.tree,
&iter,
mark->body.mark.obj);
end = iter;
gtk_text_iter_forward_char (&end);
gtk_text_btree_invalidate_region (mark->body.mark.tree,
_gtk_text_btree_invalidate_region (mark->body.mark.tree,
&iter, &end);
}
......@@ -2433,7 +2433,7 @@ ensure_not_off_end (GtkTextBTree *tree,
GtkTextIter *iter)
{
if (gtk_text_iter_get_line (iter) ==
gtk_text_btree_line_count (tree))
_gtk_text_btree_line_count (tree))
gtk_text_iter_backward_char (iter);
}
......@@ -2484,7 +2484,7 @@ real_set_mark (GtkTextBTree *tree,
{
GtkTextIter old_pos;
gtk_text_btree_get_iter_at_mark (tree, &old_pos,
_gtk_text_btree_get_iter_at_mark (tree, &old_pos,
mark->body.mark.obj);
redisplay_region (tree, &old_pos, where);
}
......@@ -2545,14 +2545,14 @@ real_set_mark (GtkTextBTree *tree,
gtk_text_iter_check (&iter);
if (gtk_debug_flags & GTK_DEBUG_TEXT)
gtk_text_btree_check (tree);
_gtk_text_btree_check (tree);
return mark;
}
GtkTextMark*
gtk_text_btree_set_mark (GtkTextBTree *tree,
_gtk_text_btree_set_mark (GtkTextBTree *tree,
GtkTextMark *existing_mark,
const gchar *name,
gboolean left_gravity,
......@@ -2569,15 +2569,15 @@ gtk_text_btree_set_mark (GtkTextBTree *tree,
}
gboolean
gtk_text_btree_get_selection_bounds (GtkTextBTree *tree,
_gtk_text_btree_get_selection_bounds (GtkTextBTree *tree,
GtkTextIter *start,
GtkTextIter *end)
{
GtkTextIter tmp_start, tmp_end;
gtk_text_btree_get_iter_at_mark (tree, &tmp_start,
_gtk_text_btree_get_iter_at_mark (tree, &tmp_start,
tree->insert_mark);
gtk_text_btree_get_iter_at_mark (tree, &tmp_end,
_gtk_text_btree_get_iter_at_mark (tree, &tmp_end,
tree->selection_bound_mark);
if (gtk_text_iter_equal (&tmp_start, &tmp_end))
......@@ -2605,12 +2605,12 @@ gtk_text_btree_get_selection_bounds (GtkTextBTree *tree,
}
void
gtk_text_btree_place_cursor (GtkTextBTree *tree,
_gtk_text_btree_place_cursor (GtkTextBTree *tree,
const GtkTextIter *iter)
{
GtkTextIter start, end;
if (gtk_text_btree_get_selection_bounds (tree, &start, &end))
if (_gtk_text_btree_get_selection_bounds (tree, &start, &end))
redisplay_region (tree, &start, &end);
/* Move insert AND selection_bound before we redisplay */
......@@ -2621,7 +2621,7 @@ gtk_text_btree_place_cursor (GtkTextBTree *tree,
}
void
gtk_text_btree_remove_mark_by_name (GtkTextBTree *tree,
__gtk_text_btree_remove_mark_by_name (GtkTextBTree *tree,
const gchar *name)
{
GtkTextMark *mark;
......@@ -2632,11 +2632,11 @@ gtk_text_btree_remove_mark_by_name (GtkTextBTree *tree,
mark = g_hash_table_lookup (tree->mark_table,
name);
gtk_text_btree_remove_mark (tree, mark);
_gtk_text_btree_remove_mark (tree, mark);
}
void
gtk_text_btree_remove_mark (GtkTextBTree *tree,
_gtk_text_btree_remove_mark (GtkTextBTree *tree,
GtkTextMark *mark)
{
GtkTextLineSegment *segment;
......@@ -2666,21 +2666,21 @@ gtk_text_btree_remove_mark (GtkTextBTree *tree,
}
gboolean
gtk_text_btree_mark_is_insert (GtkTextBTree *tree,
_gtk_text_btree_mark_is_insert (GtkTextBTree *tree,
GtkTextMark *segment)
{