summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorHavoc Pennington <hp@redhat.com>2000-10-30 17:03:00 +0000
committerHavoc Pennington <hp@src.gnome.org>2000-10-30 17:03:00 +0000
commit5190c7397c407f07d14989d32e711131aa57d39b (patch)
tree931bc10457c29d008afc5370ad70baed55db8c75 /gtk
parentad8cdea4e8677c6c56e0cbc39ecdac7135a83824 (diff)
downloadgtk+-5190c7397c407f07d14989d32e711131aa57d39b.tar.gz
Massive reindentation and reformatting. Arg alignment and comments still
2000-10-30 Havoc Pennington <hp@redhat.com> * gtktextbtree.c, gtktextbtree.h, gtktextbuffer.c, gtktextbuffer.h, gtktextchild.c, gtktextchild.h, gtktextchildprivate.h, gtktextdisplay.c, gtktextdisplay.h, gtktextiter.c, gtktextiter.h, gtktextiterprivate.h, gtktextlayout.c, gtktextlayout.h, gtktextmark.c, gtktextmark.h, gtktextmarkprivate.h, gtktextsegment.c, gtktextsegment.h, gtktexttag.c, gtktexttag.h, gtktexttagprivate.h, gtktexttagtable.c, gtktexttagtable.h, gtktexttypes.c, gtktexttypes.h, gtktextview.c, gtktextview.h: Massive reindentation and reformatting. Arg alignment and comments still need fixing in various places.
Diffstat (limited to 'gtk')
-rw-r--r--gtk/gtktextbtree.c2694
-rw-r--r--gtk/gtktextbtree.h74
-rw-r--r--gtk/gtktextbuffer.c878
-rw-r--r--gtk/gtktextbuffer.h6
-rw-r--r--gtk/gtktextchild.c72
-rw-r--r--gtk/gtktextchild.h4
-rw-r--r--gtk/gtktextchildprivate.h8
-rw-r--r--gtk/gtktextdisplay.c662
-rw-r--r--gtk/gtktextdisplay.h30
-rw-r--r--gtk/gtktextiter.c1890
-rw-r--r--gtk/gtktextiter.h14
-rw-r--r--gtk/gtktextiterprivate.h2
-rw-r--r--gtk/gtktextlayout.c1136
-rw-r--r--gtk/gtktextlayout.h204
-rw-r--r--gtk/gtktextmark.c98
-rw-r--r--gtk/gtktextmark.h12
-rw-r--r--gtk/gtktextsegment.c196
-rw-r--r--gtk/gtktextsegment.h30
-rw-r--r--gtk/gtktexttag.c580
-rw-r--r--gtk/gtktexttag.h50
-rw-r--r--gtk/gtktexttagtable.c118
-rw-r--r--gtk/gtktexttagtable.h6
-rw-r--r--gtk/gtktexttypes.c6
-rw-r--r--gtk/gtktextview.c1284
-rw-r--r--gtk/gtktextview.h48
25 files changed, 5051 insertions, 5051 deletions
diff --git a/gtk/gtktextbtree.c b/gtk/gtktextbtree.c
index d7a96bcea4..3f0f7c2c2e 100644
--- a/gtk/gtktextbtree.c
+++ b/gtk/gtktextbtree.c
@@ -14,7 +14,7 @@
* California, Sun Microsystems, Inc., and other parties. The
* following terms apply to all files associated with the software
* unless explicitly disclaimed in individual files.
- *
+ *
* The authors hereby grant permission to use, copy, modify,
* distribute, and license this software and its documentation for any
* purpose, provided that existing copyright notices are retained in
@@ -24,13 +24,13 @@
* software may be copyrighted by their authors and need not follow
* the licensing terms described here, provided that the new terms are
* clearly indicated on the first page of each file where they apply.
- *
+ *
* IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY
* PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
* DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION,
* OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+ *
* THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
@@ -49,7 +49,7 @@
* foregoing, the authors grant the U.S. Government and others acting
* in its behalf permission to use and distribute the software in
* accordance with the terms specified in this license.
- *
+ *
*/
#include "gtktextbtree.h"
@@ -101,7 +101,7 @@ struct _NodeData {
/* Height and width of this node */
gint height;
gint width : 24;
-
+
/* boolean indicating whether the height/width need to be recomputed */
gint valid : 8;
};
@@ -193,7 +193,7 @@ struct _GtkTextBTree {
guint segments_changed_stamp;
GtkTextLine *end_iter_line;
-
+
guint end_iter_line_stamp;
};
@@ -210,7 +210,7 @@ struct _GtkTextBTree {
guess this may increase memory use though, and make it slower to
walk the tree in order, or locate a particular byte index (which
is done by walking the tree in order).
-
+
There's basically a tradeoff here. However I'm thinking we want to
add pixels, byte counts, and char counts to the tree nodes,
at that point narrow and deep should speed up all operations,
@@ -265,13 +265,13 @@ static NodeData *node_data_find (NodeData *nd,
static GtkTextBTreeNode *gtk_text_btree_node_new (void);
static void gtk_text_btree_node_invalidate_downward (GtkTextBTreeNode *node);
static void gtk_text_btree_node_invalidate_upward (GtkTextBTreeNode *node,
- gpointer view_id);
+ gpointer view_id);
static NodeData * gtk_text_btree_node_check_valid (GtkTextBTreeNode *node,
- gpointer view_id);
+ gpointer view_id);
static NodeData * gtk_text_btree_node_check_valid_downward (GtkTextBTreeNode *node,
- gpointer view_id);
+ gpointer view_id);
static void gtk_text_btree_node_check_valid_upward (GtkTextBTreeNode *node,
- gpointer view_id);
+ gpointer view_id);
static void gtk_text_btree_node_remove_view (BTreeView *view,
GtkTextBTreeNode *node,
@@ -287,7 +287,7 @@ static void gtk_text_btree_node_get_size (GtkTextBTr
gint *width,
gint *height);
static GtkTextBTreeNode * gtk_text_btree_node_common_parent (GtkTextBTreeNode *node1,
- GtkTextBTreeNode *node2);
+ GtkTextBTreeNode *node2);
static void get_tree_bounds (GtkTextBTree *tree,
GtkTextIter *start,
GtkTextIter *end);
@@ -300,7 +300,7 @@ static void tag_removed_cb (GtkTextTagTable *table,
GtkTextBTree *tree);
static void cleanup_line (GtkTextLine *line);
static void recompute_node_counts (GtkTextBTree *tree,
- GtkTextBTreeNode *node);
+ GtkTextBTreeNode *node);
static void inc_count (GtkTextTag *tag,
int inc,
TagInfo *tagInfoPtr);
@@ -328,13 +328,13 @@ static void redisplay_region (GtkTextBTree *tree,
/* Inline thingies */
static inline void
-segments_changed(GtkTextBTree *tree)
+segments_changed (GtkTextBTree *tree)
{
tree->segments_changed_stamp += 1;
}
static inline void
-chars_changed(GtkTextBTree *tree)
+chars_changed (GtkTextBTree *tree)
{
tree->chars_changed_stamp += 1;
}
@@ -351,9 +351,9 @@ gtk_text_btree_new (GtkTextTagTable *table,
GtkTextBTreeNode *root_node;
GtkTextLine *line, *line2;
- g_return_val_if_fail(GTK_IS_TEXT_TAG_TABLE(table), NULL);
- g_return_val_if_fail(GTK_IS_TEXT_BUFFER(buffer), NULL);
-
+ g_return_val_if_fail (GTK_IS_TEXT_TAG_TABLE (table), NULL);
+ g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
+
/*
* The tree will initially have two empty lines. The second line
* isn't actually part of the tree's contents, but its presence
@@ -362,11 +362,11 @@ gtk_text_btree_new (GtkTextTagTable *table,
*/
/* Create the root node. */
-
- root_node = gtk_text_btree_node_new();
-
- line = gtk_text_line_new();
- line2 = gtk_text_line_new();
+
+ root_node = gtk_text_btree_node_new ();
+
+ line = gtk_text_line_new ();
+ line2 = gtk_text_line_new ();
root_node->parent = NULL;
root_node->next = NULL;
@@ -376,18 +376,18 @@ gtk_text_btree_new (GtkTextTagTable *table,
root_node->num_children = 2;
root_node->num_lines = 2;
root_node->num_chars = 2;
-
+
line->parent = root_node;
line->next = line2;
- line->segments = _gtk_char_segment_new("\n", 1);
+ line->segments = _gtk_char_segment_new ("\n", 1);
line2->parent = root_node;
line2->next = NULL;
- line2->segments = _gtk_char_segment_new("\n", 1);
+ line2->segments = _gtk_char_segment_new ("\n", 1);
/* Create the tree itself */
-
+
tree = g_new0(GtkTextBTree, 1);
tree->root_node = root_node;
tree->table = table;
@@ -402,34 +402,34 @@ gtk_text_btree_new (GtkTextTagTable *table,
tree->end_iter_line_stamp = tree->chars_changed_stamp - 1;
tree->end_iter_line = NULL;
-
- gtk_object_ref(GTK_OBJECT(tree->table));
- gtk_object_sink(GTK_OBJECT(tree->table));
-
- tree->tag_changed_handler = gtk_signal_connect(GTK_OBJECT(tree->table),
- "tag_changed",
- GTK_SIGNAL_FUNC(tag_changed_cb),
- tree);
-
- tree->tag_removed_handler = gtk_signal_connect(GTK_OBJECT(tree->table),
- "tag_removed",
- GTK_SIGNAL_FUNC(tag_removed_cb),
- tree);
-
- tree->mark_table = g_hash_table_new(g_str_hash, g_str_equal);
+
+ gtk_object_ref (GTK_OBJECT (tree->table));
+ gtk_object_sink (GTK_OBJECT (tree->table));
+
+ tree->tag_changed_handler = gtk_signal_connect (GTK_OBJECT (tree->table),
+ "tag_changed",
+ GTK_SIGNAL_FUNC (tag_changed_cb),
+ tree);
+
+ tree->tag_removed_handler = gtk_signal_connect (GTK_OBJECT (tree->table),
+ "tag_removed",
+ GTK_SIGNAL_FUNC (tag_removed_cb),
+ tree);
+
+ tree->mark_table = g_hash_table_new (g_str_hash, g_str_equal);
/* We don't ref the buffer, since the buffer owns us;
* we'd have some circularity issues. The buffer always
* lasts longer than the BTree
*/
tree->buffer = buffer;
-
+
{
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,
NULL,
@@ -439,10 +439,10 @@ gtk_text_btree_new (GtkTextTagTable *table,
FALSE);
seg = tree->insert_mark->segment;
-
+
seg->body.mark.not_deleteable = TRUE;
seg->body.mark.visible = TRUE;
-
+
tree->selection_bound_mark = gtk_text_btree_set_mark (tree,
NULL,
"selection_bound",
@@ -451,7 +451,7 @@ gtk_text_btree_new (GtkTextTagTable *table,
FALSE);
seg = tree->selection_bound_mark->segment;
-
+
seg->body.mark.not_deleteable = TRUE;
g_object_ref (G_OBJECT (tree->insert_mark));
@@ -459,16 +459,16 @@ gtk_text_btree_new (GtkTextTagTable *table,
}
tree->refcount = 1;
-
+
return tree;
}
void
gtk_text_btree_ref (GtkTextBTree *tree)
{
- g_return_if_fail(tree != NULL);
- g_return_if_fail(tree->refcount > 0);
-
+ g_return_if_fail (tree != NULL);
+ g_return_if_fail (tree->refcount > 0);
+
tree->refcount += 1;
}
@@ -478,15 +478,15 @@ mark_destroy_foreach (gpointer key, gpointer value, gpointer user_data)
GtkTextLineSegment *seg = value;
g_return_if_fail (seg->body.mark.tree == NULL);
-
+
g_object_unref (G_OBJECT (seg->body.mark.obj));
}
void
gtk_text_btree_unref (GtkTextBTree *tree)
{
- g_return_if_fail(tree != NULL);
- g_return_if_fail(tree->refcount > 0);
+ g_return_if_fail (tree != NULL);
+ g_return_if_fail (tree->refcount > 0);
tree->refcount -= 1;
@@ -498,17 +498,17 @@ gtk_text_btree_unref (GtkTextBTree *tree)
mark_destroy_foreach,
NULL);
g_hash_table_destroy (tree->mark_table);
-
+
g_object_unref (G_OBJECT (tree->insert_mark));
g_object_unref (G_OBJECT (tree->selection_bound_mark));
- gtk_signal_disconnect (GTK_OBJECT(tree->table),
+ gtk_signal_disconnect (GTK_OBJECT (tree->table),
tree->tag_changed_handler);
- gtk_signal_disconnect (GTK_OBJECT(tree->table),
+ gtk_signal_disconnect (GTK_OBJECT (tree->table),
tree->tag_removed_handler);
-
- gtk_object_unref (GTK_OBJECT(tree->table));
+
+ gtk_object_unref (GTK_OBJECT (tree->table));
g_free (tree);
}
@@ -535,8 +535,8 @@ gtk_text_btree_get_segments_changed_stamp (GtkTextBTree *tree)
void
gtk_text_btree_segments_changed (GtkTextBTree *tree)
{
- g_return_if_fail(tree != NULL);
- segments_changed(tree);
+ g_return_if_fail (tree != NULL);
+ segments_changed (tree);
}
/*
@@ -557,18 +557,18 @@ gtk_text_btree_delete (GtkTextIter *start,
GtkTextBTree *tree;
GtkTextLine *start_line;
GtkTextLine *end_line;
- GtkTextLine *deleted_lines = NULL; /* List of lines we've deleted */
+ GtkTextLine *deleted_lines = NULL; /* List of lines we've deleted */
gint start_byte_offset;
-
- g_return_if_fail(start != NULL);
- g_return_if_fail(end != NULL);
- g_return_if_fail(gtk_text_iter_get_btree(start) ==
- gtk_text_iter_get_btree(end));
-
- gtk_text_iter_reorder(start, end);
-
- tree = gtk_text_iter_get_btree(start);
-
+
+ g_return_if_fail (start != NULL);
+ g_return_if_fail (end != NULL);
+ g_return_if_fail (gtk_text_iter_get_btree (start) ==
+ gtk_text_iter_get_btree (end));
+
+ gtk_text_iter_reorder (start, end);
+
+ tree = gtk_text_iter_get_btree (start);
+
{
/*
* The code below is ugly, but it's needed to make sure there
@@ -584,31 +584,31 @@ gtk_text_btree_delete (GtkTextIter *start,
gint line1;
gint line2;
-
- line1 = gtk_text_iter_get_line(start);
- line2 = gtk_text_iter_get_line(end);
-
- if (line2 == gtk_text_btree_line_count(tree))
+
+ line1 = gtk_text_iter_get_line (start);
+ line2 = gtk_text_iter_get_line (end);
+
+ if (line2 == gtk_text_btree_line_count (tree))
{
GtkTextTag** tags;
int array_size;
GtkTextIter orig_end;
-
+
orig_end = *end;
- gtk_text_iter_prev_char(end);
-
+ gtk_text_iter_prev_char (end);
+
--line2;
- if (gtk_text_iter_get_line_offset(start) == 0 &&
+ if (gtk_text_iter_get_line_offset (start) == 0 &&
line1 != 0)
{
- gtk_text_iter_prev_char(start);
+ gtk_text_iter_prev_char (start);
--line1;
}
-
- tags = gtk_text_btree_get_tags(end,
- &array_size);
-
+
+ tags = gtk_text_btree_get_tags (end,
+ &array_size);
+
if (tags != NULL)
{
int i;
@@ -616,25 +616,25 @@ 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;
}
- g_free(tags);
+ g_free (tags);
}
}
}
-
+
/* 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);
-
- start_line = gtk_text_iter_get_text_line(start);
- end_line = gtk_text_iter_get_text_line(end);
-
+ start_byte_offset = gtk_text_iter_get_line_index (start);
+
+ start_line = gtk_text_iter_get_text_line (start);
+ end_line = gtk_text_iter_get_text_line (end);
+
/*
* Split the start and end segments, so we have a place
* to insert our new text.
@@ -644,13 +644,13 @@ gtk_text_btree_delete (GtkTextIter *start,
* us to avoid invalidating segments for start.
*/
- last_seg = gtk_text_line_segment_split(end);
+ last_seg = gtk_text_line_segment_split (end);
if (last_seg != NULL)
last_seg = last_seg->next;
else
last_seg = end_line->segments;
- prev_seg = gtk_text_line_segment_split(start);
+ prev_seg = gtk_text_line_segment_split (start);
if (prev_seg != NULL)
{
seg = prev_seg->next;
@@ -664,8 +664,8 @@ gtk_text_btree_delete (GtkTextIter *start,
/* notify iterators that their segments need recomputation,
just for robustness. */
- segments_changed(tree);
-
+ segments_changed (tree);
+
/*
* Delete all of the segments between prev_seg and last_seg.
*/
@@ -675,7 +675,7 @@ gtk_text_btree_delete (GtkTextIter *start,
while (seg != last_seg)
{
gint char_count = 0;
-
+
if (seg == NULL)
{
GtkTextLine *nextline;
@@ -686,25 +686,25 @@ 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)
start_line->next = curline->next;
else
curnode->children.line = curline->next;
-
+
for (node = curnode; node != NULL;
node = node->parent)
{
node->num_lines -= 1;
}
-
+
curnode->num_children -= 1;
- curline->next = deleted_lines;
- deleted_lines = curline;
+ curline->next = deleted_lines;
+ deleted_lines = curline;
}
-
+
curline = nextline;
seg = curline->segments;
@@ -732,7 +732,7 @@ gtk_text_btree_delete (GtkTextIter *start,
prevnode->next = curnode->next;
}
parent->num_children--;
- g_free(curnode);
+ g_free (curnode);
curnode = parent;
}
curnode = curline->parent;
@@ -741,14 +741,14 @@ gtk_text_btree_delete (GtkTextIter *start,
next = seg->next;
char_count = seg->char_count;
-
+
if ((*seg->type->deleteFunc)(seg, curline, 0) != 0)
{
/*
* This segment refuses to die. Move it to prev_seg and
* advance prev_seg if the segment has left gravity.
*/
-
+
if (prev_seg == NULL)
{
seg->next = start_line->segments;
@@ -774,7 +774,7 @@ gtk_text_btree_delete (GtkTextIter *start,
node->num_chars -= char_count;
}
}
-
+
seg = next;
}
@@ -787,7 +787,7 @@ gtk_text_btree_delete (GtkTextIter *start,
{
BTreeView *view;
GtkTextBTreeNode *ancestor_node;
-
+
GtkTextLine *prevline;
for (seg = last_seg; seg != NULL;
@@ -828,80 +828,80 @@ gtk_text_btree_delete (GtkTextIter *start,
ancestor_node = gtk_text_btree_node_common_parent (curnode, start_line->parent);
view = tree->views;
while (view)
- {
- GtkTextLine *line;
- GtkTextLineData *ld;
-
- gint deleted_width = 0;
- gint deleted_height = 0;
-
- line = deleted_lines;
- while (line)
- {
- GtkTextLine *next_line = line->next;
- ld = gtk_text_line_get_data (line, view->view_id);
-
- if (ld)
- {
- deleted_width = MAX (deleted_width, ld->width);
- deleted_height += ld->height;
- }
-
- if (!view->next)
- gtk_text_line_destroy(tree, line);
-
- line = next_line;
- }
-
- if (deleted_width > 0 || deleted_height > 0)
- {
- ld = gtk_text_line_get_data (start_line, view->view_id);
-
- /* FIXME: ld is _NOT_ necessarily non-null here, but there is currently
- * no way to add ld without also validating the node, which would
- * be improper at this point.
- */
+ {
+ GtkTextLine *line;
+ GtkTextLineData *ld;
+
+ gint deleted_width = 0;
+ gint deleted_height = 0;
+
+ line = deleted_lines;
+ while (line)
+ {
+ GtkTextLine *next_line = line->next;
+ ld = gtk_text_line_get_data (line, view->view_id);
+
+ if (ld)
+ {
+ deleted_width = MAX (deleted_width, ld->width);
+ deleted_height += ld->height;
+ }
+
+ if (!view->next)
+ gtk_text_line_destroy (tree, line);
+
+ line = next_line;
+ }
+
+ if (deleted_width > 0 || deleted_height > 0)
+ {
+ ld = gtk_text_line_get_data (start_line, view->view_id);
+
+ /* FIXME: ld is _NOT_ necessarily non-null here, but there is currently
+ * no way to add ld without also validating the node, which would
+ * be improper at this point.
+ */
/* This assertion does actually fail sometimes, must
fix before stable release -hp */
- g_assert (ld);
+ g_assert (ld);
- ld->width = MAX (deleted_width, ld->width);
- ld->height += deleted_height;
- ld->valid = FALSE;
- }
-
- gtk_text_btree_node_check_valid_downward (ancestor_node, view->view_id);
- if (ancestor_node->parent)
- gtk_text_btree_node_check_valid_upward (ancestor_node->parent, view->view_id);
+ ld->width = MAX (deleted_width, ld->width);
+ ld->height += deleted_height;
+ ld->valid = FALSE;
+ }
+
+ gtk_text_btree_node_check_valid_downward (ancestor_node, view->view_id);
+ if (ancestor_node->parent)
+ gtk_text_btree_node_check_valid_upward (ancestor_node->parent, view->view_id);
- view = view->next;
- }
-
- gtk_text_btree_rebalance(tree, curnode);
+ view = view->next;
+ }
+
+ gtk_text_btree_rebalance (tree, curnode);
}
/*
* Cleanup the segments in the new line.
*/
- cleanup_line(start_line);
+ cleanup_line (start_line);
/*
* Lastly, rebalance the first GtkTextBTreeNode of the range.
*/
- gtk_text_btree_rebalance(tree, start_line->parent);
-
+ gtk_text_btree_rebalance (tree, start_line->parent);
+
/* Notify outstanding iterators that they
are now hosed */
- chars_changed(tree);
- segments_changed(tree);
+ chars_changed (tree);
+ 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;
}
@@ -914,7 +914,7 @@ gtk_text_btree_insert (GtkTextIter *iter,
* new segment (NULL means new segment
* is at beginning of line). */
GtkTextLineSegment *cur_seg; /* Current segment; new characters
- * are inserted just after this one.
+ * are inserted just after this one.
* NULL means insert at beginning of
* line. */
GtkTextLine *line; /* Current line (new segments are
@@ -932,27 +932,27 @@ gtk_text_btree_insert (GtkTextIter *iter,
GtkTextBTree *tree;
gint start_byte_index;
GtkTextLine *start_line;
-
- g_return_if_fail(text != NULL);
- g_return_if_fail(iter != NULL);
-
+
+ g_return_if_fail (text != NULL);
+ g_return_if_fail (iter != NULL);
+
if (len < 0)
- len = strlen(text);
+ len = strlen (text);
/* extract iterator info */
- 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);
start_line = line;
- start_byte_index = gtk_text_iter_get_line_index(iter);
+ start_byte_index = gtk_text_iter_get_line_index (iter);
/* Get our insertion segment split */
- prev_seg = gtk_text_line_segment_split(iter);
+ prev_seg = gtk_text_line_segment_split (iter);
cur_seg = prev_seg;
/* Invalidate all iterators */
- chars_changed(tree);
- segments_changed(tree);
-
+ chars_changed (tree);
+ segments_changed (tree);
+
/*
* Chop the text up into lines and create a new segment for
* each line, plus a new line for the leftovers from the
@@ -978,7 +978,7 @@ gtk_text_btree_insert (GtkTextIter *iter,
seg = _gtk_char_segment_new (&text[sol], chunkSize);
char_count_delta += seg->char_count;
-
+
if (cur_seg == NULL)
{
seg->next = line->segments;
@@ -1000,16 +1000,16 @@ gtk_text_btree_insert (GtkTextIter *iter,
* and move the remainder of the old line to it.
*/
- newline = gtk_text_line_new();
- gtk_text_line_set_parent(newline, line->parent);
+ newline = gtk_text_line_new ();
+ gtk_text_line_set_parent (newline, line->parent);
newline->next = line->next;
line->next = newline;
newline->segments = seg->next;
seg->next = NULL;
line = newline;
cur_seg = NULL;
- line_count_delta++;
-
+ line_count_delta++;
+
sol = eol;
}
@@ -1018,14 +1018,14 @@ gtk_text_btree_insert (GtkTextIter *iter,
* line if it's different.
*/
- cleanup_line(start_line);
+ cleanup_line (start_line);
if (line != start_line)
{
- cleanup_line(line);
+ cleanup_line (line);
}
- post_insert_fixup(tree, line, line_count_delta, char_count_delta);
-
+ post_insert_fixup (tree, line, line_count_delta, char_count_delta);
+
/* Invalidate our region, and reset the iterator the user
passed in to point to the end of the inserted text. */
{
@@ -1033,19 +1033,19 @@ gtk_text_btree_insert (GtkTextIter *iter,
GtkTextIter end;
- gtk_text_btree_get_iter_at_line(tree,
- &start,
- start_line,
- start_byte_index);
+ gtk_text_btree_get_iter_at_line (tree,
+ &start,
+ start_line,
+ start_byte_index);
end = start;
/* We could almost certainly be more efficient here
by saving the information from the insertion loop
above. FIXME */
- gtk_text_iter_forward_chars(&end, char_count_delta);
+ gtk_text_iter_forward_chars (&end, char_count_delta);
- gtk_text_btree_invalidate_region(tree,
- &start, &end);
+ gtk_text_btree_invalidate_region (tree,
+ &start, &end);
/* Convenience for the user */
@@ -1063,14 +1063,14 @@ gtk_text_btree_insert_pixbuf (GtkTextIter *iter,
GtkTextLine *line;
GtkTextBTree *tree;
gint start_byte_offset;
-
- line = gtk_text_iter_get_text_line(iter);
- tree = gtk_text_iter_get_btree(iter);
- start_byte_offset = gtk_text_iter_get_line_index(iter);
-
+
+ line = gtk_text_iter_get_text_line (iter);
+ tree = gtk_text_iter_get_btree (iter);
+ start_byte_offset = gtk_text_iter_get_line_index (iter);
+
seg = _gtk_pixbuf_segment_new (pixbuf);
- prevPtr = gtk_text_line_segment_split(iter);
+ prevPtr = gtk_text_line_segment_split (iter);
if (prevPtr == NULL)
{
seg->next = line->segments;
@@ -1082,19 +1082,19 @@ gtk_text_btree_insert_pixbuf (GtkTextIter *iter,
prevPtr->next = seg;
}
- post_insert_fixup(tree, line, 0, seg->char_count);
+ post_insert_fixup (tree, line, 0, seg->char_count);
- chars_changed(tree);
- segments_changed(tree);
+ chars_changed (tree);
+ segments_changed (tree);
/* 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_next_char(iter); /* skip forward past the pixmap */
+ gtk_text_iter_next_char (iter); /* skip forward past the pixmap */
- gtk_text_btree_invalidate_region(tree, &start, iter);
+ gtk_text_btree_invalidate_region (tree, &start, iter);
}
@@ -1103,15 +1103,15 @@ gtk_text_btree_insert_pixbuf (GtkTextIter *iter,
*/
static GtkTextLine*
-find_line_by_y(GtkTextBTree *tree, BTreeView *view,
- GtkTextBTreeNode *node, gint y, gint *line_top,
- GtkTextLine *last_line)
+find_line_by_y (GtkTextBTree *tree, BTreeView *view,
+ GtkTextBTreeNode *node, gint y, gint *line_top,
+ GtkTextLine *last_line)
{
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)
{
GtkTextLine *line;
@@ -1122,17 +1122,17 @@ 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)
- {
- if (y < (current_y + (ld ? ld->height : 0)))
- return line;
+ if (ld)
+ {
+ if (y < (current_y + (ld ? ld->height : 0)))
+ return line;
+
+ current_y += ld->height;
+ *line_top += ld->height;
+ }
- current_y += ld->height;
- *line_top += ld->height;
- }
-
line = line->next;
}
return NULL;
@@ -1148,42 +1148,42 @@ find_line_by_y(GtkTextBTree *tree, BTreeView *view,
gint width;
gint height;
- gtk_text_btree_node_get_size(child, view->view_id,
- &width, &height);
+ gtk_text_btree_node_get_size (child, view->view_id,
+ &width, &height);
- if (y < (current_y + height))
- return find_line_by_y(tree, view, child,
- y - current_y, line_top,
- last_line);
+ if (y < (current_y + height))
+ return find_line_by_y (tree, view, child,
+ y - current_y, line_top,
+ last_line);
current_y += height;
*line_top += height;
-
+
child = child->next;
}
-
+
return NULL;
}
}
GtkTextLine *
gtk_text_btree_find_line_by_y (GtkTextBTree *tree,
- gpointer view_id,
- gint ypixel,
- gint *line_top_out)
+ gpointer view_id,
+ gint ypixel,
+ gint *line_top_out)
{
GtkTextLine *line;
BTreeView *view;
GtkTextLine *last_line;
gint line_top = 0;
-
+
view = gtk_text_btree_get_view (tree, view_id);
g_return_val_if_fail (view != NULL, NULL);
last_line = get_last_line (tree);
-
+
line = find_line_by_y (tree, view, tree->root_node, ypixel, &line_top,
- last_line);
+ last_line);
if (line_top_out)
*line_top_out = line_top;
@@ -1192,29 +1192,29 @@ gtk_text_btree_find_line_by_y (GtkTextBTree *tree,
}
static gint
-find_line_top_in_line_list(GtkTextBTree *tree,
- BTreeView *view,
- GtkTextLine *line,
- GtkTextLine *target_line,
- gint y)
+find_line_top_in_line_list (GtkTextBTree *tree,
+ BTreeView *view,
+ GtkTextLine *line,
+ GtkTextLine *target_line,
+ gint y)
{
while (line != NULL)
{
GtkTextLineData *ld;
-
+
if (line == target_line)
- return y;
+ return y;
ld = gtk_text_line_get_data (line, view->view_id);
if (ld)
- y += ld->height;
-
+ y += ld->height;
+
line = line->next;
}
-
- g_assert_not_reached(); /* If we get here, our
- target line didn't exist
- under its parent node */
+
+ g_assert_not_reached (); /* If we get here, our
+ target line didn't exist
+ under its parent node */
return 0;
}
@@ -1228,39 +1228,39 @@ gtk_text_btree_find_line_top (GtkTextBTree *tree,
GSList *nodes;
GSList *iter;
GtkTextBTreeNode *node;
-
- view = gtk_text_btree_get_view(tree, view_id);
- g_return_val_if_fail(view != NULL, 0);
+ view = gtk_text_btree_get_view (tree, view_id);
+
+ g_return_val_if_fail (view != NULL, 0);
nodes = NULL;
node = target_line->parent;
while (node != NULL)
{
- nodes = g_slist_prepend(nodes, node);
+ nodes = g_slist_prepend (nodes, node);
node = node->parent;
}
iter = nodes;
while (iter != NULL)
- {
+ {
node = iter->data;
-
+
if (node->level == 0)
{
- g_slist_free(nodes);
- return find_line_top_in_line_list(tree, view,
- node->children.line,
- target_line, y);
+ g_slist_free (nodes);
+ return find_line_top_in_line_list (tree, view,
+ node->children.line,
+ target_line, y);
}
else
{
GtkTextBTreeNode *child;
GtkTextBTreeNode *target_node;
- g_assert(iter->next != NULL); /* not at level 0 */
+ g_assert (iter->next != NULL); /* not at level 0 */
target_node = iter->next->data;
-
+
child = node->children.node;
while (child != NULL)
@@ -1272,21 +1272,21 @@ gtk_text_btree_find_line_top (GtkTextBTree *tree,
break;
else
{
- gtk_text_btree_node_get_size(child, view->view_id,
- &width, &height);
+ gtk_text_btree_node_get_size (child, view->view_id,
+ &width, &height);
y += height;
}
child = child->next;
}
- g_assert(child != NULL); /* should have broken out before we
- ran out of nodes */
+ g_assert (child != NULL); /* should have broken out before we
+ ran out of nodes */
}
- iter = g_slist_next(iter);
+ iter = g_slist_next (iter);
}
- g_assert_not_reached(); /* we return when we find the target line */
- return 0;
+ g_assert_not_reached (); /* we return when we find the target line */
+ return 0;
}
void
@@ -1297,13 +1297,13 @@ gtk_text_btree_add_view (GtkTextBTree *tree,
GtkTextLine *last_line;
GtkTextLineData *line_data;
- g_return_if_fail(tree != NULL);
-
- view = g_new(BTreeView, 1);
+ g_return_if_fail (tree != NULL);
+
+ view = g_new (BTreeView, 1);
view->view_id = layout;
view->layout = layout;
-
+
view->next = tree->views;
view->prev = NULL;
@@ -1314,14 +1314,14 @@ gtk_text_btree_add_view (GtkTextBTree *tree,
* number of loops
*/
last_line = get_last_line (tree);
-
+
line_data = g_new (GtkTextLineData, 1);
line_data->view_id = layout;
line_data->next = NULL;
line_data->width = 0;
line_data->height = 0;
line_data->valid = TRUE;
-
+
gtk_text_line_add_data (last_line, line_data);
}
@@ -1333,10 +1333,10 @@ gtk_text_btree_remove_view (GtkTextBTree *tree,
GtkTextLine *last_line;
GtkTextLineData *line_data;
- g_return_if_fail(tree != NULL);
-
+ g_return_if_fail (tree != NULL);
+
view = tree->views;
-
+
while (view != NULL)
{
if (view->view_id == view_id)
@@ -1344,8 +1344,8 @@ gtk_text_btree_remove_view (GtkTextBTree *tree,
view = view->next;
}
-
- g_return_if_fail(view != NULL);
+
+ g_return_if_fail (view != NULL);
if (view->next)
view->next->prev = view->prev;
@@ -1362,10 +1362,10 @@ gtk_text_btree_remove_view (GtkTextBTree *tree,
last_line = get_last_line (tree);
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);
-
- g_free(view);
+
+ gtk_text_btree_node_remove_view (view, tree->root_node, view_id);
+
+ g_free (view);
}
void
@@ -1374,12 +1374,12 @@ gtk_text_btree_invalidate_region (GtkTextBTree *tree,
const GtkTextIter *end)
{
BTreeView *view;
-
+
view = tree->views;
while (view != NULL)
{
- gtk_text_layout_invalidate(view->layout, start, end);
+ gtk_text_layout_invalidate (view->layout, start, end);
view = view->next;
}
@@ -1391,11 +1391,11 @@ gtk_text_btree_get_view_size (GtkTextBTree *tree,
gint *width,
gint *height)
{
- g_return_if_fail(tree != NULL);
- g_return_if_fail(view_id != NULL);
-
+ g_return_if_fail (tree != NULL);
+ g_return_if_fail (view_id != NULL);
+
gtk_text_btree_node_get_size (tree->root_node, view_id,
- width, height);
+ width, height);
}
/*
@@ -1409,10 +1409,10 @@ typedef struct {
} IterStack;
static IterStack*
-iter_stack_new(void)
+iter_stack_new (void)
{
IterStack *stack;
- stack = g_new(IterStack, 1);
+ stack = g_new (IterStack, 1);
stack->iters = NULL;
stack->count = 0;
stack->alloced = 0;
@@ -1420,20 +1420,20 @@ iter_stack_new(void)
}
static void
-iter_stack_push(IterStack *stack, const GtkTextIter *iter)
+iter_stack_push (IterStack *stack, const GtkTextIter *iter)
{
stack->count += 1;
if (stack->count > stack->alloced)
{
stack->alloced = stack->count*2;
- stack->iters = g_realloc(stack->iters,
- stack->alloced*sizeof(GtkTextIter));
+ stack->iters = g_realloc (stack->iters,
+ stack->alloced*sizeof (GtkTextIter));
}
stack->iters[stack->count-1] = *iter;
}
static gboolean
-iter_stack_pop(IterStack *stack, GtkTextIter *iter)
+iter_stack_pop (IterStack *stack, GtkTextIter *iter)
{
if (stack->count == 0)
return FALSE;
@@ -1446,14 +1446,14 @@ iter_stack_pop(IterStack *stack, GtkTextIter *iter)
}
static void
-iter_stack_free(IterStack *stack)
+iter_stack_free (IterStack *stack)
{
- g_free(stack->iters);
- g_free(stack);
+ g_free (stack->iters);
+ g_free (stack);
}
static void
-iter_stack_invert(IterStack *stack)
+iter_stack_invert (IterStack *stack)
{
if (stack->count > 0)
{
@@ -1462,7 +1462,7 @@ iter_stack_invert(IterStack *stack)
while (i < j)
{
GtkTextIter tmp;
-
+
tmp = stack->iters[i];
stack->iters[i] = stack->iters[j];
stack->iters[j] = tmp;
@@ -1482,7 +1482,7 @@ queue_tag_redisplay (GtkTextBTree *tree,
if (gtk_text_tag_affects_size (tag))
{
gtk_text_btree_invalidate_region (tree, start, end);
-
+
}
else if (gtk_text_tag_affects_nonsize_appearance (tag))
{
@@ -1506,75 +1506,75 @@ gtk_text_btree_tag (const GtkTextIter *start_orig,
GtkTextLine *end_line;
GtkTextIter iter;
GtkTextIter start, end;
- GtkTextBTree *tree;
+ GtkTextBTree *tree;
IterStack *stack;
GtkTextTagInfo *info;
-
- g_return_if_fail(start_orig != NULL);
- g_return_if_fail(end_orig != NULL);
- g_return_if_fail(GTK_IS_TEXT_TAG(tag));
- g_return_if_fail(gtk_text_iter_get_btree(start_orig) ==
- gtk_text_iter_get_btree(end_orig));
+
+ g_return_if_fail (start_orig != NULL);
+ g_return_if_fail (end_orig != NULL);
+ g_return_if_fail (GTK_IS_TEXT_TAG (tag));
+ g_return_if_fail (gtk_text_iter_get_btree (start_orig) ==
+ gtk_text_iter_get_btree (end_orig));
#if 0
- printf("%s tag %s from %d to %d\n",
- add ? "Adding" : "Removing",
- tag->name,
- gtk_text_buffer_get_offset(start_orig),
- gtk_text_buffer_get_offset(end_orig));
+ printf ("%s tag %s from %d to %d\n",
+ add ? "Adding" : "Removing",
+ tag->name,
+ gtk_text_buffer_get_offset (start_orig),
+ gtk_text_buffer_get_offset (end_orig));
#endif
-
- if (gtk_text_iter_equal(start_orig, end_orig))
+
+ if (gtk_text_iter_equal (start_orig, end_orig))
return;
-
+
start = *start_orig;
end = *end_orig;
-
- gtk_text_iter_reorder(&start, &end);
-
- tree = gtk_text_iter_get_btree(&start);
+
+ gtk_text_iter_reorder (&start, &end);
+
+ tree = gtk_text_iter_get_btree (&start);
queue_tag_redisplay (tree, tag, &start, &end);
-
- info = gtk_text_btree_get_tag_info(tree, tag);
-
- start_line = gtk_text_iter_get_text_line(&start);
- end_line = gtk_text_iter_get_text_line(&end);
+
+ info = gtk_text_btree_get_tag_info (tree, tag);
+
+ start_line = gtk_text_iter_get_text_line (&start);
+ end_line = gtk_text_iter_get_text_line (&end);
/* Find all tag toggles in the region; we are going to delete them.
We need to find them in advance, because
- forward_find_tag_toggle() won't work once we start playing around
+ forward_find_tag_toggle () won't work once we start playing around
with the tree. */
- stack = iter_stack_new();
+ stack = iter_stack_new ();
iter = start;
/* We don't want to delete a toggle that's at the start iterator. */
- gtk_text_iter_next_char(&iter);
- while (gtk_text_iter_forward_to_tag_toggle(&iter, tag))
+ gtk_text_iter_next_char (&iter);
+ while (gtk_text_iter_forward_to_tag_toggle (&iter, tag))
{
- if (gtk_text_iter_compare(&iter, &end) >= 0)
+ if (gtk_text_iter_compare (&iter, &end) >= 0)
break;
else
- iter_stack_push(stack, &iter);
+ iter_stack_push (stack, &iter);
}
/* We need to traverse the toggles in order. */
- iter_stack_invert(stack);
-
+ iter_stack_invert (stack);
+
/*
* See whether the tag is present at the start of the range. If
* the state doesn't already match what we want then add a toggle
* there.
*/
- toggled_on = gtk_text_iter_has_tag(&start, tag);
+ toggled_on = gtk_text_iter_has_tag (&start, tag);
if ( (add && !toggled_on) ||
(!add && toggled_on) )
{
/* This could create a second toggle at the start position;
- cleanup_line() will remove it if so. */
- seg = _gtk_toggle_segment_new(info, add);
+ cleanup_line () will remove it if so. */
+ seg = _gtk_toggle_segment_new (info, add);
- prev = gtk_text_line_segment_split(&start);
+ prev = gtk_text_line_segment_split (&start);
if (prev == NULL)
{
seg->next = start_line->segments;
@@ -1585,17 +1585,17 @@ gtk_text_btree_tag (const GtkTextIter *start_orig,
seg->next = prev->next;
prev->next = seg;
}
-
+
/* cleanup_line adds the new toggle to the node counts. */
#if 0
- printf("added toggle at start\n");
+ printf ("added toggle at start\n");
#endif
/* we should probably call segments_changed, but in theory
any still-cached segments in the iters we are about to
use are still valid, since they're in front
of this spot. */
}
-
+
/*
*
* Scan the range of characters and delete any internal tag
@@ -1605,55 +1605,55 @@ gtk_text_btree_tag (const GtkTextIter *start_orig,
*/
cleanupline = start_line;
- while (iter_stack_pop(stack, &iter))
+ while (iter_stack_pop (stack, &iter))
{
GtkTextLineSegment *indexable_seg;
GtkTextLine *line;
-
- line = gtk_text_iter_get_text_line(&iter);
- seg = gtk_text_iter_get_any_segment(&iter);
- indexable_seg = gtk_text_iter_get_indexable_segment(&iter);
-
- g_assert(seg != NULL);
- g_assert(indexable_seg != NULL);
- g_assert(seg != indexable_seg);
-
+
+ line = gtk_text_iter_get_text_line (&iter);
+ seg = gtk_text_iter_get_any_segment (&iter);
+ indexable_seg = gtk_text_iter_get_indexable_segment (&iter);
+
+ g_assert (seg != NULL);
+ g_assert (indexable_seg != NULL);
+ g_assert (seg != indexable_seg);
+
prev = line->segments;
/* Find the segment that actually toggles this tag. */
while (seg != indexable_seg)
{
- g_assert(seg != NULL);
- g_assert(indexable_seg != NULL);
- g_assert(seg != indexable_seg);
-
+ g_assert (seg != NULL);
+ g_assert (indexable_seg != NULL);
+ g_assert (seg != indexable_seg);
+
if ( (seg->type == &gtk_text_toggle_on_type ||
- seg->type == &gtk_text_toggle_off_type) &&
+ seg->type == &gtk_text_toggle_off_type) &&
(seg->body.toggle.info == info) )
break;
else
seg = seg->next;
}
- g_assert(seg != NULL);
- g_assert(indexable_seg != NULL);
-
- g_assert(seg != indexable_seg); /* If this happens, then
- forward_to_tag_toggle was
- full of shit. */
- g_assert(seg->body.toggle.info->tag == tag);
+ g_assert (seg != NULL);
+ g_assert (indexable_seg != NULL);
+
+ g_assert (seg != indexable_seg); /* If this happens, then
+ forward_to_tag_toggle was
+ full of shit. */
+ g_assert (seg->body.toggle.info->tag == tag);
/* If this happens, when previously tagging we didn't merge
overlapping tags. */
- g_assert( (toggled_on && seg->type == &gtk_text_toggle_off_type) ||
- (!toggled_on && seg->type == &gtk_text_toggle_on_type) );
-
+ g_assert ( (toggled_on && seg->type == &gtk_text_toggle_off_type) ||
+ (!toggled_on && seg->type == &gtk_text_toggle_on_type) );
+
toggled_on = !toggled_on;
#if 0
- printf("deleting %s toggle\n",
- seg->type == &gtk_text_toggle_on_type ? "on" : "off");
-#endif
+ printf ("deleting %s toggle\n",
+ seg->type == &gtk_text_toggle_on_type ? "on" : "off");
+#endif
/* Remove toggle segment from the list. */
if (prev == seg)
{
@@ -1674,30 +1674,30 @@ gtk_text_btree_tag (const GtkTextIter *start_orig,
the front of the line. Of course we have to do that to get
"prev" anyway, but here we are doing it an additional
time. FIXME */
- segments_changed(tree);
+ segments_changed (tree);
/* Update node counts */
if (seg->body.toggle.inNodeCounts)
{
- _gtk_change_node_toggle_count(line->parent,
- info, -1);
+ _gtk_change_node_toggle_count (line->parent,
+ info, -1);
seg->body.toggle.inNodeCounts = FALSE;
}
- g_free(seg);
+ g_free (seg);
/* We only clean up lines when we're done with them, saves some
gratuitous line-segment-traversals */
-
+
if (cleanupline != line)
{
- cleanup_line(cleanupline);
+ cleanup_line (cleanupline);
cleanupline = line;
}
}
- iter_stack_free(stack);
-
+ iter_stack_free (stack);
+
/* toggled_on now reflects the toggle state _just before_ the
end iterator. The end iterator could already have a toggle
on or a toggle off. */
@@ -1705,11 +1705,11 @@ gtk_text_btree_tag (const GtkTextIter *start_orig,
(!add && toggled_on) )
{
/* This could create a second toggle at the start position;
- cleanup_line() will remove it if so. */
-
- seg = _gtk_toggle_segment_new(info, !add);
+ cleanup_line () will remove it if so. */
+
+ seg = _gtk_toggle_segment_new (info, !add);
- prev = gtk_text_line_segment_split(&end);
+ prev = gtk_text_line_segment_split (&end);
if (prev == NULL)
{
seg->next = end_line->segments;
@@ -1721,9 +1721,9 @@ gtk_text_btree_tag (const GtkTextIter *start_orig,
prev->next = seg;
}
/* cleanup_line adds the new toggle to the node counts. */
- g_assert(seg->body.toggle.inNodeCounts == FALSE);
+ g_assert (seg->body.toggle.inNodeCounts == FALSE);
#if 0
- printf("added toggle at end\n");
+ printf ("added toggle at end\n");
#endif
}
@@ -1732,16 +1732,16 @@ gtk_text_btree_tag (const GtkTextIter *start_orig,
* these are different.
*/
- cleanup_line(cleanupline);
+ cleanup_line (cleanupline);
if (cleanupline != end_line)
{
- cleanup_line(end_line);
+ cleanup_line (end_line);
}
- segments_changed(tree);
-
+ segments_changed (tree);
+
if (gtk_debug_flags & GTK_DEBUG_TEXT)
- gtk_text_btree_check(tree);
+ gtk_text_btree_check (tree);
}
@@ -1759,8 +1759,8 @@ 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)
{
line_number = line_count;
@@ -1772,7 +1772,7 @@ gtk_text_btree_get_line (GtkTextBTree *tree,
if (real_line_number)
*real_line_number = line_number;
-
+
node = tree->root_node;
lines_left = line_number;
@@ -1790,7 +1790,7 @@ gtk_text_btree_get_line (GtkTextBTree *tree,
#if 0
if (node == NULL)
{
- g_error("gtk_text_btree_find_line ran out of GtkTextBTreeNodes");
+ g_error ("gtk_text_btree_find_line ran out of GtkTextBTreeNodes");
}
#endif
lines_left -= node->num_lines;
@@ -1807,19 +1807,19 @@ gtk_text_btree_get_line (GtkTextBTree *tree,
#if 0
if (line == NULL)
{
- g_error("gtk_text_btree_find_line ran out of lines");
+ g_error ("gtk_text_btree_find_line ran out of lines");
}
#endif
lines_left -= 1;
}
- return line;
+ return line;
}
GtkTextLine*
-gtk_text_btree_get_line_at_char(GtkTextBTree *tree,
- gint char_index,
- gint *line_start_index,
- gint *real_char_index)
+gtk_text_btree_get_line_at_char (GtkTextBTree *tree,
+ gint char_index,
+ gint *line_start_index,
+ gint *real_char_index)
{
GtkTextBTreeNode *node;
GtkTextLine *line;
@@ -1827,7 +1827,7 @@ gtk_text_btree_get_line_at_char(GtkTextBTree *tree,
int chars_left;
int chars_in_line;
int bytes_in_line;
-
+
node = tree->root_node;
/* Clamp to valid indexes (-1 is magic for "highest index") */
@@ -1837,7 +1837,7 @@ gtk_text_btree_get_line_at_char(GtkTextBTree *tree,
}
*real_char_index = char_index;
-
+
/*
* Work down through levels of the tree until a GtkTextBTreeNode is found at
* level 0.
@@ -1852,10 +1852,10 @@ gtk_text_btree_get_line_at_char(GtkTextBTree *tree,
{
chars_left -= node->num_chars;
- g_assert(chars_left >= 0);
+ g_assert (chars_left >= 0);
}
}
-
+
if (chars_left == 0)
{
/* Start of a line */
@@ -1863,7 +1863,7 @@ gtk_text_btree_get_line_at_char(GtkTextBTree *tree,
*line_start_index = char_index;
return node->children.line;
}
-
+
/*
* Work through the lines attached to the level-0 GtkTextBTreeNode.
*/
@@ -1878,22 +1878,22 @@ gtk_text_btree_get_line_at_char(GtkTextBTree *tree,
{
if (chars_in_line + seg->char_count > chars_left)
goto found; /* found our line/segment */
-
+
chars_in_line += seg->char_count;
-
+
seg = seg->next;
}
chars_left -= chars_in_line;
-
+
chars_in_line = 0;
seg = NULL;
}
found:
-
- g_assert(line != NULL); /* hosage, ran out of lines */
- g_assert(seg != NULL);
+
+ g_assert (line != NULL); /* hosage, ran out of lines */
+ g_assert (seg != NULL);
*line_start_index = char_index - chars_left;
return line;
@@ -1913,15 +1913,15 @@ gtk_text_btree_get_tags (const GtkTextIter *iter,
gint byte_index;
#define NUM_TAG_INFOS 10
-
- line = gtk_text_iter_get_text_line(iter);
- tree = gtk_text_iter_get_btree(iter);
- byte_index = gtk_text_iter_get_line_index(iter);
+
+ line = gtk_text_iter_get_text_line (iter);
+ tree = gtk_text_iter_get_btree (iter);
+ byte_index = gtk_text_iter_get_line_index (iter);
tagInfo.numTags = 0;
tagInfo.arraySize = NUM_TAG_INFOS;
- tagInfo.tags = g_new(GtkTextTag*, NUM_TAG_INFOS);
- tagInfo.counts = g_new(int, NUM_TAG_INFOS);
+ tagInfo.tags = g_new (GtkTextTag*, NUM_TAG_INFOS);
+ tagInfo.counts = g_new (int, NUM_TAG_INFOS);
/*
* Record tag toggles within the line of indexPtr but preceding
@@ -1936,7 +1936,7 @@ gtk_text_btree_get_tags (const GtkTextIter *iter,
if ((seg->type == &gtk_text_toggle_on_type)
|| (seg->type == &gtk_text_toggle_off_type))
{
- inc_count(seg->body.toggle.info->tag, 1, &tagInfo);
+ inc_count (seg->body.toggle.info->tag, 1, &tagInfo);
}
}
@@ -1955,7 +1955,7 @@ gtk_text_btree_get_tags (const GtkTextIter *iter,
if ((seg->type == &gtk_text_toggle_on_type)
|| (seg->type == &gtk_text_toggle_off_type))
{
- inc_count(seg->body.toggle.info->tag, 1, &tagInfo);
+ inc_count (seg->body.toggle.info->tag, 1, &tagInfo);
}
}
}
@@ -1971,7 +1971,7 @@ gtk_text_btree_get_tags (const GtkTextIter *iter,
GtkTextBTreeNode *siblingPtr;
Summary *summary;
- for (siblingPtr = node->parent->children.node;
+ for (siblingPtr = node->parent->children.node;
siblingPtr != node; siblingPtr = siblingPtr->next)
{
for (summary = siblingPtr->summary; summary != NULL;
@@ -1979,8 +1979,8 @@ gtk_text_btree_get_tags (const GtkTextIter *iter,
{
if (summary->toggle_count & 1)
{
- inc_count(summary->info->tag, summary->toggle_count,
- &tagInfo);
+ inc_count (summary->info->tag, summary->toggle_count,
+ &tagInfo);
}
}
}
@@ -1996,38 +1996,38 @@ gtk_text_btree_get_tags (const GtkTextIter *iter,
{
if (tagInfo.counts[src] & 1)
{
- g_assert(GTK_IS_TEXT_TAG(tagInfo.tags[src]));
+ g_assert (GTK_IS_TEXT_TAG (tagInfo.tags[src]));
tagInfo.tags[dst] = tagInfo.tags[src];
dst++;
}
}
-
+
*num_tags = dst;
- g_free(tagInfo.counts);
+ g_free (tagInfo.counts);
if (dst == 0)
{
- g_free(tagInfo.tags);
+ g_free (tagInfo.tags);
return NULL;
}
- return tagInfo.tags;
+ return tagInfo.tags;
}
static void
-copy_segment(GString *string,
- gboolean include_hidden,
- gboolean include_nonchars,
- const GtkTextIter *start,
- const GtkTextIter *end)
+copy_segment (GString *string,
+ gboolean include_hidden,
+ gboolean include_nonchars,
+ const GtkTextIter *start,
+ const GtkTextIter *end)
{
GtkTextLineSegment *end_seg;
GtkTextLineSegment *seg;
-
- if (gtk_text_iter_equal(start, end))
+
+ if (gtk_text_iter_equal (start, end))
return;
- seg = gtk_text_iter_get_indexable_segment(start);
- end_seg = gtk_text_iter_get_indexable_segment(end);
-
+ seg = gtk_text_iter_get_indexable_segment (start);
+ end_seg = gtk_text_iter_get_indexable_segment (end);
+
if (seg->type == &gtk_text_char_type)
{
gboolean copy = TRUE;
@@ -2037,37 +2037,37 @@ 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"); */
+ /* printf (" <invisible>\n"); */
}
- copy_start = gtk_text_iter_get_segment_byte(start);
+ copy_start = gtk_text_iter_get_segment_byte (start);
if (seg == end_seg)
{
/* End is in the same segment; need to copy fewer bytes. */
- gint end_byte = gtk_text_iter_get_segment_byte(end);
+ gint end_byte = gtk_text_iter_get_segment_byte (end);
copy_bytes = end_byte - copy_start;
}
else
copy_bytes = seg->byte_count - copy_start;
- g_assert(copy_bytes != 0); /* Due to iter equality check at
- front of this function. */
+ g_assert (copy_bytes != 0); /* Due to iter equality check at
+ front of this function. */
if (copy)
{
- g_assert((copy_start + copy_bytes) <= seg->byte_count);
-
- g_string_append_len(string,
- seg->body.chars + copy_start,
- copy_bytes);
+ g_assert ((copy_start + copy_bytes) <= seg->byte_count);
+
+ g_string_append_len (string,
+ seg->body.chars + copy_start,
+ copy_bytes);
}
-
- /* printf(" :%s\n", string->str); */
+
+ /* printf (" :%s\n", string->str); */
}
else if (seg->type == &gtk_text_pixbuf_type)
{
@@ -2078,16 +2078,16 @@ 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;
}
if (copy)
{
- g_string_append_len(string,
- gtk_text_unknown_char_utf8,
- 3);
+ g_string_append_len (string,
+ gtk_text_unknown_char_utf8,
+ 3);
}
}
@@ -2107,38 +2107,38 @@ gtk_text_btree_get_text (const GtkTextIter *start_orig,
GtkTextIter iter;
GtkTextIter start;
GtkTextIter end;
-
- g_return_val_if_fail(start_orig != NULL, NULL);
- g_return_val_if_fail(end_orig != NULL, NULL);
- g_return_val_if_fail(gtk_text_iter_get_btree(start_orig) ==
- gtk_text_iter_get_btree(end_orig), NULL);
+
+ g_return_val_if_fail (start_orig != NULL, NULL);
+ g_return_val_if_fail (end_orig != NULL, NULL);
+ g_return_val_if_fail (gtk_text_iter_get_btree (start_orig) ==
+ gtk_text_iter_get_btree (end_orig), NULL);
start = *start_orig;
end = *end_orig;
- gtk_text_iter_reorder(&start, &end);
-
- retval = g_string_new("");
-
- tree = gtk_text_iter_get_btree(&start);
-
- end_seg = gtk_text_iter_get_indexable_segment(&end);
+ gtk_text_iter_reorder (&start, &end);
+
+ retval = g_string_new ("");
+
+ tree = gtk_text_iter_get_btree (&start);
+
+ end_seg = gtk_text_iter_get_indexable_segment (&end);
iter = start;
- seg = gtk_text_iter_get_indexable_segment(&iter);
+ seg = gtk_text_iter_get_indexable_segment (&iter);
while (seg != end_seg)
- {
- copy_segment(retval, include_hidden, include_nonchars,
- &iter, &end);
+ {
+ copy_segment (retval, include_hidden, include_nonchars,
+ &iter, &end);
+
+ gtk_text_iter_forward_indexable_segment (&iter);
- gtk_text_iter_forward_indexable_segment(&iter);
-
- seg = gtk_text_iter_get_indexable_segment(&iter);
+ seg = gtk_text_iter_get_indexable_segment (&iter);
}
- copy_segment(retval, include_hidden, include_nonchars, &iter, &end);
-
+ copy_segment (retval, include_hidden, include_nonchars, &iter, &end);
+
str = retval->str;
- g_string_free(retval, FALSE);
+ g_string_free (retval, FALSE);
return str;
}
@@ -2176,25 +2176,25 @@ gtk_text_btree_char_is_invisible (const GtkTextIter *iter)
GtkTextLine *line;
GtkTextBTree *tree;
gint byte_index;
-
- line = gtk_text_iter_get_text_line(iter);
- tree = gtk_text_iter_get_btree(iter);
- byte_index = gtk_text_iter_get_line_index(iter);
-
- numTags = gtk_text_tag_table_size(tree->table);
-
+
+ line = gtk_text_iter_get_text_line (iter);
+ tree = gtk_text_iter_get_btree (iter);
+ byte_index = gtk_text_iter_get_line_index (iter);
+
+ numTags = gtk_text_tag_table_size (tree->table);
+
/* almost always avoid malloc, so stay out of system calls */
if (LOTSA_TAGS < numTags)
{
- tagCnts = g_new(int, numTags);
- tags = g_new(GtkTextTag*, numTags);
+ tagCnts = g_new (int, numTags);
+ tags = g_new (GtkTextTag*, numTags);
}
-
+
for (i=0; i<numTags; i++)
{
tagCnts[i] = 0;
}
-
+
/*
* Record tag toggles within the line of indexPtr but preceding
* indexPtr.
@@ -2203,7 +2203,7 @@ gtk_text_btree_char_is_invisible (const GtkTextIter *iter)
for (index = 0, seg = line->segments;
(index + seg->byte_count) <= byte_index; /* segfault here means invalid index */
index += seg->byte_count, seg = seg->next)
- {
+ {
if ((seg->type == &gtk_text_toggle_on_type)
|| (seg->type == &gtk_text_toggle_off_type))
{
@@ -2252,7 +2252,7 @@ gtk_text_btree_char_is_invisible (const GtkTextIter *iter)
GtkTextBTreeNode *siblingPtr;
Summary *summary;
- for (siblingPtr = node->parent->children.node;
+ for (siblingPtr = node->parent->children.node;
siblingPtr != node; siblingPtr = siblingPtr->next)
{
for (summary = siblingPtr->summary; summary != NULL;
@@ -2272,7 +2272,7 @@ gtk_text_btree_char_is_invisible (const GtkTextIter *iter)
}
/*
- * Now traverse from highest priority to lowest,
+ * Now traverse from highest priority to lowest,
* take invisible value from first odd count (= on)
*/
@@ -2298,11 +2298,11 @@ gtk_text_btree_char_is_invisible (const GtkTextIter *iter)
if (LOTSA_TAGS < numTags)
{
- g_free(tagCnts);
- g_free(tags);
+ g_free (tagCnts);
+ g_free (tags);
}
- return invisible;
+ return invisible;
}
@@ -2312,8 +2312,8 @@ gtk_text_btree_char_is_invisible (const GtkTextIter *iter)
static void
redisplay_region (GtkTextBTree *tree,
- const GtkTextIter *start,
- const GtkTextIter *end)
+ const GtkTextIter *start,
+ const GtkTextIter *end)
{
BTreeView *view;
GtkTextLine *start_line, *end_line;
@@ -2324,10 +2324,10 @@ redisplay_region (GtkTextBTree *tree,
start = end;
end = tmp;
}
-
+
start_line = gtk_text_iter_get_text_line (start);
end_line = gtk_text_iter_get_text_line (end);
-
+
view = tree->views;
while (view != NULL)
{
@@ -2337,14 +2337,14 @@ redisplay_region (GtkTextBTree *tree,
start_y = gtk_text_btree_find_line_top (tree, start_line, view->view_id);
if (end_line == start_line)
- end_y = start_y;
+ 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);
if (ld)
- end_y += ld->height;
-
+ end_y += ld->height;
+
gtk_text_layout_changed (view->layout, start_y,
end_y - start_y,
end_y - start_y);
@@ -2358,52 +2358,52 @@ redisplay_mark (GtkTextLineSegment *mark)
{
GtkTextIter iter;
GtkTextIter end;
-
- gtk_text_btree_get_iter_at_mark(mark->body.mark.tree,
- &iter,
- mark->body.mark.obj);
+
+ gtk_text_btree_get_iter_at_mark (mark->body.mark.tree,
+ &iter,
+ mark->body.mark.obj);
end = iter;
- gtk_text_iter_next_char(&end);
+ gtk_text_iter_next_char (&end);
- gtk_text_btree_invalidate_region(mark->body.mark.tree,
- &iter, &end);
+ gtk_text_btree_invalidate_region (mark->body.mark.tree,
+ &iter, &end);
}
static void
-redisplay_mark_if_visible(GtkTextLineSegment *mark)
+redisplay_mark_if_visible (GtkTextLineSegment *mark)
{
if (!mark->body.mark.visible)
return;
else
- redisplay_mark(mark);
+ redisplay_mark (mark);
}
static void
-ensure_not_off_end(GtkTextBTree *tree,
- GtkTextLineSegment *mark,
- GtkTextIter *iter)
+ensure_not_off_end (GtkTextBTree *tree,
+ GtkTextLineSegment *mark,
+ GtkTextIter *iter)
{
- if (gtk_text_iter_get_line(iter) ==
- gtk_text_btree_line_count(tree))
- gtk_text_iter_prev_char(iter);
+ if (gtk_text_iter_get_line (iter) ==
+ gtk_text_btree_line_count (tree))
+ gtk_text_iter_prev_char (iter);
}
static GtkTextLineSegment*
-real_set_mark(GtkTextBTree *tree,
- GtkTextMark *existing_mark,
- const gchar *name,
- gboolean left_gravity,
- const GtkTextIter *where,
- gboolean should_exist,
- gboolean redraw_selections)
+real_set_mark (GtkTextBTree *tree,
+ GtkTextMark *existing_mark,
+ const gchar *name,
+ gboolean left_gravity,
+ const GtkTextIter *where,
+ gboolean should_exist,
+ gboolean redraw_selections)
{
GtkTextLineSegment *mark;
GtkTextIter iter;
-
- g_return_val_if_fail(tree != NULL, NULL);
- g_return_val_if_fail(where != NULL, NULL);
- g_return_val_if_fail(gtk_text_iter_get_btree(where) == tree, NULL);
+
+ g_return_val_if_fail (tree != NULL, NULL);
+ g_return_val_if_fail (where != NULL, NULL);
+ g_return_val_if_fail (gtk_text_iter_get_btree (where) == tree, NULL);
if (existing_mark)
mark = existing_mark->segment;
@@ -2412,10 +2412,10 @@ real_set_mark(GtkTextBTree *tree,
name);
else
mark = NULL;
-
+
if (should_exist && mark == NULL)
{
- g_warning("No mark `%s' exists!", name);
+ g_warning ("No mark `%s' exists!", name);
return NULL;
}
@@ -2423,42 +2423,42 @@ real_set_mark(GtkTextBTree *tree,
we just move it. */
iter = *where;
-
+
if (mark != NULL)
{
if (redraw_selections &&
- (mark == tree->insert_mark->segment ||
- mark == tree->selection_bound_mark->segment))
- {
- GtkTextIter old_pos;
+ (mark == tree->insert_mark->segment ||
+ mark == tree->selection_bound_mark->segment))
+ {
+ 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);
- }
-
+ redisplay_region (tree, &old_pos, where);
+ }
+
/*
* don't let visible marks be after the final newline of the
* file.
*/
-
+
if (mark->body.mark.visible)
{
- ensure_not_off_end(tree, mark, &iter);
+ ensure_not_off_end (tree, mark, &iter);
}
/* Redraw the mark's old location. */
redisplay_mark_if_visible (mark);
-
+
/* Unlink mark from its current location.
This could hose our iterator... */
- gtk_text_btree_unlink_segment(tree, mark,
- mark->body.mark.line);
- mark->body.mark.line = gtk_text_iter_get_text_line(&iter);
- g_assert(mark->body.mark.line == gtk_text_iter_get_text_line(&iter));
+ gtk_text_btree_unlink_segment (tree, mark,
+ mark->body.mark.line);
+ mark->body.mark.line = gtk_text_iter_get_text_line (&iter);
+ g_assert (mark->body.mark.line == gtk_text_iter_get_text_line (&iter));
- segments_changed(tree); /* make sure the iterator recomputes its
- segment */
+ segments_changed (tree); /* make sure the iterator recomputes its
+ segment */
}
else
{
@@ -2466,20 +2466,20 @@ real_set_mark(GtkTextBTree *tree,
left_gravity,
name);
- mark->body.mark.line = gtk_text_iter_get_text_line(&iter);
+ mark->body.mark.line = gtk_text_iter_get_text_line (&iter);
if (mark->body.mark.name)
g_hash_table_insert (tree->mark_table,
mark->body.mark.name,
mark);
}
-
+
/* Link mark into new location */
gtk_text_btree_link_segment (mark, &iter);
-
+
/* Invalidate some iterators. */
segments_changed (tree);
-
+
/*
* update the screen at the mark's new location.
*/
@@ -2500,26 +2500,26 @@ gtk_text_btree_set_mark (GtkTextBTree *tree,
{
GtkTextLineSegment *seg;
- seg = real_set_mark(tree, existing_mark,
- name, left_gravity, iter, should_exist,
- TRUE);
+ seg = real_set_mark (tree, existing_mark,
+ name, left_gravity, iter, should_exist,
+ TRUE);
return seg ? seg->body.mark.obj : NULL;
}
gboolean
gtk_text_btree_get_selection_bounds (GtkTextBTree *tree,
- GtkTextIter *start,
- GtkTextIter *end)
+ GtkTextIter *start,
+ GtkTextIter *end)
{
GtkTextIter tmp_start, tmp_end;
-
+
gtk_text_btree_get_iter_at_mark (tree, &tmp_start,
tree->insert_mark);
gtk_text_btree_get_iter_at_mark (tree, &tmp_end,
tree->selection_bound_mark);
-
- if (gtk_text_iter_equal(&tmp_start, &tmp_end))
+
+ if (gtk_text_iter_equal (&tmp_start, &tmp_end))
{
if (start)
*start = tmp_start;
@@ -2531,27 +2531,27 @@ gtk_text_btree_get_selection_bounds (GtkTextBTree *tree,
}
else
{
- gtk_text_iter_reorder(&tmp_start, &tmp_end);
+ gtk_text_iter_reorder (&tmp_start, &tmp_end);
if (start)
*start = tmp_start;
if (end)
*end = tmp_end;
-
+
return TRUE;
}
}
void
-gtk_text_btree_place_cursor(GtkTextBTree *tree,
- const GtkTextIter *iter)
+gtk_text_btree_place_cursor (GtkTextBTree *tree,
+ const GtkTextIter *iter)
{
GtkTextIter start, end;
-
+
if (gtk_text_btree_get_selection_bounds (tree, &start, &end))
- redisplay_region(tree, &start, &end);
-
+ redisplay_region (tree, &start, &end);
+
/* Move insert AND selection_bound before we redisplay */
real_set_mark (tree, tree->insert_mark,
"insert", FALSE, iter, TRUE, FALSE);
@@ -2565,13 +2565,13 @@ gtk_text_btree_remove_mark_by_name (GtkTextBTree *tree,
{
GtkTextMark *mark;
- g_return_if_fail(tree != NULL);
- g_return_if_fail(name != NULL);
-
- mark = g_hash_table_lookup(tree->mark_table,
- name);
+ g_return_if_fail (tree != NULL);
+ g_return_if_fail (name != NULL);
+
+ mark = g_hash_table_lookup (tree->mark_table,
+ name);
- gtk_text_btree_remove_mark(tree, mark);
+ gtk_text_btree_remove_mark (tree, mark);
}
void
@@ -2579,21 +2579,21 @@ gtk_text_btree_remove_mark (GtkTextBTree *tree,
GtkTextMark *mark)
{
GtkTextLineSegment *segment;
-
+
g_return_if_fail (mark != NULL);
g_return_if_fail (tree != NULL);
segment = mark->segment;
-
+
if (segment->body.mark.not_deleteable)
{
- g_warning("Can't delete special mark `%s'", segment->body.mark.name);
+ g_warning ("Can't delete special mark `%s'", segment->body.mark.name);
return;
}
/* This calls cleanup_line and segments_changed */
gtk_text_btree_unlink_segment (tree, segment, segment->body.mark.line);
-
+
if (segment->body.mark.name)
g_hash_table_remove (tree->mark_table, segment->body.mark.name);
@@ -2623,9 +2623,9 @@ gtk_text_btree_get_mark_by_name (GtkTextBTree *tree,
const gchar *name)
{
GtkTextLineSegment *seg;
-
- g_return_val_if_fail(tree != NULL, NULL);
- g_return_val_if_fail(name != NULL, NULL);
+
+ g_return_val_if_fail (tree != NULL, NULL);
+ g_return_val_if_fail (name != NULL, NULL);
seg = g_hash_table_lookup (tree->mark_table, name);
@@ -2637,9 +2637,9 @@ gtk_text_mark_set_visible (GtkTextMark *mark,
gboolean setting)
{
GtkTextLineSegment *seg;
-
- g_return_if_fail(mark != NULL);
-
+
+ g_return_if_fail (mark != NULL);
+
seg = mark->segment;
if (seg->body.mark.visible == setting)
@@ -2658,45 +2658,45 @@ gtk_text_btree_first_could_contain_tag (GtkTextBTree *tree,
{
GtkTextBTreeNode *node;
GtkTextTagInfo *info;
-
- g_return_val_if_fail(tree != NULL, NULL);
+
+ g_return_val_if_fail (tree != NULL, NULL);
if (tag != NULL)
- {
- info = gtk_text_btree_get_existing_tag_info(tree, tag);
+ {
+ info = gtk_text_btree_get_existing_tag_info (tree, tag);
if (info == NULL)
return NULL;
-
+
if (info->tag_root == NULL)
return NULL;
-
+
node = info->tag_root;
/* We know the tag root has instances of the given
tag below it */
continue_outer_loop:
- g_assert(node != NULL);
+ g_assert (node != NULL);
while (node->level > 0)
{
- g_assert(node != NULL); /* Failure probably means bad tag summaries. */
+ g_assert (node != NULL); /* Failure probably means bad tag summaries. */
node = node->children.node;
while (node != NULL)
{
- if (gtk_text_btree_node_has_tag(node, tag))
+ if (gtk_text_btree_node_has_tag (node, tag))
goto continue_outer_loop;
-
+
node = node->next;
}
- g_assert(node != NULL);
+ g_assert (node != NULL);
}
-
- g_assert(node != NULL); /* The tag summaries said some node had
- tag toggles... */
-
- g_assert(node->level == 0);
-
+
+ g_assert (node != NULL); /* The tag summaries said some node had
+ tag toggles... */
+
+ g_assert (node->level == 0);
+
return node->children.line;
}
else
@@ -2717,28 +2717,28 @@ gtk_text_btree_last_could_contain_tag (GtkTextBTree *tree,
GtkTextBTreeNode *last_node;
GtkTextLine *line;
GtkTextTagInfo *info;
-
- g_return_val_if_fail(tree != NULL, NULL);
-
+
+ g_return_val_if_fail (tree != NULL, NULL);
+
if (tag != NULL)
{
- info = gtk_text_btree_get_existing_tag_info(tree, tag);
-
+ info = gtk_text_btree_get_existing_tag_info (tree, tag);
+
if (info->tag_root == NULL)
return NULL;
-
+
node = info->tag_root;
/* We know the tag root has instances of the given
tag below it */
-
+
while (node->level > 0)
{
- g_assert(node != NULL); /* Failure probably means bad tag summaries. */
+ g_assert (node != NULL); /* Failure probably means bad tag summaries. */
last_node = NULL;
node = node->children.node;
while (node != NULL)
{
- if (gtk_text_btree_node_has_tag(node, tag))
+ if (gtk_text_btree_node_has_tag (node, tag))
last_node = node;
node = node->next;
}
@@ -2746,11 +2746,11 @@ gtk_text_btree_last_could_contain_tag (GtkTextBTree *tree,
node = last_node;
}
- g_assert(node != NULL); /* The tag summaries said some node had
- tag toggles... */
-
- g_assert(node->level == 0);
-
+ g_assert (node != NULL); /* The tag summaries said some node had
+ tag toggles... */
+
+ g_assert (node->level == 0);
+
/* Find the last line in this node */
line = node->children.line;
while (line->next != NULL)
@@ -2792,7 +2792,7 @@ gtk_text_line_get_number (GtkTextLine *line)
{
if (line2 == NULL)
{
- g_error("gtk_text_btree_line_number couldn't find line");
+ g_error ("gtk_text_btree_line_number couldn't find line");
}
index += 1;
}
@@ -2811,18 +2811,18 @@ gtk_text_line_get_number (GtkTextLine *line)
{
if (node2 == NULL)
{
- g_error("gtk_text_btree_line_number couldn't find GtkTextBTreeNode");
+ g_error ("gtk_text_btree_line_number couldn't find GtkTextBTreeNode");
}
index += node2->num_lines;
}
}
- return index;
+ return index;
}
static GtkTextLineSegment*
-find_toggle_segment_before_char(GtkTextLine *line,
- gint char_in_line,
- GtkTextTag *tag)
+find_toggle_segment_before_char (GtkTextLine *line,
+ gint char_in_line,
+ GtkTextTag *tag)
{
GtkTextLineSegment *seg;
GtkTextLineSegment *toggle_seg;
@@ -2846,9 +2846,9 @@ find_toggle_segment_before_char(GtkTextLine *line,
}
static GtkTextLineSegment*
-find_toggle_segment_before_byte(GtkTextLine *line,
- gint byte_in_line,
- GtkTextTag *tag)
+find_toggle_segment_before_byte (GtkTextLine *line,
+ gint byte_in_line,
+ GtkTextTag *tag)
{
GtkTextLineSegment *seg;
GtkTextLineSegment *toggle_seg;
@@ -2872,9 +2872,9 @@ find_toggle_segment_before_byte(GtkTextLine *line,
}
static gboolean
-find_toggle_outside_current_line(GtkTextLine *line,
- GtkTextBTree *tree,
- GtkTextTag *tag)
+find_toggle_outside_current_line (GtkTextLine *line,
+ GtkTextBTree *tree,
+ GtkTextTag *tag)
{
GtkTextBTreeNode *node;
GtkTextLine *sibling_line;
@@ -2882,7 +2882,7 @@ find_toggle_outside_current_line(GtkTextLine *line,
GtkTextLineSegment *toggle_seg;
int toggles;
GtkTextTagInfo *info = NULL;
-
+
/*
* No toggle in this line. Look for toggles for the tag in lines
* that are predecessors of line but under the same
@@ -2902,35 +2902,35 @@ find_toggle_outside_current_line(GtkTextLine *line,
seg = seg->next;
}
-
+
sibling_line = sibling_line->next;
}
if (toggle_seg != NULL)
return (toggle_seg->type == &gtk_text_toggle_on_type);
-
+
/*
* No toggle in this GtkTextBTreeNode. Scan upwards through the ancestors of
* this GtkTextBTreeNode, counting the number of toggles of the given tag in
* siblings that precede that GtkTextBTreeNode.
*/
- info = gtk_text_btree_get_existing_tag_info(tree, tag);
+ info = gtk_text_btree_get_existing_tag_info (tree, tag);
if (info == NULL)
return FALSE;
-
+
toggles = 0;
node = line->parent;
while (node->parent != NULL)
{
GtkTextBTreeNode *sibling_node;
-
+
sibling_node = node->parent->children.node;
while (sibling_node != node)
{
Summary *summary;
-
+
summary = sibling_node->summary;
while (summary != NULL)
{
@@ -2942,7 +2942,7 @@ find_toggle_outside_current_line(GtkTextLine *line,
sibling_node = sibling_node->next;
}
-
+
if (node == info->tag_root)
break;
@@ -2954,7 +2954,7 @@ find_toggle_outside_current_line(GtkTextLine *line,
* given point.
*/
- return (toggles & 1) != 0;
+ return (toggles & 1) != 0;
}
/* FIXME this function is far too slow, for no good reason. */
@@ -2966,20 +2966,20 @@ gtk_text_line_char_has_tag (GtkTextLine *line,
{
GtkTextLineSegment *toggle_seg;
- g_return_val_if_fail(line != NULL, FALSE);
-
- /*
+ g_return_val_if_fail (line != NULL, FALSE);
+
+ /*
* Check for toggles for the tag in the line but before
* the char. If there is one, its type indicates whether or
* not the character is tagged.
*/
- toggle_seg = find_toggle_segment_before_char(line, char_in_line, tag);
-
+ toggle_seg = find_toggle_segment_before_char (line, char_in_line, tag);
+
if (toggle_seg != NULL)
return (toggle_seg->type == &gtk_text_toggle_on_type);
else
- return find_toggle_outside_current_line(line, tree, tag);
+ return find_toggle_outside_current_line (line, tree, tag);
}
gboolean
@@ -2990,20 +2990,20 @@ gtk_text_line_byte_has_tag (GtkTextLine *line,
{
GtkTextLineSegment *toggle_seg;
- g_return_val_if_fail(line != NULL, FALSE);
-
- /*
+ g_return_val_if_fail (line != NULL, FALSE);
+
+ /*
* Check for toggles for the tag in the line but before
* the char. If there is one, its type indicates whether or
* not the character is tagged.
*/
- toggle_seg = find_toggle_segment_before_byte(line, byte_in_line, tag);
-
+ toggle_seg = find_toggle_segment_before_byte (line, byte_in_line, tag);
+
if (toggle_seg != NULL)
return (toggle_seg->type == &gtk_text_toggle_on_type);
else
- return find_toggle_outside_current_line(line, tree, tag);
+ return find_toggle_outside_current_line (line, tree, tag);
}
gboolean
@@ -3031,7 +3031,7 @@ gtk_text_line_next (GtkTextLine *line)
node = line->parent;
while (node != NULL && node->next == NULL)
- node = node->parent;
+ node = node->parent;
if (node == NULL)
return NULL;
@@ -3042,10 +3042,10 @@ gtk_text_line_next (GtkTextLine *line)
node = node->children.node;
}
- g_assert(node->children.line != line);
-
+ g_assert (node->children.line != line);
+
return node->children.line;
- }
+ }
}
GtkTextLine*
@@ -3067,7 +3067,7 @@ gtk_text_line_previous (GtkTextLine *line)
prev = prev->next;
if (prev == NULL)
- g_error("gtk_text_btree_previous_line ran out of lines");
+ g_error ("gtk_text_btree_previous_line ran out of lines");
}
/*
@@ -3082,8 +3082,8 @@ gtk_text_line_previous (GtkTextLine *line)
else if (node != node->parent->children.node)
break;
}
-
- for (node2 = node->parent->children.node; ;
+
+ for (node2 = node->parent->children.node; ;
node2 = node2->children.node)
{
while (node2->next != node)
@@ -3109,10 +3109,10 @@ void
gtk_text_line_add_data (GtkTextLine *line,
GtkTextLineData *data)
{
- g_return_if_fail(line != NULL);
- g_return_if_fail(data != NULL);
- g_return_if_fail(data->view_id != NULL);
-
+ g_return_if_fail (line != NULL);
+ g_return_if_fail (data != NULL);
+ g_return_if_fail (data->view_id != NULL);
+
if (line->views)
{
data->next = line->views;
@@ -3130,9 +3130,9 @@ gtk_text_line_remove_data (GtkTextLine *line,
{
GtkTextLineData *prev;
GtkTextLineData *iter;
-
- g_return_val_if_fail(line != NULL, NULL);
- g_return_val_if_fail(view_id != NULL, NULL);
+
+ g_return_val_if_fail (line != NULL, NULL);
+ g_return_val_if_fail (view_id != NULL, NULL);
prev = NULL;
iter = line->views;
@@ -3162,10 +3162,10 @@ gtk_text_line_get_data (GtkTextLine *line,
gpointer view_id)
{
GtkTextLineData *iter;
-
- g_return_val_if_fail(line != NULL, NULL);
- g_return_val_if_fail(view_id != NULL, NULL);
-
+
+ g_return_val_if_fail (line != NULL, NULL);
+ g_return_val_if_fail (view_id != NULL, NULL);
+
iter = line->views;
while (iter != NULL)
{
@@ -3182,16 +3182,16 @@ gtk_text_line_invalidate_wrap (GtkTextLine *line,
GtkTextLineData *ld)
{
/* For now this is totally unoptimized. FIXME?
-
+
We could probably optimize the case where the width removed
is less than the max width for the parent node,
and the case where the height is unchanged when we re-wrap.
*/
-
- g_return_if_fail(ld != NULL);
+
+ g_return_if_fail (ld != NULL);
ld->valid = FALSE;
- gtk_text_btree_node_invalidate_upward(line->parent, ld->view_id);
+ gtk_text_btree_node_invalidate_upward (line->parent, ld->view_id);
}
gint
@@ -3199,7 +3199,7 @@ gtk_text_line_char_count (GtkTextLine *line)
{
GtkTextLineSegment *seg;
gint size;
-
+
size = 0;
seg = line->segments;
while (seg != NULL)
@@ -3215,7 +3215,7 @@ gtk_text_line_byte_count (GtkTextLine *line)
{
GtkTextLineSegment *seg;
gint size;
-
+
size = 0;
seg = line->segments;
while (seg != NULL)
@@ -3223,7 +3223,7 @@ gtk_text_line_byte_count (GtkTextLine *line)
size += seg->byte_count;
seg = seg->next;
}
-
+
return size;
}
@@ -3234,23 +3234,23 @@ gtk_text_line_char_index (GtkTextLine *target_line)
GtkTextBTreeNode *iter;
GtkTextLine *line;
gint num_chars;
-
+
/* Push all our parent nodes onto a stack */
iter = target_line->parent;
- g_assert(iter != NULL);
-
+ g_assert (iter != NULL);
+
while (iter != NULL)
{
- node_stack = g_slist_prepend(node_stack, iter);
+ node_stack = g_slist_prepend (node_stack, iter);
iter = iter->parent;
}
/* Check that we have the root node on top of the stack. */
- g_assert(node_stack != NULL &&
- node_stack->data != NULL &&
- ((GtkTextBTreeNode*)node_stack->data)->parent == NULL);
+ g_assert (node_stack != NULL &&
+ node_stack->data != NULL &&
+ ((GtkTextBTreeNode*)node_stack->data)->parent == NULL);
/* Add up chars in all nodes before the nodes in our stack.
*/
@@ -3261,38 +3261,38 @@ gtk_text_line_char_index (GtkTextLine *target_line)
{
GtkTextBTreeNode *child_iter;
GtkTextBTreeNode *next_node;
-
+
next_node = node_stack->next ?
node_stack->next->data : NULL;
- node_stack = g_slist_remove(node_stack, node_stack->data);
-
+ node_stack = g_slist_remove (node_stack, node_stack->data);
+
if (iter->level == 0)
{
/* stack should be empty when we're on the last node */
- g_assert(node_stack == NULL);
+ g_assert (node_stack == NULL);
break; /* Our children are now lines */
}
- g_assert(next_node != NULL);
- g_assert(iter != NULL);
- g_assert(next_node->parent == iter);
+ g_assert (next_node != NULL);
+ g_assert (iter != NULL);
+ g_assert (next_node->parent == iter);
/* Add up chars before us in the tree */
- child_iter = iter->children.node;
+ child_iter = iter->children.node;
while (child_iter != next_node)
{
- g_assert(child_iter != NULL);
-
+ g_assert (child_iter != NULL);
+
num_chars += child_iter->num_chars;
-
+
child_iter = child_iter->next;
}
iter = next_node;
}
- g_assert(iter != NULL);
- g_assert(iter == target_line->parent);
+ g_assert (iter != NULL);
+ g_assert (iter == target_line->parent);
/* Since we don't store char counts in lines, only in segments, we
have to iterate over the lines adding up segment char counts
@@ -3300,14 +3300,14 @@ gtk_text_line_char_index (GtkTextLine *target_line)
line = iter->children.line;
while (line != target_line)
{
- g_assert(line != NULL);
+ g_assert (line != NULL);
- num_chars += gtk_text_line_char_count(line);
+ num_chars += gtk_text_line_char_count (line);
line = line->next;
}
- g_assert(line == target_line);
+ g_assert (line == target_line);
return num_chars;
}
@@ -3320,14 +3320,14 @@ gtk_text_line_byte_to_segment (GtkTextLine *line,
GtkTextLineSegment *seg;
int offset;
- g_return_val_if_fail(line != NULL, NULL);
-
+ g_return_val_if_fail (line != NULL, NULL);
+
offset = byte_offset;
seg = line->segments;
while (offset >= seg->byte_count)
{
- g_assert(seg != NULL); /* means an invalid byte index */
+ g_assert (seg != NULL); /* means an invalid byte index */
offset -= seg->byte_count;
seg = seg->next;
}
@@ -3346,14 +3346,14 @@ gtk_text_line_char_to_segment (GtkTextLine *line,
GtkTextLineSegment *seg;
int offset;
- g_return_val_if_fail(line != NULL, NULL);
-
+ g_return_val_if_fail (line != NULL, NULL);
+
offset = char_offset;
seg = line->segments;
while (offset >= seg->char_count)
{
- g_assert(seg != NULL); /* means an invalid char index */
+ g_assert (seg != NULL); /* means an invalid char index */
offset -= seg->char_count;
seg = seg->next;
}
@@ -3361,7 +3361,7 @@ gtk_text_line_char_to_segment (GtkTextLine *line,
if (seg_offset)
*seg_offset = offset;
- return seg;
+ return seg;
}
GtkTextLineSegment*
@@ -3372,14 +3372,14 @@ gtk_text_line_byte_to_any_segment (GtkTextLine *line,
GtkTextLineSegment *seg;
int offset;
- g_return_val_if_fail(line != NULL, NULL);
-
+ g_return_val_if_fail (line != NULL, NULL);
+
offset = byte_offset;
seg = line->segments;
while (offset > 0 && offset >= seg->byte_count)
{
- g_assert(seg != NULL); /* means an invalid byte index */
+ g_assert (seg != NULL); /* means an invalid byte index */
offset -= seg->byte_count;
seg = seg->next;
}
@@ -3398,14 +3398,14 @@ gtk_text_line_char_to_any_segment (GtkTextLine *line,
GtkTextLineSegment *seg;
int offset;
- g_return_val_if_fail(line != NULL, NULL);
-
+ g_return_val_if_fail (line != NULL, NULL);
+
offset = char_offset;
seg = line->segments;
while (offset > 0 && offset >= seg->char_count)
{
- g_assert(seg != NULL); /* means an invalid byte index */
+ g_assert (seg != NULL); /* means an invalid byte index */
offset -= seg->char_count;
seg = seg->next;
}
@@ -3423,23 +3423,23 @@ gtk_text_line_byte_to_char (GtkTextLine *line,
gint char_offset;
GtkTextLineSegment *seg;
- g_return_val_if_fail(line != NULL, 0);
- g_return_val_if_fail(byte_offset >= 0, 0);
-
+ g_return_val_if_fail (line != NULL, 0);
+ g_return_val_if_fail (byte_offset >= 0, 0);
+
char_offset = 0;
seg = line->segments;
while (byte_offset >= seg->byte_count) /* while (we need to go farther than
the next segment) */
{
- g_assert(seg != NULL); /* our byte_index was bogus if this happens */
-
+ g_assert (seg != NULL); /* our byte_index was bogus if this happens */
+
byte_offset -= seg->byte_count;
char_offset += seg->char_count;
-
+
seg = seg->next;
}
- g_assert(seg != NULL);
+ g_assert (seg != NULL);
/* Now byte_offset is the offset into the current segment,
and char_offset is the start of the current segment.
@@ -3452,8 +3452,8 @@ gtk_text_line_byte_to_char (GtkTextLine *line,
return char_offset + g_utf8_strlen (seg->body.chars, byte_offset);
else
{
- g_assert(seg->char_count == 1);
- g_assert(byte_offset == 0);
+ g_assert (seg->char_count == 1);
+ g_assert (byte_offset == 0);
return char_offset;
}
@@ -3464,7 +3464,7 @@ gint
gtk_text_line_char_to_byte (GtkTextLine *line,
gint char_offset)
{
- g_warning("FIXME not implemented");
+ g_warning ("FIXME not implemented");
return 0;
}
@@ -3485,22 +3485,22 @@ gtk_text_line_byte_locate (GtkTextLine *line,
GtkTextLineSegment *last_indexable;
gint offset;
gint bytes_in_line;
-
- g_return_if_fail(line != NULL);
+
+ g_return_if_fail (line != NULL);
if (byte_offset < 0)
- {
+ {
/* -1 means end of line; we here assume no line is
longer than 1 bazillion bytes, of course we assumed
that anyway since we'd wrap around... */
byte_offset = G_MAXINT;
}
-
+
*segment = NULL;
*any_segment = NULL;
bytes_in_line = 0;
-
+
offset = byte_offset;
last_indexable = NULL;
@@ -3512,16 +3512,16 @@ gtk_text_line_byte_locate (GtkTextLine *line,
last_indexable refers to the last segment
we passed entirely. */
while (seg && offset >= seg->byte_count)
- {
+ {
if (seg->char_count > 0)
- {
+ {
offset -= seg->byte_count;
bytes_in_line += seg->byte_count;
last_indexable = seg;
after_prev_indexable = after_last_indexable;
after_last_indexable = last_indexable->next;
}
-
+
seg = seg->next;
}
@@ -3542,17 +3542,17 @@ gtk_text_line_byte_locate (GtkTextLine *line,
else
*any_segment = *segment;
}
-
+
/* Override any_segment if we're in the middle of a segment. */
if (offset > 0)
*any_segment = *segment;
*seg_byte_offset = offset;
- g_assert(*segment != NULL);
- g_assert(*any_segment != NULL);
- g_assert(*seg_byte_offset < (*segment)->byte_count);
-
+ g_assert (*segment != NULL);
+ g_assert (*any_segment != NULL);
+ g_assert (*seg_byte_offset < (*segment)->byte_count);
+
*line_byte_offset = bytes_in_line + *seg_byte_offset;
}
@@ -3572,22 +3572,22 @@ gtk_text_line_char_locate (GtkTextLine *line,
GtkTextLineSegment *last_indexable;
gint offset;
gint chars_in_line;
-
- g_return_if_fail(line != NULL);
+
+ g_return_if_fail (line != NULL);
if (char_offset < 0)
- {
+ {
/* -1 means end of line; we here assume no line is
longer than 1 bazillion chars, of course we assumed
that anyway since we'd wrap around... */
char_offset = G_MAXINT;
}
-
+
*segment = NULL;
*any_segment = NULL;
chars_in_line = 0;
-
+
offset = char_offset;
last_indexable = NULL;
@@ -3599,16 +3599,16 @@ gtk_text_line_char_locate (GtkTextLine *line,
last_indexable refers to the last segment
we passed entirely. */
while (seg && offset >= seg->char_count)
- {
+ {
if (seg->char_count > 0)
- {
+ {
offset -= seg->char_count;
chars_in_line += seg->char_count;
last_indexable = seg;
after_prev_indexable = after_last_indexable;
after_last_indexable = last_indexable->next;
}
-
+
seg = seg->next;
}
@@ -3629,34 +3629,34 @@ gtk_text_line_char_locate (GtkTextLine *line,
else
*any_segment = *segment;
}
-
+
/* Override any_segment if we're in the middle of a segment. */
if (offset > 0)
*any_segment = *segment;
*seg_char_offset = offset;
- g_assert(*segment != NULL);
- g_assert(*any_segment != NULL);
- g_assert(*seg_char_offset < (*segment)->char_count);
-
+ g_assert (*segment != NULL);
+ g_assert (*any_segment != NULL);
+ g_assert (*seg_char_offset < (*segment)->char_count);
+
*line_char_offset = chars_in_line + *seg_char_offset;
}
void
-gtk_text_line_byte_to_char_offsets(GtkTextLine *line,
- gint byte_offset,
- gint *line_char_offset,
- gint *seg_char_offset)
+gtk_text_line_byte_to_char_offsets (GtkTextLine *line,
+ gint byte_offset,
+ gint *line_char_offset,
+ gint *seg_char_offset)
{
GtkTextLineSegment *seg;
int offset;
- g_return_if_fail(line != NULL);
- g_return_if_fail(byte_offset >= 0);
+ g_return_if_fail (line != NULL);
+ g_return_if_fail (byte_offset >= 0);
*line_char_offset = 0;
-
+
offset = byte_offset;
seg = line->segments;
@@ -3665,43 +3665,43 @@ gtk_text_line_byte_to_char_offsets(GtkTextLine *line,
offset -= seg->byte_count;
*line_char_offset += seg->char_count;
seg = seg->next;
- g_assert(seg != NULL); /* means an invalid char offset */
+ g_assert (seg != NULL); /* means an invalid char offset */
}
- g_assert(seg->char_count > 0); /* indexable. */
-
+ g_assert (seg->char_count > 0); /* indexable. */
+
/* offset is now the number of bytes into the current segment we
want to go. Count chars into the current segment. */
if (seg->type == &gtk_text_char_type)
{
- *seg_char_offset = g_utf8_strlen(seg->body.chars, offset);
+ *seg_char_offset = g_utf8_strlen (seg->body.chars, offset);
+
+ g_assert (*seg_char_offset < seg->char_count);
- g_assert(*seg_char_offset < seg->char_count);
-
*line_char_offset += *seg_char_offset;
}
else
{
- g_assert(offset == 0);
+ g_assert (offset == 0);
*seg_char_offset = 0;
}
}
void
-gtk_text_line_char_to_byte_offsets(GtkTextLine *line,
- gint char_offset,
- gint *line_byte_offset,
- gint *seg_byte_offset)
+gtk_text_line_char_to_byte_offsets (GtkTextLine *line,
+ gint char_offset,
+ gint *line_byte_offset,
+ gint *seg_byte_offset)
{
GtkTextLineSegment *seg;
int offset;
- g_return_if_fail(line != NULL);
- g_return_if_fail(char_offset >= 0);
+ g_return_if_fail (line != NULL);
+ g_return_if_fail (char_offset >= 0);
*line_byte_offset = 0;
-
+
offset = char_offset;
seg = line->segments;
@@ -3710,11 +3710,11 @@ gtk_text_line_char_to_byte_offsets(GtkTextLine *line,
offset -= seg->char_count;
*line_byte_offset += seg->byte_count;
seg = seg->next;
- g_assert(seg != NULL); /* means an invalid char offset */
+ g_assert (seg != NULL); /* means an invalid char offset */
}
- g_assert(seg->char_count > 0); /* indexable. */
-
+ g_assert (seg->char_count > 0); /* indexable. */
+
/* offset is now the number of chars into the current segment we
want to go. Count bytes into the current segment. */
@@ -3725,19 +3725,19 @@ gtk_text_line_char_to_byte_offsets(GtkTextLine *line,
{
gint bytes;
const char * start = seg->body.chars + *seg_byte_offset;
-
+
bytes = g_utf8_next_char (start) - start;
*seg_byte_offset += bytes;
offset -= 1;
}
- g_assert(*seg_byte_offset < seg->byte_count);
-
+ g_assert (*seg_byte_offset < seg->byte_count);
+
*line_byte_offset += *seg_byte_offset;
}
else
{
- g_assert(offset == 0);
+ g_assert (offset == 0);
*seg_byte_offset = 0;
}
}
@@ -3758,10 +3758,10 @@ node_compare (GtkTextBTreeNode *lhs,
/* This function assumes that lhs and rhs are not underneath each
* other.
*/
-
+
if (lhs == rhs)
return 0;
-
+
if (lhs->level < rhs->level)
{
lhs_is_lower = TRUE;
@@ -3774,7 +3774,7 @@ node_compare (GtkTextBTreeNode *lhs,
lower = rhs;
higher = lhs;
}
-
+
/* Algorithm: find common parent of lhs/rhs. Save the child nodes
* of the common parent we used to reach the common parent; the
* ordering of these child nodes in the child list is the ordering
@@ -3787,9 +3787,9 @@ node_compare (GtkTextBTreeNode *lhs,
node = node->parent;
g_assert (node->level == higher->level);
-
+
g_assert (node != higher); /* Happens if lower is underneath higher */
-
+
/* Go up until we have two children with a common parent.
*/
parent_of_lower = node;
@@ -3806,7 +3806,7 @@ node_compare (GtkTextBTreeNode *lhs,
common_parent = parent_of_lower->parent;
g_assert (common_parent != NULL);
-
+
/* See which is first in the list of common_parent's children */
iter = common_parent->children.node;
while (iter != NULL)
@@ -3814,7 +3814,7 @@ node_compare (GtkTextBTreeNode *lhs,
if (iter == parent_of_higher)
{
/* higher is less than lower */
-
+
if (lhs_is_lower)
return 1; /* lhs > rhs */
else
@@ -3823,13 +3823,13 @@ node_compare (GtkTextBTreeNode *lhs,
else if (iter == parent_of_lower)
{
/* lower is less than higher */
-
+
if (lhs_is_lower)
return -1; /* lhs < rhs */
else
return 1;
}
-
+
iter = iter->next;
}
@@ -3839,19 +3839,19 @@ node_compare (GtkTextBTreeNode *lhs,
/* remember that tag == NULL means "any tag" */
GtkTextLine*
-gtk_text_line_next_could_contain_tag(GtkTextLine *line,
- GtkTextBTree *tree,
- GtkTextTag *tag)
+gtk_text_line_next_could_contain_tag (GtkTextLine *line,
+ GtkTextBTree *tree,
+ GtkTextTag *tag)
{
GtkTextBTreeNode *node;
GtkTextTagInfo *info;
gboolean below_tag_root;
-
- g_return_val_if_fail(line != NULL, NULL);
+
+ g_return_val_if_fail (line != NULL, NULL);
if (gtk_debug_flags & GTK_DEBUG_TEXT)
gtk_text_btree_check (tree);
-
+
if (tag == NULL)
{
/* Right now we can only offer linear-search if the user wants
@@ -3859,7 +3859,7 @@ gtk_text_line_next_could_contain_tag(GtkTextLine *line,
*/
return gtk_text_line_next (line);
}
-
+
/* Our tag summaries only have node precision, not line
precision. This means that if any line under a node could contain a
tag, then any of the others could also contain a tag.
@@ -3873,7 +3873,7 @@ gtk_text_line_next_could_contain_tag(GtkTextLine *line,
if (line->next)
return line->next;
- info = gtk_text_btree_get_existing_tag_info(tree, tag);
+ info = gtk_text_btree_get_existing_tag_info (tree, tag);
if (info == NULL)
return NULL;
@@ -3882,14 +3882,14 @@ gtk_text_line_next_could_contain_tag(GtkTextLine *line,
if (info->tag_root == line->parent)
return NULL; /* we were at the last line under the tag root */
-
+
/* We need to go up out of this node, and on to the next one with
toggles for the target tag. If we're below the tag root, we need to
find the next node below the tag root that has tag summaries. If
we're not below the tag root, we need to see if the tag root is
after us in the tree, and if so, return the first line underneath
the tag root. */
-
+
node = line->parent;
below_tag_root = FALSE;
while (node != NULL)
@@ -3914,7 +3914,7 @@ gtk_text_line_next_could_contain_tag(GtkTextLine *line,
{
node = node->next;
- if (gtk_text_btree_node_has_tag(node, tag))
+ if (gtk_text_btree_node_has_tag (node, tag))
goto found;
}
}
@@ -3944,9 +3944,9 @@ gtk_text_line_next_could_contain_tag(GtkTextLine *line,
}
found:
-
- g_assert(node != NULL);
-
+
+ g_assert (node != NULL);
+
/* We have to find the first sub-node of this node that contains
* the target tag.
*/
@@ -3968,7 +3968,7 @@ gtk_text_line_next_could_contain_tag(GtkTextLine *line,
g_assert (node != NULL);
g_assert (node->level == 0);
-
+
return node->children.line;
}
@@ -4005,16 +4005,16 @@ gtk_text_line_previous_could_contain_tag (GtkTextLine *line,
GtkTextLine *prev;
GtkTextBTreeNode *line_ancestor;
GtkTextBTreeNode *line_ancestor_parent;
-
- /* See next_could_contain_tag() for more extensive comments
+
+ /* See next_could_contain_tag () for more extensive comments
* on what's going on here.
*/
-
- g_return_val_if_fail(line != NULL, NULL);
-
+
+ g_return_val_if_fail (line != NULL, NULL);
+
if (gtk_debug_flags & GTK_DEBUG_TEXT)
gtk_text_btree_check (tree);
-
+
if (tag == NULL)
{
/* Right now we can only offer linear-search if the user wants
@@ -4027,7 +4027,7 @@ gtk_text_line_previous_could_contain_tag (GtkTextLine *line,
prev = prev_line_under_node (line->parent, line);
if (prev)
return prev;
-
+
info = gtk_text_btree_get_existing_tag_info (tree, tag);
if (info == NULL)
return NULL;
@@ -4037,7 +4037,7 @@ gtk_text_line_previous_could_contain_tag (GtkTextLine *line,
if (info->tag_root == line->parent)
return NULL; /* we were at the first line under the tag root */
-
+
/* Are we below the tag root */
node = line->parent;
below_tag_root = FALSE;
@@ -4073,7 +4073,7 @@ gtk_text_line_previous_could_contain_tag (GtkTextLine *line,
{
GSList *child_nodes = NULL;
GSList *tmp;
-
+
/* Create reverse-order list of nodes before
* line_ancestor
*/
@@ -4084,7 +4084,7 @@ gtk_text_line_previous_could_contain_tag (GtkTextLine *line,
node = node->next;
}
-
+
/* Try to find a node with our tag on it in the list */
tmp = child_nodes;
while (tmp != NULL)
@@ -4092,14 +4092,14 @@ gtk_text_line_previous_could_contain_tag (GtkTextLine *line,
GtkTextBTreeNode *this_node = tmp->data;
g_assert (this_node != line_ancestor);
-
+
if (gtk_text_btree_node_has_tag (this_node, tag))
{
found_node = this_node;
g_slist_free (child_nodes);
goto found;
}
-
+
tmp = g_slist_next (tmp);
}
@@ -4141,14 +4141,14 @@ gtk_text_line_previous_could_contain_tag (GtkTextLine *line,
}
found:
-
+
g_assert (found_node != NULL);
-
+
/* We have to find the last sub-node of this node that contains
* the target tag.
*/
node = found_node;
-
+
while (node->level > 0)
{
GSList *child_nodes = NULL;
@@ -4166,7 +4166,7 @@ gtk_text_line_previous_could_contain_tag (GtkTextLine *line,
}
node = NULL; /* detect failure to find a child node. */
-
+
iter = child_nodes;
while (iter != NULL)
{
@@ -4190,7 +4190,7 @@ gtk_text_line_previous_could_contain_tag (GtkTextLine *line,
/* this assertion is correct, but slow. */
/* g_assert (node_compare (node, line->parent) < 0); */
-
+
/* Return last line in this node. */
prev = node->children.line;
@@ -4205,7 +4205,7 @@ gtk_text_line_previous_could_contain_tag (GtkTextLine *line,
*/
static void
-summary_list_destroy(Summary *summary)
+summary_list_destroy (Summary *summary)
{
Summary *next;
while (summary != NULL)
@@ -4217,7 +4217,7 @@ summary_list_destroy(Summary *summary)
}
static GtkTextLine*
-get_last_line(GtkTextBTree *tree)
+get_last_line (GtkTextBTree *tree)
{
if (tree->end_iter_line_stamp != tree->chars_changed_stamp)
{
@@ -4225,16 +4225,16 @@ get_last_line(GtkTextBTree *tree)
GtkTextLine *line;
gint real_line;
- n_lines = gtk_text_btree_line_count(tree);
-
- g_assert(n_lines >= 1); /* num_lines doesn't return bogus last line. */
-
- line = gtk_text_btree_get_line(tree, n_lines, &real_line);
+ n_lines = gtk_text_btree_line_count (tree);
+
+ g_assert (n_lines >= 1); /* num_lines doesn't return bogus last line. */
+
+ line = gtk_text_btree_get_line (tree, n_lines, &real_line);
tree->end_iter_line_stamp = tree->chars_changed_stamp;
tree->end_iter_line = line;
}
-
+
return tree->end_iter_line;
}
@@ -4243,7 +4243,7 @@ get_last_line(GtkTextBTree *tree)
*/
static GtkTextLine*
-gtk_text_line_new(void)
+gtk_text_line_new (void)
{
GtkTextLine *line;
@@ -4253,43 +4253,43 @@ gtk_text_line_new(void)
}
static void
-gtk_text_line_destroy(GtkTextBTree *tree, GtkTextLine *line)
+gtk_text_line_destroy (GtkTextBTree *tree, GtkTextLine *line)
{
GtkTextLineData *ld;
GtkTextLineData *next;
-
- g_return_if_fail(line != NULL);
+
+ g_return_if_fail (line != NULL);
ld = line->views;
while (ld != NULL)
{
BTreeView *view;
-
+
view = gtk_text_btree_get_view (tree, ld->view_id);
- g_assert(view != NULL);
+ g_assert (view != NULL);
next = ld->next;
gtk_text_layout_free_line_data (view->layout, line, ld);
-
+
ld = next;
}
-
- g_free(line);
+
+ g_free (line);
}
static void
-gtk_text_line_set_parent(GtkTextLine *line,
- GtkTextBTreeNode *node)
+gtk_text_line_set_parent (GtkTextLine *line,
+ GtkTextBTreeNode *node)
{
if (line->parent == node)
return;
line->parent = node;
- gtk_text_btree_node_invalidate_upward(node, NULL);
+ gtk_text_btree_node_invalidate_upward (node, NULL);
}
static void
-cleanup_line(GtkTextLine *line)
+cleanup_line (GtkTextLine *line)
{
GtkTextLineSegment *seg, **prev_p;
gboolean changed;
@@ -4327,11 +4327,11 @@ cleanup_line(GtkTextLine *line)
*/
static NodeData*
-node_data_new(gpointer view_id)
+node_data_new (gpointer view_id)
{
NodeData *nd;
- nd = g_new(NodeData, 1);
+ nd = g_new (NodeData, 1);
nd->view_id = view_id;
nd->next = NULL;
@@ -4343,29 +4343,29 @@ node_data_new(gpointer view_id)
}
static void
-node_data_destroy(NodeData *nd)
+node_data_destroy (NodeData *nd)
{
-
- g_free(nd);
+
+ g_free (nd);
}
static void
-node_data_list_destroy(NodeData *nd)
+node_data_list_destroy (NodeData *nd)
{
NodeData *iter;
NodeData *next;
-
+
iter = nd;
while (iter != NULL)
{
next = iter->next;
- node_data_destroy(iter);
+ node_data_destroy (iter);
iter = next;
}
}
static NodeData*
-node_data_find(NodeData *nd, gpointer view_id)
+node_data_find (NodeData *nd, gpointer view_id)
{
while (nd != NULL)
{
@@ -4387,14 +4387,14 @@ summary_destroy (Summary *summary)
}
static GtkTextBTreeNode*
-gtk_text_btree_node_new(void)
+gtk_text_btree_node_new (void)
{
GtkTextBTreeNode *node;
- node = g_new(GtkTextBTreeNode, 1);
+ node = g_new (GtkTextBTreeNode, 1);
node->node_data = NULL;
-
+
return node;
}
@@ -4404,7 +4404,7 @@ gtk_text_btree_node_adjust_toggle_count (GtkTextBTreeNode *node,
gint adjust)
{
Summary *summary;
-
+
summary = node->summary;
while (summary != NULL)
{
@@ -4420,8 +4420,8 @@ gtk_text_btree_node_adjust_toggle_count (GtkTextBTreeNode *node,
if (summary == NULL)
{
/* didn't find a summary for our tag. */
- g_return_if_fail(adjust > 0);
- summary = g_new(Summary, 1);
+ g_return_if_fail (adjust > 0);
+ summary = g_new (Summary, 1);
summary->info = info;
summary->toggle_count = adjust;
summary->next = node->summary;
@@ -4436,14 +4436,14 @@ static gboolean
gtk_text_btree_node_has_tag (GtkTextBTreeNode *node, GtkTextTag *tag)
{
Summary *summary;
-
+
summary = node->summary;
while (summary != NULL)
{
if (tag == NULL ||
summary->info->tag == tag)
return TRUE;
-
+
summary = summary->next;
}
@@ -4452,7 +4452,7 @@ gtk_text_btree_node_has_tag (GtkTextBTreeNode *node, GtkTextTag *tag)
/* Add node and all children to the damage region. */
static void
-gtk_text_btree_node_invalidate_downward(GtkTextBTreeNode *node)
+gtk_text_btree_node_invalidate_downward (GtkTextBTreeNode *node)
{
NodeData *nd;
@@ -4462,7 +4462,7 @@ gtk_text_btree_node_invalidate_downward(GtkTextBTreeNode *node)
nd->valid = FALSE;
nd = nd->next;
}
-
+
if (node->level == 0)
{
GtkTextLine *line;
@@ -4478,30 +4478,30 @@ gtk_text_btree_node_invalidate_downward(GtkTextBTreeNode *node)
ld->valid = FALSE;
ld = ld->next;
}
-
+
line = line->next;
}
}
else
{
GtkTextBTreeNode *child;
-
+
child = node->children.node;
-
+
while (child != NULL)
{
- gtk_text_btree_node_invalidate_downward(child);
-
+ gtk_text_btree_node_invalidate_downward (child);
+
child = child->next;
}
}
}
static void
-gtk_text_btree_node_invalidate_upward(GtkTextBTreeNode *node, gpointer view_id)
+gtk_text_btree_node_invalidate_upward (GtkTextBTreeNode *node, gpointer view_id)
{
GtkTextBTreeNode *iter;
-
+
iter = node;
while (iter != NULL)
{
@@ -4510,24 +4510,24 @@ gtk_text_btree_node_invalidate_upward(GtkTextBTreeNode *node, gpointer view_id)
if (view_id)
{
nd = node_data_find (iter->node_data, view_id);
-
+
if (nd == NULL || !nd->valid)
- break; /* Once a node is invalid, we know its parents are as well. */
-
- nd->valid = FALSE;
+ break; /* Once a node is invalid, we know its parents are as well. */
+
+ nd->valid = FALSE;
}
else
{
gboolean should_continue = FALSE;
-
+
nd = iter->node_data;
while (nd != NULL)
{
if (nd->valid)
- {
- should_continue = TRUE;
- nd->valid = FALSE;
- }
+ {
+ should_continue = TRUE;
+ nd->valid = FALSE;
+ }
nd = nd->next;
}
@@ -4536,7 +4536,7 @@ gtk_text_btree_node_invalidate_upward(GtkTextBTreeNode *node, gpointer view_id)
break; /* This node was totally invalidated, so are its
parents */
}
-
+
iter = iter->parent;
}
}
@@ -4546,15 +4546,15 @@ gtk_text_btree_node_invalidate_upward(GtkTextBTreeNode *node, gpointer view_id)
* gtk_text_btree_is_valid:
* @tree: a #GtkTextBTree
* @view_id: ID for the view
- *
+ *
* Check to see if the entire #GtkTextBTree is valid or not for
* the given view.
- *
+ *
* Return value: %TRUE if the entire #GtkTextBTree is valid
**/
gboolean
gtk_text_btree_is_valid (GtkTextBTree *tree,
- gpointer view_id)
+ gpointer view_id)
{
NodeData *nd;
g_return_val_if_fail (tree != NULL, FALSE);
@@ -4576,9 +4576,9 @@ struct _ValidateState
static void
gtk_text_btree_node_validate (BTreeView *view,
- GtkTextBTreeNode *node,
- gpointer view_id,
- ValidateState *state)
+ GtkTextBTreeNode *node,
+ gpointer view_id,
+ ValidateState *state)
{
gint node_valid = TRUE;
gint node_width = 0;
@@ -4586,7 +4586,7 @@ gtk_text_btree_node_validate (BTreeView *view,
NodeData *nd = gtk_text_btree_node_ensure_data (node, view_id);
g_return_if_fail (!nd->valid);
-
+
if (node->level == 0)
{
GtkTextLine *line = node->children.line;
@@ -4594,143 +4594,143 @@ gtk_text_btree_node_validate (BTreeView *view,
/* Iterate over leading valid lines */
while (line != NULL)
- {
- ld = gtk_text_line_get_data (line, view_id);
-
- if (!ld || !ld->valid)
- break;
- else if (state->in_validation)
- {
- state->in_validation = FALSE;
- return;
- }
- else
- {
- state->y += ld->height;
- node_width = MAX (ld->width, node_width);
- node_height += ld->height;
- }
-
- line = line->next;
- }
+ {
+ ld = gtk_text_line_get_data (line, view_id);
+
+ if (!ld || !ld->valid)
+ break;
+ else if (state->in_validation)
+ {
+ state->in_validation = FALSE;
+ return;
+ }
+ else
+ {
+ state->y += ld->height;
+ node_width = MAX (ld->width, node_width);
+ node_height += ld->height;
+ }
+
+ line = line->next;
+ }
state->in_validation = TRUE;
-
+
/* Iterate over invalid lines */
while (line != NULL)
- {
- ld = gtk_text_line_get_data (line, view_id);
-
- if (ld && ld->valid)
- break;
- else
- {
- if (ld)
- state->old_height += ld->height;
- ld = gtk_text_layout_wrap (view->layout, line, ld);
- state->new_height += ld->height;
-
- node_width = MAX (ld->width, node_width);
- node_height += ld->height;
-
- state->remaining_pixels -= ld->height;
- if (state->remaining_pixels <= 0)
- {
- line = line->next;
- break;
- }
- }
-
- line = line->next;
- }
+ {
+ ld = gtk_text_line_get_data (line, view_id);
+
+ if (ld && ld->valid)
+ break;
+ else
+ {
+ if (ld)
+ state->old_height += ld->height;
+ ld = gtk_text_layout_wrap (view->layout, line, ld);
+ state->new_height += ld->height;
+
+ node_width = MAX (ld->width, node_width);
+ node_height += ld->height;
+
+ state->remaining_pixels -= ld->height;
+ if (state->remaining_pixels <= 0)
+ {
+ line = line->next;
+ break;
+ }
+ }
+
+ line = line->next;
+ }
/* Iterate over the remaining lines */
while (line != NULL)
- {
- ld = gtk_text_line_get_data (line, view_id);
- state->in_validation = FALSE;
-
- if (!ld || !ld->valid)
- node_valid = FALSE;
-
- if (ld)
- {
- node_width = MAX (ld->width, node_width);
- node_height += ld->height;
- }
-
- line = line->next;
- }
+ {
+ ld = gtk_text_line_get_data (line, view_id);
+ state->in_validation = FALSE;
+
+ if (!ld || !ld->valid)
+ node_valid = FALSE;
+
+ if (ld)
+ {
+ node_width = MAX (ld->width, node_width);
+ node_height += ld->height;
+ }
+
+ line = line->next;
+ }
}
else
{
GtkTextBTreeNode *child;
NodeData *child_nd;
-
+
child = node->children.node;
/* Iterate over leading valid nodes */
while (child)
- {
- child_nd = gtk_text_btree_node_ensure_data (child, view_id);
-
- if (!child_nd->valid)
- break;
- else if (state->in_validation)
- {
- state->in_validation = FALSE;
- return;
- }
- else
- {
- state->y += child_nd->height;
- node_width = MAX (node_width, child_nd->width);
- node_height += child_nd->height;
- }
-
- child = child->next;
- }
+ {
+ child_nd = gtk_text_btree_node_ensure_data (child, view_id);
+
+ if (!child_nd->valid)
+ break;
+ else if (state->in_validation)
+ {
+ state->in_validation = FALSE;
+ return;
+ }
+ else
+ {
+ state->y += child_nd->height;
+ node_width = MAX (node_width, child_nd->width);
+ node_height += child_nd->height;
+ }
+
+ child = child->next;
+ }
/* Iterate over invalid nodes */
while (child)
- {
- child_nd = gtk_text_btree_node_ensure_data (child, view_id);
-
- if (child_nd->valid)
- break;
- else
- {
- gtk_text_btree_node_validate (view, child, view_id, state);
-
- if (!child_nd->valid)
- node_valid = FALSE;
- node_width = MAX (node_width, child_nd->width);
- node_height += child_nd->height;
-
- if (!state->in_validation || state->remaining_pixels <= 0)
- {
- child = child->next;
- break;
- }
- }
-
- child = child->next;
- }
+ {
+ child_nd = gtk_text_btree_node_ensure_data (child, view_id);
+
+ if (child_nd->valid)
+ break;
+ else
+ {
+ gtk_text_btree_node_validate (view, child, view_id, state);
+
+ if (!child_nd->valid)
+ node_valid = FALSE;
+ node_width = MAX (node_width, child_nd->width);
+ node_height += child_nd->height;
+
+ if (!state->in_validation || state->remaining_pixels <= 0)
+ {
+ child = child->next;
+ break;
+ }
+ }
+
+ child = child->next;
+ }
/* Iterate over the remaining lines */
while (child)
- {
- child_nd = gtk_text_btree_node_ensure_data (child, view_id);
- state->in_validation = FALSE;
+ {
+ child_nd = gtk_text_btree_node_ensure_data (child, view_id);
+ state->in_validation = FALSE;
+
+ if (!child_nd->valid)
+ node_valid = FALSE;
- if (!child_nd->valid)
- node_valid = FALSE;
-
- node_width = MAX (child_nd->width, node_width);
- node_height += child_nd->height;
-
- child = child->next;
- }
+ node_width = MAX (child_nd->width, node_width);
+ node_height += child_nd->height;
+
+ child = child->next;
+ }
}
nd->width = node_width;
@@ -4747,25 +4747,25 @@ gtk_text_btree_node_validate (BTreeView *view,
* @y: location to store starting y coordinate of validated region
* @old_height: location to store old height of validated region
* @new_height: location to store new height of validated region
- *
+ *
* Validate a single contiguous invalid region of a #GtkTextBTree for
- * a given view.
- *
+ * a given view.
+ *
* Return value: %TRUE if a region has been validated, %FALSE if the
* entire tree was already valid.
**/
gboolean
gtk_text_btree_validate (GtkTextBTree *tree,
- gpointer view_id,
- gint max_pixels,
- gint *y,
- gint *old_height,
- gint *new_height)
+ gpointer view_id,
+ gint max_pixels,
+ gint *y,
+ gint *old_height,
+ gint *new_height)
{
BTreeView *view;
g_return_val_if_fail (tree != NULL, FALSE);
-
+
view = gtk_text_btree_get_view (tree, view_id);
g_return_val_if_fail (view != NULL, FALSE);
@@ -4780,18 +4780,18 @@ gtk_text_btree_validate (GtkTextBTree *tree,
state.new_height = 0;
gtk_text_btree_node_validate (view,
- tree->root_node,
- view_id, &state);
+ tree->root_node,
+ view_id, &state);
if (y)
- *y = state.y;
+ *y = state.y;
if (old_height)
- *old_height = state.old_height;
+ *old_height = state.old_height;
if (new_height)
- *new_height = state.new_height;
-
+ *new_height = state.new_height;
+
if (gtk_debug_flags & GTK_DEBUG_TEXT)
- gtk_text_btree_check(tree);
+ gtk_text_btree_check (tree);
return TRUE;
}
@@ -4801,68 +4801,68 @@ gtk_text_btree_validate (GtkTextBTree *tree,
static void
gtk_text_btree_node_compute_view_aggregates (GtkTextBTreeNode *node,
- gpointer view_id,
- gint *width_out,
- gint *height_out,
- gboolean *valid_out)
+ gpointer view_id,
+ gint *width_out,
+ gint *height_out,
+ gboolean *valid_out)
{
gint width = 0;
gint height = 0;
gboolean valid = TRUE;
-
+
if (node->level == 0)
{
GtkTextLine *line = node->children.line;
-
+
while (line != NULL)
- {
- GtkTextLineData *ld = gtk_text_line_get_data (line, view_id);
-
- if (!ld || !ld->valid)
- valid = FALSE;
-
- if (ld)
- {
- width = MAX (ld->width, width);
- height += ld->height;
- }
-
- line = line->next;
- }
+ {
+ GtkTextLineData *ld = gtk_text_line_get_data (line, view_id);
+
+ if (!ld || !ld->valid)
+ valid = FALSE;
+
+ if (ld)
+ {
+ width = MAX (ld->width, width);
+ height += ld->height;
+ }
+
+ line = line->next;
+ }
}
else
{
GtkTextBTreeNode *child = node->children.node;
while (child)
- {
- NodeData *child_nd = node_data_find (child->node_data, view_id);
-
- if (!child_nd || !child_nd->valid)
- valid = FALSE;
-
- if (child_nd)
- {
- width = MAX (child_nd->width, width);
- height += child_nd->height;
- }
-
- child = child->next;
- }
+ {
+ NodeData *child_nd = node_data_find (child->node_data, view_id);
+
+ if (!child_nd || !child_nd->valid)
+ valid = FALSE;
+
+ if (child_nd)
+ {
+ width = MAX (child_nd->width, width);
+ height += child_nd->height;
+ }
+
+ child = child->next;
+ }
}
*width_out = width;
*height_out = height;
*valid_out = valid;
}
-
+
/* Recompute the validity and size of the view data for a given
* view at this node from the immediate children of the node
*/
static NodeData *
gtk_text_btree_node_check_valid (GtkTextBTreeNode *node,
- gpointer view_id)
+ gpointer view_id)
{
NodeData *nd = gtk_text_btree_node_ensure_data (node, view_id);
gboolean valid;
@@ -4870,7 +4870,7 @@ gtk_text_btree_node_check_valid (GtkTextBTreeNode *node,
gint height;
gtk_text_btree_node_compute_view_aggregates (node, view_id,
- &width, &height, &valid);
+ &width, &height, &valid);
nd->width = width;
nd->height = height;
nd->valid = valid;
@@ -4880,7 +4880,7 @@ gtk_text_btree_node_check_valid (GtkTextBTreeNode *node,
static void
gtk_text_btree_node_check_valid_upward (GtkTextBTreeNode *node,
- gpointer view_id)
+ gpointer view_id)
{
while (node)
{
@@ -4891,7 +4891,7 @@ gtk_text_btree_node_check_valid_upward (GtkTextBTreeNode *node,
static NodeData *
gtk_text_btree_node_check_valid_downward (GtkTextBTreeNode *node,
- gpointer view_id)
+ gpointer view_id)
{
if (node->level == 0)
{
@@ -4906,18 +4906,18 @@ gtk_text_btree_node_check_valid_downward (GtkTextBTreeNode *node,
nd->valid = TRUE;
nd->width = 0;
nd->height = 0;
-
+
while (child)
- {
- NodeData *child_nd = gtk_text_btree_node_check_valid_downward (child, view_id);
-
- if (!child_nd->valid)
- nd->valid = FALSE;
- nd->width = MAX (child_nd->width, nd->width);
- nd->height += child_nd->height;
-
- child = child->next;
- }
+ {
+ NodeData *child_nd = gtk_text_btree_node_check_valid_downward (child, view_id);
+
+ if (!child_nd->valid)
+ nd->valid = FALSE;
+ nd->width = MAX (child_nd->width, nd->width);
+ nd->height += child_nd->height;
+
+ child = child->next;
+ }
return nd;
}
}
@@ -4929,14 +4929,14 @@ gtk_text_btree_node_check_valid_downward (GtkTextBTreeNode *node,
* @tree: a #GtkTextBTree
* @line: line to validate
* @view_id: view ID for the view to validate
- *
+ *
* Revalidate a single line of the btree for the given view, propagate
* results up through the entire tree.
**/
void
gtk_text_btree_validate_line (GtkTextBTree *tree,
- GtkTextLine *line,
- gpointer view_id)
+ GtkTextLine *line,
+ gpointer view_id)
{
GtkTextLineData *ld;
GtkTextLine *last_line;
@@ -4944,22 +4944,22 @@ gtk_text_btree_validate_line (GtkTextBTree *tree,
g_return_if_fail (tree != NULL);
g_return_if_fail (line != NULL);
-
+
view = gtk_text_btree_get_view (tree, view_id);
g_return_if_fail (view != NULL);
- ld = gtk_text_line_get_data(line, view_id);
+ ld = gtk_text_line_get_data (line, view_id);
if (!ld || !ld->valid)
{
ld = gtk_text_layout_wrap (view->layout, line, ld);
last_line = get_last_line (tree);
-
+
gtk_text_btree_node_check_valid_upward (line->parent, view_id);
}
}
static void
-gtk_text_btree_node_remove_view(BTreeView *view, GtkTextBTreeNode *node, gpointer view_id)
+gtk_text_btree_node_remove_view (BTreeView *view, GtkTextBTreeNode *node, gpointer view_id)
{
if (node->level == 0)
{
@@ -4970,40 +4970,40 @@ gtk_text_btree_node_remove_view(BTreeView *view, GtkTextBTreeNode *node, gpointe
{
GtkTextLineData *ld;
- ld = gtk_text_line_remove_data(line, view_id);
+ ld = gtk_text_line_remove_data (line, view_id);
if (ld)
- gtk_text_layout_free_line_data (view->layout, line, ld);
-
+ gtk_text_layout_free_line_data (view->layout, line, ld);
+
line = line->next;
}
}
else
{
GtkTextBTreeNode *child;
-
+
child = node->children.node;
-
+
while (child != NULL)
{
/* recurse */
- gtk_text_btree_node_remove_view(view, child, view_id);
-
+ gtk_text_btree_node_remove_view (view, child, view_id);
+
child = child->next;
}
}
- gtk_text_btree_node_remove_data(node, view_id);
+ gtk_text_btree_node_remove_data (node, view_id);
}
static void
-gtk_text_btree_node_destroy(GtkTextBTree *tree, GtkTextBTreeNode *node)
+gtk_text_btree_node_destroy (GtkTextBTree *tree, GtkTextBTreeNode *node)
{
if (node->level == 0)
{
GtkTextLine *line;
GtkTextLineSegment *seg;
-
+
while (node->children.line != NULL)
{
line = node->children.line;
@@ -5019,16 +5019,16 @@ gtk_text_btree_node_destroy(GtkTextBTree *tree, GtkTextBTreeNode *node)
seg->body.mark.tree = NULL;
seg->body.mark.line = NULL;
}
-
+
(*seg->type->deleteFunc) (seg, line, 1);
}
- gtk_text_line_destroy(tree, line);
+ gtk_text_line_destroy (tree, line);
}
}
else
{
GtkTextBTreeNode *childPtr;
-
+
while (node->children.node != NULL)
{
childPtr = node->children.node;
@@ -5036,17 +5036,17 @@ gtk_text_btree_node_destroy(GtkTextBTree *tree, GtkTextBTreeNode *node)
gtk_text_btree_node_destroy (tree, childPtr);
}
}
-
+
summary_list_destroy (node->summary);
node_data_list_destroy (node->node_data);
g_free (node);
}
static NodeData*
-gtk_text_btree_node_ensure_data(GtkTextBTreeNode *node, gpointer view_id)
+gtk_text_btree_node_ensure_data (GtkTextBTreeNode *node, gpointer view_id)
{
NodeData *nd;
-
+
nd = node->node_data;
while (nd != NULL)
{
@@ -5057,19 +5057,19 @@ gtk_text_btree_node_ensure_data(GtkTextBTreeNode *node, gpointer view_id)
}
if (nd == NULL) {
- nd = node_data_new(view_id);
+ nd = node_data_new (view_id);
- if (node->node_data)
- nd->next = node->node_data;
+ if (node->node_data)
+ nd->next = node->node_data;
- node->node_data = nd;
- }
+ node->node_data = nd;
+ }
return nd;
}
static void
-gtk_text_btree_node_remove_data(GtkTextBTreeNode *node, gpointer view_id)
+gtk_text_btree_node_remove_data (GtkTextBTreeNode *node, gpointer view_id)
{
NodeData *nd;
NodeData *prev;
@@ -5084,7 +5084,7 @@ gtk_text_btree_node_remove_data(GtkTextBTreeNode *node, gpointer view_id)
prev = nd;
nd = nd->next;
}
-
+
if (nd == NULL)
return;
@@ -5093,22 +5093,22 @@ gtk_text_btree_node_remove_data(GtkTextBTreeNode *node, gpointer view_id)
if (node->node_data == nd)
node->node_data = nd->next;
-
+
nd->next = NULL;
-
- node_data_destroy(nd);
+
+ node_data_destroy (nd);
}
static void
-gtk_text_btree_node_get_size(GtkTextBTreeNode *node, gpointer view_id,
- gint *width, gint *height)
+gtk_text_btree_node_get_size (GtkTextBTreeNode *node, gpointer view_id,
+ gint *width, gint *height)
{
NodeData *nd;
-
- g_return_if_fail(width != NULL);
- g_return_if_fail(height != NULL);
- nd = gtk_text_btree_node_ensure_data(node, view_id);
+ g_return_if_fail (width != NULL);
+ g_return_if_fail (height != NULL);
+
+ nd = gtk_text_btree_node_ensure_data (node, view_id);
if (width)
*width = nd->width;
@@ -5123,7 +5123,7 @@ gtk_text_btree_node_get_size(GtkTextBTreeNode *node, gpointer view_id,
*/
static GtkTextBTreeNode *
gtk_text_btree_node_common_parent (GtkTextBTreeNode *node1,
- GtkTextBTreeNode *node2)
+ GtkTextBTreeNode *node2)
{
while (node1->level < node2->level)
node1 = node1->parent;
@@ -5143,7 +5143,7 @@ gtk_text_btree_node_common_parent (GtkTextBTreeNode *node1,
*/
static BTreeView*
-gtk_text_btree_get_view(GtkTextBTree *tree, gpointer view_id)
+gtk_text_btree_get_view (GtkTextBTree *tree, gpointer view_id)
{
BTreeView *view;
@@ -5154,19 +5154,19 @@ gtk_text_btree_get_view(GtkTextBTree *tree, gpointer view_id)
break;
view = view->next;
}
-
+
return view;
}
static void
-get_tree_bounds(GtkTextBTree *tree,
- GtkTextIter *start,
- GtkTextIter *end)
+get_tree_bounds (GtkTextBTree *tree,
+ GtkTextIter *start,
+ GtkTextIter *end)
{
- gtk_text_btree_get_iter_at_line_char(tree, start, 0, 0);
- gtk_text_btree_get_last_iter(tree, end);
+ gtk_text_btree_get_iter_at_line_char (tree, start, 0, 0);
+ gtk_text_btree_get_last_iter (tree, end);
}
-
+
static void
tag_changed_cb (GtkTextTagTable *table,
GtkTextTag *tag,
@@ -5182,27 +5182,27 @@ tag_changed_cb (GtkTextTagTable *table,
GtkTextIter start;
GtkTextIter end;
- if (gtk_text_btree_get_iter_at_first_toggle(tree, &start, tag))
+ if (gtk_text_btree_get_iter_at_first_toggle (tree, &start, tag))
{
/* Must be a last toggle if there was a first one. */
gtk_text_btree_get_iter_at_last_toggle (tree, &end, tag);
gtk_text_btree_invalidate_region (tree,
&start, &end);
-
+
}
}
else
{
/* We only need to queue a redraw, not a relayout */
BTreeView *view;
-
+
view = tree->views;
-
+
while (view != NULL)
{
- gint width, height;
-
- gtk_text_btree_get_view_size (tree, view->view_id, &width, &height);
+ gint width, height;
+
+ gtk_text_btree_get_view_size (tree, view->view_id, &width, &height);
gtk_text_layout_changed (view->layout, 0, height, height);
view = view->next;
@@ -5211,26 +5211,26 @@ tag_changed_cb (GtkTextTagTable *table,
}
static void
-tag_removed_cb(GtkTextTagTable *table,
- GtkTextTag *tag,
- GtkTextBTree *tree)
+tag_removed_cb (GtkTextTagTable *table,
+ GtkTextTag *tag,
+ GtkTextBTree *tree)
{
/* Remove the tag from the tree */
GtkTextIter start;
GtkTextIter end;
- get_tree_bounds(tree, &start, &end);
+ get_tree_bounds (tree, &start, &end);
- gtk_text_btree_tag(&start, &end, tag, FALSE);
+ gtk_text_btree_tag (&start, &end, tag, FALSE);
gtk_text_btree_remove_tag_info (tree, tag);
}
/* Rebalance the out-of-whack node "node" */
static void
-gtk_text_btree_rebalance(GtkTextBTree *tree,
- GtkTextBTreeNode *node)
+gtk_text_btree_rebalance (GtkTextBTree *tree,
+ GtkTextBTreeNode *node)
{
/*
* Loop over the entire ancestral chain of the GtkTextBTreeNode, working
@@ -5260,25 +5260,25 @@ gtk_text_btree_rebalance(GtkTextBTree *tree,
* GtkTextBTreeNode, then make a new root GtkTextBTreeNode above
* it first.
*/
-
+
if (node->parent == NULL)
{
- new_node = gtk_text_btree_node_new();
+ new_node = gtk_text_btree_node_new ();
new_node->parent = NULL;
new_node->next = NULL;
new_node->summary = NULL;
new_node->level = node->level + 1;
new_node->children.node = node;
- recompute_node_counts(tree, new_node);
+ recompute_node_counts (tree, new_node);
tree->root_node = new_node;
}
- new_node = gtk_text_btree_node_new();
+ new_node = gtk_text_btree_node_new ();
new_node->parent = node->parent;
new_node->next = node->next;
node->next = new_node;
new_node->summary = NULL;
new_node->level = node->level;
- new_node->num_children = node->num_children - MIN_CHILDREN;
+ new_node->num_children = node->num_children - MIN_CHILDREN;
if (node->level == 0)
{
for (i = MIN_CHILDREN-1,
@@ -5301,12 +5301,12 @@ gtk_text_btree_rebalance(GtkTextBTree *tree,
new_node->children.node = child->next;
child->next = NULL;
}
- recompute_node_counts(tree, node);
+ recompute_node_counts (tree, node);
node->parent->num_children++;
node = new_node;
if (node->num_children <= MAX_CHILDREN)
{
- recompute_node_counts(tree, node);
+ recompute_node_counts (tree, node);
break;
}
}
@@ -5333,8 +5333,8 @@ gtk_text_btree_rebalance(GtkTextBTree *tree,
{
tree->root_node = node->children.node;
tree->root_node->parent = NULL;
- summary_list_destroy(node->summary);
- g_free(node);
+ summary_list_destroy (node->summary);
+ g_free (node);
}
return;
}
@@ -5346,7 +5346,7 @@ gtk_text_btree_rebalance(GtkTextBTree *tree,
if (node->parent->num_children < 2)
{
- gtk_text_btree_rebalance(tree, node->parent);
+ gtk_text_btree_rebalance (tree, node->parent);
continue;
}
@@ -5435,11 +5435,11 @@ gtk_text_btree_rebalance(GtkTextBTree *tree,
if (total_children <= MAX_CHILDREN)
{
- recompute_node_counts(tree, node);
+ recompute_node_counts (tree, node);
node->next = other->next;
node->parent->num_children--;
- summary_list_destroy(other->summary);
- g_free(other);
+ summary_list_destroy (other->summary);
+ g_free (other);
continue;
}
@@ -5459,8 +5459,8 @@ gtk_text_btree_rebalance(GtkTextBTree *tree,
halfwaynode->next = NULL;
}
- recompute_node_counts(tree, node);
- recompute_node_counts(tree, other);
+ recompute_node_counts (tree, node);
+ recompute_node_counts (tree, other);
}
node = node->parent;
@@ -5468,14 +5468,14 @@ gtk_text_btree_rebalance(GtkTextBTree *tree,
}
static void
-post_insert_fixup(GtkTextBTree *tree,
- GtkTextLine *line,
- gint line_count_delta,
- gint char_count_delta)
+post_insert_fixup (GtkTextBTree *tree,
+ GtkTextLine *line,
+ gint line_count_delta,
+ gint char_count_delta)
{
GtkTextBTreeNode *node;
-
+
/*
* Increment the line counts in all the parent GtkTextBTreeNodes of the insertion
* point, then rebalance the tree if necessary.
@@ -5492,16 +5492,16 @@ post_insert_fixup(GtkTextBTree *tree,
if (node->num_children > MAX_CHILDREN)
{
- gtk_text_btree_rebalance(tree, node);
+ gtk_text_btree_rebalance (tree, node);
}
if (gtk_debug_flags & GTK_DEBUG_TEXT)
- gtk_text_btree_check(tree);
+ gtk_text_btree_check (tree);
}
static GtkTextTagInfo*
-gtk_text_btree_get_existing_tag_info(GtkTextBTree *tree,
- GtkTextTag *tag)
+gtk_text_btree_get_existing_tag_info (GtkTextBTree *tree,
+ GtkTextTag *tag)
{
GtkTextTagInfo *info;
GSList *list;
@@ -5514,40 +5514,40 @@ gtk_text_btree_get_existing_tag_info(GtkTextBTree *tree,
if (info->tag == tag)
return info;
- list = g_slist_next(list);
+ list = g_slist_next (list);
}
return NULL;
}
static GtkTextTagInfo*
-gtk_text_btree_get_tag_info(GtkTextBTree *tree,
- GtkTextTag *tag)
+gtk_text_btree_get_tag_info (GtkTextBTree *tree,
+ GtkTextTag *tag)
{
GtkTextTagInfo *info;
- info = gtk_text_btree_get_existing_tag_info(tree, tag);
+ info = gtk_text_btree_get_existing_tag_info (tree, tag);
if (info == NULL)
{
/* didn't find it, create. */
- info = g_new(GtkTextTagInfo, 1);
+ info = g_new (GtkTextTagInfo, 1);
info->tag = tag;
- gtk_object_ref(GTK_OBJECT(tag));
+ gtk_object_ref (GTK_OBJECT (tag));
info->tag_root = NULL;
info->toggle_count = 0;
- tree->tag_infos = g_slist_prepend(tree->tag_infos, info);
+ tree->tag_infos = g_slist_prepend (tree->tag_infos, info);
}
-
+
return info;
}
static void
-gtk_text_btree_remove_tag_info(GtkTextBTree *tree,
- GtkTextTag *tag)
+gtk_text_btree_remove_tag_info (GtkTextBTree *tree,
+ GtkTextTag *tag)
{
GtkTextTagInfo *info;
GSList *list;
@@ -5569,29 +5569,29 @@ gtk_text_btree_remove_tag_info(GtkTextBTree *tree,
tree->tag_infos = list->next;
}
list->next = NULL;
- g_slist_free(list);
-
- gtk_object_unref(GTK_OBJECT(info->tag));
+ g_slist_free (list);
- g_free(info);
+ gtk_object_unref (GTK_OBJECT (info->tag));
+
+ g_free (info);
return;
}
- list = g_slist_next(list);
+ list = g_slist_next (list);
}
-
- g_assert_not_reached();
+
+ g_assert_not_reached ();
return;
}
static void
-recompute_level_zero_counts(GtkTextBTreeNode *node)
+recompute_level_zero_counts (GtkTextBTreeNode *node)
{
GtkTextLine *line;
GtkTextLineSegment *seg;
- g_assert(node->level == 0);
-
+ g_assert (node->level == 0);
+
line = node->children.line;
while (line != NULL)
{
@@ -5599,14 +5599,14 @@ recompute_level_zero_counts(GtkTextBTreeNode *node)
node->num_lines++;
if (line->parent != node)
- gtk_text_line_set_parent(line, node);
+ gtk_text_line_set_parent (line, node);
seg = line->segments;
while (seg != NULL)
{
node->num_chars += seg->char_count;
-
+
if (((seg->type != &gtk_text_toggle_on_type)
&& (seg->type != &gtk_text_toggle_off_type))
|| !(seg->body.toggle.inNodeCounts))
@@ -5616,12 +5616,12 @@ recompute_level_zero_counts(GtkTextBTreeNode *node)
else
{
GtkTextTagInfo *info;
-
+
info = seg->body.toggle.info;
- gtk_text_btree_node_adjust_toggle_count(node, info, 1);
+ gtk_text_btree_node_adjust_toggle_count (node, info, 1);
}
-
+
seg = seg->next;
}
@@ -5630,13 +5630,13 @@ recompute_level_zero_counts(GtkTextBTreeNode *node)
}
static void
-recompute_level_nonzero_counts(GtkTextBTreeNode *node)
+recompute_level_nonzero_counts (GtkTextBTreeNode *node)
{
Summary *summary;
GtkTextBTreeNode *child;
- g_assert(node->level > 0);
-
+ g_assert (node->level > 0);
+
child = node->children.node;
while (child != NULL)
{
@@ -5647,16 +5647,16 @@ recompute_level_nonzero_counts(GtkTextBTreeNode *node)
if (child->parent != node)
{
child->parent = node;
- gtk_text_btree_node_invalidate_upward(node, NULL);
+ gtk_text_btree_node_invalidate_upward (node, NULL);
}
summary = child->summary;
while (summary != NULL)
{
- gtk_text_btree_node_adjust_toggle_count(node,
- summary->info,
- summary->toggle_count);
-
+ gtk_text_btree_node_adjust_toggle_count (node,
+ summary->info,
+ summary->toggle_count);
+
summary = summary->next;
}
@@ -5687,7 +5687,7 @@ recompute_level_nonzero_counts(GtkTextBTreeNode *node)
*/
static void
-recompute_node_counts(GtkTextBTree *tree, GtkTextBTreeNode *node)
+recompute_node_counts (GtkTextBTree *tree, GtkTextBTreeNode *node)
{
BTreeView *view;
Summary *summary, *summary2;
@@ -5707,7 +5707,7 @@ recompute_node_counts(GtkTextBTree *tree, GtkTextBTreeNode *node)
node->num_children = 0;
node->num_lines = 0;
node->num_chars = 0;
-
+
/*
* Scan through the children, adding the childrens' tag counts into
* the GtkTextBTreeNode's tag counts and adding new Summary structures if
@@ -5715,9 +5715,9 @@ recompute_node_counts(GtkTextBTree *tree, GtkTextBTreeNode *node)
*/
if (node->level == 0)
- recompute_level_zero_counts(node);
+ recompute_level_zero_counts (node);
else
- recompute_level_nonzero_counts(node);
+ recompute_level_nonzero_counts (node);
view = tree->views;
while (view)
@@ -5725,7 +5725,7 @@ recompute_node_counts(GtkTextBTree *tree, GtkTextBTreeNode *node)
gtk_text_btree_node_check_valid (node, view->view_id);
view = view->next;
}
-
+
/*
* Scan through the GtkTextBTreeNode's tag records again and delete any Summary
* records that still have a zero count, or that have all the toggles.
@@ -5736,7 +5736,7 @@ recompute_node_counts(GtkTextBTree *tree, GtkTextBTreeNode *node)
summary2 = NULL;
for (summary = node->summary; summary != NULL; )
{
- if (summary->toggle_count > 0 &&
+ if (summary->toggle_count > 0 &&
summary->toggle_count < summary->info->toggle_count)
{
if (node->level == summary->info->tag_root->level)
@@ -5775,9 +5775,9 @@ recompute_node_counts(GtkTextBTree *tree, GtkTextBTreeNode *node)
}
void
-_gtk_change_node_toggle_count(GtkTextBTreeNode *node,
- GtkTextTagInfo *info,
- gint delta) /* may be negative */
+_gtk_change_node_toggle_count (GtkTextBTreeNode *node,
+ GtkTextTagInfo *info,
+ gint delta) /* may be negative */
{
Summary *summary, *prevPtr;
GtkTextBTreeNode *node2Ptr;
@@ -5810,7 +5810,7 @@ _gtk_change_node_toggle_count(GtkTextBTreeNode *node,
* See if there's already an entry for this tag for this GtkTextBTreeNode. If so,
* perhaps all we have to do is adjust its count.
*/
-
+
for (prevPtr = NULL, summary = node->summary;
summary != NULL;
prevPtr = summary, summary = summary->next)
@@ -5836,10 +5836,10 @@ _gtk_change_node_toggle_count(GtkTextBTreeNode *node,
* first place).
*/
- g_error("%s: bad toggle count (%d) max (%d)",
- G_STRLOC, summary->toggle_count, info->toggle_count);
+ g_error ("%s: bad toggle count (%d) max (%d)",
+ G_STRLOC, summary->toggle_count, info->toggle_count);
}
-
+
/*
* Zero toggle count; must remove this tag from the list.
*/
@@ -5859,10 +5859,10 @@ _gtk_change_node_toggle_count(GtkTextBTreeNode *node,
/*
* This tag isn't currently in the summary information list.
*/
-
+
if (rootLevel == node->level)
{
-
+
/*
* The old tag root is at the same level in the tree as this
* GtkTextBTreeNode, but it isn't at this GtkTextBTreeNode. Move the tag root up
@@ -5873,9 +5873,9 @@ _gtk_change_node_toggle_count(GtkTextBTreeNode *node,
* information at the old root and change the root to its
* parent GtkTextBTreeNode.
*/
-
+
GtkTextBTreeNode *rootnode = info->tag_root;
- summary = (Summary *) g_malloc(sizeof(Summary));
+ summary = (Summary *) g_malloc (sizeof (Summary));
summary->info = info;
summary->toggle_count = info->toggle_count - delta;
summary->next = rootnode->summary;
@@ -5884,7 +5884,7 @@ _gtk_change_node_toggle_count(GtkTextBTreeNode *node,
rootLevel = rootnode->level;
info->tag_root = rootnode;
}
- summary = (Summary *) g_malloc(sizeof(Summary));
+ summary = (Summary *) g_malloc (sizeof (Summary));
summary->info = info;
summary->toggle_count = delta;
summary->next = node->summary;
@@ -5980,7 +5980,7 @@ _gtk_change_node_toggle_count(GtkTextBTreeNode *node,
*/
static void
-inc_count(GtkTextTag *tag, int inc, TagInfo *tagInfoPtr)
+inc_count (GtkTextTag *tag, int inc, TagInfo *tagInfoPtr)
{
GtkTextTag **tag_p;
int count;
@@ -6007,16 +6007,16 @@ inc_count(GtkTextTag *tag, int inc, TagInfo *tagInfoPtr)
int *newCounts, newSize;
newSize = 2*tagInfoPtr->arraySize;
- newTags = (GtkTextTag **) g_malloc((unsigned)
- (newSize*sizeof(GtkTextTag *)));
- memcpy((void *) newTags, (void *) tagInfoPtr->tags,
- tagInfoPtr->arraySize *sizeof(GtkTextTag *));
- g_free((char *) tagInfoPtr->tags);
+ newTags = (GtkTextTag **) g_malloc ((unsigned)
+ (newSize*sizeof (GtkTextTag *)));
+ memcpy ((void *) newTags, (void *) tagInfoPtr->tags,
+ tagInfoPtr->arraySize *sizeof (GtkTextTag *));
+ g_free ((char *) tagInfoPtr->tags);
tagInfoPtr->tags = newTags;
- newCounts = (int *) g_malloc((unsigned) (newSize*sizeof(int)));
- memcpy((void *) newCounts, (void *) tagInfoPtr->counts,
- tagInfoPtr->arraySize *sizeof(int));
- g_free((char *) tagInfoPtr->counts);
+ newCounts = (int *) g_malloc ((unsigned) (newSize*sizeof (int)));
+ memcpy ((void *) newCounts, (void *) tagInfoPtr->counts,
+ tagInfoPtr->arraySize *sizeof (int));
+ g_free ((char *) tagInfoPtr->counts);
tagInfoPtr->counts = newCounts;
tagInfoPtr->arraySize = newSize;
}
@@ -6027,17 +6027,17 @@ inc_count(GtkTextTag *tag, int inc, TagInfo *tagInfoPtr)
}
static void
-gtk_text_btree_link_segment(GtkTextLineSegment *seg,
- const GtkTextIter *iter)
+gtk_text_btree_link_segment (GtkTextLineSegment *seg,
+ const GtkTextIter *iter)
{
GtkTextLineSegment *prev;
GtkTextLine *line;
GtkTextBTree *tree;
-
- line = gtk_text_iter_get_text_line(iter);
- tree = gtk_text_iter_get_btree(iter);
-
- prev = gtk_text_line_segment_split(iter);
+
+ line = gtk_text_iter_get_text_line (iter);
+ tree = gtk_text_iter_get_btree (iter);
+
+ prev = gtk_text_line_segment_split (iter);
if (prev == NULL)
{
seg->next = line->segments;
@@ -6048,17 +6048,17 @@ gtk_text_btree_link_segment(GtkTextLineSegment *seg,
seg->next = prev->next;
prev->next = seg;
}
- cleanup_line(line);
- segments_changed(tree);
-
+ cleanup_line (line);
+ segments_changed (tree);
+
if (gtk_debug_flags & GTK_DEBUG_TEXT)
- gtk_text_btree_check(tree);
+ gtk_text_btree_check (tree);
}
static void
-gtk_text_btree_unlink_segment(GtkTextBTree *tree,
- GtkTextLineSegment *seg,
- GtkTextLine *line)
+gtk_text_btree_unlink_segment (GtkTextBTree *tree,
+ GtkTextLineSegment *seg,
+ GtkTextLine *line)
{
GtkTextLineSegment *prev;
@@ -6075,8 +6075,8 @@ gtk_text_btree_unlink_segment(GtkTextBTree *tree,
}
prev->next = seg->next;
}
- cleanup_line(line);
- segments_changed(tree);
+ cleanup_line (line);
+ segments_changed (tree);
}
/*
@@ -6111,11 +6111,11 @@ _gtk_toggle_segment_check_func (GtkTextLineSegment *segPtr,
if (segPtr->byte_count != 0)
{
- g_error("toggle_segment_check_func: segment had non-zero size");
+ g_error ("toggle_segment_check_func: segment had non-zero size");
}
if (!segPtr->body.toggle.inNodeCounts)
{
- g_error("toggle_segment_check_func: toggle counts not updated in GtkTextBTreeNodes");
+ g_error ("toggle_segment_check_func: toggle counts not updated in GtkTextBTreeNodes");
}
needSummary = (segPtr->body.toggle.info->tag_root != line->parent);
for (summary = line->parent->summary; ;
@@ -6125,7 +6125,7 @@ _gtk_toggle_segment_check_func (GtkTextLineSegment *segPtr,
{
if (needSummary)
{
- g_error("toggle_segment_check_func: tag not present in GtkTextBTreeNode");
+ g_error ("toggle_segment_check_func: tag not present in GtkTextBTreeNode");
}
else
{
@@ -6136,7 +6136,7 @@ _gtk_toggle_segment_check_func (GtkTextLineSegment *segPtr,
{
if (!needSummary)
{
- g_error("toggle_segment_check_func: tag present in root GtkTextBTreeNode summary");
+ g_error ("toggle_segment_check_func: tag present in root GtkTextBTreeNode summary");
}
break;
}
@@ -6149,28 +6149,28 @@ _gtk_toggle_segment_check_func (GtkTextLineSegment *segPtr,
static void
gtk_text_btree_node_view_check_consistency (GtkTextBTreeNode *node,
- NodeData *nd)
+ NodeData *nd)
{
gint width;
gint height;
gboolean valid;
gtk_text_btree_node_compute_view_aggregates (node, nd->view_id,
- &width, &height, &valid);
+ &width, &height, &valid);
if (nd->width != width ||
nd->height != height ||
!nd->valid != !valid)
{
g_error ("Node aggregates for view %p are invalid:\n"
- "Are (%d,%d,%s), should be (%d,%d,%s)",
- nd->view_id,
- nd->width, nd->height, nd->valid ? "TRUE" : "FALSE",
- width, height, valid ? "TRUE" : "FALSE");
+ "Are (%d,%d,%s), should be (%d,%d,%s)",
+ nd->view_id,
+ nd->width, nd->height, nd->valid ? "TRUE" : "FALSE",
+ width, height, valid ? "TRUE" : "FALSE");
}
}
static void
-gtk_text_btree_node_check_consistency(GtkTextBTreeNode *node)
+gtk_text_btree_node_check_consistency (GtkTextBTreeNode *node)
{
GtkTextBTreeNode *childnode;
Summary *summary, *summary2;
@@ -6179,7 +6179,7 @@ gtk_text_btree_node_check_consistency(GtkTextBTreeNode *node)
int num_children, num_lines, num_chars, toggle_count, min_children;
GtkTextLineData *ld;
NodeData *nd;
-
+
if (node->parent != NULL)
{
min_children = MIN_CHILDREN;
@@ -6194,8 +6194,8 @@ gtk_text_btree_node_check_consistency(GtkTextBTreeNode *node)
if ((node->num_children < min_children)
|| (node->num_children > MAX_CHILDREN))
{
- g_error("gtk_text_btree_node_check_consistency: bad child count (%d)",
- node->num_children);
+ g_error ("gtk_text_btree_node_check_consistency: bad child count (%d)",
+ node->num_children);
}
nd = node->node_data;
@@ -6204,7 +6204,7 @@ gtk_text_btree_node_check_consistency(GtkTextBTreeNode *node)
gtk_text_btree_node_view_check_consistency (node, nd);
nd = nd->next;
}
-
+
num_children = 0;
num_lines = 0;
num_chars = 0;
@@ -6215,21 +6215,21 @@ gtk_text_btree_node_check_consistency(GtkTextBTreeNode *node)
{
if (line->parent != node)
{
- g_error("gtk_text_btree_node_check_consistency: line doesn't point to parent");
+ g_error ("gtk_text_btree_node_check_consistency: line doesn't point to parent");
}
if (line->segments == NULL)
{
- g_error("gtk_text_btree_node_check_consistency: line has no segments");
+ g_error ("gtk_text_btree_node_check_consistency: line has no segments");
}
ld = line->views;
while (ld != NULL)
{
/* Just ensuring we don't segv while doing this loop */
-
+
ld = ld->next;
}
-
+
for (segPtr = line->segments; segPtr != NULL; segPtr = segPtr->next)
{
if (segPtr->type->checkFunc != NULL)
@@ -6241,17 +6241,17 @@ gtk_text_btree_node_check_consistency(GtkTextBTreeNode *node)
&& (segPtr->next->byte_count == 0)
&& (segPtr->next->type->leftGravity))
{
- g_error("gtk_text_btree_node_check_consistency: wrong segment order for gravity");
+ g_error ("gtk_text_btree_node_check_consistency: wrong segment order for gravity");
}
if ((segPtr->next == NULL)
&& (segPtr->type != &gtk_text_char_type))
{
- g_error("gtk_text_btree_node_check_consistency: line ended with wrong type");
+ g_error ("gtk_text_btree_node_check_consistency: line ended with wrong type");
}
-
+
num_chars += segPtr->char_count;
}
-
+
num_children++;
num_lines++;
}
@@ -6263,12 +6263,12 @@ gtk_text_btree_node_check_consistency(GtkTextBTreeNode *node)
{
if (childnode->parent != node)
{
- g_error("gtk_text_btree_node_check_consistency: GtkTextBTreeNode doesn't point to parent");
+ g_error ("gtk_text_btree_node_check_consistency: GtkTextBTreeNode doesn't point to parent");
}
if (childnode->level != (node->level-1))
{
- g_error("gtk_text_btree_node_check_consistency: level mismatch (%d %d)",
- node->level, childnode->level);
+ g_error ("gtk_text_btree_node_check_consistency: level mismatch (%d %d)",
+ node->level, childnode->level);
}
gtk_text_btree_node_check_consistency (childnode);
for (summary = childnode->summary; summary != NULL;
@@ -6283,9 +6283,9 @@ gtk_text_btree_node_check_consistency(GtkTextBTreeNode *node)
{
break;
}
- g_error("gtk_text_btree_node_check_consistency: GtkTextBTreeNode tag \"%s\" not %s",
- summary->info->tag->name,
- "present in parent summaries");
+ g_error ("gtk_text_btree_node_check_consistency: GtkTextBTreeNode tag \"%s\" not %s",
+ summary->info->tag->name,
+ "present in parent summaries");
}
if (summary->info == summary2->info)
{
@@ -6300,18 +6300,18 @@ gtk_text_btree_node_check_consistency(GtkTextBTreeNode *node)
}
if (num_children != node->num_children)
{
- g_error("gtk_text_btree_node_check_consistency: mismatch in num_children (%d %d)",
- num_children, node->num_children);
+ g_error ("gtk_text_btree_node_check_consistency: mismatch in num_children (%d %d)",
+ num_children, node->num_children);
}
if (num_lines != node->num_lines)
{
- g_error("gtk_text_btree_node_check_consistency: mismatch in num_lines (%d %d)",
- num_lines, node->num_lines);
+ g_error ("gtk_text_btree_node_check_consistency: mismatch in num_lines (%d %d)",
+ num_lines, node->num_lines);
}
if (num_chars != node->num_chars)
{
- g_error("gtk_text_btree_node_check_consistency: mismatch in num_chars (%d %d)",
- num_chars, node->num_chars);
+ g_error ("gtk_text_btree_node_check_consistency: mismatch in num_chars (%d %d)",
+ num_chars, node->num_chars);
}
for (summary = node->summary; summary != NULL;
@@ -6319,8 +6319,8 @@ gtk_text_btree_node_check_consistency(GtkTextBTreeNode *node)
{
if (summary->info->toggle_count == summary->toggle_count)
{
- g_error("gtk_text_btree_node_check_consistency: found unpruned root for \"%s\"",
- summary->info->tag->name);
+ g_error ("gtk_text_btree_node_check_consistency: found unpruned root for \"%s\"",
+ summary->info->tag->name);
}
toggle_count = 0;
if (node->level == 0)
@@ -6340,7 +6340,7 @@ gtk_text_btree_node_check_consistency(GtkTextBTreeNode *node)
{
if (!segPtr->body.toggle.inNodeCounts)
g_error ("Toggle segment not in the node counts");
-
+
toggle_count ++;
}
}
@@ -6365,36 +6365,36 @@ gtk_text_btree_node_check_consistency(GtkTextBTreeNode *node)
}
if (toggle_count != summary->toggle_count)
{
- g_error("gtk_text_btree_node_check_consistency: mismatch in toggle_count (%d %d)",
- toggle_count, summary->toggle_count);
+ g_error ("gtk_text_btree_node_check_consistency: mismatch in toggle_count (%d %d)",
+ toggle_count, summary->toggle_count);
}
for (summary2 = summary->next; summary2 != NULL;
summary2 = summary2->next)
{
if (summary2->info == summary->info)
{
- g_error("gtk_text_btree_node_check_consistency: duplicated GtkTextBTreeNode tag: %s",
- summary->info->tag->name);
+ g_error ("gtk_text_btree_node_check_consistency: duplicated GtkTextBTreeNode tag: %s",
+ summary->info->tag->name);
}
}
}
}
static void
-listify_foreach(GtkTextTag *tag, gpointer user_data)
+listify_foreach (GtkTextTag *tag, gpointer user_data)
{
GSList** listp = user_data;
- *listp = g_slist_prepend(*listp, tag);
+ *listp = g_slist_prepend (*listp, tag);
}
static GSList*
-list_of_tags(GtkTextTagTable *table)
+list_of_tags (GtkTextTagTable *table)
{
GSList *list = NULL;
-
- gtk_text_tag_table_foreach(table, listify_foreach, &list);
-
+
+ gtk_text_tag_table_foreach (table, listify_foreach, &list);
+
return list;
}
@@ -6409,15 +6409,15 @@ gtk_text_btree_check (GtkTextBTree *tree)
GSList *taglist = NULL;
int count;
GtkTextTagInfo *info;
-
+
/*
* Make sure that the tag toggle counts and the tag root pointers are OK.
*/
- for (taglist = list_of_tags(tree->table);
+ for (taglist = list_of_tags (tree->table);
taglist != NULL ; taglist = taglist->next)
{
tag = taglist->data;
- info = gtk_text_btree_get_existing_tag_info(tree, tag);
+ info = gtk_text_btree_get_existing_tag_info (tree, tag);
if (info != NULL)
{
node = info->tag_root;
@@ -6425,27 +6425,27 @@ gtk_text_btree_check (GtkTextBTree *tree)
{
if (info->toggle_count != 0)
{
- g_error("gtk_text_btree_check found \"%s\" with toggles (%d) but no root",
- tag->name, info->toggle_count);
+ g_error ("gtk_text_btree_check found \"%s\" with toggles (%d) but no root",
+ tag->name, info->toggle_count);
}
continue; /* no ranges for the tag */
}
else if (info->toggle_count == 0)
{
- g_error("gtk_text_btree_check found root for \"%s\" with no toggles",
- tag->name);
+ g_error ("gtk_text_btree_check found root for \"%s\" with no toggles",
+ tag->name);
}
else if (info->toggle_count & 1)
{
- g_error("gtk_text_btree_check found odd toggle count for \"%s\" (%d)",
- tag->name, info->toggle_count);
+ g_error ("gtk_text_btree_check found odd toggle count for \"%s\" (%d)",
+ tag->name, info->toggle_count);
}
for (summary = node->summary; summary != NULL;
summary = summary->next)
{
if (summary->info->tag == tag)
{
- g_error("gtk_text_btree_check found root GtkTextBTreeNode with summary info");
+ g_error ("gtk_text_btree_check found root GtkTextBTreeNode with summary info");
}
}
count = 0;
@@ -6467,7 +6467,7 @@ gtk_text_btree_check (GtkTextBTree *tree)
else
{
GtkTextLineSegmentClass * last = NULL;
-
+
for (line = node->children.line ; line != NULL ;
line = line->next)
{
@@ -6482,9 +6482,9 @@ gtk_text_btree_check (GtkTextBTree *tree)
g_error ("Two consecutive toggles on or off weren't merged");
if (!seg->body.toggle.inNodeCounts)
g_error ("Toggle segment not in the node counts");
-
+
last = seg->type;
-
+
count++;
}
}
@@ -6492,13 +6492,13 @@ gtk_text_btree_check (GtkTextBTree *tree)
}
if (count != info->toggle_count)
{
- g_error("gtk_text_btree_check toggle_count (%d) wrong for \"%s\" should be (%d)",
- info->toggle_count, tag->name, count);
+ g_error ("gtk_text_btree_check toggle_count (%d) wrong for \"%s\" should be (%d)",
+ info->toggle_count, tag->name, count);
}
}
}
- g_slist_free(taglist);
+ g_slist_free (taglist);
taglist = NULL;
/*
@@ -6506,7 +6506,7 @@ gtk_text_btree_check (GtkTextBTree *tree)
*/
node = tree->root_node;
- gtk_text_btree_node_check_consistency(tree->root_node);
+ gtk_text_btree_node_check_consistency (tree->root_node);
/*
* Make sure that there are at least two lines in the text and
@@ -6515,11 +6515,11 @@ gtk_text_btree_check (GtkTextBTree *tree)
if (node->num_lines < 2)
{
- g_error("gtk_text_btree_check: less than 2 lines in tree");
+ g_error ("gtk_text_btree_check: less than 2 lines in tree");
}
if (node->num_chars < 2)
{
- g_error("gtk_text_btree_check: less than 2 chars in tree");
+ g_error ("gtk_text_btree_check: less than 2 chars in tree");
}
while (node->level > 0)
{
@@ -6549,27 +6549,27 @@ gtk_text_btree_check (GtkTextBTree *tree)
}
if (seg->type != &gtk_text_char_type)
{
- g_error("gtk_text_btree_check: last line has bogus segment type");
+ g_error ("gtk_text_btree_check: last line has bogus segment type");
}
if (seg->next != NULL)
{
- g_error("gtk_text_btree_check: last line has too many segments");
+ g_error ("gtk_text_btree_check: last line has too many segments");
}
if (seg->byte_count != 1)
{
- g_error("gtk_text_btree_check: last line has wrong # characters: %d",
- seg->byte_count);
+ g_error ("gtk_text_btree_check: last line has wrong # characters: %d",
+ seg->byte_count);
}
if ((seg->body.chars[0] != '\n') || (seg->body.chars[1] != 0))
{
- g_error("gtk_text_btree_check: last line had bad value: %s",
- seg->body.chars);
+ g_error ("gtk_text_btree_check: last line had bad value: %s",
+ seg->body.chars);
}
}
-void gtk_text_btree_spew_line(GtkTextBTree* tree, GtkTextLine* line);
-void gtk_text_btree_spew_segment(GtkTextBTree* tree, GtkTextLineSegment* seg);
-void gtk_text_btree_spew_node(GtkTextBTreeNode *node, int indent);
+void gtk_text_btree_spew_line (GtkTextBTree* tree, GtkTextLine* line);
+void gtk_text_btree_spew_segment (GtkTextBTree* tree, GtkTextLineSegment* seg);
+void gtk_text_btree_spew_node (GtkTextBTreeNode *node, int indent);
void gtk_text_btree_spew_line_short (GtkTextLine *line, int indent);
void
@@ -6577,19 +6577,19 @@ gtk_text_btree_spew (GtkTextBTree *tree)
{
GtkTextLine * line;
int real_line;
-
- printf("%d lines in tree %p\n",
- gtk_text_btree_line_count(tree), tree);
-
- line = gtk_text_btree_get_line(tree, 0, &real_line);
+
+ printf ("%d lines in tree %p\n",
+ gtk_text_btree_line_count (tree), tree);
+
+ line = gtk_text_btree_get_line (tree, 0, &real_line);
while (line != NULL)
{
- gtk_text_btree_spew_line(tree, line);
- line = gtk_text_line_next(line);
+ gtk_text_btree_spew_line (tree, line);
+ line = gtk_text_line_next (line);
}
- printf("=================== Tag information\n");
+ printf ("=================== Tag information\n");
{
GSList * list;
@@ -6607,14 +6607,14 @@ gtk_text_btree_spew (GtkTextBTree *tree)
list = g_slist_next (list);
}
-
+
if (tree->tag_infos == NULL)
{
printf (" (no tags in the tree)\n");
}
}
- printf("=================== Tree nodes\n");
+ printf ("=================== Tree nodes\n");
{
gtk_text_btree_spew_node (tree->root_node, 0);
@@ -6626,7 +6626,7 @@ gtk_text_btree_spew_line_short (GtkTextLine *line, int indent)
{
gchar * spaces;
GtkTextLineSegment *seg;
-
+
spaces = g_strnfill (indent, ' ');
printf ("%sline %p chars %d bytes %d\n",
@@ -6639,7 +6639,7 @@ gtk_text_btree_spew_line_short (GtkTextLine *line, int indent)
{
if (seg->type == &gtk_text_char_type)
{
- gchar* str = g_strndup(seg->body.chars, MIN (seg->byte_count, 10));
+ gchar* str = g_strndup (seg->body.chars, MIN (seg->byte_count, 10));
gchar* s;
s = str;
while (*s)
@@ -6648,29 +6648,29 @@ gtk_text_btree_spew_line_short (GtkTextLine *line, int indent)
*s = '\\';
++s;
}
- printf("%s chars `%s'...\n", spaces, str);
- g_free(str);
+ printf ("%s chars `%s'...\n", spaces, str);
+ g_free (str);
}
else if (seg->type == &gtk_text_right_mark_type)
{
- printf("%s right mark `%s' visible: %d\n",
- spaces,
- seg->body.mark.name,
- seg->body.mark.visible);
+ printf ("%s right mark `%s' visible: %d\n",
+ spaces,
+ seg->body.mark.name,
+ seg->body.mark.visible);
}
else if (seg->type == &gtk_text_left_mark_type)
{
- printf("%s left mark `%s' visible: %d\n",
- spaces,
- seg->body.mark.name,
- seg->body.mark.visible);
+ printf ("%s left mark `%s' visible: %d\n",
+ spaces,
+ seg->body.mark.name,
+ seg->body.mark.visible);
}
else if (seg->type == &gtk_text_toggle_on_type ||
seg->type == &gtk_text_toggle_off_type)
{
- printf("%s tag `%s' %s\n",
- spaces, seg->body.toggle.info->tag->name,
- seg->type == &gtk_text_toggle_off_type ? "off" : "on");
+ printf ("%s tag `%s' %s\n",
+ spaces, seg->body.toggle.info->tag->name,
+ seg->type == &gtk_text_toggle_off_type ? "off" : "on");
}
seg = seg->next;
@@ -6680,12 +6680,12 @@ gtk_text_btree_spew_line_short (GtkTextLine *line, int indent)
}
void
-gtk_text_btree_spew_node(GtkTextBTreeNode *node, int indent)
+gtk_text_btree_spew_node (GtkTextBTreeNode *node, int indent)
{
gchar * spaces;
GtkTextBTreeNode *iter;
Summary *s;
-
+
spaces = g_strnfill (indent, ' ');
printf ("%snode %p level %d children %d lines %d chars %d\n",
@@ -6699,9 +6699,9 @@ gtk_text_btree_spew_node(GtkTextBTreeNode *node, int indent)
spaces, s->toggle_count, s->info->tag->name);
s = s->next;
}
-
+
g_free (spaces);
-
+
if (node->level > 0)
{
iter = node->children.node;
@@ -6718,61 +6718,61 @@ gtk_text_btree_spew_node(GtkTextBTreeNode *node, int indent)
while (line != NULL)
{
gtk_text_btree_spew_line_short (line, indent + 2);
-
+
line = line->next;
}
}
}
void
-gtk_text_btree_spew_line(GtkTextBTree* tree, GtkTextLine* line)
+gtk_text_btree_spew_line (GtkTextBTree* tree, GtkTextLine* line)
{
GtkTextLineSegment * seg;
- printf("%4d| line: %p parent: %p next: %p\n",
- gtk_text_line_get_number(line), line, line->parent, line->next);
-
+ printf ("%4d| line: %p parent: %p next: %p\n",
+ gtk_text_line_get_number (line), line, line->parent, line->next);
+
seg = line->segments;
-
+
while (seg != NULL)
{
- gtk_text_btree_spew_segment(tree, seg);
+ gtk_text_btree_spew_segment (tree, seg);
seg = seg->next;
}
}
void
-gtk_text_btree_spew_segment(GtkTextBTree* tree, GtkTextLineSegment * seg)
+gtk_text_btree_spew_segment (GtkTextBTree* tree, GtkTextLineSegment * seg)
{
- printf(" segment: %p type: %s bytes: %d chars: %d\n",
- seg, seg->type->name, seg->byte_count, seg->char_count);
-
+ printf (" segment: %p type: %s bytes: %d chars: %d\n",
+ seg, seg->type->name, seg->byte_count, seg->char_count);
+
if (seg->type == &gtk_text_char_type)
{
- gchar* str = g_strndup(seg->body.chars, seg->byte_count);
- printf(" `%s'\n", str);
- g_free(str);
+ gchar* str = g_strndup (seg->body.chars, seg->byte_count);
+ printf (" `%s'\n", str);
+ g_free (str);
}
else if (seg->type == &gtk_text_right_mark_type)
{
- printf(" right mark `%s' visible: %d not_deleteable: %d\n",
- seg->body.mark.name,
- seg->body.mark.visible,
- seg->body.mark.not_deleteable);
+ printf (" right mark `%s' visible: %d not_deleteable: %d\n",
+ seg->body.mark.name,
+ seg->body.mark.visible,
+ seg->body.mark.not_deleteable);
}
else if (seg->type == &gtk_text_left_mark_type)
{
- printf(" left mark `%s' visible: %d not_deleteable: %d\n",
- seg->body.mark.name,
- seg->body.mark.visible,
- seg->body.mark.not_deleteable);
+ printf (" left mark `%s' visible: %d not_deleteable: %d\n",
+ seg->body.mark.name,
+ seg->body.mark.visible,
+ seg->body.mark.not_deleteable);
}
else if (seg->type == &gtk_text_toggle_on_type ||
seg->type == &gtk_text_toggle_off_type)
{
- printf(" tag `%s' priority %d\n",
- seg->body.toggle.info->tag->name,
- seg->body.toggle.info->tag->priority);
+ printf (" tag `%s' priority %d\n",
+ seg->body.toggle.info->tag->name,
+ seg->body.toggle.info->tag->priority);
}
}
diff --git a/gtk/gtktextbtree.h b/gtk/gtktextbtree.h
index 53ffc0c7a8..f5ce91d159 100644
--- a/gtk/gtktextbtree.h
+++ b/gtk/gtktextbtree.h
@@ -38,34 +38,34 @@ void gtk_text_btree_insert_pixbuf (GtkTextIter *iter,
/* View stuff */
GtkTextLine *gtk_text_btree_find_line_by_y (GtkTextBTree *tree,
- gpointer view_id,
- gint ypixel,
- gint *line_top_y);
+ gpointer view_id,
+ gint ypixel,
+ gint *line_top_y);
gint gtk_text_btree_find_line_top (GtkTextBTree *tree,
- GtkTextLine *line,
- gpointer view_id);
+ GtkTextLine *line,
+ gpointer view_id);
void gtk_text_btree_add_view (GtkTextBTree *tree,
- GtkTextLayout *layout);
+ GtkTextLayout *layout);
void gtk_text_btree_remove_view (GtkTextBTree *tree,
- gpointer view_id);
+ gpointer view_id);
void gtk_text_btree_invalidate_region (GtkTextBTree *tree,
- const GtkTextIter *start,
- const GtkTextIter *end);
+ const GtkTextIter *start,
+ const GtkTextIter *end);
void gtk_text_btree_get_view_size (GtkTextBTree *tree,
- gpointer view_id,
- gint *width,
- gint *height);
+ gpointer view_id,
+ gint *width,
+ gint *height);
gboolean gtk_text_btree_is_valid (GtkTextBTree *tree,
- gpointer view_id);
+ gpointer view_id);
gboolean gtk_text_btree_validate (GtkTextBTree *tree,
- gpointer view_id,
- gint max_pixels,
- gint *y,
- gint *old_height,
- gint *new_height);
+ gpointer view_id,
+ gint max_pixels,
+ gint *y,
+ gint *old_height,
+ gint *new_height);
void gtk_text_btree_validate_line (GtkTextBTree *tree,
- GtkTextLine *line,
- gpointer view_id);
+ GtkTextLine *line,
+ gpointer view_id);
/* Tag */
@@ -133,29 +133,29 @@ gboolean gtk_text_btree_get_iter_at_last_toggle (GtkTextBTree *tree,
/* Manipulate marks */
GtkTextMark *gtk_text_btree_set_mark (GtkTextBTree *tree,
GtkTextMark *existing_mark,
- const gchar *name,
- gboolean left_gravity,
- const GtkTextIter *index,
+ const gchar *name,
+ gboolean left_gravity,
+ const GtkTextIter *index,
gboolean should_exist);
void gtk_text_btree_remove_mark_by_name (GtkTextBTree *tree,
- const gchar *name);
+ const gchar *name);
void gtk_text_btree_remove_mark (GtkTextBTree *tree,
- GtkTextMark *segment);
+ GtkTextMark *segment);
gboolean gtk_text_btree_get_selection_bounds (GtkTextBTree *tree,
- GtkTextIter *start,
- GtkTextIter *end);
+ GtkTextIter *start,
+ GtkTextIter *end);
void gtk_text_btree_place_cursor (GtkTextBTree *tree,
- const GtkTextIter *where);
+ const GtkTextIter *where);
gboolean gtk_text_btree_mark_is_insert (GtkTextBTree *tree,
- GtkTextMark *segment);
+ GtkTextMark *segment);
gboolean gtk_text_btree_mark_is_selection_bound (GtkTextBTree *tree,
- GtkTextMark *segment);
+ GtkTextMark *segment);
GtkTextMark *gtk_text_btree_get_mark_by_name (GtkTextBTree *tree,
- const gchar *name);
+ const gchar *name);
GtkTextLine * gtk_text_btree_first_could_contain_tag (GtkTextBTree *tree,
- GtkTextTag *tag);
+ GtkTextTag *tag);
GtkTextLine * gtk_text_btree_last_could_contain_tag (GtkTextBTree *tree,
- GtkTextTag *tag);
+ GtkTextTag *tag);
/* Lines */
@@ -177,12 +177,12 @@ struct _GtkTextLineData {
*/
struct _GtkTextLine {
- GtkTextBTreeNode *parent; /* Pointer to parent node containing
- * line. */
- GtkTextLine *next; /* Next in linked list of lines with
+ GtkTextBTreeNode *parent; /* Pointer to parent node containing
+ * line. */
+ GtkTextLine *next; /* Next in linked list of lines with
* same parent node in B-tree. NULL
* means end of list. */
- GtkTextLineSegment *segments; /* First in ordered list of segments
+ GtkTextLineSegment *segments; /* First in ordered list of segments
* that make up the line. */
GtkTextLineData *views; /* data stored here by views */
};
diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
index dc43d0389d..54414acc1b 100644
--- a/gtk/gtktextbuffer.c
+++ b/gtk/gtktextbuffer.c
@@ -8,7 +8,7 @@
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
@@ -21,7 +21,7 @@
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
@@ -131,7 +131,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
+
signals[INSERT_TEXT] =
gtk_signal_new ("insert_text",
GTK_RUN_LAST,
@@ -174,7 +174,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
gtk_marshal_VOID__VOID,
GTK_TYPE_NONE,
0);
-
+
signals[MARK_SET] =
gtk_signal_new ("mark_set",
GTK_RUN_LAST,
@@ -207,7 +207,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
GTK_TYPE_POINTER,
GTK_TYPE_POINTER,
GTK_TYPE_POINTER);
-
+
signals[REMOVE_TAG] =
gtk_signal_new ("remove_tag",
GTK_RUN_LAST,
@@ -219,7 +219,7 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
GTK_TYPE_POINTER,
GTK_TYPE_POINTER,
GTK_TYPE_POINTER);
-
+
gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
object_class->destroy = gtk_text_buffer_destroy;
@@ -240,26 +240,26 @@ gtk_text_buffer_init (GtkTextBuffer *buffer)
/**
* gtk_text_buffer_new:
* @table: a tag table, or NULL to create a new one
- *
+ *
* Creates a new text buffer.
- *
+ *
* Return value: a new text buffer
**/
GtkTextBuffer*
gtk_text_buffer_new (GtkTextTagTable *table)
{
GtkTextBuffer *text_buffer;
-
+
text_buffer = GTK_TEXT_BUFFER (gtk_type_new (gtk_text_buffer_get_type ()));
if (table)
{
text_buffer->tag_table = table;
-
- gtk_object_ref (GTK_OBJECT(text_buffer->tag_table));
- gtk_object_sink (GTK_OBJECT(text_buffer->tag_table));
- }
-
+
+ gtk_object_ref (GTK_OBJECT (text_buffer->tag_table));
+ gtk_object_sink (GTK_OBJECT (text_buffer->tag_table));
+ }
+
return text_buffer;
}
@@ -272,16 +272,16 @@ gtk_text_buffer_destroy (GtkObject *object)
if (buffer->tag_table)
{
- gtk_object_unref(GTK_OBJECT(buffer->tag_table));
+ gtk_object_unref (GTK_OBJECT (buffer->tag_table));
buffer->tag_table = NULL;
}
if (buffer->btree)
{
- gtk_text_btree_unref(buffer->btree);
+ gtk_text_btree_unref (buffer->btree);
buffer->btree = NULL;
}
-
+
(* parent_class->destroy) (object);
}
@@ -302,8 +302,8 @@ get_table (GtkTextBuffer *buffer)
{
buffer->tag_table = gtk_text_tag_table_new ();
- gtk_object_ref (GTK_OBJECT(buffer->tag_table));
- gtk_object_sink (GTK_OBJECT(buffer->tag_table));
+ gtk_object_ref (GTK_OBJECT (buffer->tag_table));
+ gtk_object_sink (GTK_OBJECT (buffer->tag_table));
}
return buffer->tag_table;
@@ -313,9 +313,9 @@ static GtkTextBTree*
get_btree (GtkTextBuffer *buffer)
{
if (buffer->btree == NULL)
- buffer->btree = gtk_text_btree_new(gtk_text_buffer_get_tag_table (buffer),
- buffer);
-
+ buffer->btree = gtk_text_btree_new (gtk_text_buffer_get_tag_table (buffer),
+ buffer);
+
return buffer->btree;
}
@@ -328,15 +328,15 @@ _gtk_text_buffer_get_btree (GtkTextBuffer *buffer)
/**
* gtk_text_buffer_get_tag_table:
* @buffer: a #GtkTextBuffer
- *
+ *
* Get the #GtkTextTagTable associated with this buffer.
- *
+ *
* Return value: the buffer's tag table
**/
GtkTextTagTable*
gtk_text_buffer_get_tag_table (GtkTextBuffer *buffer)
{
- g_return_val_if_fail(GTK_IS_TEXT_BUFFER(buffer), NULL);
+ g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
return get_table (buffer);
}
@@ -346,7 +346,7 @@ gtk_text_buffer_get_tag_table (GtkTextBuffer *buffer)
* @buffer: a #GtkTextBuffer
* @text: UTF-8 text to insert
* @len: length of @text in bytes
- *
+ *
* Deletes current contents of @buffer, and inserts @text instead. If
* @text doesn't end with a newline, a newline is added;
* #GtkTextBuffer contents must always end with a newline. If @text
@@ -359,8 +359,8 @@ gtk_text_buffer_set_text (GtkTextBuffer *buffer,
gint len)
{
GtkTextIter start, end;
-
- g_return_if_fail (GTK_IS_TEXT_BUFFER(buffer));
+
+ g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
g_return_if_fail (text != NULL);
if (len < 0)
@@ -373,7 +373,7 @@ gtk_text_buffer_set_text (GtkTextBuffer *buffer,
len -= 1;
gtk_text_buffer_get_bounds (buffer, &start, &end);
-
+
gtk_text_buffer_delete (buffer, &start, &end);
if (len > 0)
@@ -388,40 +388,40 @@ gtk_text_buffer_set_text (GtkTextBuffer *buffer,
*/
static void
-gtk_text_buffer_real_insert_text(GtkTextBuffer *buffer,
- GtkTextIter *iter,
- const gchar *text,
- gint len,
- gboolean interactive)
+gtk_text_buffer_real_insert_text (GtkTextBuffer *buffer,
+ GtkTextIter *iter,
+ const gchar *text,
+ gint len,
+ gboolean interactive)
{
- g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
- g_return_if_fail(iter != NULL);
+ 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]);
+ gtk_signal_emit (GTK_OBJECT (buffer), signals[CHANGED]);
- gtk_text_buffer_set_modified(buffer, TRUE);
+ gtk_text_buffer_set_modified (buffer, TRUE);
}
static void
-gtk_text_buffer_emit_insert(GtkTextBuffer *buffer,
- GtkTextIter *iter,
- const gchar *text,
- gint len,
- gboolean interactive)
+gtk_text_buffer_emit_insert (GtkTextBuffer *buffer,
+ GtkTextIter *iter,
+ const gchar *text,
+ gint len,
+ gboolean interactive)
{
- g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
- g_return_if_fail(iter != NULL);
- g_return_if_fail(text != NULL);
+ g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+ g_return_if_fail (iter != NULL);
+ g_return_if_fail (text != NULL);
if (len < 0)
- len = strlen(text);
-
+ len = strlen (text);
+
if (len > 0)
{
- gtk_signal_emit(GTK_OBJECT(buffer), signals[INSERT_TEXT],
- iter, text, len, interactive);
+ gtk_signal_emit (GTK_OBJECT (buffer), signals[INSERT_TEXT],
+ iter, text, len, interactive);
}
}
@@ -431,7 +431,7 @@ gtk_text_buffer_emit_insert(GtkTextBuffer *buffer,
* @iter: a position in the buffer
* @text: UTF-8 format text to insert
* @len: length of text in bytes, or -1
- *
+ *
* Inserts @len bytes of @text at position @iter. If @len is -1,
* @text must be nul-terminated and will be inserted in its
* entirety. Emits the "insert_text" signal; insertion actually occurs
@@ -439,7 +439,7 @@ gtk_text_buffer_emit_insert(GtkTextBuffer *buffer,
* insertion occurs (because the buffer contents change), but the
* default signal handler revalidates it to point to the end of the
* inserted text.
- *
+ *
**/
void
gtk_text_buffer_insert (GtkTextBuffer *buffer,
@@ -447,11 +447,11 @@ gtk_text_buffer_insert (GtkTextBuffer *buffer,
const gchar *text,
gint len)
{
- g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
- g_return_if_fail(iter != NULL);
- g_return_if_fail(text != NULL);
-
- gtk_text_buffer_emit_insert(buffer, iter, text, len, FALSE);
+ g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+ g_return_if_fail (iter != NULL);
+ g_return_if_fail (text != NULL);
+
+ gtk_text_buffer_emit_insert (buffer, iter, text, len, FALSE);
}
/**
@@ -459,8 +459,8 @@ gtk_text_buffer_insert (GtkTextBuffer *buffer,
* @buffer: a #GtkTextBuffer
* @text: some text in UTF-8 format
* @len: length of text, in bytes
- *
- * Simply calls gtk_text_buffer_insert(), using the current
+ *
+ * Simply calls gtk_text_buffer_insert (), using the current
* cursor position as the insertion point.
**/
void
@@ -470,14 +470,14 @@ gtk_text_buffer_insert_at_cursor (GtkTextBuffer *buffer,
{
GtkTextIter iter;
- g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
- g_return_if_fail(text != NULL);
+ g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+ g_return_if_fail (text != NULL);
- gtk_text_buffer_get_iter_at_mark(buffer, &iter,
- gtk_text_buffer_get_mark (buffer,
- "insert"));
+ gtk_text_buffer_get_iter_at_mark (buffer, &iter,
+ gtk_text_buffer_get_mark (buffer,
+ "insert"));
- gtk_text_buffer_insert(buffer, &iter, text, len);
+ gtk_text_buffer_insert (buffer, &iter, text, len);
}
/**
@@ -487,24 +487,24 @@ gtk_text_buffer_insert_at_cursor (GtkTextBuffer *buffer,
* @text: some UTF-8 text
* @len: length of text in bytes, or -1
* @default_editable: default editability of buffer
- *
- * Like gtk_text_buffer_insert(), but the insertion will not occur if
+ *
+ * Like gtk_text_buffer_insert (), but the insertion will not occur if
* @iter is at a non-editable location in the buffer. Usually you
* want to prevent insertions at ineditable locations if the insertion
* results from a user action (is interactive).
- *
+ *
* Return value: whether text was actually inserted
**/
gboolean
-gtk_text_buffer_insert_interactive(GtkTextBuffer *buffer,
- GtkTextIter *iter,
- const gchar *text,
- gint len,
- gboolean default_editable)
-{
- g_return_val_if_fail(GTK_IS_TEXT_BUFFER(buffer), FALSE);
- g_return_val_if_fail(text != NULL, FALSE);
-
+gtk_text_buffer_insert_interactive (GtkTextBuffer *buffer,
+ GtkTextIter *iter,
+ const gchar *text,
+ gint len,
+ gboolean default_editable)
+{
+ g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
+ g_return_val_if_fail (text != NULL, FALSE);
+
if (gtk_text_iter_editable (iter, default_editable))
{
gtk_text_buffer_emit_insert (buffer, iter, text, len, TRUE);
@@ -520,10 +520,10 @@ gtk_text_buffer_insert_interactive(GtkTextBuffer *buffer,
* @text: text in UTF-8 format
* @len: length of text in bytes, or -1
* @default_editable: default editability of buffer
- *
- * Calls gtk_text_buffer_insert_interactive() at the cursor
+ *
+ * Calls gtk_text_buffer_insert_interactive () at the cursor
* position.
- *
+ *
* Return value: whether text was actually inserted
**/
gboolean
@@ -534,12 +534,12 @@ gtk_text_buffer_insert_interactive_at_cursor (GtkTextBuffer *buffer,
{
GtkTextIter iter;
- g_return_val_if_fail(GTK_IS_TEXT_BUFFER(buffer), FALSE);
- g_return_val_if_fail(text != NULL, FALSE);
-
- gtk_text_buffer_get_iter_at_mark(buffer, &iter,
- gtk_text_buffer_get_mark (buffer,
- "insert"));
+ g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
+ g_return_val_if_fail (text != NULL, FALSE);
+
+ gtk_text_buffer_get_iter_at_mark (buffer, &iter,
+ gtk_text_buffer_get_mark (buffer,
+ "insert"));
return gtk_text_buffer_insert_interactive (buffer, &iter, text, len,
default_editable);
@@ -598,7 +598,7 @@ gtk_text_buffer_insert_range_interactive (GtkTextBuffer *buffer,
/* FIXME */
-
+
return FALSE;
}
@@ -607,15 +607,15 @@ gtk_text_buffer_insert_range_interactive (GtkTextBuffer *buffer,
* @buffer: a #GtkTextBuffer
* @iter: an iterator in @buffer
* @text: UTF-8 text
- * @len: length of @text, or -1
+ * @len: length of @text, or -1
* @first_tag: first tag to apply to @text
- * @Varargs: NULL-terminated list of tags to apply
- *
+ * @Varargs: NULL-terminated list of tags to apply
+ *
* Inserts @text into @buffer at @iter, applying the list of tags to
* the newly-inserted text. The last tag specified must be NULL to
- * terminate the list. Equivalent to calling gtk_text_buffer_insert(),
- * then gtk_text_buffer_apply_tag() on the inserted text;
- * gtk_text_buffer_insert_with_tags() is just a convenience function.
+ * terminate the list. Equivalent to calling gtk_text_buffer_insert (),
+ * then gtk_text_buffer_apply_tag () on the inserted text;
+ * gtk_text_buffer_insert_with_tags () is just a convenience function.
**/
void
gtk_text_buffer_insert_with_tags (GtkTextBuffer *buffer,
@@ -629,20 +629,20 @@ gtk_text_buffer_insert_with_tags (GtkTextBuffer *buffer,
GtkTextIter start;
va_list args;
GtkTextTag *tag;
-
- g_return_if_fail (GTK_IS_TEXT_BUFFER(buffer));
+
+ g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
g_return_if_fail (iter != NULL);
g_return_if_fail (text != NULL);
start_offset = gtk_text_iter_get_offset (iter);
-
+
gtk_text_buffer_insert (buffer, iter, text, len);
if (first_tag == NULL)
return;
-
+
gtk_text_buffer_get_iter_at_offset (buffer, &start, start_offset);
-
+
va_start (args, first_tag);
tag = first_tag;
while (tag)
@@ -663,8 +663,8 @@ gtk_text_buffer_insert_with_tags (GtkTextBuffer *buffer,
* @len: length of @text, or -1
* @first_tag_name: name of a tag to apply to @text
* @Varargs: more tag names
- *
- * Same as gtk_text_buffer_insert_with_tags(), but allows you
+ *
+ * Same as gtk_text_buffer_insert_with_tags (), but allows you
* to pass in tag names instead of tag objects.
**/
void
@@ -679,20 +679,20 @@ gtk_text_buffer_insert_with_tags_by_name (GtkTextBuffer *buffer,
GtkTextIter start;
va_list args;
const gchar *tag_name;
-
- g_return_if_fail (GTK_IS_TEXT_BUFFER(buffer));
+
+ g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
g_return_if_fail (iter != NULL);
g_return_if_fail (text != NULL);
start_offset = gtk_text_iter_get_offset (iter);
-
+
gtk_text_buffer_insert (buffer, iter, text, len);
if (first_tag_name == NULL)
return;
-
+
gtk_text_buffer_get_iter_at_offset (buffer, &start, start_offset);
-
+
va_start (args, first_tag_name);
tag_name = first_tag_name;
while (tag_name)
@@ -707,7 +707,7 @@ gtk_text_buffer_insert_with_tags_by_name (GtkTextBuffer *buffer,
g_warning ("%s: no tag with name '%s'!", G_STRLOC, tag_name);
return;
}
-
+
gtk_text_buffer_apply_tag (buffer, tag, &start, iter);
tag_name = va_arg (args, const gchar*);
@@ -722,23 +722,23 @@ gtk_text_buffer_insert_with_tags_by_name (GtkTextBuffer *buffer,
*/
static void
-gtk_text_buffer_real_delete_text(GtkTextBuffer *buffer,
- GtkTextIter *start,
- GtkTextIter *end,
- gboolean interactive)
+gtk_text_buffer_real_delete_text (GtkTextBuffer *buffer,
+ GtkTextIter *start,
+ GtkTextIter *end,
+ gboolean interactive)
{
- g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
- g_return_if_fail(start != NULL);
- g_return_if_fail(end != NULL);
-
- gtk_text_btree_delete(start, end);
+ g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+ g_return_if_fail (start != NULL);
+ g_return_if_fail (end != NULL);
+
+ gtk_text_btree_delete (start, end);
/* may have deleted the selection... */
- gtk_text_buffer_update_primary_selection(buffer);
-
- gtk_signal_emit(GTK_OBJECT(buffer), signals[CHANGED]);
-
- gtk_text_buffer_set_modified(buffer, TRUE);
+ gtk_text_buffer_update_primary_selection (buffer);
+
+ gtk_signal_emit (GTK_OBJECT (buffer), signals[CHANGED]);
+
+ gtk_text_buffer_set_modified (buffer, TRUE);
}
static void
@@ -747,11 +747,11 @@ gtk_text_buffer_emit_delete (GtkTextBuffer *buffer,
GtkTextIter *end,
gboolean interactive)
{
- g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
- g_return_if_fail(start != NULL);
- g_return_if_fail(end != NULL);
+ g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+ g_return_if_fail (start != NULL);
+ g_return_if_fail (end != NULL);
- if (gtk_text_iter_equal(start, end))
+ if (gtk_text_iter_equal (start, end))
return;
gtk_text_iter_reorder (start, end);
@@ -764,10 +764,10 @@ gtk_text_buffer_emit_delete (GtkTextBuffer *buffer,
* gtktextbtree.c. This is all sort of annoying, but really hard
* to fix.
*/
- gtk_signal_emit(GTK_OBJECT(buffer),
- signals[DELETE_TEXT],
- start, end,
- interactive);
+ gtk_signal_emit (GTK_OBJECT (buffer),
+ signals[DELETE_TEXT],
+ start, end,
+ interactive);
}
/**
@@ -777,7 +777,7 @@ gtk_text_buffer_emit_delete (GtkTextBuffer *buffer,
* @end: another position in @buffer
*
* Deletes text between @start and @end. The order of @start and @end
- * is not actually relevant; gtk_text_buffer_delete() will reorder
+ * is not actually relevant; gtk_text_buffer_delete () will reorder
* them. This function actually emits the "delete_text" signal, and
* the default handler of that signal deletes the text. Because the
* buffer is modified, all outstanding iterators become invalid after
@@ -788,18 +788,18 @@ gtk_text_buffer_emit_delete (GtkTextBuffer *buffer,
* #GtkTextBuffer always contains at least one newline. You can
* safely include the final newline in the range [@start,@end) but it
* won't be affected by the deletion.
- *
+ *
**/
void
gtk_text_buffer_delete (GtkTextBuffer *buffer,
GtkTextIter *start,
GtkTextIter *end)
{
- g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
- g_return_if_fail(start != NULL);
- g_return_if_fail(end != NULL);
-
- gtk_text_buffer_emit_delete(buffer, start, end, FALSE);
+ g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+ g_return_if_fail (start != NULL);
+ g_return_if_fail (end != NULL);
+
+ gtk_text_buffer_emit_delete (buffer, start, end, FALSE);
}
/**
@@ -807,14 +807,14 @@ gtk_text_buffer_delete (GtkTextBuffer *buffer,
* @buffer: a #GtkTextBuffer
* @start_iter: start of range to delete
* @end_iter: end of range
- * @default_editable: whether the buffer is editable by default
- *
+ * @default_editable: whether the buffer is editable by default
+ *
* Deletes all <emphasis>editable</emphasis> text in the given range.
- * Calls gtk_text_buffer_delete() for each editable sub-range of
+ * Calls gtk_text_buffer_delete () for each editable sub-range of
* [@start,@end). @start and @end are revalidated to point to
* the location of the last deleted range, or left untouched if
* no text was deleted.
- *
+ *
* Return value: whether some text was actually deleted
**/
gboolean
@@ -830,21 +830,21 @@ gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
gboolean deleted_stuff = FALSE;
/* Delete all editable text in the range start_iter, end_iter */
-
- g_return_val_if_fail(GTK_IS_TEXT_BUFFER(buffer), FALSE);
+
+ g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
g_return_val_if_fail (start_iter != NULL, FALSE);
g_return_val_if_fail (end_iter != NULL, FALSE);
gtk_text_iter_reorder (start_iter, end_iter);
-
- start_mark = gtk_text_buffer_create_mark (buffer, NULL,
+
+ start_mark = gtk_text_buffer_create_mark (buffer, NULL,
start_iter, TRUE);
- end_mark = gtk_text_buffer_create_mark (buffer, NULL,
+ end_mark = gtk_text_buffer_create_mark (buffer, NULL,
end_iter, FALSE);
iter = *start_iter;
-
+
current_state = gtk_text_iter_editable (&iter, default_editable);
-
+
while (TRUE)
{
gboolean new_state;
@@ -852,9 +852,9 @@ gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
GtkTextIter end;
gtk_text_iter_forward_to_tag_toggle (&iter, NULL);
-
+
gtk_text_buffer_get_iter_at_mark (buffer, &end, end_mark);
-
+
if (gtk_text_iter_compare (&iter, &end) >= 0)
{
done = TRUE;
@@ -871,11 +871,11 @@ gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
{
/* We're ending an editable region. Delete said region. */
GtkTextIter start;
-
+
gtk_text_buffer_get_iter_at_mark (buffer, &start, start_mark);
-
+
gtk_text_buffer_emit_delete (buffer, &start, &iter, TRUE);
-
+
deleted_stuff = TRUE;
/* revalidate user's iterators. */
@@ -893,9 +893,9 @@ gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
{
/* End of an editable region. Delete it. */
GtkTextIter start;
-
+
gtk_text_buffer_get_iter_at_mark (buffer, &start, start_mark);
-
+
gtk_text_buffer_emit_delete (buffer, &start, &iter, TRUE);
current_state = FALSE;
@@ -911,8 +911,8 @@ gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
* the previous region. Move start mark to start of this region.
*/
- g_assert (!current_state && new_state);
-
+ g_assert (!current_state && new_state);
+
gtk_text_buffer_move_mark (buffer, start_mark,
&iter);
@@ -924,10 +924,10 @@ gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
break;
}
-
+
gtk_text_buffer_delete_mark (buffer, start_mark);
gtk_text_buffer_delete_mark (buffer, end_mark);
-
+
return deleted_stuff;
}
@@ -941,15 +941,15 @@ gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
* @start: start of a range
* @end: end of a range
* @include_hidden_chars: whether to include invisible text
- *
+ *
* Returns the text in the range [@start,@end). Excludes undisplayed
* text (text marked with tags that set the invisibility attribute) if
* @include_hidden_chars is FALSE. Does not include characters
* representing embedded images, so byte and character indexes into
* the returned string do <emphasis>not</emphasis> correspond to byte
* and character indexes into the buffer. Contrast with
- * gtk_text_buffer_get_slice().
- *
+ * gtk_text_buffer_get_slice ().
+ *
* Return value: an allocated UTF-8 string
**/
gchar*
@@ -958,14 +958,14 @@ gtk_text_buffer_get_text (GtkTextBuffer *buffer,
const GtkTextIter *end,
gboolean include_hidden_chars)
{
- g_return_val_if_fail(GTK_IS_TEXT_BUFFER(buffer), NULL);
- g_return_val_if_fail(start != NULL, NULL);
- g_return_val_if_fail(end != NULL, NULL);
+ g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
+ g_return_val_if_fail (start != NULL, NULL);
+ g_return_val_if_fail (end != NULL, NULL);
if (include_hidden_chars)
- return gtk_text_iter_get_text(start, end);
+ return gtk_text_iter_get_text (start, end);
else
- return gtk_text_iter_get_visible_text(start, end);
+ return gtk_text_iter_get_visible_text (start, end);
}
/**
@@ -973,7 +973,7 @@ gtk_text_buffer_get_text (GtkTextBuffer *buffer,
* @buffer: a #GtkTextBuffer
* @start: start of a range
* @end: end of a range
- * @include_hidden_chars: whether to include invisible text
+ * @include_hidden_chars: whether to include invisible text
*
* Returns the text in the range [@start,@end). Excludes undisplayed
* text (text marked with tags that set the invisibility attribute) if
@@ -982,8 +982,8 @@ gtk_text_buffer_get_text (GtkTextBuffer *buffer,
* embedded images, so byte and character indexes into
* the returned string <emphasis>do</emphasis> correspond to byte
* and character indexes into the buffer. Contrast with
- * gtk_text_buffer_get_text().
- *
+ * gtk_text_buffer_get_text ().
+ *
* Return value: an allocated UTF-8 string
**/
gchar*
@@ -992,14 +992,14 @@ gtk_text_buffer_get_slice (GtkTextBuffer *buffer,
const GtkTextIter *end,
gboolean include_hidden_chars)
{
- g_return_val_if_fail(GTK_IS_TEXT_BUFFER(buffer), NULL);
- g_return_val_if_fail(start != NULL, NULL);
- g_return_val_if_fail(end != NULL, NULL);
+ g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
+ g_return_val_if_fail (start != NULL, NULL);
+ g_return_val_if_fail (end != NULL, NULL);
if (include_hidden_chars)
- return gtk_text_iter_get_slice(start, end);
+ return gtk_text_iter_get_slice (start, end);
else
- return gtk_text_iter_get_visible_slice(start, end);
+ return gtk_text_iter_get_visible_slice (start, end);
}
/*
@@ -1011,16 +1011,16 @@ gtk_text_buffer_insert_pixbuf (GtkTextBuffer *buffer,
GtkTextIter *iter,
GdkPixbuf *pixbuf)
{
- g_return_if_fail (GTK_IS_TEXT_BUFFER(buffer));
+ g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
g_return_if_fail (iter != NULL);
g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-
+
gtk_text_btree_insert_pixbuf (iter, pixbuf);
/* FIXME pixbuf-specific signal like insert_text */
-
- gtk_signal_emit (GTK_OBJECT(buffer), signals[CHANGED]);
-
+
+ gtk_signal_emit (GTK_OBJECT (buffer), signals[CHANGED]);
+
gtk_text_buffer_set_modified (buffer, TRUE);
}
@@ -1030,7 +1030,7 @@ gtk_text_buffer_insert_pixbuf (GtkTextBuffer *buffer,
static void
gtk_text_buffer_mark_set (GtkTextBuffer *buffer,
- const GtkTextIter *location,
+ const GtkTextIter *location,
GtkTextMark *mark)
{
/* IMO this should NOT work like insert_text and delete_text,
@@ -1044,11 +1044,11 @@ gtk_text_buffer_mark_set (GtkTextBuffer *buffer,
to modify the default behavior. */
g_object_ref (G_OBJECT (mark));
-
- gtk_signal_emit(GTK_OBJECT(buffer),
- signals[MARK_SET],
- location,
- mark);
+
+ gtk_signal_emit (GTK_OBJECT (buffer),
+ signals[MARK_SET],
+ location,
+ mark);
g_object_unref (G_OBJECT (mark));
}
@@ -1062,9 +1062,9 @@ gtk_text_buffer_mark_set (GtkTextBuffer *buffer,
* mark.
* @should_exist: if %TRUE, warn if the mark does not exist, and return
* immediately.
- *
+ *
* Move the mark to the given position, if not @should_exist, create the mark.
- *
+ *
* Return value: mark
**/
static GtkTextMark*
@@ -1077,7 +1077,7 @@ gtk_text_buffer_set_mark (GtkTextBuffer *buffer,
{
GtkTextIter location;
GtkTextMark *mark;
-
+
mark = gtk_text_btree_set_mark (get_btree (buffer),
existing_mark,
mark_name,
@@ -1085,16 +1085,16 @@ gtk_text_buffer_set_mark (GtkTextBuffer *buffer,
iter,
should_exist);
- if (gtk_text_btree_mark_is_insert(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),
&location,
mark);
-
+
gtk_text_buffer_mark_set (buffer, &location, mark);
return mark;
@@ -1106,10 +1106,10 @@ gtk_text_buffer_set_mark (GtkTextBuffer *buffer,
* @mark_name: name for mark, or %NULL
* @where: location to place mark
* @left_gravity: whether the mark has left gravity
- *
+ *
* Creates a mark at position @where. If @mark_name is %NULL, the mark
* is anonymous; otherwise, the mark can be retrieved by name using
- * gtk_text_buffer_get_mark(). If a mark has left gravity, and text is
+ * gtk_text_buffer_get_mark (). If a mark has left gravity, and text is
* inserted at the mark's current location, the mark will be moved to
* the left of the newly-inserted text. If the mark has right gravity
* (@left_gravity = %FALSE), the mark will end up on the right of
@@ -1124,17 +1124,17 @@ gtk_text_buffer_set_mark (GtkTextBuffer *buffer,
*
* Emits the "mark_set" signal as notification of the mark's initial
* placement.
- *
+ *
* Return value: the new #GtkTextMark object
**/
GtkTextMark*
-gtk_text_buffer_create_mark(GtkTextBuffer *buffer,
- const gchar *mark_name,
- const GtkTextIter *where,
- gboolean left_gravity)
+gtk_text_buffer_create_mark (GtkTextBuffer *buffer,
+ const gchar *mark_name,
+ const GtkTextIter *where,
+ gboolean left_gravity)
{
- g_return_val_if_fail (GTK_IS_TEXT_BUFFER(buffer), NULL);
-
+ g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
+
return gtk_text_buffer_set_mark (buffer, NULL, mark_name, where,
left_gravity, FALSE);
}
@@ -1144,7 +1144,7 @@ gtk_text_buffer_create_mark(GtkTextBuffer *buffer,
* @buffer: a #GtkTextBuffer
* @mark: a #GtkTextMark
* @where: new location for @mark in @buffer
- *
+ *
* Moves @mark to the new location @where. Emits the "mark_set" signal
* as notification of the move.
**/
@@ -1155,8 +1155,8 @@ gtk_text_buffer_move_mark (GtkTextBuffer *buffer,
{
g_return_if_fail (GTK_IS_TEXT_MARK (mark));
g_return_if_fail (!gtk_text_mark_get_deleted (mark));
- g_return_if_fail (GTK_IS_TEXT_BUFFER(buffer));
-
+ g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+
gtk_text_buffer_set_mark (buffer, mark, NULL, where, FALSE, TRUE);
}
@@ -1165,7 +1165,7 @@ gtk_text_buffer_move_mark (GtkTextBuffer *buffer,
* @buffer: a #GtkTextBuffer
* @iter: iterator to initialize
* @mark: a #GtkTextMark in @buffer
- *
+ *
* Initializes @iter with the current position of @mark.
**/
void
@@ -1175,7 +1175,7 @@ gtk_text_buffer_get_iter_at_mark (GtkTextBuffer *buffer,
{
g_return_if_fail (GTK_IS_TEXT_MARK (mark));
g_return_if_fail (!gtk_text_mark_get_deleted (mark));
- g_return_if_fail (GTK_IS_TEXT_BUFFER(buffer));
+ g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
gtk_text_btree_get_iter_at_mark (get_btree (buffer),
iter,
@@ -1185,35 +1185,35 @@ gtk_text_buffer_get_iter_at_mark (GtkTextBuffer *buffer,
/**
* gtk_text_buffer_delete_mark:
* @buffer: a #GtkTextBuffer
- * @mark: a #GtkTextMark in @buffer
- *
+ * @mark: a #GtkTextMark in @buffer
+ *
* Deletes @mark, so that it's no longer located anywhere in the
* buffer. Removes the reference the buffer holds to the mark, so if
- * you haven't called g_object_ref() on the mark, it will be freed. Even
+ * you haven't called g_object_ref () on the mark, it will be freed. Even
* if the mark isn't freed, most operations on @mark become
* invalid. There is no way to undelete a
- * mark. gtk_text_mark_get_deleted() will return TRUE after this
- * function has been called on a mark; gtk_text_mark_get_deleted()
+ * mark. gtk_text_mark_get_deleted () will return TRUE after this
+ * function has been called on a mark; gtk_text_mark_get_deleted ()
* indicates that a mark no longer belongs to a buffer. The "mark_deleted"
* signal will be emitted as notification after the mark is deleted.
**/
void
-gtk_text_buffer_delete_mark(GtkTextBuffer *buffer,
- GtkTextMark *mark)
+gtk_text_buffer_delete_mark (GtkTextBuffer *buffer,
+ GtkTextMark *mark)
{
g_return_if_fail (GTK_IS_TEXT_MARK (mark));
g_return_if_fail (!gtk_text_mark_get_deleted (mark));
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
-
+
g_object_ref (G_OBJECT (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
* handler.
*/
- gtk_signal_emit (GTK_OBJECT(buffer), signals[MARK_DELETED],
+ gtk_signal_emit (GTK_OBJECT (buffer), signals[MARK_DELETED],
mark);
g_object_unref (G_OBJECT (mark));
@@ -1223,10 +1223,10 @@ gtk_text_buffer_delete_mark(GtkTextBuffer *buffer,
* gtk_text_buffer_get_mark:
* @buffer: a #GtkTextBuffer
* @name: a mark name
- *
+ *
* Returns the mark named @name in buffer @buffer, or NULL if no such
* mark exists in the buffer.
- *
+ *
* Return value: a #GtkTextMark, or NULL
**/
GtkTextMark*
@@ -1235,9 +1235,9 @@ gtk_text_buffer_get_mark (GtkTextBuffer *buffer,
{
GtkTextMark *mark;
- g_return_val_if_fail (GTK_IS_TEXT_BUFFER(buffer), NULL);
+ 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);
return mark;
@@ -1246,12 +1246,12 @@ gtk_text_buffer_get_mark (GtkTextBuffer *buffer,
/**
* gtk_text_buffer_move_mark_by_name:
- * @buffer: a #GtkTextBuffer
+ * @buffer: a #GtkTextBuffer
* @name: name of a mark
* @where: new location for mark
- *
+ *
* Moves the mark named @name (which must exist) to location @where.
- * See gtk_text_buffer_move_mark() for details.
+ * See gtk_text_buffer_move_mark () for details.
**/
void
gtk_text_buffer_move_mark_by_name (GtkTextBuffer *buffer,
@@ -1260,17 +1260,17 @@ gtk_text_buffer_move_mark_by_name (GtkTextBuffer *buffer,
{
GtkTextMark *mark;
- g_return_if_fail (GTK_IS_TEXT_BUFFER(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)
{
g_warning ("%s: no mark named '%s'", G_STRLOC, name);
return;
}
-
+
gtk_text_buffer_move_mark (buffer, mark, where);
}
@@ -1278,9 +1278,9 @@ gtk_text_buffer_move_mark_by_name (GtkTextBuffer *buffer,
* gtk_text_buffer_delete_mark_by_name:
* @buffer: a #GtkTextBuffer
* @name: name of a mark in @buffer
- *
+ *
* Deletes the mark named @name; the mark must exist. See
- * gtk_text_buffer_delete_mark() for details.
+ * gtk_text_buffer_delete_mark () for details.
**/
void
gtk_text_buffer_delete_mark_by_name (GtkTextBuffer *buffer,
@@ -1288,35 +1288,35 @@ gtk_text_buffer_delete_mark_by_name (GtkTextBuffer *buffer,
{
GtkTextMark *mark;
- g_return_if_fail (GTK_IS_TEXT_BUFFER(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)
{
g_warning ("%s: no mark named '%s'", G_STRLOC, name);
return;
}
-
+
gtk_text_buffer_delete_mark (buffer, mark);
}
/**
* gtk_text_buffer_get_insert:
* @buffer: a #GtkTextBuffer
- *
+ *
* Returns the mark that represents the cursor (insertion point).
- * Equivalent to calling gtk_text_buffer_get_mark() to get the mark
+ * Equivalent to calling gtk_text_buffer_get_mark () to get the mark
* name "insert," but very slightly more efficient, and involves less
* typing.
- *
+ *
* Return value: insertion point mark
**/
GtkTextMark*
gtk_text_buffer_get_insert (GtkTextBuffer *buffer)
{
- g_return_val_if_fail(GTK_IS_TEXT_BUFFER(buffer), NULL);
+ g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
/* FIXME use struct member in btree */
return gtk_text_buffer_get_mark (buffer, "insert");
@@ -1325,25 +1325,25 @@ gtk_text_buffer_get_insert (GtkTextBuffer *buffer)
/**
* gtk_text_buffer_get_selection_bound:
* @buffer: a #GtkTextBuffer
- *
+ *
* Returns the mark that represents the selection bound. Equivalent
- * to calling gtk_text_buffer_get_mark() to get the mark name
+ * to calling gtk_text_buffer_get_mark () to get the mark name
* "selection_bound," but very slightly more efficient, and involves
* less typing.
*
* The currently-selected text in @buffer is the region between the
* "selection_bound" and "insert" marks. If "selection_bound" and
* "insert" are in the same place, then there is no current selection.
- * gtk_text_buffer_get_selection_bounds() is another convenient function
+ * gtk_text_buffer_get_selection_bounds () is another convenient function
* for handling the selection, if you just want to know whether there's a
* selection and what its bounds are.
- *
+ *
* Return value: selection bound mark
**/
GtkTextMark*
gtk_text_buffer_get_selection_bound (GtkTextBuffer *buffer)
{
- g_return_val_if_fail(GTK_IS_TEXT_BUFFER(buffer), NULL);
+ g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
/* FIXME use struct member in btree */
return gtk_text_buffer_get_mark (buffer, "selection_bound");
@@ -1364,8 +1364,8 @@ gtk_text_buffer_move_child_anchor (GtkTextBuffer *buffer,
GtkTextChildAnchor *anchor,
GtkTextIter *where)
{
-
-
+
+
}
void
@@ -1382,18 +1382,18 @@ gtk_text_buffer_get_iter_at_child_anchor (GtkTextBuffer *buffer,
GtkTextIter *iter,
GtkTextChildAnchor *anchor)
{
-
+
}
/**
* gtk_text_buffer_place_cursor:
- * @buffer: a #GtkTextBuffer
+ * @buffer: a #GtkTextBuffer
* @where: where to put the cursor
- *
+ *
* This function moves the "insert" and "selection_bound" marks
* simultaneously. If you move them to the same place in two steps
- * with gtk_text_buffer_move_mark(), you will temporarily select a
+ * with gtk_text_buffer_move_mark (), you will temporarily select a
* region in between their old and new locations, which can be pretty
* inefficient since the temporarily-selected region will force stuff
* to be recalculated. This function moves them as a unit, which can
@@ -1404,14 +1404,14 @@ gtk_text_buffer_place_cursor (GtkTextBuffer *buffer,
const GtkTextIter *where)
{
GtkTextIter real;
-
- g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
+
+ g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
real = *where;
-
+
if (gtk_text_iter_is_last (&real))
gtk_text_iter_prev_char (&real);
-
+
gtk_text_btree_place_cursor (get_btree (buffer), &real);
gtk_text_buffer_mark_set (buffer, &real,
gtk_text_buffer_get_mark (buffer,
@@ -1429,27 +1429,27 @@ gtk_text_buffer_place_cursor (GtkTextBuffer *buffer,
* gtk_text_buffer_create_tag:
* @buffer: a #GtkTextBuffer
* @tag_name: name of the new tag, or %NULL
- *
+ *
* Creates a tag and adds it to the tag table for @buffer.
- * Equivalent to calling gtk_text_tag_new() and then adding the
+ * Equivalent to calling gtk_text_tag_new () and then adding the
* tag to the buffer's tag table. The returned tag has its refcount
- * incremented, as if you'd called gtk_text_tag_new().
+ * incremented, as if you'd called gtk_text_tag_new ().
*
* If @tag_name is %NULL, the tag is anonymous.
- *
+ *
* Return value: a new tag
**/
GtkTextTag*
-gtk_text_buffer_create_tag(GtkTextBuffer *buffer,
- const gchar *tag_name)
+gtk_text_buffer_create_tag (GtkTextBuffer *buffer,
+ const gchar *tag_name)
{
GtkTextTag *tag;
-
- g_return_val_if_fail(GTK_IS_TEXT_BUFFER(buffer), NULL);
-
- tag = gtk_text_tag_new(tag_name);
- gtk_text_tag_table_add(get_table (buffer), tag);
+ g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
+
+ tag = gtk_text_tag_new (tag_name);
+
+ gtk_text_tag_table_add (get_table (buffer), tag);
return tag;
}
@@ -1474,55 +1474,55 @@ gtk_text_buffer_real_remove_tag (GtkTextBuffer *buffer,
static void
-gtk_text_buffer_emit_tag(GtkTextBuffer *buffer,
- GtkTextTag *tag,
- gboolean apply,
- const GtkTextIter *start,
- const GtkTextIter *end)
+gtk_text_buffer_emit_tag (GtkTextBuffer *buffer,
+ GtkTextTag *tag,
+ gboolean apply,
+ const GtkTextIter *start,
+ const GtkTextIter *end)
{
GtkTextIter start_tmp = *start;
GtkTextIter end_tmp = *end;
-
- g_return_if_fail(tag != NULL);
-
+
+ g_return_if_fail (tag != NULL);
+
gtk_text_iter_reorder (&start_tmp, &end_tmp);
-
+
if (apply)
- gtk_signal_emit (GTK_OBJECT(buffer), signals[APPLY_TAG],
+ gtk_signal_emit (GTK_OBJECT (buffer), signals[APPLY_TAG],
tag, &start_tmp, &end_tmp);
else
- gtk_signal_emit (GTK_OBJECT(buffer), signals[REMOVE_TAG],
+ gtk_signal_emit (GTK_OBJECT (buffer), signals[REMOVE_TAG],
tag, &start_tmp, &end_tmp);
}
void
-gtk_text_buffer_apply_tag(GtkTextBuffer *buffer,
- GtkTextTag *tag,
- const GtkTextIter *start,
- const GtkTextIter *end)
+gtk_text_buffer_apply_tag (GtkTextBuffer *buffer,
+ GtkTextTag *tag,
+ const GtkTextIter *start,
+ const GtkTextIter *end)
{
- g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
- g_return_if_fail(GTK_IS_TEXT_TAG (tag));
- g_return_if_fail(start != NULL);
- g_return_if_fail(end != NULL);
+ g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+ g_return_if_fail (GTK_IS_TEXT_TAG (tag));
+ g_return_if_fail (start != NULL);
+ g_return_if_fail (end != NULL);
- gtk_text_buffer_emit_tag(buffer, tag, TRUE, start, end);
+ gtk_text_buffer_emit_tag (buffer, tag, TRUE, start, end);
}
void
-gtk_text_buffer_remove_tag(GtkTextBuffer *buffer,
- GtkTextTag *tag,
- const GtkTextIter *start,
- const GtkTextIter *end)
+gtk_text_buffer_remove_tag (GtkTextBuffer *buffer,
+ GtkTextTag *tag,
+ const GtkTextIter *start,
+ const GtkTextIter *end)
{
- g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
- g_return_if_fail(GTK_IS_TEXT_TAG (tag));
- g_return_if_fail(start != NULL);
- g_return_if_fail(end != NULL);
+ g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+ g_return_if_fail (GTK_IS_TEXT_TAG (tag));
+ g_return_if_fail (start != NULL);
+ g_return_if_fail (end != NULL);
- gtk_text_buffer_emit_tag(buffer, tag, FALSE, start, end);
+ gtk_text_buffer_emit_tag (buffer, tag, FALSE, start, end);
}
@@ -1533,22 +1533,22 @@ gtk_text_buffer_apply_tag_by_name (GtkTextBuffer *buffer,
const GtkTextIter *end)
{
GtkTextTag *tag;
-
- g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
- g_return_if_fail(name != NULL);
- g_return_if_fail(start != NULL);
- g_return_if_fail(end != NULL);
-
- tag = gtk_text_tag_table_lookup(get_table (buffer),
- name);
+
+ g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+ g_return_if_fail (name != NULL);
+ g_return_if_fail (start != NULL);
+ g_return_if_fail (end != NULL);
+
+ tag = gtk_text_tag_table_lookup (get_table (buffer),
+ name);
if (tag == NULL)
{
- g_warning("Unknown tag `%s'", name);
+ g_warning ("Unknown tag `%s'", name);
return;
}
- gtk_text_buffer_emit_tag(buffer, tag, TRUE, start, end);
+ gtk_text_buffer_emit_tag (buffer, tag, TRUE, start, end);
}
void
@@ -1558,22 +1558,22 @@ gtk_text_buffer_remove_tag_by_name (GtkTextBuffer *buffer,
const GtkTextIter *end)
{
GtkTextTag *tag;
-
- g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
- g_return_if_fail(name != NULL);
- g_return_if_fail(start != NULL);
- g_return_if_fail(end != NULL);
- tag = gtk_text_tag_table_lookup(get_table (buffer),
- name);
+ g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
+ g_return_if_fail (name != NULL);
+ g_return_if_fail (start != NULL);
+ g_return_if_fail (end != NULL);
+
+ tag = gtk_text_tag_table_lookup (get_table (buffer),
+ name);
if (tag == NULL)
{
- g_warning("Unknown tag `%s'", name);
+ g_warning ("Unknown tag `%s'", name);
return;
}
-
- gtk_text_buffer_emit_tag(buffer, tag, FALSE, start, end);
+
+ gtk_text_buffer_emit_tag (buffer, tag, FALSE, start, end);
}
@@ -1586,9 +1586,9 @@ gtk_text_buffer_get_iter_at_line_offset (GtkTextBuffer *buffer,
GtkTextIter *iter,
gint line_number,
gint char_offset)
-{
+{
g_return_if_fail (iter != NULL);
- g_return_if_fail (GTK_IS_TEXT_BUFFER(buffer));
+ g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
gtk_text_btree_get_iter_at_line_char (get_btree (buffer),
iter, line_number, char_offset);
@@ -1601,7 +1601,7 @@ gtk_text_buffer_get_iter_at_line_index (GtkTextBuffer *buffer,
gint byte_index)
{
g_return_if_fail (iter != NULL);
- g_return_if_fail (GTK_IS_TEXT_BUFFER(buffer));
+ g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
gtk_text_btree_get_iter_at_line_byte (get_btree (buffer),
iter, line_number, byte_index);
@@ -1612,8 +1612,8 @@ gtk_text_buffer_get_iter_at_line (GtkTextBuffer *buffer,
GtkTextIter *iter,
gint line_number)
{
- g_return_if_fail(iter != NULL);
- g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
+ g_return_if_fail (iter != NULL);
+ g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
gtk_text_buffer_get_iter_at_line_offset (buffer, iter, line_number, 0);
}
@@ -1623,20 +1623,20 @@ gtk_text_buffer_get_iter_at_offset (GtkTextBuffer *buffer,
GtkTextIter *iter,
gint char_offset)
{
- g_return_if_fail(iter != NULL);
- g_return_if_fail(GTK_IS_TEXT_BUFFER(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
gtk_text_buffer_get_last_iter (GtkTextBuffer *buffer,
GtkTextIter *iter)
-{
- g_return_if_fail(iter != NULL);
- g_return_if_fail(GTK_IS_TEXT_BUFFER(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
@@ -1644,12 +1644,12 @@ gtk_text_buffer_get_bounds (GtkTextBuffer *buffer,
GtkTextIter *start,
GtkTextIter *end)
{
- g_return_if_fail(start != NULL);
- g_return_if_fail(end != NULL);
- g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
+ g_return_if_fail (start != NULL);
+ 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);
}
/*
@@ -1659,8 +1659,8 @@ gtk_text_buffer_get_bounds (GtkTextBuffer *buffer,
gboolean
gtk_text_buffer_modified (GtkTextBuffer *buffer)
{
- g_return_val_if_fail(GTK_IS_TEXT_BUFFER(buffer), FALSE);
-
+ g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
+
return buffer->modified;
}
@@ -1669,17 +1669,17 @@ gtk_text_buffer_set_modified (GtkTextBuffer *buffer,
gboolean setting)
{
gboolean fixed_setting;
-
- g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
+
+ g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
fixed_setting = setting != FALSE;
-
+
if (buffer->modified == fixed_setting)
return;
else
{
buffer->modified = fixed_setting;
- gtk_signal_emit(GTK_OBJECT(buffer), signals[MODIFIED_CHANGED]);
+ gtk_signal_emit (GTK_OBJECT (buffer), signals[MODIFIED_CHANGED]);
}
}
@@ -1689,19 +1689,19 @@ gtk_text_buffer_set_modified (GtkTextBuffer *buffer,
*/
gint
-gtk_text_buffer_get_line_count(GtkTextBuffer *buffer)
+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));
+ g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), 0);
+
+ return gtk_text_btree_line_count (get_btree (buffer));
}
gint
-gtk_text_buffer_get_char_count(GtkTextBuffer *buffer)
+gtk_text_buffer_get_char_count (GtkTextBuffer *buffer)
{
- g_return_val_if_fail(GTK_IS_TEXT_BUFFER(buffer), 0);
+ 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));
}
GSList*
@@ -1711,27 +1711,27 @@ gtk_text_buffer_get_tags (GtkTextBuffer *buffer,
GSList *retval = NULL;
GtkTextTag** tags;
gint count = 0;
-
- tags = gtk_text_btree_get_tags(iter, &count);
+
+ tags = gtk_text_btree_get_tags (iter, &count);
if (count > 0)
{
gint i;
- gtk_text_tag_array_sort(tags, count);
-
+ gtk_text_tag_array_sort (tags, count);
+
i = 0;
while (i < count)
{
- retval = g_slist_prepend(retval, tags[i]);
+ retval = g_slist_prepend (retval, tags[i]);
++i;
}
- retval = g_slist_reverse(retval);
+ retval = g_slist_reverse (retval);
}
if (tags)
- g_free(tags);
+ g_free (tags);
return retval;
}
@@ -1740,22 +1740,22 @@ gtk_text_buffer_get_tags (GtkTextBuffer *buffer,
*/
static void
clipboard_clear_cb (GtkClipboard *clipboard,
- gpointer data)
+ gpointer data)
{
/* Move selection_bound to the insertion point */
GtkTextIter insert;
GtkTextIter selection_bound;
GtkTextBuffer *buffer = GTK_TEXT_BUFFER (data);
-
- gtk_text_buffer_get_iter_at_mark(buffer, &insert,
- gtk_text_buffer_get_mark (buffer, "insert"));
- gtk_text_buffer_get_iter_at_mark(buffer, &selection_bound,
- gtk_text_buffer_get_mark (buffer, "selection_bound"));
-
- if (!gtk_text_iter_equal(&insert, &selection_bound))
- gtk_text_buffer_move_mark(buffer,
- gtk_text_buffer_get_mark (buffer, "selection_bound"),
- &insert);
+
+ gtk_text_buffer_get_iter_at_mark (buffer, &insert,
+ gtk_text_buffer_get_mark (buffer, "insert"));
+ gtk_text_buffer_get_iter_at_mark (buffer, &selection_bound,
+ gtk_text_buffer_get_mark (buffer, "selection_bound"));
+
+ if (!gtk_text_iter_equal (&insert, &selection_bound))
+ gtk_text_buffer_move_mark (buffer,
+ gtk_text_buffer_get_mark (buffer, "selection_bound"),
+ &insert);
}
/* Called when we have the primary selection and someone else wants our
@@ -1763,18 +1763,18 @@ clipboard_clear_cb (GtkClipboard *clipboard,
*/
static void
clipboard_get_cb (GtkClipboard *clipboard,
- GtkSelectionData *selection_data,
- guint info,
- gpointer data)
+ GtkSelectionData *selection_data,
+ guint info,
+ gpointer data)
{
- GtkTextBuffer *buffer = GTK_TEXT_BUFFER(data);
+ GtkTextBuffer *buffer = GTK_TEXT_BUFFER (data);
gchar *str;
GtkTextIter start, end;
-
- if (gtk_text_buffer_get_selection_bounds(buffer, &start, &end))
+
+ if (gtk_text_buffer_get_selection_bounds (buffer, &start, &end))
{
/* Extract the selected text */
- str = gtk_text_iter_get_visible_text(&start, &end);
+ str = gtk_text_iter_get_visible_text (&start, &end);
gtk_selection_data_set_text (selection_data, str);
g_free (str);
}
@@ -1784,8 +1784,8 @@ clipboard_get_cb (GtkClipboard *clipboard,
*/
static void
clipboard_received (GtkClipboard *clipboard,
- const gchar *str,
- gpointer data)
+ const gchar *str,
+ gpointer data)
{
ClipboardRequest *request_data = data;
GtkTextBuffer *buffer = request_data->buffer;
@@ -1797,23 +1797,23 @@ clipboard_received (GtkClipboard *clipboard,
GtkTextMark *paste_point_override;
paste_point_override = gtk_text_buffer_get_mark (buffer,
- "gtk_paste_point_override");
-
+ "gtk_paste_point_override");
+
if (paste_point_override != NULL)
- {
- gtk_text_buffer_get_iter_at_mark(buffer, &insert_point,
- paste_point_override);
- gtk_text_buffer_delete_mark(buffer,
- gtk_text_buffer_get_mark (buffer,
- "gtk_paste_point_override"));
- }
+ {
+ gtk_text_buffer_get_iter_at_mark (buffer, &insert_point,
+ paste_point_override);
+ gtk_text_buffer_delete_mark (buffer,
+ gtk_text_buffer_get_mark (buffer,
+ "gtk_paste_point_override"));
+ }
else
- {
- gtk_text_buffer_get_iter_at_mark(buffer, &insert_point,
- gtk_text_buffer_get_mark (buffer,
- "insert"));
- }
-
+ {
+ gtk_text_buffer_get_iter_at_mark (buffer, &insert_point,
+ gtk_text_buffer_get_mark (buffer,
+ "insert"));
+ }
+
reselect = FALSE;
/* FIXME ALL OF THIS - I think that the "best method" is that when pasting
@@ -1824,33 +1824,33 @@ clipboard_received (GtkClipboard *clipboard,
* This probably is best implemented as a "replace_selection" flag in
* ClipboardRequest.
*/
-#if 0
- if ((TRUE/* Text is selected FIXME */) &&
- (!buffer->have_selection || request_data->is_clipboard))
- {
- reselect = TRUE;
-
- if (buffer->have_selection)
- {
- /* FIXME Delete currently-selected chars but don't give up X
- selection since we'll use the newly-pasted stuff as
- a new X selection */
-
- }
- else
- ; /* FIXME Delete selected chars and give up X selection */
- }
-#endif
+#if 0
+ if ((TRUE/* Text is selected FIXME */) &&
+ (!buffer->have_selection || request_data->is_clipboard))
+ {
+ reselect = TRUE;
+
+ if (buffer->have_selection)
+ {
+ /* FIXME Delete currently-selected chars but don't give up X
+ selection since we'll use the newly-pasted stuff as
+ a new X selection */
+
+ }
+ else
+ ; /* FIXME Delete selected chars and give up X selection */
+ }
+#endif
if (request_data->interactive)
- gtk_text_buffer_insert_interactive (buffer, &insert_point,
- str, -1, request_data->default_editable);
+ gtk_text_buffer_insert_interactive (buffer, &insert_point,
+ str, -1, request_data->default_editable);
else
- gtk_text_buffer_insert (buffer, &insert_point,
- str, -1);
-
+ gtk_text_buffer_insert (buffer, &insert_point,
+ str, -1);
+
if (reselect)
- ; /* FIXME Select the region of text we just inserted */
+ ; /* FIXME Select the region of text we just inserted */
}
g_object_unref (G_OBJECT (buffer));
@@ -1862,7 +1862,7 @@ gtk_text_buffer_update_primary_selection (GtkTextBuffer *buffer)
{
static const GtkTargetEntry targets[] = {
{ "STRING", 0, TARGET_STRING },
- { "TEXT", 0, TARGET_TEXT },
+ { "TEXT", 0, TARGET_TEXT },
{ "COMPOUND_TEXT", 0, TARGET_COMPOUND_TEXT },
{ "UTF8_STRING", 0, TARGET_UTF8_STRING }
};
@@ -1875,11 +1875,11 @@ gtk_text_buffer_update_primary_selection (GtkTextBuffer *buffer)
/* Determine whether we have a selection and adjust X selection
* accordingly.
*/
-
+
if (!gtk_text_buffer_get_selection_bounds (buffer, &start, &end))
{
if (gtk_clipboard_get_owner (clipboard) == G_OBJECT (buffer))
- gtk_clipboard_clear (clipboard);
+ gtk_clipboard_clear (clipboard);
}
else
{
@@ -1887,13 +1887,13 @@ gtk_text_buffer_update_primary_selection (GtkTextBuffer *buffer)
* timestamp.
*/
if (!gtk_clipboard_set_with_owner (clipboard, targets, G_N_ELEMENTS (targets),
- clipboard_get_cb, clipboard_clear_cb, G_OBJECT (buffer)))
- clipboard_clear_cb (clipboard, buffer);
+ clipboard_get_cb, clipboard_clear_cb, G_OBJECT (buffer)))
+ clipboard_clear_cb (clipboard, buffer);
}
}
static void
-paste (GtkTextBuffer *buffer,
+paste (GtkTextBuffer *buffer,
gboolean is_clipboard,
gboolean interactive,
gboolean default_editable)
@@ -1906,25 +1906,25 @@ paste (GtkTextBuffer *buffer,
data->default_editable = default_editable;
gtk_clipboard_request_text (gtk_clipboard_get (is_clipboard ? GDK_NONE : GDK_SELECTION_PRIMARY),
- clipboard_received, data);
+ clipboard_received, data);
}
void
gtk_text_buffer_paste_primary (GtkTextBuffer *buffer,
- GtkTextIter *override_location,
- gboolean default_editable)
+ GtkTextIter *override_location,
+ gboolean default_editable)
{
if (override_location != NULL)
- gtk_text_buffer_create_mark(buffer,
- "gtk_paste_point_override",
- override_location, FALSE);
-
+ gtk_text_buffer_create_mark (buffer,
+ "gtk_paste_point_override",
+ override_location, FALSE);
+
paste (buffer, FALSE, TRUE, default_editable);
}
void
gtk_text_buffer_paste_clipboard (GtkTextBuffer *buffer,
- gboolean default_editable)
+ gboolean default_editable)
{
paste (buffer, TRUE, TRUE, default_editable);
}
@@ -1936,8 +1936,8 @@ gtk_text_buffer_delete_selection (GtkTextBuffer *buffer,
{
GtkTextIter start;
GtkTextIter end;
-
- if (!gtk_text_buffer_get_selection_bounds(buffer, &start, &end))
+
+ if (!gtk_text_buffer_get_selection_bounds (buffer, &start, &end))
{
return FALSE; /* No selection */
}
@@ -1953,10 +1953,10 @@ gtk_text_buffer_delete_selection (GtkTextBuffer *buffer,
}
static void
-cut_or_copy(GtkTextBuffer *buffer,
- gboolean delete_region_after,
- gboolean interactive,
- gboolean default_editable)
+cut_or_copy (GtkTextBuffer *buffer,
+ gboolean delete_region_after,
+ gboolean interactive,
+ gboolean default_editable)
{
/* We prefer to cut the selected region between selection_bound and
insertion point. If that region is empty, then we cut the region
@@ -1967,29 +1967,29 @@ cut_or_copy(GtkTextBuffer *buffer,
GtkTextIter start;
GtkTextIter end;
- if (!gtk_text_buffer_get_selection_bounds(buffer, &start, &end))
+ if (!gtk_text_buffer_get_selection_bounds (buffer, &start, &end))
{
/* Let's try the anchor thing */
GtkTextMark * anchor = gtk_text_buffer_get_mark (buffer, "anchor");
-
+
if (anchor == NULL)
return;
else
{
- gtk_text_buffer_get_iter_at_mark(buffer, &end, anchor);
- gtk_text_iter_reorder(&start, &end);
+ gtk_text_buffer_get_iter_at_mark (buffer, &end, anchor);
+ gtk_text_iter_reorder (&start, &end);
}
}
- if (!gtk_text_iter_equal(&start, &end))
+ if (!gtk_text_iter_equal (&start, &end))
{
GtkClipboard *clipboard = gtk_clipboard_get (GDK_NONE);
gchar *text;
-
+
text = gtk_text_iter_get_visible_text (&start, &end);
gtk_clipboard_set_text (clipboard, text, -1);
g_free (text);
-
+
if (delete_region_after)
{
if (interactive)
@@ -2003,7 +2003,7 @@ cut_or_copy(GtkTextBuffer *buffer,
void
gtk_text_buffer_cut_clipboard (GtkTextBuffer *buffer,
- gboolean default_editable)
+ gboolean default_editable)
{
cut_or_copy (buffer, TRUE, TRUE, default_editable);
}
@@ -2020,14 +2020,14 @@ gtk_text_buffer_copy_clipboard (GtkTextBuffer *buffer)
* @buffer: a #GtkTextBuffer
* @start: iterator to initialize with selection start
* @end: iterator to initialize with selection end
- *
+ *
* Returns %TRUE if some text is selected; places the bounds
* of the selection in @start and @end (if the selection has length 0,
* then @start and @end are filled in with the same value).
* @start and @end will be in ascending order. If @start and @end are
* NULL, then they are not filled in, but the return value still indicates
* whether text is selected.
- *
+ *
* Return value: whether the selection has nonzero length
**/
gboolean
@@ -2046,9 +2046,9 @@ gtk_text_buffer_get_selection_bounds (GtkTextBuffer *buffer,
*/
void
-_gtk_text_buffer_spew(GtkTextBuffer *buffer)
+_gtk_text_buffer_spew (GtkTextBuffer *buffer)
{
- gtk_text_btree_spew(get_btree (buffer));
+ gtk_text_btree_spew (get_btree (buffer));
}
diff --git a/gtk/gtktextbuffer.h b/gtk/gtktextbuffer.h
index 920d09d2e9..2b60ab56e7 100644
--- a/gtk/gtktextbuffer.h
+++ b/gtk/gtktextbuffer.h
@@ -8,7 +8,7 @@
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
@@ -21,7 +21,7 @@
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef GTK_TEXT_BUFFER_H
@@ -44,7 +44,7 @@ extern "C" {
typedef struct _GtkTextBTree GtkTextBTree;
-#define GTK_TYPE_TEXT_BUFFER (gtk_text_buffer_get_type())
+#define GTK_TYPE_TEXT_BUFFER (gtk_text_buffer_get_type ())
#define GTK_TEXT_BUFFER(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_TEXT_BUFFER, GtkTextBuffer))
#define GTK_TEXT_BUFFER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_BUFFER, GtkTextBufferClass))
#define GTK_IS_TEXT_BUFFER(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_TEXT_BUFFER))
diff --git a/gtk/gtktextchild.c b/gtk/gtktextchild.c
index 11a0987d4f..2baac10330 100644
--- a/gtk/gtktextchild.c
+++ b/gtk/gtktextchild.c
@@ -9,7 +9,7 @@
* California, Sun Microsystems, Inc., and other parties. The
* following terms apply to all files associated with the software
* unless explicitly disclaimed in individual files.
- *
+ *
* The authors hereby grant permission to use, copy, modify,
* distribute, and license this software and its documentation for any
* purpose, provided that existing copyright notices are retained in
@@ -19,13 +19,13 @@
* software may be copyrighted by their authors and need not follow
* the licensing terms described here, provided that the new terms are
* clearly indicated on the first page of each file where they apply.
- *
+ *
* IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY
* PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
* DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION,
* OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+ *
* THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
@@ -44,7 +44,7 @@
* foregoing, the authors grant the U.S. Government and others acting
* in its behalf permission to use and distribute the software in
* accordance with the terms specified in this license.
- *
+ *
*/
#include "gtktextchild.h"
@@ -59,30 +59,30 @@ pixbuf_segment_cleanup_func (GtkTextLineSegment *seg,
}
static int
-pixbuf_segment_delete_func(GtkTextLineSegment *seg,
- GtkTextLine *line,
- gboolean tree_gone)
+pixbuf_segment_delete_func (GtkTextLineSegment *seg,
+ GtkTextLine *line,
+ gboolean tree_gone)
{
if (seg->body.pixbuf.pixbuf)
- g_object_unref(G_OBJECT (seg->body.pixbuf.pixbuf));
+ g_object_unref (G_OBJECT (seg->body.pixbuf.pixbuf));
- g_free(seg);
+ g_free (seg);
return 0;
}
static void
-pixbuf_segment_check_func(GtkTextLineSegment *seg,
- GtkTextLine *line)
+pixbuf_segment_check_func (GtkTextLineSegment *seg,
+ GtkTextLine *line)
{
if (seg->next == NULL)
- g_error("pixbuf segment is the last segment in a line");
+ g_error ("pixbuf segment is the last segment in a line");
if (seg->byte_count != 3)
- g_error("pixbuf segment has byte count of %d", seg->byte_count);
-
+ g_error ("pixbuf segment has byte count of %d", seg->byte_count);
+
if (seg->char_count != 1)
- g_error("pixbuf segment has char count of %d", seg->char_count);
+ g_error ("pixbuf segment has char count of %d", seg->char_count);
}
@@ -97,8 +97,8 @@ GtkTextLineSegmentClass gtk_text_pixbuf_type = {
};
-#define PIXBUF_SEG_SIZE ((unsigned) (G_STRUCT_OFFSET(GtkTextLineSegment, body) \
- + sizeof(GtkTextPixbuf)))
+#define PIXBUF_SEG_SIZE ((unsigned) (G_STRUCT_OFFSET (GtkTextLineSegment, body) \
+ + sizeof (GtkTextPixbuf)))
GtkTextLineSegment *
_gtk_pixbuf_segment_new (GdkPixbuf *pixbuf)
@@ -114,11 +114,11 @@ _gtk_pixbuf_segment_new (GdkPixbuf *pixbuf)
seg->byte_count = 3; /* We convert to the 0xFFFD "unknown character",
a 3-byte sequence in UTF-8 */
seg->char_count = 1;
-
+
seg->body.pixbuf.pixbuf = pixbuf;
g_object_ref (G_OBJECT (pixbuf));
-
+
return seg;
}
@@ -128,7 +128,7 @@ child_segment_cleanup_func (GtkTextLineSegment *seg,
GtkTextLine *line)
{
seg->body.child.line = line;
-
+
return seg;
}
@@ -147,13 +147,13 @@ child_segment_check_func (GtkTextLineSegment *seg,
GtkTextLine *line)
{
if (seg->next == NULL)
- g_error("child segment is the last segment in a line");
+ g_error ("child segment is the last segment in a line");
if (seg->byte_count != 3)
- g_error("child segment has byte count of %d", seg->byte_count);
-
+ g_error ("child segment has byte count of %d", seg->byte_count);
+
if (seg->char_count != 1)
- g_error("child segment has char count of %d", seg->char_count);
+ g_error ("child segment has char count of %d", seg->char_count);
}
GtkTextLineSegmentClass gtk_text_child_type = {
@@ -167,7 +167,7 @@ GtkTextLineSegmentClass gtk_text_child_type = {
};
#define WIDGET_SEG_SIZE ((unsigned) (G_STRUCT_OFFSET (GtkTextLineSegment, body) \
- + sizeof(GtkTextChildBody)))
+ + sizeof (GtkTextChildBody)))
GtkTextLineSegment *
_gtk_widget_segment_new (void)
@@ -184,21 +184,21 @@ _gtk_widget_segment_new (void)
* a 3-byte sequence in UTF-8
*/
seg->char_count = 1;
-
+
seg->body.child.ref_count = 1;
seg->body.child.widgets = NULL;
seg->body.child.tree = NULL;
seg->body.child.line = NULL;
-
+
return seg;
}
void
_gtk_widget_segment_add (GtkTextLineSegment *widget_segment,
- GtkWidget *child)
+ GtkWidget *child)
{
g_assert (widget_segment->type = &gtk_text_child_type);
-
+
widget_segment->body.child.widgets =
g_slist_prepend (widget_segment->body.child.widgets,
child);
@@ -208,7 +208,7 @@ _gtk_widget_segment_add (GtkTextLineSegment *widget_segment,
void
_gtk_widget_segment_remove (GtkTextLineSegment *widget_segment,
- GtkWidget *child)
+ GtkWidget *child)
{
g_assert (widget_segment->type = &gtk_text_child_type);
@@ -240,7 +240,7 @@ _gtk_widget_segment_unref (GtkTextLineSegment *widget_segment)
if (widget_segment->body.child.tree == NULL)
g_warning ("widget segment destroyed while still in btree");
-
+
tmp_list = widget_segment->body.child.widgets;
while (tmp_list)
{
@@ -259,7 +259,7 @@ void
gtk_text_child_anchor_ref (GtkTextChildAnchor *anchor)
{
GtkTextLineSegment *seg = (GtkTextLineSegment *) anchor;
-
+
g_return_if_fail (seg->type = &gtk_text_child_type);
g_return_if_fail (seg->body.child.ref_count > 0);
@@ -270,7 +270,7 @@ void
gtk_text_child_anchor_unref (GtkTextChildAnchor *anchor)
{
GtkTextLineSegment *seg = (GtkTextLineSegment *) anchor;
-
+
g_return_if_fail (seg->type = &gtk_text_child_type);
g_return_if_fail (seg->body.child.ref_count > 0);
@@ -283,9 +283,9 @@ gtk_text_child_anchor_get_widgets (GtkTextChildAnchor *anchor)
GtkTextLineSegment *seg = (GtkTextLineSegment *) anchor;
GList *list = NULL;
GSList *iter;
-
+
g_return_val_if_fail (seg->type = &gtk_text_child_type, NULL);
-
+
iter = seg->body.child.widgets;
while (iter != NULL)
{
@@ -304,7 +304,7 @@ gboolean
gtk_text_child_anchor_get_deleted (GtkTextChildAnchor *anchor)
{
GtkTextLineSegment *seg = (GtkTextLineSegment *) anchor;
-
+
g_return_val_if_fail (seg->type = &gtk_text_child_type, TRUE);
return seg->body.child.tree == NULL;
diff --git a/gtk/gtktextchild.h b/gtk/gtktextchild.h
index 9357a3b870..5c8dc591fb 100644
--- a/gtk/gtktextchild.h
+++ b/gtk/gtktextchild.h
@@ -8,7 +8,7 @@
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
@@ -21,7 +21,7 @@
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef GTK_TEXT_CHILD_H
diff --git a/gtk/gtktextchildprivate.h b/gtk/gtktextchildprivate.h
index 9fbc8c308f..8c19f07c08 100644
--- a/gtk/gtktextchildprivate.h
+++ b/gtk/gtktextchildprivate.h
@@ -9,7 +9,7 @@
* California, Sun Microsystems, Inc., and other parties. The
* following terms apply to all files associated with the software
* unless explicitly disclaimed in individual files.
- *
+ *
* The authors hereby grant permission to use, copy, modify,
* distribute, and license this software and its documentation for any
* purpose, provided that existing copyright notices are retained in
@@ -19,13 +19,13 @@
* software may be copyrighted by their authors and need not follow
* the licensing terms described here, provided that the new terms are
* clearly indicated on the first page of each file where they apply.
- *
+ *
* IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY
* PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
* DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION,
* OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+ *
* THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
@@ -44,7 +44,7 @@
* foregoing, the authors grant the U.S. Government and others acting
* in its behalf permission to use and distribute the software in
* accordance with the terms specified in this license.
- *
+ *
*/
#ifndef GTK_TEXT_CHILD_PRIVATE_H
diff --git a/gtk/gtktextdisplay.c b/gtk/gtktextdisplay.c
index fd0499de43..3a103593ef 100644
--- a/gtk/gtktextdisplay.c
+++ b/gtk/gtktextdisplay.c
@@ -7,9 +7,9 @@
*
* This file can be used under your choice of two licenses, the LGPL
* and the original Tk license.
- *
+ *
* LGPL:
- *
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
@@ -30,7 +30,7 @@
* California, Sun Microsystems, Inc., and other parties. The
* following terms apply to all files associated with the software
* unless explicitly disclaimed in individual files.
- *
+ *
* The authors hereby grant permission to use, copy, modify,
* distribute, and license this software and its documentation for any
* purpose, provided that existing copyright notices are retained in
@@ -40,13 +40,13 @@
* software may be copyrighted by their authors and need not follow
* the licensing terms described here, provided that the new terms are
* clearly indicated on the first page of each file where they apply.
- *
+ *
* IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY
* PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
* DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION,
* OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+ *
* THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
@@ -84,7 +84,7 @@ typedef struct _GtkTextRenderState GtkTextRenderState;
struct _GtkTextRenderState
{
GtkWidget *widget;
-
+
GtkTextAppearance *last_appearance;
GdkGC *fg_gc;
GdkGC *bg_gc;
@@ -92,20 +92,20 @@ struct _GtkTextRenderState
};
static void get_item_properties (PangoItem *item,
- GtkTextAppearance **appearance);
+ GtkTextAppearance **appearance);
static GdkRegion *get_selected_clip (GtkTextRenderState *render_state,
- PangoLayout *layout,
- PangoLayoutLine *line,
- int x,
- int y,
- int height,
- int start_index,
- int end_index);
+ PangoLayout *layout,
+ PangoLayoutLine *line,
+ int x,
+ int y,
+ int height,
+ int start_index,
+ int end_index);
static GtkTextRenderState *
gtk_text_render_state_new (GtkWidget *widget,
- GdkDrawable *drawable,
- GdkRectangle *clip_rect)
+ GdkDrawable *drawable,
+ GdkRectangle *clip_rect)
{
GtkTextRenderState *state = g_new0 (GtkTextRenderState, 1);
@@ -122,14 +122,14 @@ gtk_text_render_state_destroy (GtkTextRenderState *state)
{
gdk_gc_unref (state->fg_gc);
gdk_gc_unref (state->bg_gc);
-
+
g_free (state);
}
static void
gtk_text_render_state_set_color (GtkTextRenderState *state,
- GdkGC *gc,
- GdkColor *color)
+ GdkGC *gc,
+ GdkColor *color)
{
gdk_colormap_alloc_color (gtk_widget_get_colormap (state->widget), color, FALSE, TRUE);
gdk_gc_set_foreground (gc, color);
@@ -137,64 +137,64 @@ gtk_text_render_state_set_color (GtkTextRenderState *state,
static void
gtk_text_render_state_update (GtkTextRenderState *state,
- GtkTextAppearance *new_appearance)
+ GtkTextAppearance *new_appearance)
{
if (!state->last_appearance ||
!gdk_color_equal (&new_appearance->fg_color, &state->last_appearance->fg_color))
gtk_text_render_state_set_color (state, state->fg_gc, &new_appearance->fg_color);
-
+
if (!state->last_appearance ||
new_appearance->fg_stipple != state->last_appearance->fg_stipple)
{
if (new_appearance->fg_stipple)
- {
- gdk_gc_set_fill(state->fg_gc, GDK_STIPPLED);
- gdk_gc_set_stipple(state->fg_gc, new_appearance->fg_stipple);
- }
+ {
+ gdk_gc_set_fill (state->fg_gc, GDK_STIPPLED);
+ gdk_gc_set_stipple (state->fg_gc, new_appearance->fg_stipple);
+ }
else
- {
- gdk_gc_set_fill(state->fg_gc, GDK_SOLID);
- }
+ {
+ gdk_gc_set_fill (state->fg_gc, GDK_SOLID);
+ }
}
-
+
if (new_appearance->draw_bg)
{
if (!state->last_appearance ||
- !gdk_color_equal (&new_appearance->bg_color, &state->last_appearance->bg_color))
- gtk_text_render_state_set_color (state, state->bg_gc, &new_appearance->bg_color);
-
+ !gdk_color_equal (&new_appearance->bg_color, &state->last_appearance->bg_color))
+ gtk_text_render_state_set_color (state, state->bg_gc, &new_appearance->bg_color);
+
if (!state->last_appearance ||
- new_appearance->bg_stipple != state->last_appearance->bg_stipple)
- {
- if (new_appearance->bg_stipple)
- {
- gdk_gc_set_fill(state->bg_gc, GDK_STIPPLED);
- gdk_gc_set_stipple(state->bg_gc, new_appearance->bg_stipple);
- }
- else
- {
- gdk_gc_set_fill(state->bg_gc, GDK_SOLID);
- }
- }
+ new_appearance->bg_stipple != state->last_appearance->bg_stipple)
+ {
+ if (new_appearance->bg_stipple)
+ {
+ gdk_gc_set_fill (state->bg_gc, GDK_STIPPLED);
+ gdk_gc_set_stipple (state->bg_gc, new_appearance->bg_stipple);
+ }
+ else
+ {
+ gdk_gc_set_fill (state->bg_gc, GDK_SOLID);
+ }
+ }
}
state->last_appearance = new_appearance;
}
-static void
+static void
render_layout_line (GdkDrawable *drawable,
- GtkTextRenderState *render_state,
- PangoLayoutLine *line,
- GSList **pixbuf_pointer,
- int x,
- int y,
- gboolean selected)
+ GtkTextRenderState *render_state,
+ PangoLayoutLine *line,
+ GSList **pixbuf_pointer,
+ int x,
+ int y,
+ gboolean selected)
{
GSList *tmp_list = line->runs;
PangoRectangle overall_rect;
PangoRectangle logical_rect;
PangoRectangle ink_rect;
-
+
gint x_off = 0;
pango_layout_line_get_extents (line, NULL, &overall_rect);
@@ -203,93 +203,93 @@ render_layout_line (GdkDrawable *drawable,
{
PangoLayoutRun *run = tmp_list->data;
GtkTextAppearance *appearance;
-
+
tmp_list = tmp_list->next;
get_item_properties (run->item, &appearance);
- if (appearance) /* A text segment */
- {
- GdkGC *fg_gc;
-
- if (selected)
- {
- fg_gc = render_state->widget->style->fg_gc[GTK_STATE_SELECTED];
- }
- else
- {
- gtk_text_render_state_update (render_state, appearance);
-
- fg_gc = render_state->fg_gc;
- }
-
- if (appearance->underline == PANGO_UNDERLINE_NONE && !appearance->strikethrough)
- pango_glyph_string_extents (run->glyphs, run->item->analysis.font,
- NULL, &logical_rect);
- else
- pango_glyph_string_extents (run->glyphs, run->item->analysis.font,
- &ink_rect, &logical_rect);
-
- if (appearance->draw_bg && !selected)
- gdk_draw_rectangle (drawable, render_state->bg_gc, TRUE,
- x + (x_off + logical_rect.x) / PANGO_SCALE,
- y + logical_rect.y / PANGO_SCALE,
- logical_rect.width / PANGO_SCALE,
- logical_rect.height / PANGO_SCALE);
-
- gdk_draw_glyphs (drawable, fg_gc,
- run->item->analysis.font,
- x + x_off / PANGO_SCALE, y, run->glyphs);
-
- switch (appearance->underline)
- {
- case PANGO_UNDERLINE_NONE:
- break;
- case PANGO_UNDERLINE_DOUBLE:
- gdk_draw_line (drawable, fg_gc,
- x + (x_off + ink_rect.x) / PANGO_SCALE - 1, y + 4,
- x + (x_off + ink_rect.x + ink_rect.width) / PANGO_SCALE, y + 4);
- /* Fall through */
- case PANGO_UNDERLINE_SINGLE:
- gdk_draw_line (drawable, fg_gc,
- x + (x_off + ink_rect.x) / PANGO_SCALE - 1, y + 2,
- x + (x_off + ink_rect.x + ink_rect.width) / PANGO_SCALE, y + 2);
- break;
- case PANGO_UNDERLINE_LOW:
- gdk_draw_line (drawable, fg_gc,
- x + (x_off + ink_rect.x) / PANGO_SCALE - 1, y + (ink_rect.y + ink_rect.height) / PANGO_SCALE + 2,
- x + (x_off + ink_rect.x + ink_rect.width) / PANGO_SCALE, y + (ink_rect.y + ink_rect.height) / PANGO_SCALE + 2);
- break;
- }
-
- if (appearance->strikethrough)
- {
- gint strikethrough_y = y + (0.3 * logical_rect.y) / PANGO_SCALE;
- gdk_draw_line (drawable, fg_gc,
- x + (x_off + ink_rect.x) / PANGO_SCALE - 1, strikethrough_y,
- x + (x_off + ink_rect.x + ink_rect.width) / PANGO_SCALE, strikethrough_y);
- }
-
- x_off += logical_rect.width;
- }
- else /* Pixbuf segment */
- {
- GtkTextPixbuf *pixbuf = (*pixbuf_pointer)->data;
- gint width, height;
- GdkRectangle pixbuf_rect, draw_rect;
+ if (appearance) /* A text segment */
+ {
+ GdkGC *fg_gc;
+
+ if (selected)
+ {
+ fg_gc = render_state->widget->style->fg_gc[GTK_STATE_SELECTED];
+ }
+ else
+ {
+ gtk_text_render_state_update (render_state, appearance);
+
+ fg_gc = render_state->fg_gc;
+ }
+
+ if (appearance->underline == PANGO_UNDERLINE_NONE && !appearance->strikethrough)
+ pango_glyph_string_extents (run->glyphs, run->item->analysis.font,
+ NULL, &logical_rect);
+ else
+ pango_glyph_string_extents (run->glyphs, run->item->analysis.font,
+ &ink_rect, &logical_rect);
+
+ if (appearance->draw_bg && !selected)
+ gdk_draw_rectangle (drawable, render_state->bg_gc, TRUE,
+ x + (x_off + logical_rect.x) / PANGO_SCALE,
+ y + logical_rect.y / PANGO_SCALE,
+ logical_rect.width / PANGO_SCALE,
+ logical_rect.height / PANGO_SCALE);
+
+ gdk_draw_glyphs (drawable, fg_gc,
+ run->item->analysis.font,
+ x + x_off / PANGO_SCALE, y, run->glyphs);
+
+ switch (appearance->underline)
+ {
+ case PANGO_UNDERLINE_NONE:
+ break;
+ case PANGO_UNDERLINE_DOUBLE:
+ gdk_draw_line (drawable, fg_gc,
+ x + (x_off + ink_rect.x) / PANGO_SCALE - 1, y + 4,
+ x + (x_off + ink_rect.x + ink_rect.width) / PANGO_SCALE, y + 4);
+ /* Fall through */
+ case PANGO_UNDERLINE_SINGLE:
+ gdk_draw_line (drawable, fg_gc,
+ x + (x_off + ink_rect.x) / PANGO_SCALE - 1, y + 2,
+ x + (x_off + ink_rect.x + ink_rect.width) / PANGO_SCALE, y + 2);
+ break;
+ case PANGO_UNDERLINE_LOW:
+ gdk_draw_line (drawable, fg_gc,
+ x + (x_off + ink_rect.x) / PANGO_SCALE - 1, y + (ink_rect.y + ink_rect.height) / PANGO_SCALE + 2,
+ x + (x_off + ink_rect.x + ink_rect.width) / PANGO_SCALE, y + (ink_rect.y + ink_rect.height) / PANGO_SCALE + 2);
+ break;
+ }
+
+ if (appearance->strikethrough)
+ {
+ gint strikethrough_y = y + (0.3 * logical_rect.y) / PANGO_SCALE;
+ gdk_draw_line (drawable, fg_gc,
+ x + (x_off + ink_rect.x) / PANGO_SCALE - 1, strikethrough_y,
+ x + (x_off + ink_rect.x + ink_rect.width) / PANGO_SCALE, strikethrough_y);
+ }
+
+ x_off += logical_rect.width;
+ }
+ else /* Pixbuf segment */
+ {
+ GtkTextPixbuf *pixbuf = (*pixbuf_pointer)->data;
+ gint width, height;
+ GdkRectangle pixbuf_rect, draw_rect;
GdkBitmap *mask = NULL;
-
- *pixbuf_pointer = (*pixbuf_pointer)->next;
+
+ *pixbuf_pointer = (*pixbuf_pointer)->next;
width = gdk_pixbuf_get_width (pixbuf->pixbuf);
height = gdk_pixbuf_get_height (pixbuf->pixbuf);
- pixbuf_rect.x = x + x_off / PANGO_SCALE;
- pixbuf_rect.y = y - height;
- pixbuf_rect.width = width;
- pixbuf_rect.height = height;
-
- if (gdk_rectangle_intersect (&pixbuf_rect, &render_state->clip_rect,
+ pixbuf_rect.x = x + x_off / PANGO_SCALE;
+ pixbuf_rect.y = y - height;
+ pixbuf_rect.width = width;
+ pixbuf_rect.height = height;
+
+ if (gdk_rectangle_intersect (&pixbuf_rect, &render_state->clip_rect,
&draw_rect))
{
if (gdk_pixbuf_get_has_alpha (pixbuf->pixbuf))
@@ -304,7 +304,7 @@ render_layout_line (GdkDrawable *drawable,
gdk_pixbuf_get_width (pixbuf->pixbuf),
gdk_pixbuf_get_height (pixbuf->pixbuf),
128);
-
+
}
if (mask)
@@ -313,7 +313,7 @@ render_layout_line (GdkDrawable *drawable,
gdk_gc_set_clip_origin (render_state->fg_gc,
pixbuf_rect.x, pixbuf_rect.y);
}
-
+
gdk_pixbuf_render_to_drawable (pixbuf->pixbuf,
drawable,
render_state->fg_gc,
@@ -332,20 +332,20 @@ render_layout_line (GdkDrawable *drawable,
g_object_unref (G_OBJECT (mask));
}
}
-
- x_off += width * PANGO_SCALE;
- }
+
+ x_off += width * PANGO_SCALE;
+ }
}
}
-static void
+static void
render_para (GdkDrawable *drawable,
- GtkTextRenderState *render_state,
- GtkTextLineDisplay *line_display,
- int x,
- int y,
- int selection_start_index,
- int selection_end_index)
+ GtkTextRenderState *render_state,
+ GtkTextLineDisplay *line_display,
+ int x,
+ int y,
+ int selection_start_index,
+ int selection_end_index)
{
PangoRectangle logical_rect;
GSList *pixbuf_pointer = line_display->pixbufs;
@@ -355,10 +355,10 @@ render_para (GdkDrawable *drawable,
int indent;
int total_width;
int y_offset = 0;
- int byte_offset = 0;
+ int byte_offset = 0;
gboolean first = TRUE;
-
+
indent = pango_layout_get_indent (layout);
total_width = pango_layout_get_width (layout);
align = pango_layout_get_alignment (layout);
@@ -372,133 +372,133 @@ render_para (GdkDrawable *drawable,
PangoLayoutLine *line = tmp_list->data;
int x_offset;
int selection_y, selection_height;
-
+
pango_layout_line_get_extents (line, NULL, &logical_rect);
x_offset = line_display->left_margin * PANGO_SCALE;
switch (align)
- {
- case PANGO_ALIGN_RIGHT:
- x_offset += total_width - logical_rect.width;
- break;
- case PANGO_ALIGN_CENTER:
- x_offset += (total_width - logical_rect.width) / 2;
- break;
- default:
- break;
- }
+ {
+ case PANGO_ALIGN_RIGHT:
+ x_offset += total_width - logical_rect.width;
+ break;
+ case PANGO_ALIGN_CENTER:
+ x_offset += (total_width - logical_rect.width) / 2;
+ break;
+ default:
+ break;
+ }
if (first)
- {
- if (indent > 0)
- {
- if (align == PANGO_ALIGN_LEFT)
- x_offset += indent;
- else
- x_offset -= indent;
- }
- }
+ {
+ if (indent > 0)
+ {
+ if (align == PANGO_ALIGN_LEFT)
+ x_offset += indent;
+ else
+ x_offset -= indent;
+ }
+ }
else
- {
- if (indent < 0)
- {
- if (align == PANGO_ALIGN_LEFT)
- x_offset -= indent;
- else
- x_offset += indent;
- }
- }
+ {
+ if (indent < 0)
+ {
+ if (align == PANGO_ALIGN_LEFT)
+ x_offset -= indent;
+ else
+ x_offset += indent;
+ }
+ }
selection_y = y + y_offset / PANGO_SCALE;
selection_height = logical_rect.height / PANGO_SCALE;
if (first)
- {
- selection_y -= line_display->top_margin;
- selection_height += line_display->top_margin;
- }
+ {
+ selection_y -= line_display->top_margin;
+ selection_height += line_display->top_margin;
+ }
if (!tmp_list->next)
- selection_height += line_display->bottom_margin;
+ selection_height += line_display->bottom_margin;
first = FALSE;
-
+
if (selection_start_index < byte_offset &&
- selection_end_index > line->length + byte_offset) /* All selected */
- {
- gdk_draw_rectangle (drawable,
- render_state->widget->style->bg_gc[GTK_STATE_SELECTED],
- TRUE,
- x + line_display->left_margin, selection_y,
- total_width / PANGO_SCALE, selection_height);
- render_layout_line (drawable, render_state, line, &pixbuf_pointer,
- x + x_offset / PANGO_SCALE, y + (y_offset - logical_rect.y) / PANGO_SCALE,
- TRUE);
- }
+ selection_end_index > line->length + byte_offset) /* All selected */
+ {
+ gdk_draw_rectangle (drawable,
+ render_state->widget->style->bg_gc[GTK_STATE_SELECTED],
+ TRUE,
+ x + line_display->left_margin, selection_y,
+ total_width / PANGO_SCALE, selection_height);
+ render_layout_line (drawable, render_state, line, &pixbuf_pointer,
+ x + x_offset / PANGO_SCALE, y + (y_offset - logical_rect.y) / PANGO_SCALE,
+ TRUE);
+ }
else
- {
- GSList *pixbuf_pointer_tmp = pixbuf_pointer;
-
- render_layout_line (drawable, render_state, line, &pixbuf_pointer,
- x + x_offset / PANGO_SCALE, y + (y_offset - logical_rect.y) / PANGO_SCALE,
- FALSE);
-
- if (selection_start_index < byte_offset + line->length &&
- selection_end_index > byte_offset) /* Some selected */
- {
- GdkRegion *clip_region = get_selected_clip (render_state, layout, line,
- x + line_display->x_offset,
- selection_y, selection_height,
- selection_start_index, selection_end_index);
-
- gdk_gc_set_clip_region (render_state->widget->style->fg_gc [GTK_STATE_SELECTED], clip_region);
- gdk_gc_set_clip_region (render_state->widget->style->bg_gc [GTK_STATE_SELECTED], clip_region);
-
- gdk_draw_rectangle (drawable,
- render_state->widget->style->bg_gc[GTK_STATE_SELECTED],
- TRUE,
- x + x_offset / PANGO_SCALE, selection_y,
- logical_rect.width / PANGO_SCALE,
- selection_height);
-
- render_layout_line (drawable, render_state, line, &pixbuf_pointer_tmp,
- x + x_offset / PANGO_SCALE, y + (y_offset - logical_rect.y) / PANGO_SCALE,
- TRUE);
-
- gdk_gc_set_clip_region (render_state->widget->style->fg_gc [GTK_STATE_SELECTED], NULL);
- gdk_gc_set_clip_region (render_state->widget->style->bg_gc [GTK_STATE_SELECTED], NULL);
-
- gdk_region_destroy (clip_region);
-
- /* Paint in the ends of the line */
- if (x_offset > line_display->left_margin * PANGO_SCALE &&
- ((line_display->direction == GTK_TEXT_DIR_LTR && selection_start_index < byte_offset) ||
- (line_display->direction == GTK_TEXT_DIR_RTL && selection_end_index > byte_offset + line->length)))
- {
- gdk_draw_rectangle (drawable,
- render_state->widget->style->bg_gc[GTK_STATE_SELECTED],
- TRUE,
- x + line_display->left_margin, selection_y,
- x + x_offset / PANGO_SCALE - line_display->left_margin,
- selection_height);
- }
-
- if (x_offset + logical_rect.width < line_display->left_margin * PANGO_SCALE + total_width &&
- ((line_display->direction == GTK_TEXT_DIR_LTR && selection_end_index > byte_offset + line->length) ||
- (line_display->direction == GTK_TEXT_DIR_RTL && selection_start_index < byte_offset)))
- {
-
-
- gdk_draw_rectangle (drawable,
- render_state->widget->style->bg_gc[GTK_STATE_SELECTED],
- TRUE,
- x + (x_offset + logical_rect.width) / PANGO_SCALE,
- selection_y,
- x + (line_display->left_margin * PANGO_SCALE + total_width - x_offset - logical_rect.width) / PANGO_SCALE,
- selection_height);
- }
- }
- }
+ {
+ GSList *pixbuf_pointer_tmp = pixbuf_pointer;
+
+ render_layout_line (drawable, render_state, line, &pixbuf_pointer,
+ x + x_offset / PANGO_SCALE, y + (y_offset - logical_rect.y) / PANGO_SCALE,
+ FALSE);
+
+ if (selection_start_index < byte_offset + line->length &&
+ selection_end_index > byte_offset) /* Some selected */
+ {
+ GdkRegion *clip_region = get_selected_clip (render_state, layout, line,
+ x + line_display->x_offset,
+ selection_y, selection_height,
+ selection_start_index, selection_end_index);
+
+ gdk_gc_set_clip_region (render_state->widget->style->fg_gc [GTK_STATE_SELECTED], clip_region);
+ gdk_gc_set_clip_region (render_state->widget->style->bg_gc [GTK_STATE_SELECTED], clip_region);
+
+ gdk_draw_rectangle (drawable,
+ render_state->widget->style->bg_gc[GTK_STATE_SELECTED],
+ TRUE,
+ x + x_offset / PANGO_SCALE, selection_y,
+ logical_rect.width / PANGO_SCALE,
+ selection_height);
+
+ render_layout_line (drawable, render_state, line, &pixbuf_pointer_tmp,
+ x + x_offset / PANGO_SCALE, y + (y_offset - logical_rect.y) / PANGO_SCALE,
+ TRUE);
+
+ gdk_gc_set_clip_region (render_state->widget->style->fg_gc [GTK_STATE_SELECTED], NULL);
+ gdk_gc_set_clip_region (render_state->widget->style->bg_gc [GTK_STATE_SELECTED], NULL);
+
+ gdk_region_destroy (clip_region);
+
+ /* Paint in the ends of the line */
+ if (x_offset > line_display->left_margin * PANGO_SCALE &&
+ ((line_display->direction == GTK_TEXT_DIR_LTR && selection_start_index < byte_offset) ||
+ (line_display->direction == GTK_TEXT_DIR_RTL && selection_end_index > byte_offset + line->length)))
+ {
+ gdk_draw_rectangle (drawable,
+ render_state->widget->style->bg_gc[GTK_STATE_SELECTED],
+ TRUE,
+ x + line_display->left_margin, selection_y,
+ x + x_offset / PANGO_SCALE - line_display->left_margin,
+ selection_height);
+ }
+
+ if (x_offset + logical_rect.width < line_display->left_margin * PANGO_SCALE + total_width &&
+ ((line_display->direction == GTK_TEXT_DIR_LTR && selection_end_index > byte_offset + line->length) ||
+ (line_display->direction == GTK_TEXT_DIR_RTL && selection_start_index < byte_offset)))
+ {
+
+
+ gdk_draw_rectangle (drawable,
+ render_state->widget->style->bg_gc[GTK_STATE_SELECTED],
+ TRUE,
+ x + (x_offset + logical_rect.width) / PANGO_SCALE,
+ selection_y,
+ x + (line_display->left_margin * PANGO_SCALE + total_width - x_offset - logical_rect.width) / PANGO_SCALE,
+ selection_height);
+ }
+ }
+ }
byte_offset += line->length;
y_offset += logical_rect.height;
@@ -508,13 +508,13 @@ render_para (GdkDrawable *drawable,
static GdkRegion *
get_selected_clip (GtkTextRenderState *render_state,
- PangoLayout *layout,
- PangoLayoutLine *line,
- int x,
- int y,
- int height,
- int start_index,
- int end_index)
+ PangoLayout *layout,
+ PangoLayoutLine *line,
+ int x,
+ int y,
+ int height,
+ int start_index,
+ int end_index)
{
gint *ranges;
gint n_ranges, i;
@@ -533,7 +533,7 @@ get_selected_clip (GtkTextRenderState *render_state,
rect.y = y;
rect.width = (ranges[2*i + 1] - ranges[2*i]) / PANGO_SCALE;
rect.height = height;
-
+
gdk_region_union_with_rect (clip_region, &rect);
}
@@ -547,20 +547,20 @@ get_selected_clip (GtkTextRenderState *render_state,
static void
get_item_properties (PangoItem *item,
- GtkTextAppearance **appearance)
+ GtkTextAppearance **appearance)
{
GSList *tmp_list = item->extra_attrs;
-
+
*appearance = NULL;
-
+
while (tmp_list)
{
PangoAttribute *attr = tmp_list->data;
if (attr->klass->type == gtk_text_attr_appearance_type)
- {
- *appearance = &((GtkTextAttrAppearance *)attr)->appearance;
- }
+ {
+ *appearance = &((GtkTextAttrAppearance *)attr)->appearance;
+ }
tmp_list = tmp_list->next;
}
@@ -568,18 +568,18 @@ get_item_properties (PangoItem *item,
void
gtk_text_layout_draw (GtkTextLayout *layout,
- GtkWidget *widget,
- GdkDrawable *drawable,
- /* Location of the layout
- in buffer coordinates */
- gint x_offset,
- gint y_offset,
- /* Region of the layout to
- render */
- gint x,
- gint y,
- gint width,
- gint height)
+ GtkWidget *widget,
+ GdkDrawable *drawable,
+ /* Location of the layout
+ in buffer coordinates */
+ gint x_offset,
+ gint y_offset,
+ /* Region of the layout to
+ render */
+ gint x,
+ gint y,
+ gint width,
+ gint height)
{
GdkRectangle clip;
gint current_y;
@@ -589,7 +589,7 @@ gtk_text_layout_draw (GtkTextLayout *layout,
GtkTextRenderState *render_state;
GtkTextIter selection_start, selection_end;
gboolean have_selection = FALSE;
-
+
g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
g_return_if_fail (layout->default_style != NULL);
g_return_if_fail (layout->buffer != NULL);
@@ -619,12 +619,12 @@ gtk_text_layout_draw (GtkTextLayout *layout,
gdk_gc_set_clip_rectangle (render_state->bg_gc, &clip);
gtk_text_layout_wrap_loop_start (layout);
-
+
if (gtk_text_buffer_get_selection_bounds (layout->buffer,
- &selection_start,
- &selection_end))
+ &selection_start,
+ &selection_end))
have_selection = TRUE;
-
+
tmp_list = line_list;
while (tmp_list != NULL)
{
@@ -633,68 +633,68 @@ gtk_text_layout_draw (GtkTextLayout *layout,
gint selection_end_index = -1;
GtkTextLine *line = tmp_list->data;
-
+
line_display = gtk_text_layout_get_line_display (layout, line, FALSE);
if (have_selection)
- {
- GtkTextIter line_start, line_end;
- gint byte_count = gtk_text_line_byte_count (line);
-
- gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
+ {
+ GtkTextIter line_start, line_end;
+ gint byte_count = gtk_text_line_byte_count (line);
+
+ 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),
+ line, 0);
+ gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
&line_end,
- line, byte_count - 1);
-
- if (gtk_text_iter_compare (&selection_start, &line_end) < 0 &&
- gtk_text_iter_compare (&selection_end, &line_start) > 0)
- {
- if (gtk_text_iter_compare (&selection_start, &line_start) >= 0)
- selection_start_index = gtk_text_iter_get_line_index (&selection_start);
- else
- selection_start_index = -1;
-
- if (gtk_text_iter_compare (&selection_end, &line_end) <= 0)
- selection_end_index = gtk_text_iter_get_line_index (&selection_end);
- else
- selection_end_index = byte_count;
- }
- }
-
+ line, byte_count - 1);
+
+ if (gtk_text_iter_compare (&selection_start, &line_end) < 0 &&
+ gtk_text_iter_compare (&selection_end, &line_start) > 0)
+ {
+ if (gtk_text_iter_compare (&selection_start, &line_start) >= 0)
+ selection_start_index = gtk_text_iter_get_line_index (&selection_start);
+ else
+ selection_start_index = -1;
+
+ if (gtk_text_iter_compare (&selection_end, &line_end) <= 0)
+ selection_end_index = gtk_text_iter_get_line_index (&selection_end);
+ else
+ selection_end_index = byte_count;
+ }
+ }
+
render_para (drawable, render_state, line_display,
- - x_offset,
- current_y + line_display->top_margin,
- selection_start_index, selection_end_index);
+ - x_offset,
+ current_y + line_display->top_margin,
+ selection_start_index, selection_end_index);
+
-
/* We paint the cursors last, because they overlap another chunk
and need to appear on top. */
cursor_list = line_display->cursors;
while (cursor_list)
- {
- GtkTextCursorDisplay *cursor = cursor_list->data;
- GdkGC *gc;
-
- if (cursor->is_strong)
- gc = widget->style->bg_gc[GTK_STATE_SELECTED];
- else
- gc = widget->style->fg_gc[GTK_STATE_NORMAL];
-
- gdk_draw_line (drawable, gc,
- line_display->x_offset + cursor->x,
- current_y + line_display->top_margin + cursor->y,
- line_display->x_offset + cursor->x,
- current_y + line_display->top_margin + cursor->y + cursor->height);
-
- cursor_list = cursor_list->next;
- }
+ {
+ GtkTextCursorDisplay *cursor = cursor_list->data;
+ GdkGC *gc;
+
+ if (cursor->is_strong)
+ gc = widget->style->bg_gc[GTK_STATE_SELECTED];
+ else
+ gc = widget->style->fg_gc[GTK_STATE_NORMAL];
+
+ gdk_draw_line (drawable, gc,
+ line_display->x_offset + cursor->x,
+ current_y + line_display->top_margin + cursor->y,
+ line_display->x_offset + cursor->x,
+ current_y + line_display->top_margin + cursor->y + cursor->height);
+
+ cursor_list = cursor_list->next;
+ }
current_y += line_display->height;
gtk_text_layout_free_line_display (layout, line_display);
-
+
tmp_list = g_slist_next (tmp_list);
}
diff --git a/gtk/gtktextdisplay.h b/gtk/gtktextdisplay.h
index acbc5f9727..03ec505dc5 100644
--- a/gtk/gtktextdisplay.h
+++ b/gtk/gtktextdisplay.h
@@ -7,9 +7,9 @@
*
* This file can be used under your choice of two licenses, the LGPL
* and the original Tk license.
- *
+ *
* LGPL:
- *
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
@@ -30,7 +30,7 @@
* California, Sun Microsystems, Inc., and other parties. The
* following terms apply to all files associated with the software
* unless explicitly disclaimed in individual files.
- *
+ *
* The authors hereby grant permission to use, copy, modify,
* distribute, and license this software and its documentation for any
* purpose, provided that existing copyright notices are retained in
@@ -40,13 +40,13 @@
* software may be copyrighted by their authors and need not follow
* the licensing terms described here, provided that the new terms are
* clearly indicated on the first page of each file where they apply.
- *
+ *
* IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY
* PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
* DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION,
* OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+ *
* THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
@@ -94,15 +94,15 @@ extern "C" {
* x/y/width/height - Region of the layout to render. x,y must be inside
* the drawable.
*/
-void gtk_text_layout_draw (GtkTextLayout *layout,
- GtkWidget *widget,
- GdkDrawable *drawable,
- gint x_offset,
- gint y_offset,
- gint x,
- gint y,
- gint width,
- gint height);
+void gtk_text_layout_draw (GtkTextLayout *layout,
+ GtkWidget *widget,
+ GdkDrawable *drawable,
+ gint x_offset,
+ gint y_offset,
+ gint x,
+ gint y,
+ gint width,
+ gint height);
@@ -110,4 +110,4 @@ void gtk_text_layout_draw (GtkTextLayout *layout,
}
#endif /* __cplusplus */
-#endif /* GTK_TEXT_DISPLAY_H */
+#endif /* GTK_TEXT_DISPLAY_H */
diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c
index a600091702..4e5ba2bce8 100644
--- a/gtk/gtktextiter.c
+++ b/gtk/gtktextiter.c
@@ -8,7 +8,7 @@
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
@@ -21,7 +21,7 @@
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#include "gtktextiter.h"
@@ -68,13 +68,13 @@ struct _GtkTextRealIter
other than the char stamp and the tree are valid.
*/
static void
-iter_set_common(GtkTextRealIter *iter,
- GtkTextLine *line)
+iter_set_common (GtkTextRealIter *iter,
+ GtkTextLine *line)
{
/* Update segments stamp */
iter->segments_changed_stamp =
- gtk_text_btree_get_segments_changed_stamp(iter->tree);
-
+ gtk_text_btree_get_segments_changed_stamp (iter->tree);
+
iter->line = line;
iter->line_byte_offset = -1;
@@ -86,11 +86,11 @@ iter_set_common(GtkTextRealIter *iter,
}
static void
-iter_set_from_byte_offset(GtkTextRealIter *iter,
- GtkTextLine *line,
- gint byte_offset)
+iter_set_from_byte_offset (GtkTextRealIter *iter,
+ GtkTextLine *line,
+ gint byte_offset)
{
- iter_set_common(iter, line);
+ iter_set_common (iter, line);
gtk_text_line_byte_locate (iter->line,
byte_offset,
@@ -102,11 +102,11 @@ iter_set_from_byte_offset(GtkTextRealIter *iter,
}
static void
-iter_set_from_char_offset(GtkTextRealIter *iter,
- GtkTextLine *line,
- gint char_offset)
+iter_set_from_char_offset (GtkTextRealIter *iter,
+ GtkTextLine *line,
+ gint char_offset)
{
- iter_set_common(iter, line);
+ iter_set_common (iter, line);
gtk_text_line_char_locate (iter->line,
char_offset,
@@ -117,9 +117,9 @@ iter_set_from_char_offset(GtkTextRealIter *iter,
}
static void
-iter_set_from_segment(GtkTextRealIter *iter,
- GtkTextLine *line,
- GtkTextLineSegment *segment)
+iter_set_from_segment (GtkTextRealIter *iter,
+ GtkTextLine *line,
+ GtkTextLineSegment *segment)
{
GtkTextLineSegment *seg;
gint byte_offset;
@@ -142,23 +142,23 @@ iter_set_from_segment(GtkTextRealIter *iter,
work. This ensures the btree and line are valid, but doesn't
update the segments. */
static GtkTextRealIter*
-gtk_text_iter_make_surreal(const GtkTextIter *_iter)
+gtk_text_iter_make_surreal (const GtkTextIter *_iter)
{
GtkTextRealIter *iter = (GtkTextRealIter*)_iter;
-
+
if (iter->chars_changed_stamp !=
- gtk_text_btree_get_chars_changed_stamp(iter->tree))
- {
- g_warning("Invalid text buffer iterator: either the iterator "
- "is uninitialized, or the characters/pixbufs/widgets "
- "in the buffer have been modified since the iterator "
- "was created.\nYou must use marks, character numbers, "
- "or line numbers to preserve a position across buffer "
- "modifications.\nYou can apply tags and insert marks "
- "without invalidating your iterators,\n"
- "but any mutation that affects 'indexable' buffer contents "
- "(contents that can be referred to by character offset)\n"
- "will invalidate all outstanding iterators");
+ gtk_text_btree_get_chars_changed_stamp (iter->tree))
+ {
+ g_warning ("Invalid text buffer iterator: either the iterator "
+ "is uninitialized, or the characters/pixbufs/widgets "
+ "in the buffer have been modified since the iterator "
+ "was created.\nYou must use marks, character numbers, "
+ "or line numbers to preserve a position across buffer "
+ "modifications.\nYou can apply tags and insert marks "
+ "without invalidating your iterators,\n"
+ "but any mutation that affects 'indexable' buffer contents "
+ "(contents that can be referred to by character offset)\n"
+ "will invalidate all outstanding iterators");
return NULL;
}
@@ -168,7 +168,7 @@ gtk_text_iter_make_surreal(const GtkTextIter *_iter)
should have used make_real. */
if (iter->segments_changed_stamp !=
- gtk_text_btree_get_segments_changed_stamp(iter->tree))
+ gtk_text_btree_get_segments_changed_stamp (iter->tree))
{
iter->segment = NULL;
iter->any_segment = NULL;
@@ -176,190 +176,190 @@ gtk_text_iter_make_surreal(const GtkTextIter *_iter)
iter->segment_byte_offset = -10000;
iter->segment_char_offset = -10000;
}
-
+
return iter;
}
static GtkTextRealIter*
-gtk_text_iter_make_real(const GtkTextIter *_iter)
+gtk_text_iter_make_real (const GtkTextIter *_iter)
{
GtkTextRealIter *iter;
-
- iter = gtk_text_iter_make_surreal(_iter);
-
+
+ iter = gtk_text_iter_make_surreal (_iter);
+
if (iter->segments_changed_stamp !=
- gtk_text_btree_get_segments_changed_stamp(iter->tree))
+ gtk_text_btree_get_segments_changed_stamp (iter->tree))
{
if (iter->line_byte_offset >= 0)
{
- iter_set_from_byte_offset(iter,
- iter->line,
- iter->line_byte_offset);
+ iter_set_from_byte_offset (iter,
+ iter->line,
+ iter->line_byte_offset);
}
else
{
- g_assert(iter->line_char_offset >= 0);
-
- iter_set_from_char_offset(iter,
- iter->line,
- iter->line_char_offset);
+ g_assert (iter->line_char_offset >= 0);
+
+ iter_set_from_char_offset (iter,
+ iter->line,
+ iter->line_char_offset);
}
}
- g_assert(iter->segment != NULL);
- g_assert(iter->any_segment != NULL);
- g_assert(iter->segment->char_count > 0);
-
+ g_assert (iter->segment != NULL);
+ g_assert (iter->any_segment != NULL);
+ g_assert (iter->segment->char_count > 0);
+
return iter;
}
static GtkTextRealIter*
-iter_init_common(GtkTextIter *_iter,
- GtkTextBTree *tree)
+iter_init_common (GtkTextIter *_iter,
+ GtkTextBTree *tree)
{
GtkTextRealIter *iter = (GtkTextRealIter*)_iter;
- g_return_val_if_fail(iter != NULL, NULL);
- g_return_val_if_fail(tree != NULL, NULL);
+ g_return_val_if_fail (iter != NULL, NULL);
+ g_return_val_if_fail (tree != NULL, NULL);
iter->tree = tree;
iter->chars_changed_stamp =
- gtk_text_btree_get_chars_changed_stamp(iter->tree);
-
+ gtk_text_btree_get_chars_changed_stamp (iter->tree);
+
return iter;
}
static GtkTextRealIter*
-iter_init_from_segment(GtkTextIter *iter,
- GtkTextBTree *tree,
- GtkTextLine *line,
- GtkTextLineSegment *segment)
+iter_init_from_segment (GtkTextIter *iter,
+ GtkTextBTree *tree,
+ GtkTextLine *line,
+ GtkTextLineSegment *segment)
{
GtkTextRealIter *real;
-
- g_return_val_if_fail(line != NULL, NULL);
- real = iter_init_common(iter, tree);
-
- iter_set_from_segment(real, line, segment);
-
+ g_return_val_if_fail (line != NULL, NULL);
+
+ real = iter_init_common (iter, tree);
+
+ iter_set_from_segment (real, line, segment);
+
return real;
}
static GtkTextRealIter*
-iter_init_from_byte_offset(GtkTextIter *iter,
- GtkTextBTree *tree,
- GtkTextLine *line,
- gint line_byte_offset)
+iter_init_from_byte_offset (GtkTextIter *iter,
+ GtkTextBTree *tree,
+ GtkTextLine *line,
+ gint line_byte_offset)
{
GtkTextRealIter *real;
-
- g_return_val_if_fail(line != NULL, NULL);
- real = iter_init_common(iter, tree);
-
- iter_set_from_byte_offset(real, line, line_byte_offset);
-
+ g_return_val_if_fail (line != NULL, NULL);
+
+ real = iter_init_common (iter, tree);
+
+ iter_set_from_byte_offset (real, line, line_byte_offset);
+
return real;
}
static GtkTextRealIter*
-iter_init_from_char_offset(GtkTextIter *iter,
- GtkTextBTree *tree,
- GtkTextLine *line,
- gint line_char_offset)
+iter_init_from_char_offset (GtkTextIter *iter,
+ GtkTextBTree *tree,
+ GtkTextLine *line,
+ gint line_char_offset)
{
GtkTextRealIter *real;
-
- g_return_val_if_fail(line != NULL, NULL);
- real = iter_init_common(iter, tree);
-
- iter_set_from_char_offset(real, line, line_char_offset);
-
+ g_return_val_if_fail (line != NULL, NULL);
+
+ real = iter_init_common (iter, tree);
+
+ iter_set_from_char_offset (real, line, line_char_offset);
+
return real;
}
static inline void
-invalidate_segment(GtkTextRealIter *iter)
+invalidate_segment (GtkTextRealIter *iter)
{
iter->segments_changed_stamp -= 1;
}
static inline void
-invalidate_char_index(GtkTextRealIter *iter)
+invalidate_char_index (GtkTextRealIter *iter)
{
iter->cached_char_index = -1;
}
static inline void
-invalidate_line_number(GtkTextRealIter *iter)
+invalidate_line_number (GtkTextRealIter *iter)
{
iter->cached_line_number = -1;
}
static inline void
-adjust_char_index(GtkTextRealIter *iter, gint count)
+adjust_char_index (GtkTextRealIter *iter, gint count)
{
if (iter->cached_char_index >= 0)
iter->cached_char_index += count;
}
static inline void
-adjust_line_number(GtkTextRealIter *iter, gint count)
+adjust_line_number (GtkTextRealIter *iter, gint count)
{
if (iter->cached_line_number >= 0)
iter->cached_line_number += count;
}
static inline void
-adjust_char_offsets(GtkTextRealIter *iter, gint count)
+adjust_char_offsets (GtkTextRealIter *iter, gint count)
{
if (iter->line_char_offset >= 0)
{
iter->line_char_offset += count;
- g_assert(iter->segment_char_offset >= 0);
+ g_assert (iter->segment_char_offset >= 0);
iter->segment_char_offset += count;
}
}
static inline void
-adjust_byte_offsets(GtkTextRealIter *iter, gint count)
+adjust_byte_offsets (GtkTextRealIter *iter, gint count)
{
if (iter->line_byte_offset >= 0)
{
iter->line_byte_offset += count;
- g_assert(iter->segment_byte_offset >= 0);
+ g_assert (iter->segment_byte_offset >= 0);
iter->segment_byte_offset += count;
}
}
static inline void
-ensure_char_offsets(GtkTextRealIter *iter)
+ensure_char_offsets (GtkTextRealIter *iter)
{
if (iter->line_char_offset < 0)
{
- g_assert(iter->line_byte_offset >= 0);
+ g_assert (iter->line_byte_offset >= 0);
- gtk_text_line_byte_to_char_offsets(iter->line,
- iter->line_byte_offset,
- &iter->line_char_offset,
- &iter->segment_char_offset);
+ gtk_text_line_byte_to_char_offsets (iter->line,
+ iter->line_byte_offset,
+ &iter->line_char_offset,
+ &iter->segment_char_offset);
}
}
static inline void
-ensure_byte_offsets(GtkTextRealIter *iter)
+ensure_byte_offsets (GtkTextRealIter *iter)
{
if (iter->line_byte_offset < 0)
{
- g_assert(iter->line_char_offset >= 0);
+ g_assert (iter->line_char_offset >= 0);
- gtk_text_line_char_to_byte_offsets(iter->line,
- iter->line_char_offset,
- &iter->line_byte_offset,
- &iter->segment_byte_offset);
+ gtk_text_line_char_to_byte_offsets (iter->line,
+ iter->line_char_offset,
+ &iter->line_byte_offset,
+ &iter->segment_byte_offset);
}
}
@@ -371,62 +371,62 @@ is_segment_start (GtkTextRealIter *real)
#if 1
static void
-check_invariants(const GtkTextIter *iter)
+check_invariants (const GtkTextIter *iter)
{
if (gtk_debug_flags & GTK_DEBUG_TEXT)
gtk_text_iter_check (iter);
}
#else
-#define check_invariants(x)
+#define check_invariants (x)
#endif
/**
* gtk_text_iter_get_buffer:
* @iter: an iterator
- *
+ *
* Return the #GtkTextBuffer this iterator is associated with
- *
+ *
* Return value: the buffer
**/
GtkTextBuffer*
-gtk_text_iter_get_buffer(const GtkTextIter *iter)
+gtk_text_iter_get_buffer (const GtkTextIter *iter)
{
GtkTextRealIter *real;
- g_return_val_if_fail(iter != NULL, NULL);
-
- real = gtk_text_iter_make_surreal(iter);
+ g_return_val_if_fail (iter != NULL, NULL);
+
+ real = gtk_text_iter_make_surreal (iter);
if (real == NULL)
return NULL;
- check_invariants(iter);
-
- return gtk_text_btree_get_buffer(real->tree);
+ check_invariants (iter);
+
+ return gtk_text_btree_get_buffer (real->tree);
}
/**
* gtk_text_iter_copy:
* @iter: an iterator
- *
+ *
* Create a dynamically-allocated copy of an iterator. This function
* is not useful in applications, because iterators can be copied with a
* simple assignment (<literal>GtkTextIter i = j;</literal>). The
* function is used by language bindings.
- *
- * Return value: a copy of the @iter, free with gtk_text_iter_free()
+ *
+ * Return value: a copy of the @iter, free with gtk_text_iter_free ()
**/
GtkTextIter*
-gtk_text_iter_copy(const GtkTextIter *iter)
+gtk_text_iter_copy (const GtkTextIter *iter)
{
GtkTextIter *new_iter;
- g_return_val_if_fail(iter != NULL, NULL);
-
- new_iter = g_new(GtkTextIter, 1);
+ g_return_val_if_fail (iter != NULL, NULL);
+
+ new_iter = g_new (GtkTextIter, 1);
*new_iter = *iter;
-
+
return new_iter;
}
@@ -438,101 +438,101 @@ gtk_text_iter_copy(const GtkTextIter *iter)
* is intended for use in language bindings, and is not
* especially useful for applications, because iterators can
* simply be allocated on the stack.
- *
+ *
**/
void
-gtk_text_iter_free(GtkTextIter *iter)
+gtk_text_iter_free (GtkTextIter *iter)
{
- g_return_if_fail(iter != NULL);
+ g_return_if_fail (iter != NULL);
- g_free(iter);
+ g_free (iter);
}
GtkTextLineSegment*
-gtk_text_iter_get_indexable_segment(const GtkTextIter *iter)
+gtk_text_iter_get_indexable_segment (const GtkTextIter *iter)
{
GtkTextRealIter *real;
- g_return_val_if_fail(iter != NULL, 0);
-
- real = gtk_text_iter_make_real(iter);
+ g_return_val_if_fail (iter != NULL, 0);
+
+ real = gtk_text_iter_make_real (iter);
if (real == NULL)
return NULL;
- check_invariants(iter);
-
- g_assert(real->segment != NULL);
-
+ check_invariants (iter);
+
+ g_assert (real->segment != NULL);
+
return real->segment;
}
GtkTextLineSegment*
-gtk_text_iter_get_any_segment(const GtkTextIter *iter)
+gtk_text_iter_get_any_segment (const GtkTextIter *iter)
{
GtkTextRealIter *real;
- g_return_val_if_fail(iter != NULL, 0);
-
- real = gtk_text_iter_make_real(iter);
+ g_return_val_if_fail (iter != NULL, 0);
+
+ real = gtk_text_iter_make_real (iter);
if (real == NULL)
return NULL;
- check_invariants(iter);
-
- g_assert(real->any_segment != NULL);
-
+ check_invariants (iter);
+
+ g_assert (real->any_segment != NULL);
+
return real->any_segment;
}
gint
-gtk_text_iter_get_segment_byte(const GtkTextIter *iter)
+gtk_text_iter_get_segment_byte (const GtkTextIter *iter)
{
GtkTextRealIter *real;
- g_return_val_if_fail(iter != NULL, 0);
-
- real = gtk_text_iter_make_real(iter);
+ g_return_val_if_fail (iter != NULL, 0);
+
+ real = gtk_text_iter_make_real (iter);
if (real == NULL)
return 0;
- ensure_byte_offsets(real);
+ ensure_byte_offsets (real);
+
+ check_invariants (iter);
- check_invariants(iter);
-
return real->segment_byte_offset;
}
gint
-gtk_text_iter_get_segment_char(const GtkTextIter *iter)
+gtk_text_iter_get_segment_char (const GtkTextIter *iter)
{
GtkTextRealIter *real;
- g_return_val_if_fail(iter != NULL, 0);
-
- real = gtk_text_iter_make_real(iter);
+ g_return_val_if_fail (iter != NULL, 0);
+
+ real = gtk_text_iter_make_real (iter);
if (real == NULL)
return 0;
- ensure_char_offsets(real);
+ ensure_char_offsets (real);
+
+ check_invariants (iter);
- check_invariants(iter);
-
return real->segment_char_offset;
}
/* This function does not require a still-valid
iterator */
GtkTextLine*
-gtk_text_iter_get_text_line(const GtkTextIter *iter)
+gtk_text_iter_get_text_line (const GtkTextIter *iter)
{
const GtkTextRealIter *real;
- g_return_val_if_fail(iter != NULL, 0);
-
+ g_return_val_if_fail (iter != NULL, 0);
+
real = (const GtkTextRealIter*)iter;
return real->line;
@@ -541,12 +541,12 @@ gtk_text_iter_get_text_line(const GtkTextIter *iter)
/* This function does not require a still-valid
iterator */
GtkTextBTree*
-gtk_text_iter_get_btree(const GtkTextIter *iter)
+gtk_text_iter_get_btree (const GtkTextIter *iter)
{
const GtkTextRealIter *real;
- g_return_val_if_fail(iter != NULL, 0);
-
+ g_return_val_if_fail (iter != NULL, 0);
+
real = (const GtkTextRealIter*)iter;
return real->tree;
@@ -559,23 +559,23 @@ gtk_text_iter_get_btree(const GtkTextIter *iter)
/**
* gtk_text_iter_get_offset:
* @iter: an iterator
- *
+ *
* Returns the character offset of an iterator.
* Each character in a #GtkTextBuffer has an offset,
* starting with 0 for the first character in the buffer.
- * Use gtk_text_buffer_get_iter_at_offset() to convert an
+ * Use gtk_text_buffer_get_iter_at_offset () to convert an
* offset back into an iterator.
- *
+ *
* Return value: a character offset
**/
gint
-gtk_text_iter_get_offset(const GtkTextIter *iter)
+gtk_text_iter_get_offset (const GtkTextIter *iter)
{
GtkTextRealIter *real;
- g_return_val_if_fail(iter != NULL, 0);
-
- real = gtk_text_iter_make_surreal(iter);
+ g_return_val_if_fail (iter != NULL, 0);
+
+ real = gtk_text_iter_make_surreal (iter);
if (real == NULL)
return 0;
@@ -583,87 +583,87 @@ gtk_text_iter_get_offset(const GtkTextIter *iter)
if (real->cached_char_index < 0)
{
real->cached_char_index =
- gtk_text_line_char_index(real->line);
- ensure_char_offsets(real);
+ gtk_text_line_char_index (real->line);
+ ensure_char_offsets (real);
real->cached_char_index += real->line_char_offset;
}
- check_invariants(iter);
-
+ check_invariants (iter);
+
return real->cached_char_index;
}
/**
* gtk_text_iter_get_line:
* @iter: an iterator
- *
+ *
* Returns the line number containing the iterator. Lines in
* a #GtkTextBuffer are numbered beginning with 0 for the first
* line in the buffer.
- *
+ *
* Return value: a line number
**/
gint
-gtk_text_iter_get_line(const GtkTextIter *iter)
+gtk_text_iter_get_line (const GtkTextIter *iter)
{
GtkTextRealIter *real;
- g_return_val_if_fail(iter != NULL, 0);
-
- real = gtk_text_iter_make_surreal(iter);
+ g_return_val_if_fail (iter != NULL, 0);
+
+ real = gtk_text_iter_make_surreal (iter);
if (real == NULL)
return 0;
if (real->cached_line_number < 0)
real->cached_line_number =
- gtk_text_line_get_number(real->line);
+ gtk_text_line_get_number (real->line);
+
+ check_invariants (iter);
- check_invariants(iter);
-
return real->cached_line_number;
}
/**
* gtk_text_iter_get_line_offset:
* @iter: an iterator
- *
+ *
* Returns the character offset of the iterator,
* counting from the start of a newline-terminated line.
* The first character on the line has offset 0.
- *
+ *
* Return value: offset from start of line
**/
gint
-gtk_text_iter_get_line_offset(const GtkTextIter *iter)
+gtk_text_iter_get_line_offset (const GtkTextIter *iter)
{
GtkTextRealIter *real;
- g_return_val_if_fail(iter != NULL, 0);
-
- real = gtk_text_iter_make_surreal(iter);
+ g_return_val_if_fail (iter != NULL, 0);
+
+ real = gtk_text_iter_make_surreal (iter);
if (real == NULL)
return 0;
- ensure_char_offsets(real);
+ ensure_char_offsets (real);
+
+ check_invariants (iter);
- check_invariants(iter);
-
return real->line_char_offset;
}
/**
* gtk_text_iter_get_line_index:
* @iter: an iterator
- *
+ *
* Returns the byte index of the iterator, counting
* from the start of a newline-terminated line.
* Remember that #GtkTextBuffer encodes text in
* UTF-8, and that characters can require a variable
* number of bytes to represent.
- *
+ *
* Return value: distance from start of line, in bytes
**/
gint
@@ -671,17 +671,17 @@ gtk_text_iter_get_line_index (const GtkTextIter *iter)
{
GtkTextRealIter *real;
- g_return_val_if_fail(iter != NULL, 0);
-
- real = gtk_text_iter_make_surreal(iter);
+ g_return_val_if_fail (iter != NULL, 0);
+
+ real = gtk_text_iter_make_surreal (iter);
if (real == NULL)
return 0;
- ensure_byte_offsets(real);
+ ensure_byte_offsets (real);
+
+ check_invariants (iter);
- check_invariants(iter);
-
return real->line_byte_offset;
}
@@ -692,15 +692,15 @@ gtk_text_iter_get_line_index (const GtkTextIter *iter)
/**
* gtk_text_iter_get_char:
* @iter: an iterator
- *
+ *
* Returns the Unicode character at this iterator. (Equivalent to
* operator* on a C++ iterator.) If the iterator points at a
* non-character element, such as an image embedded in the buffer, the
* Unicode "unknown" character 0xFFFD is returned. If invoked on
* the end iterator, zero is returned; zero is not a valid Unicode character.
- * So you can write a loop which ends when gtk_text_iter_get_char()
+ * So you can write a loop which ends when gtk_text_iter_get_char ()
* returns 0.
- *
+ *
* Return value: a Unicode character, or 0 if @iter is not dereferenceable
**/
gunichar
@@ -708,21 +708,21 @@ gtk_text_iter_get_char (const GtkTextIter *iter)
{
GtkTextRealIter *real;
- g_return_val_if_fail(iter != NULL, 0);
-
- real = gtk_text_iter_make_real(iter);
+ g_return_val_if_fail (iter != NULL, 0);
+
+ real = gtk_text_iter_make_real (iter);
if (real == NULL)
return 0;
- check_invariants(iter);
+ check_invariants (iter);
if (gtk_text_iter_is_last (iter))
return 0;
else if (real->segment->type == &gtk_text_char_type)
{
- ensure_byte_offsets(real);
-
+ ensure_byte_offsets (real);
+
return g_utf8_get_char (real->segment->body.chars +
real->segment_byte_offset);
}
@@ -737,111 +737,111 @@ gtk_text_iter_get_char (const GtkTextIter *iter)
* gtk_text_iter_get_slice:
* @start: iterator at start of a range
* @end: iterator at end of a range
- *
+ *
* Returns the text in the given range. A "slice" is an array of
* characters encoded in UTF-8 format, including the Unicode "unknown"
* character 0xFFFD for iterable non-character elements in the buffer,
* such as images. Because images are encoded in the slice, byte and
* character offsets in the returned array will correspond to byte
* offsets in the text buffer.
- *
+ *
* Return value: slice of text from the buffer
**/
gchar*
gtk_text_iter_get_slice (const GtkTextIter *start,
const GtkTextIter *end)
{
- g_return_val_if_fail(start != NULL, NULL);
- g_return_val_if_fail(end != NULL, NULL);
+ g_return_val_if_fail (start != NULL, NULL);
+ g_return_val_if_fail (end != NULL, NULL);
- check_invariants(start);
- check_invariants(end);
-
- return gtk_text_btree_get_text(start, end, TRUE, TRUE);
+ check_invariants (start);
+ check_invariants (end);
+
+ return gtk_text_btree_get_text (start, end, TRUE, TRUE);
}
/**
* gtk_text_iter_get_text:
* @start: iterator at start of a range
* @end: iterator at end of a range
- *
+ *
* Returns <emphasis>text</emphasis> in the given range. If the range
* contains non-text elements such as images, the character and byte
* offsets in the returned string will not correspond to character and
* byte offsets in the buffer. If you want offsets to correspond, see
- * gtk_text_iter_get_slice().
- *
+ * gtk_text_iter_get_slice ().
+ *
* Return value: array of characters from the buffer
**/
gchar*
gtk_text_iter_get_text (const GtkTextIter *start,
const GtkTextIter *end)
{
- g_return_val_if_fail(start != NULL, NULL);
- g_return_val_if_fail(end != NULL, NULL);
+ g_return_val_if_fail (start != NULL, NULL);
+ g_return_val_if_fail (end != NULL, NULL);
+
+ check_invariants (start);
+ check_invariants (end);
- check_invariants(start);
- check_invariants(end);
-
- return gtk_text_btree_get_text(start, end, TRUE, FALSE);
+ return gtk_text_btree_get_text (start, end, TRUE, FALSE);
}
/**
* gtk_text_iter_get_visible_slice:
* @start: iterator at start of range
* @end: iterator at end of range
- *
- * Like gtk_text_iter_get_slice(), but invisible text is not included.
+ *
+ * Like gtk_text_iter_get_slice (), but invisible text is not included.
* Invisible text is usually invisible because a #GtkTextTag with the
* "invisible" attribute turned on has been applied to it.
- *
+ *
* Return value: slice of text from the buffer
**/
gchar*
gtk_text_iter_get_visible_slice (const GtkTextIter *start,
const GtkTextIter *end)
{
- g_return_val_if_fail(start != NULL, NULL);
- g_return_val_if_fail(end != NULL, NULL);
+ g_return_val_if_fail (start != NULL, NULL);
+ g_return_val_if_fail (end != NULL, NULL);
- check_invariants(start);
- check_invariants(end);
-
- return gtk_text_btree_get_text(start, end, FALSE, TRUE);
+ check_invariants (start);
+ check_invariants (end);
+
+ return gtk_text_btree_get_text (start, end, FALSE, TRUE);
}
/**
* gtk_text_iter_get_visible_text:
* @start: iterator at start of range
* @end: iterator at end of range
- *
- * Like gtk_text_iter_get_text(), but invisible text is not included.
+ *
+ * Like gtk_text_iter_get_text (), but invisible text is not included.
* Invisible text is usually invisible because a #GtkTextTag with the
* "invisible" attribute turned on has been applied to it.
- *
+ *
* Return value: string containing visible text in the range
**/
gchar*
gtk_text_iter_get_visible_text (const GtkTextIter *start,
- const GtkTextIter *end)
+ const GtkTextIter *end)
{
- g_return_val_if_fail(start != NULL, NULL);
- g_return_val_if_fail(end != NULL, NULL);
-
- check_invariants(start);
- check_invariants(end);
-
- return gtk_text_btree_get_text(start, end, FALSE, FALSE);
+ g_return_val_if_fail (start != NULL, NULL);
+ g_return_val_if_fail (end != NULL, NULL);
+
+ check_invariants (start);
+ check_invariants (end);
+
+ return gtk_text_btree_get_text (start, end, FALSE, FALSE);
}
/**
* gtk_text_iter_get_pixbuf:
* @iter: an iterator
- *
+ *
* If the location pointed to by @iter contains a pixbuf, the pixbuf
* is returned (with no new reference count added). Otherwise,
* NULL is returned.
- *
+ *
* Return value: the pixbuf at @iter
**/
GdkPixbuf*
@@ -849,15 +849,15 @@ gtk_text_iter_get_pixbuf (const GtkTextIter *iter)
{
GtkTextRealIter *real;
- g_return_val_if_fail(iter != NULL, FALSE);
-
- real = gtk_text_iter_make_real(iter);
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+ real = gtk_text_iter_make_real (iter);
if (real == NULL)
return FALSE;
-
- check_invariants(iter);
-
+
+ check_invariants (iter);
+
if (real->segment->type != &gtk_text_pixbuf_type)
return FALSE;
else
@@ -867,13 +867,13 @@ gtk_text_iter_get_pixbuf (const GtkTextIter *iter)
/**
* gtk_text_iter_get_marks:
* @iter: an iterator
- *
+ *
* Returns a list of all #GtkTextMark at this location. Because marks
* are not iterable (they don't take up any "space" in the buffer,
* they are just marks in between iterable locations), multiple marks
* can exist in the same place. The returned list is not in any
* meaningful order.
- *
+ *
* Return value: list of #GtkTextMark
**/
GSList*
@@ -882,16 +882,16 @@ gtk_text_iter_get_marks (const GtkTextIter *iter)
GtkTextRealIter *real;
GtkTextLineSegment *seg;
GSList *retval;
-
- g_return_val_if_fail(iter != NULL, NULL);
-
- real = gtk_text_iter_make_real(iter);
+
+ g_return_val_if_fail (iter != NULL, NULL);
+
+ real = gtk_text_iter_make_real (iter);
if (real == NULL)
return NULL;
- check_invariants(iter);
-
+ check_invariants (iter);
+
retval = NULL;
seg = real->any_segment;
while (seg != real->segment)
@@ -899,7 +899,7 @@ gtk_text_iter_get_marks (const GtkTextIter *iter)
if (seg->type == &gtk_text_left_mark_type ||
seg->type == &gtk_text_right_mark_type)
retval = g_slist_prepend (retval, seg->body.mark.obj);
-
+
seg = seg->next;
}
@@ -912,14 +912,14 @@ gtk_text_iter_get_marks (const GtkTextIter *iter)
* gtk_text_iter_get_toggled_tags:
* @iter: an iterator
* @toggled_on: TRUE to get toggled-on tags
- *
+ *
* Returns a list of #GtkTextTag that are toggled on or off at this
* point. (If @toggled_on is TRUE, the list contains tags that are
* toggled on.) If a tag is toggled on at @iter, then some non-empty
* range of characters following @iter has that tag applied to it. If
* a tag is toggled off, then some non-empty range following @iter
* does <emphasis>not</emphasis> have the tag applied to it.
- *
+ *
* Return value: tags toggled at this point
**/
GSList*
@@ -929,16 +929,16 @@ gtk_text_iter_get_toggled_tags (const GtkTextIter *iter,
GtkTextRealIter *real;
GtkTextLineSegment *seg;
GSList *retval;
-
- g_return_val_if_fail(iter != NULL, NULL);
-
- real = gtk_text_iter_make_real(iter);
+
+ g_return_val_if_fail (iter != NULL, NULL);
+
+ real = gtk_text_iter_make_real (iter);
if (real == NULL)
return NULL;
- check_invariants(iter);
-
+ check_invariants (iter);
+
retval = NULL;
seg = real->any_segment;
while (seg != real->segment)
@@ -947,17 +947,17 @@ gtk_text_iter_get_toggled_tags (const GtkTextIter *iter,
{
if (seg->type == &gtk_text_toggle_on_type)
{
- retval = g_slist_prepend(retval, seg->body.toggle.info->tag);
+ retval = g_slist_prepend (retval, seg->body.toggle.info->tag);
}
}
else
{
if (seg->type == &gtk_text_toggle_off_type)
{
- retval = g_slist_prepend(retval, seg->body.toggle.info->tag);
+ retval = g_slist_prepend (retval, seg->body.toggle.info->tag);
}
}
-
+
seg = seg->next;
}
@@ -970,14 +970,14 @@ gtk_text_iter_get_toggled_tags (const GtkTextIter *iter,
* gtk_text_iter_begins_tag:
* @iter: an iterator
* @tag: a #GtkTextTag, or NULL
- *
+ *
* Returns TRUE if @tag is toggled on at exactly this point. If @tag
* is NULL, returns TRUE if any tag is toggled on at this point. Note
- * that the gtk_text_iter_begins_tag() returns TRUE if @iter is the
+ * that the gtk_text_iter_begins_tag () returns TRUE if @iter is the
* <emphasis>start</emphasis> of the tagged range;
- * gtk_text_iter_has_tag() tells you whether an iterator is
+ * gtk_text_iter_has_tag () tells you whether an iterator is
* <emphasis>within</emphasis> a tagged range.
- *
+ *
* Return value: whether @iter is the start of a range tagged with @tag
**/
gboolean
@@ -986,16 +986,16 @@ gtk_text_iter_begins_tag (const GtkTextIter *iter,
{
GtkTextRealIter *real;
GtkTextLineSegment *seg;
-
- g_return_val_if_fail(iter != NULL, FALSE);
-
- real = gtk_text_iter_make_real(iter);
+
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+ real = gtk_text_iter_make_real (iter);
if (real == NULL)
return FALSE;
- check_invariants(iter);
-
+ check_invariants (iter);
+
seg = real->any_segment;
while (seg != real->segment)
{
@@ -1005,7 +1005,7 @@ gtk_text_iter_begins_tag (const GtkTextIter *iter,
seg->body.toggle.info->tag == tag)
return TRUE;
}
-
+
seg = seg->next;
}
@@ -1019,30 +1019,30 @@ gtk_text_iter_begins_tag (const GtkTextIter *iter,
*
* Returns TRUE if @tag is toggled off at exactly this point. If @tag
* is NULL, returns TRUE if any tag is toggled off at this point. Note
- * that the gtk_text_iter_ends_tag() returns TRUE if @iter is the
+ * that the gtk_text_iter_ends_tag () returns TRUE if @iter is the
* <emphasis>end</emphasis> of the tagged range;
- * gtk_text_iter_has_tag() tells you whether an iterator is
+ * gtk_text_iter_has_tag () tells you whether an iterator is
* <emphasis>within</emphasis> a tagged range.
- *
+ *
* Return value: whether @iter is the end of a range tagged with @tag
- *
+ *
**/
gboolean
gtk_text_iter_ends_tag (const GtkTextIter *iter,
- GtkTextTag *tag)
+ GtkTextTag *tag)
{
GtkTextRealIter *real;
GtkTextLineSegment *seg;
-
- g_return_val_if_fail(iter != NULL, FALSE);
-
- real = gtk_text_iter_make_real(iter);
+
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+ real = gtk_text_iter_make_real (iter);
if (real == NULL)
return FALSE;
- check_invariants(iter);
-
+ check_invariants (iter);
+
seg = real->any_segment;
while (seg != real->segment)
{
@@ -1052,7 +1052,7 @@ gtk_text_iter_ends_tag (const GtkTextIter *iter,
seg->body.toggle.info->tag == tag)
return TRUE;
}
-
+
seg = seg->next;
}
@@ -1063,29 +1063,29 @@ gtk_text_iter_ends_tag (const GtkTextIter *iter,
* gtk_text_iter_toggles_tag:
* @iter: an iterator
* @tag: a #GtkTextTag, or NULL
- *
- * This is equivalent to (gtk_text_iter_begins_tag() ||
- * gtk_text_iter_ends_tag()), i.e. it tells you whether a range with
+ *
+ * This is equivalent to (gtk_text_iter_begins_tag () ||
+ * gtk_text_iter_ends_tag ()), i.e. it tells you whether a range with
* @tag applied to it begins <emphasis>or</emphasis> ends at @iter.
- *
+ *
* Return value: whether @tag is toggled on or off at @iter
**/
gboolean
gtk_text_iter_toggles_tag (const GtkTextIter *iter,
- GtkTextTag *tag)
+ GtkTextTag *tag)
{
GtkTextRealIter *real;
GtkTextLineSegment *seg;
-
- g_return_val_if_fail(iter != NULL, FALSE);
-
- real = gtk_text_iter_make_real(iter);
+
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+ real = gtk_text_iter_make_real (iter);
if (real == NULL)
return FALSE;
- check_invariants(iter);
-
+ check_invariants (iter);
+
seg = real->any_segment;
while (seg != real->segment)
{
@@ -1094,7 +1094,7 @@ gtk_text_iter_toggles_tag (const GtkTextIter *iter,
(tag == NULL ||
seg->body.toggle.info->tag == tag) )
return TRUE;
-
+
seg = seg->next;
}
@@ -1105,9 +1105,9 @@ gtk_text_iter_toggles_tag (const GtkTextIter *iter,
* gtk_text_iter_has_tag:
* @iter: an iterator
* @tag: a #GtkTextTag
- *
+ *
* Returns TRUE if @iter is within a range tagged with @tag.
- *
+ *
* Return value: whether @iter is tagged with @tag
**/
gboolean
@@ -1115,26 +1115,26 @@ gtk_text_iter_has_tag (const GtkTextIter *iter,
GtkTextTag *tag)
{
GtkTextRealIter *real;
-
- g_return_val_if_fail(iter != NULL, FALSE);
- g_return_val_if_fail(GTK_IS_TEXT_TAG(tag), FALSE);
-
- real = gtk_text_iter_make_surreal(iter);
+
+ g_return_val_if_fail (iter != NULL, FALSE);
+ g_return_val_if_fail (GTK_IS_TEXT_TAG (tag), FALSE);
+
+ real = gtk_text_iter_make_surreal (iter);
if (real == NULL)
- return FALSE;
+ return FALSE;
+
+ check_invariants (iter);
- check_invariants(iter);
-
if (real->line_byte_offset >= 0)
{
- return gtk_text_line_byte_has_tag(real->line, real->tree,
+ return gtk_text_line_byte_has_tag (real->line, real->tree,
real->line_byte_offset, tag);
}
else
{
- g_assert(real->line_char_offset >= 0);
- return gtk_text_line_char_has_tag(real->line, real->tree,
+ g_assert (real->line_char_offset >= 0);
+ return gtk_text_line_char_has_tag (real->line, real->tree,
real->line_char_offset, tag);
}
}
@@ -1143,13 +1143,13 @@ gtk_text_iter_has_tag (const GtkTextIter *iter,
* gtk_text_iter_editable:
* @iter: an iterator
* @default_setting: TRUE if text is editable by default
- *
+ *
* Returns whether @iter is within an editable region of text.
* Non-editable text is "locked" and can't be changed by the user via
* #GtkTextView. This function is simply a convenience wrapper around
- * gtk_text_iter_get_attributes(). If no tags applied to this text
+ * gtk_text_iter_get_attributes (). If no tags applied to this text
* affect editability, @default_setting will be returned.
- *
+ *
* Return value: whether @iter is inside an editable range
**/
gboolean
@@ -1158,7 +1158,7 @@ gtk_text_iter_editable (const GtkTextIter *iter,
{
GtkTextAttributes *values;
gboolean retval;
-
+
values = gtk_text_attributes_new ();
values->editable = default_setting;
@@ -1166,7 +1166,7 @@ gtk_text_iter_editable (const GtkTextIter *iter,
gtk_text_iter_get_attributes (iter, values);
retval = values->editable;
-
+
gtk_text_attributes_unref (values);
return retval;
@@ -1175,12 +1175,12 @@ gtk_text_iter_editable (const GtkTextIter *iter,
/**
* gtk_text_iter_get_language:
* @iter: an iterator
- *
- * A convenience wrapper around gtk_text_iter_get_attributes(),
+ *
+ * A convenience wrapper around gtk_text_iter_get_attributes (),
* which returns the language in effect at @iter. If no tags affecting
* language * apply to @iter, the return value is identical to that of
- * gtk_get_default_language().
- *
+ * gtk_get_default_language ().
+ *
* Return value: language in effect at @iter
**/
static gchar*
@@ -1188,13 +1188,13 @@ gtk_text_iter_get_language (const GtkTextIter *iter)
{
GtkTextAttributes *values;
gchar *retval;
-
+
values = gtk_text_attributes_new ();
gtk_text_iter_get_attributes (iter, values);
retval = g_strdup (values->language);
-
+
gtk_text_attributes_unref (values);
return retval;
@@ -1203,36 +1203,36 @@ gtk_text_iter_get_language (const GtkTextIter *iter)
/**
* gtk_text_iter_starts_line:
* @iter: an iterator
- *
+ *
* Returns TRUE if @iter begins a newline-terminated line,
- * i.e. gtk_text_iter_get_line_offset() would return 0.
+ * i.e. gtk_text_iter_get_line_offset () would return 0.
* However this function is potentially more efficient than
- * gtk_text_iter_get_line_offset() because it doesn't have to compute
+ * gtk_text_iter_get_line_offset () because it doesn't have to compute
* the offset, it just has to see whether it's 0.
- *
+ *
* Return value: whether @iter begins a line
**/
gboolean
gtk_text_iter_starts_line (const GtkTextIter *iter)
{
GtkTextRealIter *real;
-
- g_return_val_if_fail(iter != NULL, FALSE);
-
- real = gtk_text_iter_make_surreal(iter);
+
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+ real = gtk_text_iter_make_surreal (iter);
if (real == NULL)
- return FALSE;
+ return FALSE;
+
+ check_invariants (iter);
- check_invariants(iter);
-
if (real->line_byte_offset >= 0)
{
return (real->line_byte_offset == 0);
}
else
{
- g_assert(real->line_char_offset >= 0);
+ g_assert (real->line_char_offset >= 0);
return (real->line_char_offset == 0);
}
}
@@ -1240,56 +1240,56 @@ gtk_text_iter_starts_line (const GtkTextIter *iter)
/**
* gtk_text_iter_ends_line:
* @iter: an iterator
- *
+ *
* Returns TRUE if @iter points to a newline character.
- *
+ *
* Return value: whether @iter is at the end of a line
**/
gboolean
gtk_text_iter_ends_line (const GtkTextIter *iter)
{
- g_return_val_if_fail(iter != NULL, FALSE);
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+ check_invariants (iter);
- check_invariants(iter);
-
- return gtk_text_iter_get_char(iter) == '\n';
+ return gtk_text_iter_get_char (iter) == '\n';
}
/**
* gtk_text_iter_is_last:
* @iter: an iterator
- *
+ *
* Returns TRUE if @iter is the end iterator, i.e. one past the last
- * dereferenceable iterator in the buffer. gtk_text_iter_is_last() is
+ * dereferenceable iterator in the buffer. gtk_text_iter_is_last () is
* the most efficient way to check whether an iterator is the end
* iterator.
- *
- * Return value: whether @iter is the end iterator
+ *
+ * Return value: whether @iter is the end iterator
**/
gboolean
gtk_text_iter_is_last (const GtkTextIter *iter)
{
GtkTextRealIter *real;
-
- g_return_val_if_fail(iter != NULL, FALSE);
-
- real = gtk_text_iter_make_surreal(iter);
+
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+ real = gtk_text_iter_make_surreal (iter);
if (real == NULL)
- return FALSE;
+ return FALSE;
- check_invariants(iter);
-
- return gtk_text_line_is_last(real->line, real->tree);
+ check_invariants (iter);
+
+ return gtk_text_line_is_last (real->line, real->tree);
}
/**
* gtk_text_iter_is_first:
* @iter: an iterator
- *
+ *
* Returns TRUE if @iter is the first iterator in the buffer, that is
* if @iter has a character offset of 0.
- *
+ *
* Return value: whether @iter is the first in the buffer
**/
gboolean
@@ -1301,10 +1301,10 @@ gtk_text_iter_is_first (const GtkTextIter *iter)
/**
* gtk_text_iter_get_chars_in_line:
* @iter: an iterator
- *
+ *
* Returns the number of characters in the line containing @iter,
* including the terminating newline.
- *
+ *
* Return value: number of characters in the line
**/
gint
@@ -1313,21 +1313,21 @@ gtk_text_iter_get_chars_in_line (const GtkTextIter *iter)
GtkTextRealIter *real;
gint count;
GtkTextLineSegment *seg;
-
- g_return_val_if_fail(iter != NULL, FALSE);
-
- real = gtk_text_iter_make_surreal(iter);
+
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+ real = gtk_text_iter_make_surreal (iter);
if (real == NULL)
- return 0;
+ return 0;
+
+ check_invariants (iter);
- check_invariants(iter);
-
if (real->line_char_offset >= 0)
{
/* We can start at the segments we've already found. */
count = real->line_char_offset - real->segment_char_offset;
- seg = gtk_text_iter_get_indexable_segment(iter);
+ seg = gtk_text_iter_get_indexable_segment (iter);
}
else
{
@@ -1336,11 +1336,11 @@ gtk_text_iter_get_chars_in_line (const GtkTextIter *iter)
count = 0;
}
-
+
while (seg != NULL)
{
count += seg->char_count;
-
+
seg = seg->next;
}
@@ -1351,19 +1351,19 @@ gtk_text_iter_get_chars_in_line (const GtkTextIter *iter)
* gtk_text_iter_get_attributes:
* @iter: an iterator
* @values: a #GtkTextAttributes to be filled in
- *
+ *
* Computes the effect of any tags applied to this spot in the
* text. The @values parameter should be initialized to the default
* settings you wish to use if no tags are in effect.
- * gtk_text_iter_get_attributes() will modify @values, applying the
+ * gtk_text_iter_get_attributes () will modify @values, applying the
* effects of any tags present at @iter. If any tags affected @values,
* the function returns TRUE.
- *
+ *
* Return value: TRUE if @values was modified
**/
gboolean
gtk_text_iter_get_attributes (const GtkTextIter *iter,
- GtkTextAttributes *values)
+ GtkTextAttributes *values)
{
GtkTextTag** tags;
gint tag_count = 0;
@@ -1379,13 +1379,13 @@ gtk_text_iter_get_attributes (const GtkTextIter *iter,
return FALSE;
}
-
+
/* Sort tags in ascending order of priority */
gtk_text_tag_array_sort (tags, tag_count);
-
+
gtk_text_attributes_fill_from_tags (values,
- tags,
- tag_count);
+ tags,
+ tag_count);
g_free (tags);
@@ -1404,21 +1404,21 @@ static gboolean
forward_line_leaving_caches_unmodified (GtkTextRealIter *real)
{
GtkTextLine *new_line;
-
+
new_line = gtk_text_line_next (real->line);
g_assert (new_line != real->line);
-
+
if (new_line != NULL)
- {
+ {
real->line = new_line;
real->line_byte_offset = 0;
real->line_char_offset = 0;
-
+
real->segment_byte_offset = 0;
real->segment_char_offset = 0;
-
+
/* Find first segments in new line */
real->any_segment = real->line->segments;
real->segment = real->any_segment;
@@ -1433,20 +1433,20 @@ forward_line_leaving_caches_unmodified (GtkTextRealIter *real)
at the "end" index. (the end index is the last
line pointer, segment_byte_offset of 0) */
- g_assert(real->line_char_offset == 0 ||
- real->line_byte_offset == 0);
-
+ g_assert (real->line_char_offset == 0 ||
+ real->line_byte_offset == 0);
+
/* The only indexable segment allowed on the bogus
line at the end is a single char segment containing
a newline. */
if (real->segments_changed_stamp ==
- gtk_text_btree_get_segments_changed_stamp(real->tree))
+ gtk_text_btree_get_segments_changed_stamp (real->tree))
{
- g_assert(real->segment->type == &gtk_text_char_type);
- g_assert(real->segment->char_count == 1);
+ g_assert (real->segment->type == &gtk_text_char_type);
+ g_assert (real->segment->char_count == 1);
}
/* We leave real->line as-is */
-
+
return FALSE;
}
}
@@ -1460,21 +1460,21 @@ static gboolean
backward_line_leaving_caches_unmodified (GtkTextRealIter *real)
{
GtkTextLine *new_line;
-
+
new_line = gtk_text_line_previous (real->line);
g_assert (new_line != real->line);
-
+
if (new_line != NULL)
- {
+ {
real->line = new_line;
real->line_byte_offset = 0;
real->line_char_offset = 0;
-
+
real->segment_byte_offset = 0;
real->segment_char_offset = 0;
-
+
/* Find first segments in new line */
real->any_segment = real->line->segments;
real->segment = real->any_segment;
@@ -1487,11 +1487,11 @@ backward_line_leaving_caches_unmodified (GtkTextRealIter *real)
{
/* There is no way to move backward; we were already
at the first line. */
-
+
/* We leave real->line as-is */
/* Note that we didn't clamp to the start of the first line. */
-
+
return FALSE;
}
}
@@ -1504,15 +1504,15 @@ forward_char (GtkTextRealIter *real)
{
GtkTextIter *iter = (GtkTextIter*)real;
- check_invariants((GtkTextIter*)real);
-
- ensure_char_offsets(real);
-
+ check_invariants ((GtkTextIter*)real);
+
+ ensure_char_offsets (real);
+
if ( (real->segment_char_offset + 1) == real->segment->char_count)
{
/* Need to move to the next segment; if no next segment,
need to move to next line. */
- return gtk_text_iter_forward_indexable_segment(iter);
+ return gtk_text_iter_forward_indexable_segment (iter);
}
else
{
@@ -1520,33 +1520,33 @@ forward_char (GtkTextRealIter *real)
up-to-date, if it was already up-to-date. */
g_assert (real->segment->type == &gtk_text_char_type);
-
+
if (real->line_byte_offset >= 0)
{
gint bytes;
const char * start =
real->segment->body.chars + real->segment_byte_offset;
-
+
bytes = g_utf8_next_char (start) - start;
real->line_byte_offset += bytes;
real->segment_byte_offset += bytes;
- g_assert(real->segment_byte_offset < real->segment->byte_count);
+ g_assert (real->segment_byte_offset < real->segment->byte_count);
}
real->line_char_offset += 1;
real->segment_char_offset += 1;
- adjust_char_index(real, 1);
-
- g_assert(real->segment_char_offset < real->segment->char_count);
+ adjust_char_index (real, 1);
+
+ g_assert (real->segment_char_offset < real->segment->char_count);
/* We moved into the middle of a segment, so the any_segment
must now be the segment we're in the middle of. */
real->any_segment = real->segment;
-
- check_invariants((GtkTextIter*)real);
+
+ check_invariants ((GtkTextIter*)real);
if (gtk_text_iter_is_last ((GtkTextIter*)real))
return FALSE;
@@ -1565,16 +1565,16 @@ gtk_text_iter_forward_indexable_segment (GtkTextIter *iter)
GtkTextRealIter *real;
gint chars_skipped;
gint bytes_skipped;
-
- g_return_val_if_fail(iter != NULL, FALSE);
-
- real = gtk_text_iter_make_real(iter);
+
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+ real = gtk_text_iter_make_real (iter);
if (real == NULL)
return FALSE;
- check_invariants(iter);
-
+ check_invariants (iter);
+
if (real->line_char_offset >= 0)
{
chars_skipped = real->segment->char_count - real->segment_char_offset;
@@ -1590,14 +1590,14 @@ gtk_text_iter_forward_indexable_segment (GtkTextIter *iter)
}
else
bytes_skipped = 0;
-
+
/* Get first segment of any kind */
any_seg = real->segment->next;
/* skip non-indexable segments, if any */
seg = any_seg;
while (seg != NULL && seg->char_count == 0)
seg = seg->next;
-
+
if (seg != NULL)
{
real->any_segment = any_seg;
@@ -1618,12 +1618,12 @@ gtk_text_iter_forward_indexable_segment (GtkTextIter *iter)
adjust_char_index (real, chars_skipped);
}
- check_invariants(iter);
-
+ check_invariants (iter);
+
return TRUE;
}
else
- {
+ {
/* End of the line */
if (forward_line_leaving_caches_unmodified (real))
{
@@ -1635,7 +1635,7 @@ gtk_text_iter_forward_indexable_segment (GtkTextIter *iter)
g_assert (real->line_char_offset == 0);
g_assert (real->segment_byte_offset == 0);
g_assert (real->segment_char_offset == 0);
- g_assert (gtk_text_iter_starts_line(iter));
+ g_assert (gtk_text_iter_starts_line (iter));
check_invariants (iter);
@@ -1648,8 +1648,8 @@ gtk_text_iter_forward_indexable_segment (GtkTextIter *iter)
{
/* End of buffer */
- check_invariants(iter);
-
+ check_invariants (iter);
+
return FALSE;
}
}
@@ -1663,7 +1663,7 @@ at_last_indexable_segment (GtkTextRealIter *real)
/* Return TRUE if there are no indexable segments after
* this iterator.
*/
-
+
seg = real->segment->next;
while (seg)
{
@@ -1693,16 +1693,16 @@ gtk_text_iter_backward_indexable_segment (GtkTextIter *iter)
GtkTextLineSegment *prev_any_seg;
gint bytes_skipped;
gint chars_skipped;
-
+
g_return_val_if_fail (iter != NULL, FALSE);
- real = gtk_text_iter_make_real(iter);
+ real = gtk_text_iter_make_real (iter);
if (real == NULL)
return FALSE;
check_invariants (iter);
-
+
/* Find first segments in line */
any_seg = real->line->segments;
seg = any_seg;
@@ -1714,7 +1714,7 @@ gtk_text_iter_backward_indexable_segment (GtkTextIter *iter)
/* Could probably do this case faster by hand-coding the
* iteration.
*/
-
+
/* We were already at the start of a line;
* go back to the previous line.
*/
@@ -1722,7 +1722,7 @@ gtk_text_iter_backward_indexable_segment (GtkTextIter *iter)
{
/* Go forward to last indexable segment in line. */
while (!at_last_indexable_segment (real))
- gtk_text_iter_forward_indexable_segment (iter);
+ gtk_text_iter_forward_indexable_segment (iter);
check_invariants (iter);
@@ -1740,7 +1740,7 @@ gtk_text_iter_backward_indexable_segment (GtkTextIter *iter)
{
prev_seg = seg;
prev_any_seg = any_seg;
-
+
any_seg = seg->next;
seg = any_seg;
while (seg->char_count == 0)
@@ -1750,7 +1750,7 @@ gtk_text_iter_backward_indexable_segment (GtkTextIter *iter)
g_assert (prev_seg != NULL);
g_assert (prev_any_seg != NULL);
g_assert (prev_seg->char_count > 0);
-
+
/* We skipped the entire previous segment, plus any
* chars we were into the current segment.
*/
@@ -1763,7 +1763,7 @@ gtk_text_iter_backward_indexable_segment (GtkTextIter *iter)
chars_skipped = prev_seg->char_count + real->segment_char_offset;
else
chars_skipped = -1;
-
+
real->segment = prev_seg;
real->any_segment = prev_any_seg;
real->segment_byte_offset = 0;
@@ -1779,7 +1779,7 @@ gtk_text_iter_backward_indexable_segment (GtkTextIter *iter)
}
else
real->line_byte_offset = -1;
-
+
if (chars_skipped >= 0)
{
if (real->line_char_offset >= 0)
@@ -1787,7 +1787,7 @@ gtk_text_iter_backward_indexable_segment (GtkTextIter *iter)
real->line_char_offset -= chars_skipped;
g_assert (real->line_char_offset >= 0);
}
-
+
if (real->cached_char_index >= 0)
{
real->cached_char_index -= chars_skipped;
@@ -1803,61 +1803,61 @@ gtk_text_iter_backward_indexable_segment (GtkTextIter *iter)
/* line number is unchanged. */
check_invariants (iter);
-
+
return TRUE;
}
/**
* gtk_text_iter_next_char:
* @iter: an iterator
- *
+ *
* Moves @iter forward by one character offset. Note that images
* embedded in the buffer occupy 1 character slot, so
- * gtk_text_iter_next_char() may actually move onto an image instead
+ * gtk_text_iter_next_char () may actually move onto an image instead
* of a character, if you have images in your buffer. If @iter is the
* end iterator or one character before it, @iter will now point at
- * the end iterator, and gtk_text_iter_next_char() returns FALSE for
+ * the end iterator, and gtk_text_iter_next_char () returns FALSE for
* convenience when writing loops.
- *
+ *
* Return value: whether the new position is the end iterator
**/
gboolean
-gtk_text_iter_next_char(GtkTextIter *iter)
+gtk_text_iter_next_char (GtkTextIter *iter)
{
GtkTextRealIter *real;
-
- g_return_val_if_fail(iter != NULL, FALSE);
-
- real = gtk_text_iter_make_real(iter);
+
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+ real = gtk_text_iter_make_real (iter);
if (real == NULL)
return FALSE;
else
{
- check_invariants(iter);
- return forward_char(real);
+ check_invariants (iter);
+ return forward_char (real);
}
}
/**
* gtk_text_iter_prev_char:
* @iter: an iterator
- *
+ *
* Moves backward by one character offset. Returns TRUE if movement
* was possible; if @iter was the first in the buffer (character
- * offset 0), gtk_text_iter_prev_char() returns FALSE for convenience when
+ * offset 0), gtk_text_iter_prev_char () returns FALSE for convenience when
* writing loops.
- *
+ *
* Return value: whether movement was possible
**/
gboolean
-gtk_text_iter_prev_char(GtkTextIter *iter)
+gtk_text_iter_prev_char (GtkTextIter *iter)
{
- g_return_val_if_fail(iter != NULL, FALSE);
+ g_return_val_if_fail (iter != NULL, FALSE);
- check_invariants(iter);
-
- return gtk_text_iter_backward_chars(iter, 1);
+ check_invariants (iter);
+
+ return gtk_text_iter_backward_chars (iter, 1);
}
/*
@@ -1865,7 +1865,7 @@ gtk_text_iter_prev_char(GtkTextIter *iter)
movement within a single line, because we can't use the BTree to
speed within-line searches up; for movement between lines, we would
like to avoid the linear scan probably.
-
+
Instead of using this constant, it might be nice to cache the line
length in the iterator and linear scan if motion is within a single
line.
@@ -1879,60 +1879,60 @@ gtk_text_iter_prev_char(GtkTextIter *iter)
* gtk_text_iter_forward_chars:
* @iter: an iterator
* @count: number of characters to move, may be negative
- *
+ *
* Moves @count characters if possible (if @count would move past the
* start or end of the buffer, moves to the start or end of the
* buffer). The return value indicates whether the new position of
* @iter is different from its original position, and dereferenceable
* (the last iterator in the buffer is not dereferenceable). If @count
* is 0, the function does nothing and returns FALSE.
- *
+ *
* Return value: whether @iter moved and is dereferenceable
**/
gboolean
-gtk_text_iter_forward_chars(GtkTextIter *iter, gint count)
+gtk_text_iter_forward_chars (GtkTextIter *iter, gint count)
{
GtkTextRealIter *real;
-
- g_return_val_if_fail(iter != NULL, FALSE);
-
- real = gtk_text_iter_make_real(iter);
-
+
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+ real = gtk_text_iter_make_real (iter);
+
if (real == NULL)
return FALSE;
else if (count == 0)
return FALSE;
else if (count < 0)
- return gtk_text_iter_backward_chars(iter, 0 - count);
+ return gtk_text_iter_backward_chars (iter, 0 - count);
else if (count < MAX_LINEAR_SCAN)
{
- check_invariants(iter);
-
+ check_invariants (iter);
+
while (count > 1)
{
- if (!forward_char(real))
+ if (!forward_char (real))
return FALSE;
--count;
}
-
- return forward_char(real);
+
+ return forward_char (real);
}
else
{
gint current_char_index;
gint new_char_index;
- check_invariants(iter);
-
- current_char_index = gtk_text_iter_get_offset(iter);
+ check_invariants (iter);
+
+ current_char_index = gtk_text_iter_get_offset (iter);
- if (current_char_index == gtk_text_btree_char_count(real->tree))
+ if (current_char_index == gtk_text_btree_char_count (real->tree))
return FALSE; /* can't move forward */
-
+
new_char_index = current_char_index + count;
- gtk_text_iter_set_offset(iter, new_char_index);
+ gtk_text_iter_set_offset (iter, new_char_index);
- check_invariants(iter);
+ check_invariants (iter);
/* Return FALSE if we're on the non-dereferenceable end
* iterator.
@@ -1955,19 +1955,19 @@ gtk_text_iter_forward_chars(GtkTextIter *iter, gint count)
* onto a dereferenceable position; if the iterator didn't move, or
* moved onto the end iterator, then FALSE is returned. If @count is 0,
* the function does nothing and returns FALSE.
- *
+ *
* Return value: whether @iter moved and is dereferenceable
- *
+ *
**/
gboolean
-gtk_text_iter_backward_chars(GtkTextIter *iter, gint count)
+gtk_text_iter_backward_chars (GtkTextIter *iter, gint count)
{
GtkTextRealIter *real;
- g_return_val_if_fail(iter != NULL, FALSE);
-
- real = gtk_text_iter_make_real(iter);
-
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+ real = gtk_text_iter_make_real (iter);
+
if (real == NULL)
return FALSE;
else if (count == 0)
@@ -1975,17 +1975,17 @@ gtk_text_iter_backward_chars(GtkTextIter *iter, gint count)
else if (count < 0)
return gtk_text_iter_forward_chars (iter, 0 - count);
- ensure_char_offsets(real);
- check_invariants(iter);
-
+ ensure_char_offsets (real);
+ check_invariants (iter);
+
if (count <= real->segment_char_offset)
{
- /* Optimize the within-segment case */
- g_assert(real->segment->char_count > 0);
- g_assert(real->segment->type == &gtk_text_char_type);
+ /* Optimize the within-segment case */
+ g_assert (real->segment->char_count > 0);
+ g_assert (real->segment->type == &gtk_text_char_type);
real->segment_char_offset -= count;
- g_assert(real->segment_char_offset >= 0);
+ g_assert (real->segment_char_offset >= 0);
if (real->line_byte_offset >= 0)
{
@@ -2001,17 +2001,17 @@ gtk_text_iter_backward_chars(GtkTextIter *iter, gint count)
++i;
}
-
+
real->line_byte_offset -= (real->segment_byte_offset - new_byte_offset);
real->segment_byte_offset = new_byte_offset;
}
-
+
real->line_char_offset -= count;
- adjust_char_index(real, 0 - count);
+ adjust_char_index (real, 0 - count);
+
+ check_invariants (iter);
- check_invariants(iter);
-
return TRUE;
}
else
@@ -2024,25 +2024,25 @@ gtk_text_iter_backward_chars(GtkTextIter *iter, gint count)
{
gint current_char_index;
gint new_char_index;
-
+
current_char_index = gtk_text_iter_get_offset (iter);
if (current_char_index == 0)
return FALSE; /* can't move backward */
-
+
new_char_index = current_char_index - count;
if (new_char_index < 0)
new_char_index = 0;
gtk_text_iter_set_offset (iter, new_char_index);
- check_invariants(iter);
-
+ check_invariants (iter);
+
return TRUE;
}
else
{
/* FIXME backward_indexable_segment here */
-
+
return FALSE;
}
}
@@ -2059,12 +2059,12 @@ gtk_text_iter_backward_chars(GtkTextIter *iter, gint count)
* gtk_text_iter_forward_text_chars:
* @iter: a #GtkTextIter
* @count: number of chars to move
- *
+ *
* Moves forward by @count text characters (pixbufs, widgets,
* etc. do not count as characters for this). Equivalent to moving
- * through the results of gtk_text_iter_get_text(), rather than
- * gtk_text_iter_get_slice().
- *
+ * through the results of gtk_text_iter_get_text (), rather than
+ * gtk_text_iter_get_slice ().
+ *
* Return value: whether @iter moved and is dereferenceable
**/
gboolean
@@ -2080,12 +2080,12 @@ gtk_text_iter_forward_text_chars (GtkTextIter *iter,
* gtk_text_iter_forward_text_chars:
* @iter: a #GtkTextIter
* @count: number of chars to move
- *
+ *
* Moves backward by @count text characters (pixbufs, widgets,
* etc. do not count as characters for this). Equivalent to moving
- * through the results of gtk_text_iter_get_text(), rather than
- * gtk_text_iter_get_slice().
- *
+ * through the results of gtk_text_iter_get_text (), rather than
+ * gtk_text_iter_get_slice ().
+ *
* Return value: whether @iter moved and is dereferenceable
**/
gboolean
@@ -2100,34 +2100,34 @@ gtk_text_iter_backward_text_chars (GtkTextIter *iter,
/**
* gtk_text_iter_forward_line:
* @iter: an iterator
- *
+ *
* Moves @iter to the start of the next line. Returns TRUE if there
* was a next line to move to, and FALSE if @iter was simply moved to
* the end of the buffer and is now not dereferenceable, or if @iter was
* already at the end of the buffer.
- *
+ *
* Return value: whether @iter can be dereferenced
**/
gboolean
-gtk_text_iter_forward_line(GtkTextIter *iter)
+gtk_text_iter_forward_line (GtkTextIter *iter)
{
GtkTextRealIter *real;
-
- g_return_val_if_fail(iter != NULL, FALSE);
-
- real = gtk_text_iter_make_real(iter);
-
+
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+ real = gtk_text_iter_make_real (iter);
+
if (real == NULL)
return FALSE;
- check_invariants(iter);
-
- if (forward_line_leaving_caches_unmodified(real))
+ check_invariants (iter);
+
+ if (forward_line_leaving_caches_unmodified (real))
{
- invalidate_char_index(real);
- adjust_line_number(real, 1);
+ invalidate_char_index (real);
+ adjust_line_number (real, 1);
- check_invariants(iter);
+ check_invariants (iter);
if (gtk_text_iter_is_last (iter))
return FALSE;
@@ -2136,7 +2136,7 @@ gtk_text_iter_forward_line(GtkTextIter *iter)
}
else
{
- check_invariants(iter);
+ check_invariants (iter);
return FALSE;
}
}
@@ -2144,7 +2144,7 @@ gtk_text_iter_forward_line(GtkTextIter *iter)
/**
* gtk_text_iter_backward_line:
* @iter: an iterator
- *
+ *
* Moves @iter to the start of the previous line. Returns TRUE if
* @iter could be moved; i.e. if @iter was at character offset 0, this
* function returns FALSE. Therefore if @iter was already on line 0,
@@ -2152,36 +2152,36 @@ gtk_text_iter_forward_line(GtkTextIter *iter)
* the line and the function returns TRUE. (Note that this implies that
* in a loop calling this function, the line number may not change on
* every iteration, if your first iteration is on line 0.)
- *
+ *
* Return value: whether @iter moved
**/
gboolean
-gtk_text_iter_backward_line(GtkTextIter *iter)
+gtk_text_iter_backward_line (GtkTextIter *iter)
{
GtkTextLine *new_line;
GtkTextRealIter *real;
gboolean offset_will_change;
gint offset;
-
- g_return_val_if_fail(iter != NULL, FALSE);
-
- real = gtk_text_iter_make_real(iter);
-
+
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+ real = gtk_text_iter_make_real (iter);
+
if (real == NULL)
return FALSE;
- check_invariants(iter);
-
+ check_invariants (iter);
+
new_line = gtk_text_line_previous (real->line);
offset_will_change = FALSE;
if (real->line_char_offset > 0)
offset_will_change = TRUE;
-
+
if (new_line != NULL)
{
real->line = new_line;
-
+
adjust_line_number (real, -1);
}
else
@@ -2191,19 +2191,19 @@ gtk_text_iter_backward_line(GtkTextIter *iter)
}
invalidate_char_index (real);
-
+
real->line_byte_offset = 0;
real->line_char_offset = 0;
real->segment_byte_offset = 0;
real->segment_char_offset = 0;
-
+
/* Find first segment in line */
real->any_segment = real->line->segments;
real->segment = gtk_text_line_byte_to_segment (real->line,
0, &offset);
- g_assert(offset == 0);
+ g_assert (offset == 0);
/* Note that if we are on the first line, we snap to the start of
* the first line and return TRUE, so TRUE means the iterator
@@ -2212,12 +2212,12 @@ gtk_text_iter_backward_line(GtkTextIter *iter)
*/
check_invariants (iter);
-
+
return TRUE;
}
gboolean
-gtk_text_iter_forward_lines(GtkTextIter *iter, gint count)
+gtk_text_iter_forward_lines (GtkTextIter *iter, gint count)
{
if (count < 0)
return gtk_text_iter_backward_lines (iter, 0 - count);
@@ -2225,18 +2225,18 @@ gtk_text_iter_forward_lines(GtkTextIter *iter, gint count)
return FALSE;
else if (count == 1)
{
- check_invariants(iter);
+ check_invariants (iter);
return gtk_text_iter_forward_line (iter);
}
else
{
gint old_line;
-
- old_line = gtk_text_iter_get_line(iter);
-
- gtk_text_iter_set_line(iter, old_line + count);
- check_invariants(iter);
+ old_line = gtk_text_iter_get_line (iter);
+
+ gtk_text_iter_set_line (iter, old_line + count);
+
+ check_invariants (iter);
/* return whether it moved, and is dereferenceable. */
return
@@ -2246,25 +2246,25 @@ gtk_text_iter_forward_lines(GtkTextIter *iter, gint count)
}
gboolean
-gtk_text_iter_backward_lines(GtkTextIter *iter, gint count)
+gtk_text_iter_backward_lines (GtkTextIter *iter, gint count)
{
if (count < 0)
- return gtk_text_iter_forward_lines(iter, 0 - count);
+ return gtk_text_iter_forward_lines (iter, 0 - count);
else if (count == 0)
return FALSE;
else if (count == 1)
{
- return gtk_text_iter_backward_line(iter);
+ return gtk_text_iter_backward_line (iter);
}
else
{
gint old_line;
-
- old_line = gtk_text_iter_get_line(iter);
-
- gtk_text_iter_set_line(iter, MAX(old_line - count, 0));
- return (gtk_text_iter_get_line(iter) != old_line);
+ old_line = gtk_text_iter_get_line (iter);
+
+ gtk_text_iter_set_line (iter, MAX (old_line - count, 0));
+
+ return (gtk_text_iter_get_line (iter) != old_line);
}
}
@@ -2272,7 +2272,7 @@ typedef gboolean (* FindLogAttrFunc) (PangoLogAttr *attrs,
gint offset,
gint min_offset,
gint len,
- gint *found_offset);
+ gint *found_offset);
static gboolean
find_word_end_func (PangoLogAttr *attrs,
@@ -2282,17 +2282,17 @@ find_word_end_func (PangoLogAttr *attrs,
gint *found_offset)
{
++offset; /* We always go to the NEXT word end */
-
+
/* Find start of next word */
while (offset < min_offset + len &&
!attrs[offset].is_word_stop)
++offset;
-
+
/* Find end */
while (offset < min_offset + len &&
!attrs[offset].is_white)
++offset;
-
+
*found_offset = offset;
return offset < min_offset + len;
@@ -2306,17 +2306,17 @@ find_word_start_func (PangoLogAttr *attrs,
gint *found_offset)
{
--offset; /* We always go to the NEXT word start */
-
+
/* Find end of prev word */
while (offset >= min_offset &&
attrs[offset].is_white)
--offset;
-
+
/* Find start */
while (offset >= min_offset &&
!attrs[offset].is_word_stop)
--offset;
-
+
*found_offset = offset;
return offset >= min_offset;
@@ -2336,8 +2336,8 @@ find_by_log_attrs (GtkTextIter *iter,
PangoLogAttr *attrs;
int offset;
gboolean found = FALSE;
-
- g_return_val_if_fail(iter != NULL, FALSE);
+
+ g_return_val_if_fail (iter != NULL, FALSE);
orig = *iter;
start = *iter;
@@ -2345,19 +2345,19 @@ find_by_log_attrs (GtkTextIter *iter,
gtk_text_iter_set_line_offset (&start, 0);
gtk_text_iter_forward_to_newline (&end);
-
+
paragraph = gtk_text_iter_get_text (&start, &end);
char_len = g_utf8_strlen (paragraph, -1);
byte_len = strlen (paragraph);
offset = gtk_text_iter_get_line_offset (iter);
-
+
if (char_len > 0 && offset < char_len)
{
gchar *lang;
-
+
attrs = g_new (PangoLogAttr, char_len);
-
+
lang = gtk_text_iter_get_language (iter);
pango_get_log_attrs (paragraph, byte_len, -1,
@@ -2367,12 +2367,12 @@ find_by_log_attrs (GtkTextIter *iter,
g_free (lang);
found = (* func) (attrs, offset, 0, char_len, &offset);
-
+
g_free (attrs);
}
-
+
g_free (paragraph);
-
+
if (!found)
{
if (forward)
@@ -2391,23 +2391,23 @@ find_by_log_attrs (GtkTextIter *iter,
}
}
else
- {
+ {
gtk_text_iter_set_line_offset (iter, offset);
-
+
return
- !gtk_text_iter_equal(iter, &orig) &&
+ !gtk_text_iter_equal (iter, &orig) &&
!gtk_text_iter_is_last (iter);
}
}
gboolean
-gtk_text_iter_forward_word_end(GtkTextIter *iter)
+gtk_text_iter_forward_word_end (GtkTextIter *iter)
{
return find_by_log_attrs (iter, find_word_end_func, TRUE);
}
gboolean
-gtk_text_iter_backward_word_start(GtkTextIter *iter)
+gtk_text_iter_backward_word_start (GtkTextIter *iter)
{
return find_by_log_attrs (iter, find_word_start_func, FALSE);
}
@@ -2416,19 +2416,19 @@ gtk_text_iter_backward_word_start(GtkTextIter *iter)
* a truly spectacularly slow function.
*/
gboolean
-gtk_text_iter_forward_word_ends(GtkTextIter *iter,
+gtk_text_iter_forward_word_ends (GtkTextIter *iter,
gint count)
{
- g_return_val_if_fail(iter != NULL, FALSE);
- g_return_val_if_fail(count > 0, FALSE);
+ g_return_val_if_fail (iter != NULL, FALSE);
+ g_return_val_if_fail (count > 0, FALSE);
- if (!gtk_text_iter_forward_word_end(iter))
+ if (!gtk_text_iter_forward_word_end (iter))
return FALSE;
--count;
-
+
while (count > 0)
{
- if (!gtk_text_iter_forward_word_end(iter))
+ if (!gtk_text_iter_forward_word_end (iter))
break;
--count;
}
@@ -2436,19 +2436,19 @@ gtk_text_iter_forward_word_ends(GtkTextIter *iter,
}
gboolean
-gtk_text_iter_backward_word_starts(GtkTextIter *iter,
- gint count)
+gtk_text_iter_backward_word_starts (GtkTextIter *iter,
+ gint count)
{
- g_return_val_if_fail(iter != NULL, FALSE);
- g_return_val_if_fail(count > 0, FALSE);
+ g_return_val_if_fail (iter != NULL, FALSE);
+ g_return_val_if_fail (count > 0, FALSE);
- if (!gtk_text_iter_backward_word_start(iter))
+ if (!gtk_text_iter_backward_word_start (iter))
return FALSE;
--count;
-
+
while (count > 0)
{
- if (!gtk_text_iter_backward_word_start(iter))
+ if (!gtk_text_iter_backward_word_start (iter))
break;
--count;
}
@@ -2456,20 +2456,20 @@ gtk_text_iter_backward_word_starts(GtkTextIter *iter,
}
void
-gtk_text_iter_set_line_offset(GtkTextIter *iter,
- gint char_on_line)
+gtk_text_iter_set_line_offset (GtkTextIter *iter,
+ gint char_on_line)
{
GtkTextRealIter *real;
-
+
g_return_if_fail (iter != NULL);
-
+
real = gtk_text_iter_make_surreal (iter);
if (real == NULL)
return;
check_invariants (iter);
-
+
iter_set_from_char_offset (real, real->line, char_on_line);
check_invariants (iter);
@@ -2480,16 +2480,16 @@ gtk_text_iter_set_line_index (GtkTextIter *iter,
gint byte_on_line)
{
GtkTextRealIter *real;
-
+
g_return_if_fail (iter != NULL);
-
+
real = gtk_text_iter_make_surreal (iter);
if (real == NULL)
return;
check_invariants (iter);
-
+
iter_set_from_byte_offset (real, real->line, byte_on_line);
if (real->segment->type == &gtk_text_char_type &&
@@ -2498,7 +2498,7 @@ gtk_text_iter_set_line_index (GtkTextIter *iter,
"character; this will crash the text buffer. "
"Byte indexes must refer to the start of a character.",
G_STRLOC, byte_on_line);
-
+
check_invariants (iter);
}
@@ -2509,20 +2509,20 @@ gtk_text_iter_set_line (GtkTextIter *iter,
GtkTextLine *line;
gint real_line;
GtkTextRealIter *real;
-
+
g_return_if_fail (iter != NULL);
-
+
real = gtk_text_iter_make_surreal (iter);
if (real == NULL)
return;
check_invariants (iter);
-
+
line = gtk_text_btree_get_line (real->tree, line_number, &real_line);
iter_set_from_char_offset (real, line, 0);
-
+
/* We might as well cache this, since we know it. */
real->cached_line_number = real_line;
@@ -2530,37 +2530,37 @@ gtk_text_iter_set_line (GtkTextIter *iter,
}
void
-gtk_text_iter_set_offset(GtkTextIter *iter, gint char_index)
+gtk_text_iter_set_offset (GtkTextIter *iter, gint char_index)
{
GtkTextLine *line;
GtkTextRealIter *real;
gint line_start;
gint real_char_index;
-
- g_return_if_fail(iter != NULL);
-
- real = gtk_text_iter_make_surreal(iter);
+
+ g_return_if_fail (iter != NULL);
+
+ real = gtk_text_iter_make_surreal (iter);
if (real == NULL)
return;
- check_invariants(iter);
-
+ check_invariants (iter);
+
if (real->cached_char_index >= 0 &&
real->cached_char_index == char_index)
return;
- line = gtk_text_btree_get_line_at_char(real->tree,
+ line = gtk_text_btree_get_line_at_char (real->tree,
char_index,
&line_start,
&real_char_index);
- iter_set_from_char_offset(real, line, real_char_index - line_start);
-
+ iter_set_from_char_offset (real, line, real_char_index - line_start);
+
/* Go ahead and cache this since we have it. */
real->cached_char_index = real_char_index;
- check_invariants(iter);
+ check_invariants (iter);
}
void
@@ -2569,45 +2569,45 @@ gtk_text_iter_forward_to_end (GtkTextIter *iter)
GtkTextBuffer *buffer;
GtkTextRealIter *real;
- g_return_if_fail(iter != NULL);
-
- real = gtk_text_iter_make_surreal(iter);
+ g_return_if_fail (iter != NULL);
+
+ real = gtk_text_iter_make_surreal (iter);
if (real == NULL)
return;
-
- buffer = gtk_text_btree_get_buffer(real->tree);
- gtk_text_buffer_get_last_iter(buffer, iter);
+ buffer = gtk_text_btree_get_buffer (real->tree);
+
+ gtk_text_buffer_get_last_iter (buffer, iter);
}
gboolean
-gtk_text_iter_forward_to_newline(GtkTextIter *iter)
+gtk_text_iter_forward_to_newline (GtkTextIter *iter)
{
gint current_offset;
gint new_offset;
-
- g_return_val_if_fail(iter != NULL, FALSE);
-
- current_offset = gtk_text_iter_get_line_offset(iter);
- new_offset = gtk_text_iter_get_chars_in_line(iter) - 1;
+
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+ current_offset = gtk_text_iter_get_line_offset (iter);
+ new_offset = gtk_text_iter_get_chars_in_line (iter) - 1;
if (current_offset < new_offset)
{
/* Move to end of this line. */
- gtk_text_iter_set_line_offset(iter, new_offset);
+ gtk_text_iter_set_line_offset (iter, new_offset);
return TRUE;
}
else
{
/* Move to end of next line. */
- if (gtk_text_iter_forward_line(iter))
+ if (gtk_text_iter_forward_line (iter))
{
/* We don't want to move past all
* empty lines.
*/
if (gtk_text_iter_get_char (iter) != '\n')
- gtk_text_iter_forward_to_newline(iter);
+ gtk_text_iter_forward_to_newline (iter);
return TRUE;
}
else
@@ -2619,13 +2619,13 @@ gtk_text_iter_forward_to_newline(GtkTextIter *iter)
* gtk_text_iter_forward_to_tag_toggle:
* @iter: a #GtkTextIter
* @tag: a #GtkTextTag, or NULL
- *
+ *
* Moves forward to the next toggle (on or off) of the
* #GtkTextTag @tag, or to the next toggle of any tag if
* @tag is NULL. If no matching tag toggles are found,
* returns FALSE, otherwise TRUE. Does not return toggles
* located at @iter, only toggles after @iter.
- *
+ *
* Return value: whether we found a tag toggle after @iter
**/
gboolean
@@ -2636,19 +2636,19 @@ gtk_text_iter_forward_to_tag_toggle (GtkTextIter *iter,
GtkTextLine *current_line;
GtkTextRealIter *real;
- g_return_val_if_fail(iter != NULL, FALSE);
-
- real = gtk_text_iter_make_real(iter);
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+ real = gtk_text_iter_make_real (iter);
if (real == NULL)
return FALSE;
- check_invariants(iter);
-
+ check_invariants (iter);
+
current_line = real->line;
next_line = gtk_text_line_next_could_contain_tag (current_line,
real->tree, tag);
-
+
while (gtk_text_iter_forward_indexable_segment (iter))
{
/* If we went forward to a line that couldn't contain a toggle
@@ -2663,7 +2663,7 @@ gtk_text_iter_forward_to_tag_toggle (GtkTextIter *iter,
gtk_text_btree_get_last_iter (real->tree, iter);
return FALSE;
}
-
+
if (real->line != next_line)
iter_set_from_byte_offset (real, next_line, 0);
@@ -2673,7 +2673,7 @@ gtk_text_iter_forward_to_tag_toggle (GtkTextIter *iter,
tag);
}
- if (gtk_text_iter_toggles_tag(iter, tag))
+ if (gtk_text_iter_toggles_tag (iter, tag))
{
/* If there's a toggle here, it isn't indexable so
any_segment can't be the indexable segment. */
@@ -2690,7 +2690,7 @@ gtk_text_iter_forward_to_tag_toggle (GtkTextIter *iter,
g_assert (real->any_segment != real->segment);
return TRUE;
}
-
+
/* Reached end of buffer */
return FALSE;
}
@@ -2699,13 +2699,13 @@ gtk_text_iter_forward_to_tag_toggle (GtkTextIter *iter,
* gtk_text_iter_backward_to_tag_toggle:
* @iter: a #GtkTextIter
* @tag: a #GtkTextTag, or NULL
- *
+ *
* Moves backward to the next toggle (on or off) of the
* #GtkTextTag @tag, or to the next toggle of any tag if
* @tag is NULL. If no matching tag toggles are found,
* returns FALSE, otherwise TRUE. Does not return toggles
* located at @iter, only toggles before @iter.
- *
+ *
* Return value: whether we found a tag toggle before @iter
**/
gboolean
@@ -2716,19 +2716,19 @@ gtk_text_iter_backward_to_tag_toggle (GtkTextIter *iter,
GtkTextLine *current_line;
GtkTextRealIter *real;
- g_return_val_if_fail(iter != NULL, FALSE);
-
- real = gtk_text_iter_make_real(iter);
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+ real = gtk_text_iter_make_real (iter);
if (real == NULL)
return FALSE;
- check_invariants(iter);
-
+ check_invariants (iter);
+
current_line = real->line;
prev_line = gtk_text_line_previous_could_contain_tag (current_line,
real->tree, tag);
-
+
/* If we're at segment start, go to the previous segment;
* if mid-segment, snap to start of current segment.
@@ -2741,11 +2741,11 @@ gtk_text_iter_backward_to_tag_toggle (GtkTextIter *iter,
else
{
ensure_char_offsets (real);
-
+
if (!gtk_text_iter_backward_chars (iter, real->segment_char_offset))
return FALSE;
}
-
+
do
{
/* If we went backward to a line that couldn't contain a toggle
@@ -2761,18 +2761,18 @@ gtk_text_iter_backward_to_tag_toggle (GtkTextIter *iter,
gtk_text_btree_get_iter_at_char (real->tree, iter, 0);
return FALSE;
}
-
+
if (real->line != prev_line)
{
/* Set to last segment in prev_line (could do this
* more quickly)
*/
iter_set_from_byte_offset (real, prev_line, 0);
-
+
while (!at_last_indexable_segment (real))
- gtk_text_iter_forward_indexable_segment (iter);
+ gtk_text_iter_forward_indexable_segment (iter);
}
-
+
current_line = real->line;
prev_line = gtk_text_line_previous_could_contain_tag (current_line,
real->tree,
@@ -2788,55 +2788,55 @@ gtk_text_iter_backward_to_tag_toggle (GtkTextIter *iter,
return TRUE;
}
}
- while (gtk_text_iter_backward_indexable_segment (iter));
-
+ while (gtk_text_iter_backward_indexable_segment (iter));
+
/* Reached front of buffer */
return FALSE;
}
static gboolean
-matches_pred(GtkTextIter *iter,
- GtkTextCharPredicate pred,
- gpointer user_data)
+matches_pred (GtkTextIter *iter,
+ GtkTextCharPredicate pred,
+ gpointer user_data)
{
gint ch;
- ch = gtk_text_iter_get_char(iter);
+ ch = gtk_text_iter_get_char (iter);
return (*pred) (ch, user_data);
}
gboolean
gtk_text_iter_forward_find_char (GtkTextIter *iter,
- GtkTextCharPredicate pred,
- gpointer user_data)
+ GtkTextCharPredicate pred,
+ gpointer user_data)
{
- g_return_val_if_fail(iter != NULL, FALSE);
- g_return_val_if_fail(pred != NULL, FALSE);
+ g_return_val_if_fail (iter != NULL, FALSE);
+ g_return_val_if_fail (pred != NULL, FALSE);
while (gtk_text_iter_next_char (iter))
{
if (matches_pred (iter, pred, user_data))
return TRUE;
}
-
+
return FALSE;
}
gboolean
gtk_text_iter_backward_find_char (GtkTextIter *iter,
- GtkTextCharPredicate pred,
- gpointer user_data)
+ GtkTextCharPredicate pred,
+ gpointer user_data)
{
- g_return_val_if_fail(iter != NULL, FALSE);
- g_return_val_if_fail(pred != NULL, FALSE);
+ g_return_val_if_fail (iter != NULL, FALSE);
+ g_return_val_if_fail (pred != NULL, FALSE);
while (gtk_text_iter_prev_char (iter))
{
if (matches_pred (iter, pred, user_data))
return TRUE;
}
-
+
return FALSE;
}
@@ -2850,24 +2850,24 @@ forward_chars_with_skipping (GtkTextIter *iter,
gint i;
g_return_if_fail (count >= 0);
-
+
i = count;
-
+
while (i > 0)
{
gboolean ignored = FALSE;
-
+
if (skip_nontext &&
gtk_text_iter_get_char (iter) == gtk_text_unknown_char)
ignored = TRUE;
-
+
if (!ignored &&
skip_invisible &&
gtk_text_btree_char_is_invisible (iter))
ignored = TRUE;
-
+
gtk_text_iter_next_char (iter);
-
+
if (!ignored)
--i;
}
@@ -2885,20 +2885,20 @@ lines_match (const GtkTextIter *start,
gchar *line_text;
const gchar *found;
gint offset;
-
+
if (*lines == NULL || **lines == '\0')
{
if (match_start)
*match_start = *start;
-
+
if (match_end)
*match_end = *start;
return TRUE;
}
-
+
next = *start;
gtk_text_iter_forward_line (&next);
-
+
/* No more text in buffer, but *lines is nonempty */
if (gtk_text_iter_equal (start, &next))
{
@@ -2913,13 +2913,13 @@ lines_match (const GtkTextIter *start,
line_text = gtk_text_iter_get_slice (start, &next);
}
else
- {
+ {
if (visible_only)
line_text = gtk_text_iter_get_visible_text (start, &next);
else
line_text = gtk_text_iter_get_text (start, &next);
}
-
+
if (match_start) /* if this is the first line we're matching */
found = strstr (line_text, *lines);
else
@@ -2934,16 +2934,16 @@ lines_match (const GtkTextIter *start,
}
if (found == NULL)
- {
+ {
g_free (line_text);
return FALSE;
}
-
+
/* Get offset to start of search string */
offset = g_utf8_strlen (line_text, found - line_text);
-
+
next = *start;
-
+
/* If match start needs to be returned, set it to the
* start of the search string.
*/
@@ -2954,27 +2954,27 @@ lines_match (const GtkTextIter *start,
forward_chars_with_skipping (match_start, offset,
visible_only, !slice);
}
-
+
/* Go to end of search string */
offset += g_utf8_strlen (*lines, -1);
forward_chars_with_skipping (&next, offset,
visible_only, !slice);
-
+
g_free (line_text);
++lines;
if (match_end)
*match_end = next;
-
+
/* pass NULL for match_start, since we don't need to find the
* start again.
*/
return lines_match (&next, lines, visible_only, slice, NULL, match_end);
}
-/* strsplit() that retains the delimiter as part of the string. */
+/* strsplit () that retains the delimiter as part of the string. */
static gchar **
strbreakup (const char *string,
const char *delimiter,
@@ -2996,19 +2996,19 @@ strbreakup (const char *string,
guint delimiter_len = strlen (delimiter);
do
- {
- guint len;
- gchar *new_string;
-
- len = s - string + delimiter_len;
- new_string = g_new (gchar, len + 1);
- strncpy (new_string, string, len);
- new_string[len] = 0;
- string_list = g_slist_prepend (string_list, new_string);
- n++;
- string = s + delimiter_len;
- s = strstr (string, delimiter);
- }
+ {
+ guint len;
+ gchar *new_string;
+
+ len = s - string + delimiter_len;
+ new_string = g_new (gchar, len + 1);
+ strncpy (new_string, string, len);
+ new_string[len] = 0;
+ string_list = g_slist_prepend (string_list, new_string);
+ n++;
+ string = s + delimiter_len;
+ s = strstr (string, delimiter);
+ }
while (--max_tokens && s);
}
if (*string)
@@ -3042,7 +3042,7 @@ gtk_text_iter_forward_search (const GtkTextIter *iter,
GtkTextIter match;
gboolean retval = FALSE;
GtkTextIter search;
-
+
g_return_val_if_fail (iter != NULL, FALSE);
g_return_val_if_fail (str != NULL, FALSE);
@@ -3061,37 +3061,37 @@ gtk_text_iter_forward_search (const GtkTextIter *iter,
else
return FALSE;
}
-
+
/* locate all lines */
lines = strbreakup (str, "\n", -1);
-
+
search = *iter;
do
- {
+ {
/* This loop has an inefficient worst-case, where
- * gtk_text_iter_get_text() is called repeatedly on
+ * gtk_text_iter_get_text () is called repeatedly on
* a single line.
*/
GtkTextIter end;
-
+
if (lines_match (&search, (const gchar**)lines,
visible_only, slice, &match, &end))
{
retval = TRUE;
-
+
if (match_start)
*match_start = match;
if (match_end)
*match_end = end;
-
+
break;
}
}
while (gtk_text_iter_forward_line (&search));
-
+
g_strfreev ((gchar**)lines);
return retval;
@@ -3109,14 +3109,14 @@ vectors_equal_ignoring_trailing (gchar **vec1,
i2 = vec2;
while (*i1 && *i2)
- {
+ {
if (strcmp (*i1, *i2) != 0)
{
if (*(i2 + 1) == NULL) /* if this is the last line */
{
gint len1 = strlen (*i1);
gint len2 = strlen (*i2);
-
+
if (len2 >= len1 &&
strncmp (*i1, *i2, len1) == 0)
{
@@ -3167,7 +3167,7 @@ lines_window_init (LinesWindow *win,
/* If we start on line 1, there are 2 lines to search (0 and 1), so
* n_lines can be 2.
- */
+ */
if (gtk_text_iter_is_first (start) ||
gtk_text_iter_get_line (start) + 1 < win->n_lines)
{
@@ -3176,7 +3176,7 @@ lines_window_init (LinesWindow *win,
*win->lines = NULL;
return;
}
-
+
line_start = *start;
line_end = *start;
@@ -3188,17 +3188,17 @@ lines_window_init (LinesWindow *win,
/* we were already at the start; so go back one line */
gtk_text_iter_backward_line (&line_start);
}
-
+
win->first_line_start = line_start;
win->first_line_end = line_end;
-
+
win->lines = g_new0 (gchar*, win->n_lines + 1);
-
+
i = win->n_lines - 1;
while (i >= 0)
{
gchar *line_text;
-
+
if (win->slice)
{
if (win->visible_only)
@@ -3207,7 +3207,7 @@ lines_window_init (LinesWindow *win,
line_text = gtk_text_iter_get_slice (&line_start, &line_end);
}
else
- {
+ {
if (win->visible_only)
line_text = gtk_text_iter_get_visible_text (&line_start, &line_end);
else
@@ -3218,7 +3218,7 @@ lines_window_init (LinesWindow *win,
line_end = line_start;
gtk_text_iter_backward_line (&line_start);
-
+
--i;
}
}
@@ -3228,38 +3228,38 @@ lines_window_back (LinesWindow *win)
{
GtkTextIter new_start;
gchar *line_text;
-
+
new_start = win->first_line_start;
if (!gtk_text_iter_backward_line (&new_start))
return FALSE;
- else
+ else
{
win->first_line_start = new_start;
win->first_line_end = new_start;
- gtk_text_iter_forward_line (&win->first_line_end);
+ gtk_text_iter_forward_line (&win->first_line_end);
}
if (win->slice)
{
if (win->visible_only)
- line_text = gtk_text_iter_get_visible_slice (&win->first_line_start,
+ line_text = gtk_text_iter_get_visible_slice (&win->first_line_start,
&win->first_line_end);
else
- line_text = gtk_text_iter_get_slice (&win->first_line_start,
+ line_text = gtk_text_iter_get_slice (&win->first_line_start,
&win->first_line_end);
}
else
- {
+ {
if (win->visible_only)
- line_text = gtk_text_iter_get_visible_text (&win->first_line_start,
+ line_text = gtk_text_iter_get_visible_text (&win->first_line_start,
&win->first_line_end);
else
- line_text = gtk_text_iter_get_text (&win->first_line_start,
+ line_text = gtk_text_iter_get_text (&win->first_line_start,
&win->first_line_end);
}
-
+
/* Move lines to make room for first line. */
g_memmove (win->lines + 1, win->lines, win->n_lines * sizeof (gchar*));
@@ -3292,7 +3292,7 @@ my_strrstr (const gchar *haystack,
const gchar *haystack_rend = haystack - 1;
const gchar *needle_rend = needle - 1;
const gchar *p;
-
+
p = haystack + haystack_len;
while (p != haystack)
{
@@ -3308,13 +3308,13 @@ my_strrstr (const gchar *haystack,
if (n == needle_rend)
return (gchar*)++s;
-
+
--p;
}
return NULL;
}
-
+
gboolean
gtk_text_iter_backward_search (const GtkTextIter *iter,
const gchar *str,
@@ -3328,7 +3328,7 @@ gtk_text_iter_backward_search (const GtkTextIter *iter,
gint n_lines;
LinesWindow win;
gboolean retval = FALSE;
-
+
g_return_val_if_fail (iter != NULL, FALSE);
g_return_val_if_fail (str != NULL, FALSE);
@@ -3336,7 +3336,7 @@ gtk_text_iter_backward_search (const GtkTextIter *iter,
{
/* If we can move one char, return the empty string there */
GtkTextIter match = *iter;
-
+
if (gtk_text_iter_prev_char (&match))
{
if (match_start)
@@ -3348,7 +3348,7 @@ gtk_text_iter_backward_search (const GtkTextIter *iter,
else
return FALSE;
}
-
+
/* locate all lines */
lines = strbreakup (str, "\n", -1);
@@ -3364,12 +3364,12 @@ gtk_text_iter_backward_search (const GtkTextIter *iter,
win.n_lines = n_lines;
win.slice = slice;
win.visible_only = visible_only;
-
+
lines_window_init (&win, iter);
if (*win.lines == NULL)
goto out;
-
+
do
{
gchar *first_line_match;
@@ -3379,50 +3379,50 @@ gtk_text_iter_backward_search (const GtkTextIter *iter,
* end of the first line, which is correct.
*/
first_line_match = my_strrstr (*win.lines, *lines);
-
- if (first_line_match &&
+
+ if (first_line_match &&
vectors_equal_ignoring_trailing (lines + 1, win.lines + 1))
- {
- /* Match! */
- gint offset;
- GtkTextIter next;
-
- /* Offset to start of search string */
- offset = g_utf8_strlen (*win.lines, first_line_match - *win.lines);
-
- next = win.first_line_start;
- if (match_start)
- {
- *match_start = next;
- forward_chars_with_skipping (match_start, offset,
- visible_only, !slice);
- }
-
- /* Go to end of search string */
- l = lines;
- while (*l)
- {
- offset += g_utf8_strlen (*l, -1);
- ++l;
- }
-
- forward_chars_with_skipping (&next, offset,
- visible_only, !slice);
-
- if (match_end)
- *match_end = next;
-
- retval = TRUE;
- goto out;
- }
+ {
+ /* Match! */
+ gint offset;
+ GtkTextIter next;
+
+ /* Offset to start of search string */
+ offset = g_utf8_strlen (*win.lines, first_line_match - *win.lines);
+
+ next = win.first_line_start;
+ if (match_start)
+ {
+ *match_start = next;
+ forward_chars_with_skipping (match_start, offset,
+ visible_only, !slice);
+ }
+
+ /* Go to end of search string */
+ l = lines;
+ while (*l)
+ {
+ offset += g_utf8_strlen (*l, -1);
+ ++l;
+ }
+
+ forward_chars_with_skipping (&next, offset,
+ visible_only, !slice);
+
+ if (match_end)
+ *match_end = next;
+
+ retval = TRUE;
+ goto out;
+ }
}
while (lines_window_back (&win));
out:
lines_window_free (&win);
g_strfreev (lines);
-
- return retval;
+
+ return retval;
}
/*
@@ -3439,9 +3439,9 @@ gtk_text_iter_equal (const GtkTextIter *lhs,
real_lhs = (GtkTextRealIter*)lhs;
real_rhs = (GtkTextRealIter*)rhs;
- check_invariants(lhs);
- check_invariants(rhs);
-
+ check_invariants (lhs);
+ check_invariants (rhs);
+
if (real_lhs->line != real_rhs->line)
return FALSE;
else if (real_lhs->line_byte_offset >= 0 &&
@@ -3449,26 +3449,26 @@ gtk_text_iter_equal (const GtkTextIter *lhs,
return real_lhs->line_byte_offset == real_rhs->line_byte_offset;
else
{
- /* the ensure_char_offsets() calls do nothing if the char offsets
+ /* the ensure_char_offsets () calls do nothing if the char offsets
are already up-to-date. */
- ensure_char_offsets(real_lhs);
- ensure_char_offsets(real_rhs);
- return real_lhs->line_char_offset == real_rhs->line_char_offset;
+ ensure_char_offsets (real_lhs);
+ ensure_char_offsets (real_rhs);
+ return real_lhs->line_char_offset == real_rhs->line_char_offset;
}
}
gint
-gtk_text_iter_compare(const GtkTextIter *lhs, const GtkTextIter *rhs)
+gtk_text_iter_compare (const GtkTextIter *lhs, const GtkTextIter *rhs)
{
GtkTextRealIter *real_lhs;
GtkTextRealIter *real_rhs;
- real_lhs = gtk_text_iter_make_surreal(lhs);
- real_rhs = gtk_text_iter_make_surreal(rhs);
+ real_lhs = gtk_text_iter_make_surreal (lhs);
+ real_rhs = gtk_text_iter_make_surreal (rhs);
+
+ check_invariants (lhs);
+ check_invariants (rhs);
- check_invariants(lhs);
- check_invariants(rhs);
-
if (real_lhs == NULL ||
real_rhs == NULL)
return -1; /* why not */
@@ -3485,14 +3485,14 @@ gtk_text_iter_compare(const GtkTextIter *lhs, const GtkTextIter *rhs)
}
else
{
- /* the ensure_char_offsets() calls do nothing if
+ /* the ensure_char_offsets () calls do nothing if
the offsets are already up-to-date. */
- ensure_char_offsets(real_lhs);
- ensure_char_offsets(real_rhs);
+ ensure_char_offsets (real_lhs);
+ ensure_char_offsets (real_rhs);
left_index = real_lhs->line_char_offset;
right_index = real_rhs->line_char_offset;
}
-
+
if (left_index < right_index)
return -1;
else if (left_index > right_index)
@@ -3503,15 +3503,15 @@ gtk_text_iter_compare(const GtkTextIter *lhs, const GtkTextIter *rhs)
else
{
gint line1, line2;
-
- line1 = gtk_text_iter_get_line(lhs);
- line2 = gtk_text_iter_get_line(rhs);
+
+ line1 = gtk_text_iter_get_line (lhs);
+ line2 = gtk_text_iter_get_line (rhs);
if (line1 < line2)
return -1;
else if (line1 > line2)
return 1;
else
- return 0;
+ return 0;
}
}
@@ -3520,18 +3520,18 @@ gtk_text_iter_in_range (const GtkTextIter *iter,
const GtkTextIter *start,
const GtkTextIter *end)
{
- return gtk_text_iter_compare(iter, start) >= 0 &&
- gtk_text_iter_compare(iter, end) < 0;
+ return gtk_text_iter_compare (iter, start) >= 0 &&
+ gtk_text_iter_compare (iter, end) < 0;
}
void
gtk_text_iter_reorder (GtkTextIter *first,
- GtkTextIter *second)
+ GtkTextIter *second)
{
- g_return_if_fail(first != NULL);
- g_return_if_fail(second != NULL);
+ g_return_if_fail (first != NULL);
+ g_return_if_fail (second != NULL);
- if (gtk_text_iter_compare(first, second) > 0)
+ if (gtk_text_iter_compare (first, second) > 0)
{
GtkTextIter tmp;
@@ -3547,48 +3547,48 @@ gtk_text_iter_reorder (GtkTextIter *first,
void
gtk_text_btree_get_iter_at_char (GtkTextBTree *tree,
- GtkTextIter *iter,
- gint char_index)
+ GtkTextIter *iter,
+ gint char_index)
{
GtkTextRealIter *real = (GtkTextRealIter*)iter;
gint real_char_index;
gint line_start;
GtkTextLine *line;
-
- g_return_if_fail(iter != NULL);
- g_return_if_fail(tree != NULL);
- line = gtk_text_btree_get_line_at_char(tree, char_index,
+ g_return_if_fail (iter != NULL);
+ g_return_if_fail (tree != NULL);
+
+ line = gtk_text_btree_get_line_at_char (tree, char_index,
&line_start, &real_char_index);
-
- iter_init_from_char_offset(iter, tree, line, real_char_index - line_start);
- real->cached_char_index = real_char_index;
+ iter_init_from_char_offset (iter, tree, line, real_char_index - line_start);
- check_invariants(iter);
+ real->cached_char_index = real_char_index;
+
+ check_invariants (iter);
}
void
gtk_text_btree_get_iter_at_line_char (GtkTextBTree *tree,
- GtkTextIter *iter,
- gint line_number,
- gint char_on_line)
+ GtkTextIter *iter,
+ gint line_number,
+ gint char_on_line)
{
GtkTextRealIter *real = (GtkTextRealIter*)iter;
GtkTextLine *line;
gint real_line;
-
- g_return_if_fail(iter != NULL);
- g_return_if_fail(tree != NULL);
-
- line = gtk_text_btree_get_line(tree, line_number, &real_line);
- iter_init_from_char_offset(iter, tree, line, char_on_line);
+ g_return_if_fail (iter != NULL);
+ g_return_if_fail (tree != NULL);
+
+ line = gtk_text_btree_get_line (tree, line_number, &real_line);
+
+ iter_init_from_char_offset (iter, tree, line, char_on_line);
/* We might as well cache this, since we know it. */
real->cached_line_number = real_line;
- check_invariants(iter);
+ check_invariants (iter);
}
void
@@ -3600,13 +3600,13 @@ gtk_text_btree_get_iter_at_line_byte (GtkTextBTree *tree,
GtkTextRealIter *real = (GtkTextRealIter*)iter;
GtkTextLine *line;
gint real_line;
-
- g_return_if_fail(iter != NULL);
- g_return_if_fail(tree != NULL);
-
- line = gtk_text_btree_get_line(tree, line_number, &real_line);
- iter_init_from_byte_offset(iter, tree, line, byte_index);
+ g_return_if_fail (iter != NULL);
+ g_return_if_fail (tree != NULL);
+
+ line = gtk_text_btree_get_line (tree, line_number, &real_line);
+
+ iter_init_from_byte_offset (iter, tree, line, byte_index);
/* We might as well cache this, since we know it. */
real->cached_line_number = real_line;
@@ -3616,92 +3616,92 @@ gtk_text_btree_get_iter_at_line_byte (GtkTextBTree *tree,
g_warning ("%s: Incorrect byte offset %d falls in the middle of a UTF-8 "
"character; this will crash the text buffer. "
"Byte indexes must refer to the start of a character.",
- G_STRLOC, byte_index);
-
- check_invariants(iter);
+ G_STRLOC, byte_index);
+
+ check_invariants (iter);
}
void
gtk_text_btree_get_iter_at_line (GtkTextBTree *tree,
- GtkTextIter *iter,
- GtkTextLine *line,
- gint byte_offset)
+ GtkTextIter *iter,
+ GtkTextLine *line,
+ gint byte_offset)
{
- g_return_if_fail(iter != NULL);
- g_return_if_fail(tree != NULL);
- g_return_if_fail(line != NULL);
+ g_return_if_fail (iter != NULL);
+ g_return_if_fail (tree != NULL);
+ g_return_if_fail (line != NULL);
- iter_init_from_byte_offset(iter, tree, line, byte_offset);
+ iter_init_from_byte_offset (iter, tree, line, byte_offset);
- check_invariants(iter);
+ check_invariants (iter);
}
gboolean
gtk_text_btree_get_iter_at_first_toggle (GtkTextBTree *tree,
- GtkTextIter *iter,
- GtkTextTag *tag)
+ GtkTextIter *iter,
+ GtkTextTag *tag)
{
GtkTextLine *line;
-
- g_return_val_if_fail(iter != NULL, FALSE);
- g_return_val_if_fail(tree != NULL, FALSE);
- line = gtk_text_btree_first_could_contain_tag(tree, tag);
+ g_return_val_if_fail (iter != NULL, FALSE);
+ g_return_val_if_fail (tree != NULL, FALSE);
+
+ line = gtk_text_btree_first_could_contain_tag (tree, tag);
if (line == NULL)
{
/* Set iter to last in tree */
- gtk_text_btree_get_last_iter(tree, iter);
- check_invariants(iter);
+ gtk_text_btree_get_last_iter (tree, iter);
+ check_invariants (iter);
return FALSE;
}
else
{
- iter_init_from_byte_offset(iter, tree, line, 0);
- gtk_text_iter_forward_to_tag_toggle(iter, tag);
- check_invariants(iter);
+ iter_init_from_byte_offset (iter, tree, line, 0);
+ gtk_text_iter_forward_to_tag_toggle (iter, tag);
+ check_invariants (iter);
return TRUE;
}
}
gboolean
gtk_text_btree_get_iter_at_last_toggle (GtkTextBTree *tree,
- GtkTextIter *iter,
- GtkTextTag *tag)
+ GtkTextIter *iter,
+ GtkTextTag *tag)
{
GtkTextLine *line;
-
- g_return_val_if_fail(iter != NULL, FALSE);
- g_return_val_if_fail(tree != NULL, FALSE);
- line = gtk_text_btree_last_could_contain_tag(tree, tag);
+ g_return_val_if_fail (iter != NULL, FALSE);
+ g_return_val_if_fail (tree != NULL, FALSE);
+
+ line = gtk_text_btree_last_could_contain_tag (tree, tag);
if (line == NULL)
{
/* Set iter to first in tree */
- gtk_text_btree_get_iter_at_line_char(tree, iter, 0, 0);
- check_invariants(iter);
+ gtk_text_btree_get_iter_at_line_char (tree, iter, 0, 0);
+ check_invariants (iter);
return FALSE;
}
else
{
- iter_init_from_byte_offset(iter, tree, line, -1);
- gtk_text_iter_backward_to_tag_toggle(iter, tag);
- check_invariants(iter);
+ iter_init_from_byte_offset (iter, tree, line, -1);
+ gtk_text_iter_backward_to_tag_toggle (iter, tag);
+ check_invariants (iter);
return TRUE;
}
}
gboolean
gtk_text_btree_get_iter_at_mark_name (GtkTextBTree *tree,
- GtkTextIter *iter,
- const gchar *mark_name)
+ GtkTextIter *iter,
+ const gchar *mark_name)
{
GtkTextMark *mark;
-
- g_return_val_if_fail(iter != NULL, FALSE);
- g_return_val_if_fail(tree != NULL, FALSE);
-
+
+ g_return_val_if_fail (iter != NULL, FALSE);
+ g_return_val_if_fail (tree != NULL, FALSE);
+
mark = gtk_text_btree_get_mark_by_name (tree, mark_name);
if (mark == NULL)
@@ -3720,51 +3720,51 @@ gtk_text_btree_get_iter_at_mark (GtkTextBTree *tree,
GtkTextMark *mark)
{
GtkTextLineSegment *seg;
-
+
g_return_if_fail (iter != NULL);
g_return_if_fail (tree != NULL);
g_return_if_fail (GTK_IS_TEXT_MARK (mark));
seg = mark->segment;
-
+
iter_init_from_segment (iter, tree,
seg->body.mark.line, seg);
- g_assert (seg->body.mark.line == gtk_text_iter_get_text_line(iter));
- check_invariants(iter);
+ g_assert (seg->body.mark.line == gtk_text_iter_get_text_line (iter));
+ check_invariants (iter);
}
void
gtk_text_btree_get_last_iter (GtkTextBTree *tree,
- GtkTextIter *iter)
+ GtkTextIter *iter)
{
- g_return_if_fail(iter != NULL);
- g_return_if_fail(tree != NULL);
-
- gtk_text_btree_get_iter_at_char(tree,
+ g_return_if_fail (iter != NULL);
+ g_return_if_fail (tree != NULL);
+
+ gtk_text_btree_get_iter_at_char (tree,
iter,
- gtk_text_btree_char_count(tree));
- check_invariants(iter);
+ gtk_text_btree_char_count (tree));
+ check_invariants (iter);
}
void
gtk_text_iter_spew (const GtkTextIter *iter, const gchar *desc)
{
GtkTextRealIter *real = (GtkTextRealIter*)iter;
-
- g_return_if_fail(iter != NULL);
- if (real->chars_changed_stamp != gtk_text_btree_get_chars_changed_stamp(real->tree))
+ g_return_if_fail (iter != NULL);
+
+ if (real->chars_changed_stamp != gtk_text_btree_get_chars_changed_stamp (real->tree))
g_print (" %20s: <invalidated iterator>\n", desc);
else
{
- check_invariants(iter);
+ check_invariants (iter);
g_print (" %20s: line %d / char %d / line char %d / line byte %d\n",
desc,
- gtk_text_iter_get_line(iter),
- gtk_text_iter_get_offset(iter),
- gtk_text_iter_get_line_offset(iter),
- gtk_text_iter_get_line_index(iter));
- check_invariants(iter);
+ gtk_text_iter_get_line (iter),
+ gtk_text_iter_get_offset (iter),
+ gtk_text_iter_get_line_offset (iter),
+ gtk_text_iter_get_line_index (iter));
+ check_invariants (iter);
}
}
@@ -3778,102 +3778,102 @@ gtk_text_iter_check (const GtkTextIter *iter)
GtkTextLineSegment *char_segment;
GtkTextLineSegment *char_any_segment;
gboolean segments_updated;
-
+
/* We are going to check our class invariants for the Iter class. */
g_assert (sizeof (GtkTextIter) == sizeof (GtkTextRealIter));
-
+
if (real->chars_changed_stamp !=
- gtk_text_btree_get_chars_changed_stamp(real->tree))
- g_error("iterator check failed: invalid iterator");
-
+ gtk_text_btree_get_chars_changed_stamp (real->tree))
+ g_error ("iterator check failed: invalid iterator");
+
if (real->line_char_offset < 0 && real->line_byte_offset < 0)
- g_error("iterator check failed: both char and byte offsets are invalid");
+ g_error ("iterator check failed: both char and byte offsets are invalid");
segments_updated = (real->segments_changed_stamp ==
- gtk_text_btree_get_segments_changed_stamp(real->tree));
+ gtk_text_btree_get_segments_changed_stamp (real->tree));
#if 0
- printf("checking iter, segments %s updated, byte %d char %d\n",
- segments_updated ? "are" : "aren't",
- real->line_byte_offset,
- real->line_char_offset);
+ printf ("checking iter, segments %s updated, byte %d char %d\n",
+ segments_updated ? "are" : "aren't",
+ real->line_byte_offset,
+ real->line_char_offset);
#endif
-
+
if (segments_updated)
{
if (real->segment_char_offset < 0 && real->segment_byte_offset < 0)
- g_error("iterator check failed: both char and byte segment offsets are invalid");
-
+ g_error ("iterator check failed: both char and byte segment offsets are invalid");
+
if (real->segment->char_count == 0)
- g_error("iterator check failed: segment is not indexable.");
+ g_error ("iterator check failed: segment is not indexable.");
if (real->line_char_offset >= 0 && real->segment_char_offset < 0)
- g_error("segment char offset is not properly up-to-date");
+ g_error ("segment char offset is not properly up-to-date");
if (real->line_byte_offset >= 0 && real->segment_byte_offset < 0)
- g_error("segment byte offset is not properly up-to-date");
+ g_error ("segment byte offset is not properly up-to-date");
if (real->segment_byte_offset >= 0 &&
real->segment_byte_offset >= real->segment->byte_count)
- g_error("segment byte offset is too large.");
+ g_error ("segment byte offset is too large.");
if (real->segment_char_offset >= 0 &&
real->segment_char_offset >= real->segment->char_count)
- g_error("segment char offset is too large.");
+ g_error ("segment char offset is too large.");
}
-
+
if (real->line_byte_offset >= 0)
{
- gtk_text_line_byte_locate(real->line, real->line_byte_offset,
- &byte_segment, &byte_any_segment,
- &seg_byte_offset, &line_byte_offset);
+ gtk_text_line_byte_locate (real->line, real->line_byte_offset,
+ &byte_segment, &byte_any_segment,
+ &seg_byte_offset, &line_byte_offset);
if (line_byte_offset != real->line_byte_offset)
- g_error("wrong byte offset was stored in iterator");
-
+ g_error ("wrong byte offset was stored in iterator");
+
if (segments_updated)
{
if (real->segment != byte_segment)
- g_error("wrong segment was stored in iterator");
+ g_error ("wrong segment was stored in iterator");
if (real->any_segment != byte_any_segment)
- g_error("wrong any_segment was stored in iterator");
-
+ g_error ("wrong any_segment was stored in iterator");
+
if (seg_byte_offset != real->segment_byte_offset)
- g_error("wrong segment byte offset was stored in iterator");
+ g_error ("wrong segment byte offset was stored in iterator");
}
}
-
+
if (real->line_char_offset >= 0)
{
- gtk_text_line_char_locate(real->line, real->line_char_offset,
- &char_segment, &char_any_segment,
- &seg_char_offset, &line_char_offset);
+ gtk_text_line_char_locate (real->line, real->line_char_offset,
+ &char_segment, &char_any_segment,
+ &seg_char_offset, &line_char_offset);
if (line_char_offset != real->line_char_offset)
- g_error("wrong char offset was stored in iterator");
-
+ g_error ("wrong char offset was stored in iterator");
+
if (segments_updated)
{
if (real->segment != char_segment)
- g_error("wrong segment was stored in iterator");
+ g_error ("wrong segment was stored in iterator");
if (real->any_segment != char_any_segment)
- g_error("wrong any_segment was stored in iterator");
-
+ g_error ("wrong any_segment was stored in iterator");
+
if (seg_char_offset != real->segment_char_offset)
- g_error("wrong segment char offset was stored in iterator");
+ g_error ("wrong segment char offset was stored in iterator");
}
}
-
+
if (real->line_char_offset >= 0 && real->line_byte_offset >= 0)
{
if (byte_segment != char_segment)
- g_error("char and byte offsets did not point to the same segment");
+ g_error ("char and byte offsets did not point to the same segment");
if (byte_any_segment != char_any_segment)
- g_error("char and byte offsets did not point to the same any segment");
+ g_error ("char and byte offsets did not point to the same any segment");
/* Make sure the segment offsets are equivalent, if it's a char
segment. */
@@ -3889,13 +3889,13 @@ gtk_text_iter_check (const GtkTextIter *iter)
}
if (byte_offset != seg_byte_offset)
- g_error("byte offset did not correspond to char offset");
+ g_error ("byte offset did not correspond to char offset");
char_offset =
g_utf8_strlen (char_segment->body.chars, seg_byte_offset);
if (char_offset != seg_char_offset)
- g_error("char offset did not correspond to byte offset");
+ g_error ("char offset did not correspond to byte offset");
}
}
@@ -3903,9 +3903,9 @@ gtk_text_iter_check (const GtkTextIter *iter)
{
gint should_be;
- should_be = gtk_text_line_get_number(real->line);
+ should_be = gtk_text_line_get_number (real->line);
if (real->cached_line_number != should_be)
- g_error("wrong line number was cached");
+ g_error ("wrong line number was cached");
}
if (real->cached_char_index >= 0)
@@ -3916,11 +3916,11 @@ gtk_text_iter_check (const GtkTextIter *iter)
{
gint char_index;
- char_index = gtk_text_line_char_index(real->line);
+ char_index = gtk_text_line_char_index (real->line);
char_index += real->line_char_offset;
if (real->cached_char_index != char_index)
- g_error("wrong char index was cached");
+ g_error ("wrong char index was cached");
}
}
}
diff --git a/gtk/gtktextiter.h b/gtk/gtktextiter.h
index f9b9202840..148046cfae 100644
--- a/gtk/gtktextiter.h
+++ b/gtk/gtktextiter.h
@@ -8,7 +8,7 @@
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
@@ -21,7 +21,7 @@
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef GTK_TEXT_ITER_H
@@ -59,7 +59,7 @@ struct _GtkTextIter {
/* This is primarily intended for language bindings that want to avoid
a "buffer" argument to text insertions, deletions, etc. */
-GtkTextBuffer *gtk_text_iter_get_buffer(const GtkTextIter *iter);
+GtkTextBuffer *gtk_text_iter_get_buffer (const GtkTextIter *iter);
/*
* Life cycle
@@ -178,12 +178,12 @@ gboolean gtk_text_iter_backward_to_tag_toggle (GtkTextIter *iter,
typedef gboolean (* GtkTextCharPredicate) (gunichar ch, gpointer user_data);
gboolean gtk_text_iter_forward_find_char (GtkTextIter *iter,
- GtkTextCharPredicate pred,
- gpointer user_data);
+ GtkTextCharPredicate pred,
+ gpointer user_data);
gboolean gtk_text_iter_backward_find_char (GtkTextIter *iter,
- GtkTextCharPredicate pred,
- gpointer user_data);
+ GtkTextCharPredicate pred,
+ gpointer user_data);
gboolean gtk_text_iter_forward_search (const GtkTextIter *iter,
const gchar *str,
diff --git a/gtk/gtktextiterprivate.h b/gtk/gtktextiterprivate.h
index bd6835a987..55f661102f 100644
--- a/gtk/gtktextiterprivate.h
+++ b/gtk/gtktextiterprivate.h
@@ -21,7 +21,7 @@ gint gtk_text_iter_get_segment_char (const GtkTextIter
/* debug */
-void gtk_text_iter_check(const GtkTextIter *iter);
+void gtk_text_iter_check (const GtkTextIter *iter);
#ifdef __cplusplus
}
diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index bcb8e693d5..2d590af1a4 100644
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -9,9 +9,9 @@
*
* This file can be used under your choice of two licenses, the LGPL
* and the original Tk license.
- *
+ *
* LGPL:
- *
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
@@ -32,7 +32,7 @@
* California, Sun Microsystems, Inc., and other parties. The
* following terms apply to all files associated with the software
* unless explicitly disclaimed in individual files.
- *
+ *
* The authors hereby grant permission to use, copy, modify,
* distribute, and license this software and its documentation for any
* purpose, provided that existing copyright notices are retained in
@@ -42,13 +42,13 @@
* software may be copyrighted by their authors and need not follow
* the licensing terms described here, provided that the new terms are
* clearly indicated on the first page of each file where they apply.
- *
+ *
* IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY
* PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
* DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION,
* OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+ *
* THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
@@ -85,28 +85,28 @@
#include <string.h>
static GtkTextLineData *gtk_text_line_data_new (GtkTextLayout *layout,
- GtkTextLine *line);
+ GtkTextLine *line);
static GtkTextLineData *gtk_text_layout_real_wrap (GtkTextLayout *layout,
- GtkTextLine *line,
- /* may be NULL */
- GtkTextLineData *line_data);
+ GtkTextLine *line,
+ /* may be NULL */
+ GtkTextLineData *line_data);
static void gtk_text_layout_real_get_log_attrs (GtkTextLayout *layout,
- GtkTextLine *line,
- PangoLogAttr **attrs,
- gint *n_attrs);
+ GtkTextLine *line,
+ PangoLogAttr **attrs,
+ gint *n_attrs);
static void gtk_text_layout_invalidated (GtkTextLayout *layout);
static void gtk_text_layout_real_invalidate (GtkTextLayout *layout,
- const GtkTextIter *start,
- const GtkTextIter *end);
+ const GtkTextIter *start,
+ const GtkTextIter *end);
static void gtk_text_layout_invalidate_cache (GtkTextLayout *layout,
- GtkTextLine *line);
+ GtkTextLine *line);
static void gtk_text_layout_real_free_line_data (GtkTextLayout *layout,
- GtkTextLine *line,
- GtkTextLineData *line_data);
+ GtkTextLine *line,
+ GtkTextLineData *line_data);
static void gtk_text_layout_invalidate_all (GtkTextLayout *layout);
@@ -153,8 +153,8 @@ gtk_text_layout_get_type (void)
(GtkClassInitFunc) NULL
};
- our_type = gtk_type_unique (GTK_TYPE_OBJECT, &our_info);
- }
+ our_type = gtk_type_unique (GTK_TYPE_OBJECT, &our_info);
+ }
return our_type;
}
@@ -189,7 +189,7 @@ gtk_text_layout_class_init (GtkTextLayoutClass *klass)
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;
@@ -228,7 +228,7 @@ gtk_text_layout_destroy (GtkObject *object)
layout = GTK_TEXT_LAYOUT (object);
- gtk_text_layout_set_buffer (layout, NULL);
+ gtk_text_layout_set_buffer (layout, NULL);
if (layout->default_style)
gtk_text_attributes_unref (layout->default_style);
@@ -244,7 +244,7 @@ gtk_text_layout_destroy (GtkObject *object)
g_object_unref (G_OBJECT (layout->rtl_context));
layout->rtl_context = NULL;
}
-
+
(* parent_class->destroy) (object);
}
@@ -264,17 +264,17 @@ gtk_text_layout_set_buffer (GtkTextLayout *layout,
{
g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
g_return_if_fail (buffer == NULL || GTK_IS_TEXT_BUFFER (buffer));
-
+
if (layout->buffer == buffer)
return;
free_style_cache (layout);
-
+
if (layout->buffer)
{
gtk_text_btree_remove_view (_gtk_text_buffer_get_btree (layout->buffer),
layout);
-
+
gtk_object_unref (GTK_OBJECT (layout->buffer));
layout->buffer = NULL;
}
@@ -294,7 +294,7 @@ void
gtk_text_layout_default_style_changed (GtkTextLayout *layout)
{
g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
-
+
gtk_text_layout_invalidate_all (layout);
}
@@ -309,7 +309,7 @@ gtk_text_layout_set_default_style (GtkTextLayout *layout,
return;
gtk_text_attributes_ref (values);
-
+
if (layout->default_style)
gtk_text_attributes_unref (layout->default_style);
@@ -320,8 +320,8 @@ gtk_text_layout_set_default_style (GtkTextLayout *layout,
void
gtk_text_layout_set_contexts (GtkTextLayout *layout,
- PangoContext *ltr_context,
- PangoContext *rtl_context)
+ PangoContext *ltr_context,
+ PangoContext *rtl_context)
{
g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
@@ -330,13 +330,13 @@ gtk_text_layout_set_contexts (GtkTextLayout *layout,
layout->ltr_context = ltr_context;
g_object_ref (G_OBJECT (ltr_context));
-
+
if (layout->rtl_context)
g_object_unref (G_OBJECT (rtl_context));
layout->rtl_context = rtl_context;
g_object_ref (G_OBJECT (rtl_context));
-
+
gtk_text_layout_invalidate_all (layout);
}
@@ -346,12 +346,12 @@ gtk_text_layout_set_screen_width (GtkTextLayout *layout, gint width)
g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
g_return_if_fail (width >= 0);
g_return_if_fail (layout->wrap_loop_count == 0);
-
+
if (layout->screen_width == width)
return;
-
+
layout->screen_width = width;
-
+
gtk_text_layout_invalidate_all (layout);
}
@@ -359,15 +359,15 @@ gtk_text_layout_set_screen_width (GtkTextLayout *layout, gint width)
* gtk_text_layout_set_cursor_visible:
* @layout: a #GtkTextLayout
* @cursor_visible: If %FALSE, then the insertion cursor will not
- * be shown, even if the text is editable.
- *
+ * be shown, even if the text is editable.
+ *
* Sets whether the insertion cursor should be shown. Generally,
* widgets using #GtkTextLayout will hide the cursor when the
* widget does not have the input focus.
**/
void
gtk_text_layout_set_cursor_visible (GtkTextLayout *layout,
- gboolean cursor_visible)
+ gboolean cursor_visible)
{
cursor_visible = (cursor_visible != FALSE);
@@ -375,13 +375,13 @@ gtk_text_layout_set_cursor_visible (GtkTextLayout *layout,
{
GtkTextIter iter;
gint y, height;
-
+
layout->cursor_visible = cursor_visible;
/* Now queue a redraw on the paragraph containing the cursor
*/
gtk_text_buffer_get_iter_at_mark (layout->buffer, &iter,
- gtk_text_buffer_get_mark (layout->buffer, "insert"));
+ gtk_text_buffer_get_mark (layout->buffer, "insert"));
gtk_text_layout_get_line_yrange (layout, &iter, &y, &height);
gtk_text_layout_changed (layout, y, height, height);
@@ -393,9 +393,9 @@ gtk_text_layout_set_cursor_visible (GtkTextLayout *layout,
/**
* gtk_text_layout_get_cursor_visible:
* @layout: a #GtkTextLayout
- *
+ *
* Returns whether the insertion cursor will be shown.
- *
+ *
* Return value: if %FALSE, the insertion cursor will not be
shown, even if the text is editable.
**/
@@ -411,16 +411,16 @@ gtk_text_layout_get_size (GtkTextLayout *layout,
gint *height)
{
gint w, h;
-
+
g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
-
+
gtk_text_btree_get_view_size (_gtk_text_buffer_get_btree (layout->buffer),
layout,
&w, &h);
layout->width = w;
layout->height = h;
-
+
if (width)
*width = layout->width;
@@ -436,17 +436,17 @@ gtk_text_layout_invalidated (GtkTextLayout *layout)
void
gtk_text_layout_changed (GtkTextLayout *layout,
- gint y,
- gint old_height,
- gint new_height)
+ gint y,
+ gint old_height,
+ gint new_height)
{
gtk_signal_emit (GTK_OBJECT (layout), signals[CHANGED], y, old_height, new_height);
}
void
gtk_text_layout_free_line_data (GtkTextLayout *layout,
- GtkTextLine *line,
- GtkTextLineData *line_data)
+ GtkTextLine *line,
+ GtkTextLineData *line_data)
{
(* GTK_TEXT_LAYOUT_GET_CLASS (layout)->free_line_data)
(layout, line, line_data);
@@ -463,18 +463,18 @@ gtk_text_layout_invalidate (GtkTextLayout *layout,
GtkTextLineData*
gtk_text_layout_wrap (GtkTextLayout *layout,
- GtkTextLine *line,
- /* may be NULL */
- GtkTextLineData *line_data)
+ GtkTextLine *line,
+ /* may be NULL */
+ GtkTextLineData *line_data)
{
return (* GTK_TEXT_LAYOUT_GET_CLASS (layout)->wrap) (layout, line, line_data);
}
void
gtk_text_layout_get_log_attrs (GtkTextLayout *layout,
- GtkTextLine *line,
- PangoLogAttr **attrs,
- gint *n_attrs)
+ GtkTextLine *line,
+ PangoLogAttr **attrs,
+ gint *n_attrs)
{
(* GTK_TEXT_LAYOUT_GET_CLASS (layout)->get_log_attrs)
(layout, line, attrs, n_attrs);
@@ -483,7 +483,7 @@ gtk_text_layout_get_log_attrs (GtkTextLayout *layout,
GSList*
gtk_text_layout_get_lines (GtkTextLayout *layout,
/* [top_y, bottom_y) */
- gint top_y,
+ gint top_y,
gint bottom_y,
gint *first_line_y)
{
@@ -491,12 +491,12 @@ gtk_text_layout_get_lines (GtkTextLayout *layout,
GtkTextLine *last_btree_line;
GtkTextLine *line;
GSList *retval;
-
+
g_return_val_if_fail (GTK_IS_TEXT_LAYOUT (layout), NULL);
g_return_val_if_fail (bottom_y > top_y, NULL);
retval = NULL;
-
+
first_btree_line =
gtk_text_btree_find_line_by_y (_gtk_text_buffer_get_btree (layout->buffer),
layout, top_y, first_line_y);
@@ -506,7 +506,7 @@ gtk_text_layout_get_lines (GtkTextLayout *layout,
/* 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),
@@ -521,9 +521,9 @@ gtk_text_layout_get_lines (GtkTextLayout *layout,
{
GtkTextLineData *ld = gtk_text_line_get_data (last_btree_line, layout);
if (ld->height == 0)
- G_BREAKPOINT();
+ G_BREAKPOINT ();
}
-
+
g_assert (last_btree_line != NULL);
line = first_btree_line;
@@ -533,10 +533,10 @@ gtk_text_layout_get_lines (GtkTextLayout *layout,
if (line == last_btree_line)
break;
-
+
line = gtk_text_line_next (line);
}
-
+
retval = g_slist_reverse (retval);
return retval;
@@ -557,7 +557,7 @@ gtk_text_layout_wrap_loop_start (GtkTextLayout *layout)
{
g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
g_return_if_fail (layout->one_style_cache == NULL);
-
+
layout->wrap_loop_count += 1;
}
@@ -565,7 +565,7 @@ void
gtk_text_layout_wrap_loop_end (GtkTextLayout *layout)
{
g_return_if_fail (layout->wrap_loop_count > 0);
-
+
layout->wrap_loop_count -= 1;
if (layout->wrap_loop_count == 0)
@@ -584,7 +584,7 @@ gtk_text_layout_invalidate_all (GtkTextLayout *layout)
{
GtkTextIter start;
GtkTextIter end;
-
+
if (layout->buffer == NULL)
return;
@@ -595,7 +595,7 @@ gtk_text_layout_invalidate_all (GtkTextLayout *layout)
static void
gtk_text_layout_invalidate_cache (GtkTextLayout *layout,
- GtkTextLine *line)
+ GtkTextLine *line)
{
if (layout->one_display_cache && line == layout->one_display_cache->line)
{
@@ -612,7 +612,7 @@ gtk_text_layout_real_invalidate (GtkTextLayout *layout,
{
GtkTextLine *line;
GtkTextLine *last_line;
-
+
g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
g_return_if_fail (layout->wrap_loop_count == 0);
@@ -620,7 +620,7 @@ gtk_text_layout_real_invalidate (GtkTextLayout *layout,
gtk_text_view_index_spew (start_index, "invalidate 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);
@@ -629,25 +629,25 @@ gtk_text_layout_real_invalidate (GtkTextLayout *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);
- }
-
+ (line != last_line || !gtk_text_iter_starts_line (end)))
+ {
+ gtk_text_layout_invalidate_cache (layout, line);
+ gtk_text_line_invalidate_wrap (line, line_data);
+ }
+
if (line == last_line)
break;
-
+
line = gtk_text_line_next (line);
}
-
+
gtk_text_layout_invalidated (layout);
}
static void
gtk_text_layout_real_free_line_data (GtkTextLayout *layout,
- GtkTextLine *line,
- GtkTextLineData *line_data)
+ GtkTextLine *line,
+ GtkTextLineData *line_data)
{
if (layout->one_display_cache && line == layout->one_display_cache->line)
{
@@ -655,7 +655,7 @@ gtk_text_layout_real_free_line_data (GtkTextLayout *layout,
layout->one_display_cache = NULL;
gtk_text_layout_free_line_display (layout, tmp_display);
}
-
+
g_free (line_data);
}
@@ -664,9 +664,9 @@ gtk_text_layout_real_free_line_data (GtkTextLayout *layout,
/**
* gtk_text_layout_is_valid:
* @layout: a #GtkTextLayout
- *
+ *
* Check if there are any invalid regions in a #GtkTextLayout's buffer
- *
+ *
* Return value: #TRUE if any invalid regions were found
**/
gboolean
@@ -674,7 +674,7 @@ 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),
layout);
}
@@ -690,32 +690,32 @@ gtk_text_layout_is_valid (GtkTextLayout *layout)
* @y1: offset from the top of the line pointed to by @anchor at
* which to end validation. (The offset here is in pixels
* after validation.)
- *
- * Ensure that a region of a #GtkTextLayout is valid. The ::changed
+ *
+ * Ensure that a region of a #GtkTextLayout is valid. The ::changed
* signal will be emitted if any lines are validated.
**/
void
gtk_text_layout_validate_yrange (GtkTextLayout *layout,
- GtkTextIter *anchor,
- gint y0,
- gint y1)
+ GtkTextIter *anchor,
+ gint y0,
+ gint y1)
{
GtkTextLine *line;
GtkTextLine *first_line = NULL;
GtkTextLine *last_line = NULL;
gint seen;
gint delta_height = 0;
- gint first_line_y = 0; /* Quiet GCC */
- gint last_line_y = 0; /* Quiet GCC */
-
+ 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)
y0 = 0;
if (y1 < 0)
y1 = 0;
-
+
/* Validate backwards from the anchor line to y0
*/
line = gtk_text_iter_get_text_line (anchor);
@@ -724,24 +724,24 @@ gtk_text_layout_validate_yrange (GtkTextLayout *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),
+ {
+ 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);
-
- delta_height += line_data->height - old_height;
-
- first_line = line;
- first_line_y = -seen;
- if (!last_line)
- {
- last_line = line;
- last_line_y = -seen + line_data->height;
- }
- }
-
+ line_data = gtk_text_line_get_data (line, layout);
+
+ delta_height += line_data->height - old_height;
+
+ first_line = line;
+ first_line_y = -seen;
+ if (!last_line)
+ {
+ last_line = line;
+ last_line_y = -seen + line_data->height;
+ }
+ }
+
seen += line_data->height;
line = gtk_text_line_previous (line);
}
@@ -753,24 +753,24 @@ gtk_text_layout_validate_yrange (GtkTextLayout *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),
+ {
+ 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);
-
- delta_height += line_data->height - old_height;
-
- if (!first_line)
- {
- first_line = line;
- first_line_y = seen;
- }
- last_line = line;
- last_line_y = seen + line_data->height;
- }
-
+ line_data = gtk_text_line_get_data (line, layout);
+
+ delta_height += line_data->height - old_height;
+
+ if (!first_line)
+ {
+ first_line = line;
+ first_line_y = seen;
+ }
+ last_line = line;
+ last_line_y = seen + line_data->height;
+ }
+
seen += line_data->height;
line = gtk_text_line_next (line);
}
@@ -781,12 +781,12 @@ gtk_text_layout_validate_yrange (GtkTextLayout *layout,
{
gint line_top =
gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer),
- first_line, layout);
-
+ first_line, layout);
+
gtk_text_layout_changed (layout,
- line_top,
- last_line_y - first_line_y - delta_height,
- last_line_y - first_line_y);
+ line_top,
+ last_line_y - first_line_y - delta_height,
+ last_line_y - first_line_y);
}
}
@@ -795,23 +795,23 @@ gtk_text_layout_validate_yrange (GtkTextLayout *layout,
* @tree: a #GtkTextLayout
* @max_pixels: the maximum number of pixels to validate. (No more
* than one paragraph beyond this limit will be validated)
- *
+ *
* Validate regions of a #GtkTextLayout. The ::changed signal will
* be emitted for each region validated.
**/
void
gtk_text_layout_validate (GtkTextLayout *layout,
- gint max_pixels)
+ gint max_pixels)
{
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),
+ gtk_text_btree_validate (_gtk_text_buffer_get_btree (layout->buffer),
layout, max_pixels,
- &y, &old_height, &new_height))
+ &y, &old_height, &new_height))
{
max_pixels -= new_height;
gtk_text_layout_changed (layout, y, old_height, new_height);
@@ -820,14 +820,14 @@ gtk_text_layout_validate (GtkTextLayout *layout,
static GtkTextLineData*
gtk_text_layout_real_wrap (GtkTextLayout *layout,
- GtkTextLine *line,
- /* may be NULL */
- GtkTextLineData *line_data)
+ GtkTextLine *line,
+ /* may be NULL */
+ GtkTextLineData *line_data)
{
GtkTextLineDisplay *display;
-
+
g_return_val_if_fail (GTK_IS_TEXT_LAYOUT (layout), NULL);
-
+
if (line_data == NULL)
{
line_data = gtk_text_line_data_new (layout, line);
@@ -845,14 +845,14 @@ gtk_text_layout_real_wrap (GtkTextLayout *layout,
static void
gtk_text_layout_real_get_log_attrs (GtkTextLayout *layout,
- GtkTextLine *line,
- PangoLogAttr **attrs,
- gint *n_attrs)
+ GtkTextLine *line,
+ PangoLogAttr **attrs,
+ gint *n_attrs)
{
GtkTextLineDisplay *display;
-
+
g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
-
+
display = gtk_text_layout_get_line_display (layout, line, TRUE);
pango_layout_get_log_attrs (display->layout, attrs, n_attrs);
gtk_text_layout_free_line_display (layout, display);
@@ -866,12 +866,12 @@ gtk_text_layout_real_get_log_attrs (GtkTextLayout *layout,
release_style () to free it. */
static GtkTextAttributes*
get_style (GtkTextLayout *layout,
- const GtkTextIter *iter)
+ const GtkTextIter *iter)
{
GtkTextTag** tags;
gint tag_count = 0;
GtkTextAttributes *style;
-
+
/* If we have the one-style cache, then it means
that we haven't seen a toggle since we filled in the
one-style cache.
@@ -883,7 +883,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);
@@ -901,18 +901,18 @@ get_style (GtkTextLayout *layout,
return layout->default_style;
}
-
+
/* Sort tags in ascending order of priority */
gtk_text_tag_array_sort (tags, tag_count);
-
+
style = gtk_text_attributes_new ();
-
+
gtk_text_attributes_copy (layout->default_style,
- style);
+ style);
gtk_text_attributes_fill_from_tags (style,
- tags,
- tag_count);
+ tags,
+ tag_count);
g_free (tags);
@@ -922,14 +922,14 @@ get_style (GtkTextLayout *layout,
g_assert (layout->one_style_cache == NULL);
gtk_text_attributes_ref (style); /* ref held by layout->one_style_cache */
layout->one_style_cache = style;
-
+
/* Returning yet another refcount */
return style;
}
static void
release_style (GtkTextLayout *layout,
- GtkTextAttributes *style)
+ GtkTextAttributes *style)
{
g_return_if_fail (style != NULL);
g_return_if_fail (style->refcount > 0);
@@ -945,12 +945,12 @@ release_style (GtkTextLayout *layout,
is completely invisible */
static gboolean
totally_invisible_line (GtkTextLayout *layout,
- GtkTextLine *line,
- GtkTextIter *iter)
+ GtkTextLine *line,
+ GtkTextIter *iter)
{
GtkTextLineSegment *seg;
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. */
if (layout->one_style_cache &&
@@ -962,11 +962,11 @@ 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),
- iter, line, 0);
-
+ 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))
- return FALSE;
+ return FALSE;
}
bytes = 0;
@@ -982,11 +982,11 @@ totally_invisible_line (GtkTextLayout *layout,
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 == &gtk_text_toggle_on_type)
{
invalidate_cached_style (layout);
-
+
/* Bail out if an elision-unsetting tag begins */
if (seg->body.toggle.info->tag->invisible_set &&
!seg->body.toggle.info->tag->values->invisible)
@@ -995,7 +995,7 @@ totally_invisible_line (GtkTextLayout *layout,
else if (seg->type == &gtk_text_toggle_off_type)
{
invalidate_cached_style (layout);
-
+
/* Bail out if an elision-setting tag ends */
if (seg->body.toggle.info->tag->invisible_set &&
seg->body.toggle.info->tag->values->invisible)
@@ -1013,9 +1013,9 @@ totally_invisible_line (GtkTextLayout *layout,
static void
set_para_values (GtkTextLayout *layout,
- GtkTextAttributes *style,
- GtkTextLineDisplay *display,
- gdouble *align)
+ GtkTextAttributes *style,
+ GtkTextLineDisplay *display,
+ gdouble *align)
{
PangoAlignment pango_align = PANGO_ALIGN_LEFT;
int layout_width;
@@ -1048,15 +1048,15 @@ set_para_values (GtkTextLayout *layout,
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;
+ 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);
@@ -1064,7 +1064,7 @@ set_para_values (GtkTextLayout *layout,
if (style->tabs)
pango_layout_set_tabs (display->layout, style->tabs);
-
+
display->top_margin = style->pixels_above_lines;
display->height = style->pixels_above_lines + style->pixels_below_lines;
display->bottom_margin = style->pixels_below_lines;
@@ -1092,7 +1092,7 @@ static PangoAttribute *
gtk_text_attr_appearance_copy (const PangoAttribute *attr)
{
const GtkTextAttrAppearance *appearance_attr = (const GtkTextAttrAppearance *)attr;
-
+
return gtk_text_attr_appearance_new (&appearance_attr->appearance);
}
@@ -1105,36 +1105,36 @@ gtk_text_attr_appearance_destroy (PangoAttribute *attr)
gdk_drawable_unref (appearance->bg_stipple);
if (appearance->fg_stipple)
gdk_drawable_unref (appearance->fg_stipple);
-
+
g_free (attr);
}
static gboolean
gtk_text_attr_appearance_compare (const PangoAttribute *attr1,
- const PangoAttribute *attr2)
+ const PangoAttribute *attr2)
{
const GtkTextAppearance *appearance1 = &((const GtkTextAttrAppearance *)attr1)->appearance;
const GtkTextAppearance *appearance2 = &((const GtkTextAttrAppearance *)attr2)->appearance;
return (gdk_color_equal (&appearance1->fg_color, &appearance2->fg_color) &&
- gdk_color_equal (&appearance1->bg_color, &appearance2->bg_color) &&
- appearance1->fg_stipple == appearance2->fg_stipple &&
- appearance1->bg_stipple == appearance2->bg_stipple &&
- appearance1->underline == appearance2->underline &&
- appearance1->strikethrough == appearance2->strikethrough &&
- appearance1->draw_bg == appearance2->draw_bg);
-
+ gdk_color_equal (&appearance1->bg_color, &appearance2->bg_color) &&
+ appearance1->fg_stipple == appearance2->fg_stipple &&
+ appearance1->bg_stipple == appearance2->bg_stipple &&
+ appearance1->underline == appearance2->underline &&
+ appearance1->strikethrough == appearance2->strikethrough &&
+ appearance1->draw_bg == appearance2->draw_bg);
+
}
/**
* gtk_text_attr_appearance_new:
- * @desc:
- *
+ * @desc:
+ *
* Create a new font description attribute. (This attribute
* allows setting family, style, weight, variant, stretch,
* and size simultaneously.)
- *
- * Return value:
+ *
+ * Return value:
**/
static PangoAttribute *
gtk_text_attr_appearance_new (const GtkTextAppearance *appearance)
@@ -1156,7 +1156,7 @@ gtk_text_attr_appearance_new (const GtkTextAppearance *appearance)
result->attr.klass = &klass;
result->appearance = *appearance;
-
+
if (appearance->bg_stipple)
gdk_drawable_ref (appearance->bg_stipple);
if (appearance->fg_stipple)
@@ -1167,11 +1167,11 @@ gtk_text_attr_appearance_new (const GtkTextAppearance *appearance)
static void
add_text_attrs (GtkTextLayout *layout,
- GtkTextAttributes *style,
- gint byte_count,
- PangoAttrList *attrs,
- gint start,
- gboolean size_only)
+ GtkTextAttributes *style,
+ gint byte_count,
+ PangoAttrList *attrs,
+ gint start,
+ gboolean size_only)
{
PangoAttribute *attr;
@@ -1184,21 +1184,21 @@ add_text_attrs (GtkTextLayout *layout,
if (!size_only)
{
attr = gtk_text_attr_appearance_new (&style->appearance);
-
+
attr->start_index = start;
attr->end_index = start + byte_count;
- pango_attr_list_insert (attrs, attr);
+ pango_attr_list_insert (attrs, attr);
}
}
static void
add_pixbuf_attrs (GtkTextLayout *layout,
- GtkTextLineDisplay *display,
- GtkTextAttributes *style,
- GtkTextLineSegment *seg,
- PangoAttrList *attrs,
- gint start)
+ GtkTextLineDisplay *display,
+ GtkTextAttributes *style,
+ GtkTextLineSegment *seg,
+ PangoAttrList *attrs,
+ gint start)
{
PangoAttribute *attr;
PangoRectangle logical_rect;
@@ -1223,9 +1223,9 @@ add_pixbuf_attrs (GtkTextLayout *layout,
static void
add_cursor (GtkTextLayout *layout,
- GtkTextLineDisplay *display,
- GtkTextLineSegment *seg,
- gint start)
+ GtkTextLineDisplay *display,
+ GtkTextLineSegment *seg,
+ gint start)
{
PangoRectangle strong_pos, weak_pos;
GtkTextCursorDisplay *cursor;
@@ -1238,25 +1238,25 @@ add_cursor (GtkTextLayout *layout,
(!layout->cursor_visible ||
gtk_text_buffer_get_selection_bounds (layout->buffer, NULL, NULL)))
return;
-
+
pango_layout_get_cursor_pos (display->layout, start, &strong_pos, &weak_pos);
-
+
cursor = g_new (GtkTextCursorDisplay, 1);
-
+
cursor->x = strong_pos.x / PANGO_SCALE;
cursor->y = strong_pos.y / PANGO_SCALE;
cursor->height = strong_pos.height / PANGO_SCALE;
cursor->is_strong = TRUE;
display->cursors = g_slist_prepend (display->cursors, cursor);
-
+
if (weak_pos.x == strong_pos.x)
cursor->is_weak = TRUE;
else
{
cursor->is_weak = FALSE;
-
+
cursor = g_new (GtkTextCursorDisplay, 1);
-
+
cursor->x = weak_pos.x / PANGO_SCALE;
cursor->y = weak_pos.y / PANGO_SCALE;
cursor->height = weak_pos.height / PANGO_SCALE;
@@ -1268,8 +1268,8 @@ add_cursor (GtkTextLayout *layout,
GtkTextLineDisplay *
gtk_text_layout_get_line_display (GtkTextLayout *layout,
- GtkTextLine *line,
- gboolean size_only)
+ GtkTextLine *line,
+ gboolean size_only)
{
GtkTextLineDisplay *display;
GtkTextLineSegment *seg;
@@ -1290,16 +1290,16 @@ gtk_text_layout_get_line_display (GtkTextLayout *layout,
if (layout->one_display_cache)
{
if (line == layout->one_display_cache->line &&
- (size_only || !layout->one_display_cache->size_only))
- return layout->one_display_cache;
+ (size_only || !layout->one_display_cache->size_only))
+ return layout->one_display_cache;
else
- {
- GtkTextLineDisplay *tmp_display = layout->one_display_cache;
- layout->one_display_cache = NULL;
- gtk_text_layout_free_line_display (layout, tmp_display);
- }
+ {
+ GtkTextLineDisplay *tmp_display = layout->one_display_cache;
+ layout->one_display_cache = NULL;
+ gtk_text_layout_free_line_display (layout, tmp_display);
+ }
}
-
+
display = g_new0 (GtkTextLineDisplay, 1);
display->size_only = size_only;
@@ -1307,7 +1307,7 @@ gtk_text_layout_get_line_display (GtkTextLayout *layout,
gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
&iter, line, 0);
-
+
/* Special-case optimization for completely
* invisible lines; makes it faster to deal
* with sequences of invisible lines.
@@ -1329,79 +1329,79 @@ gtk_text_layout_get_line_display (GtkTextLayout *layout,
{
/* Displayable segments */
if (seg->type == &gtk_text_char_type ||
- seg->type == &gtk_text_pixbuf_type)
+ seg->type == &gtk_text_pixbuf_type)
{
- gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
- &iter, line,
- byte_offset);
- style = get_style (layout, &iter);
-
- /* We have to delay setting the paragraph values until we
- * hit the first pixbuf or text segment because toggles at
- * the beginning of the paragraph should affect the
- * paragraph-global values
- */
- if (!para_values_set)
- {
- set_para_values (layout, style, display, &align);
- para_values_set = TRUE;
- }
+ gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
+ &iter, line,
+ byte_offset);
+ style = get_style (layout, &iter);
+
+ /* We have to delay setting the paragraph values until we
+ * hit the first pixbuf or text segment because toggles at
+ * the beginning of the paragraph should affect the
+ * paragraph-global values
+ */
+ if (!para_values_set)
+ {
+ set_para_values (layout, style, display, &align);
+ para_values_set = TRUE;
+ }
/* First see if the chunk is invisible, and ignore it if so. Tk
- * looked at tabs, wrap mode, etc. before doing this, but
- * that made no sense to me, so I am just skipping the
- * invisible chunks
- */
+ * looked at tabs, wrap mode, etc. before doing this, but
+ * that made no sense to me, so I am just skipping the
+ * invisible chunks
+ */
if (!style->invisible)
{
- if (seg->type == &gtk_text_char_type)
- {
- /* We don't want to split segments because of marks,
- * so we scan forward for more segments only
- * separated from us by marks. In theory, we should
- * also merge segments with identical styles, even
- * if there are toggles in-between
+ if (seg->type == &gtk_text_char_type)
+ {
+ /* We don't want to split segments because of marks,
+ * so we scan forward for more segments only
+ * separated from us by marks. In theory, we should
+ * also merge segments with identical styles, even
+ * if there are toggles in-between
*/
- gint byte_count = 0;
-
- while (TRUE)
- {
- if (seg->type == &gtk_text_char_type)
- {
- memcpy (text + byte_offset, seg->body.chars, seg->byte_count);
- byte_offset += seg->byte_count;
- byte_count += seg->byte_count;
- }
- else if (seg->body.mark.visible)
- {
- cursor_byte_offsets = g_slist_prepend (cursor_byte_offsets, GINT_TO_POINTER (byte_offset));
- cursor_segs = g_slist_prepend (cursor_segs, seg);
- }
-
- if (!seg->next ||
- (seg->next->type != &gtk_text_right_mark_type &&
- seg->next->type != &gtk_text_left_mark_type &&
- seg->next->type != &gtk_text_char_type))
- break;
-
- seg = seg->next;
- }
-
- add_text_attrs (layout, style, byte_count, attrs,
+ gint byte_count = 0;
+
+ while (TRUE)
+ {
+ if (seg->type == &gtk_text_char_type)
+ {
+ memcpy (text + byte_offset, seg->body.chars, seg->byte_count);
+ byte_offset += seg->byte_count;
+ byte_count += seg->byte_count;
+ }
+ else if (seg->body.mark.visible)
+ {
+ cursor_byte_offsets = g_slist_prepend (cursor_byte_offsets, GINT_TO_POINTER (byte_offset));
+ cursor_segs = g_slist_prepend (cursor_segs, seg);
+ }
+
+ if (!seg->next ||
+ (seg->next->type != &gtk_text_right_mark_type &&
+ seg->next->type != &gtk_text_left_mark_type &&
+ seg->next->type != &gtk_text_char_type))
+ break;
+
+ seg = seg->next;
+ }
+
+ add_text_attrs (layout, style, byte_count, attrs,
byte_offset - byte_count, size_only);
- }
- else
- {
- add_pixbuf_attrs (layout, display, style,
+ }
+ else
+ {
+ add_pixbuf_attrs (layout, display, style,
seg, attrs, byte_offset);
- memcpy (text + byte_offset, gtk_text_unknown_char_utf8,
+ memcpy (text + byte_offset, gtk_text_unknown_char_utf8,
seg->byte_count);
- byte_offset += seg->byte_count;
- }
- }
+ byte_offset += seg->byte_count;
+ }
+ }
- release_style (layout, style);
+ release_style (layout, style);
}
/* Toggles */
@@ -1412,7 +1412,7 @@ gtk_text_layout_get_line_display (GtkTextLayout *layout,
current cached style */
invalidate_cached_style (layout);
}
-
+
/* Marks */
else if (seg->type == &gtk_text_right_mark_type ||
seg->type == &gtk_text_left_mark_type)
@@ -1420,11 +1420,11 @@ gtk_text_layout_get_line_display (GtkTextLayout *layout,
/* Display visible marks */
if (seg->body.mark.visible)
- {
- cursor_byte_offsets = g_slist_prepend (cursor_byte_offsets,
+ {
+ cursor_byte_offsets = g_slist_prepend (cursor_byte_offsets,
GINT_TO_POINTER (byte_offset));
- cursor_segs = g_slist_prepend (cursor_segs, seg);
- }
+ cursor_segs = g_slist_prepend (cursor_segs, seg);
+ }
}
else
@@ -1439,11 +1439,11 @@ gtk_text_layout_get_line_display (GtkTextLayout *layout,
set_para_values (layout, style, display, &align);
release_style (layout, style);
}
-
+
/* Pango doesn't want the trailing new line */
if (byte_offset > 0 && text[byte_offset - 1] == '\n')
byte_offset--;
-
+
pango_layout_set_text (display->layout, text, byte_offset);
pango_layout_set_attributes (display->layout, attrs);
@@ -1466,7 +1466,7 @@ gtk_text_layout_get_line_display (GtkTextLayout *layout,
display->width = extents.width / PANGO_SCALE + display->left_margin + display->right_margin;
display->height += extents.height / PANGO_SCALE;
-
+
/* Free this if we aren't in a loop */
if (layout->wrap_loop_count == 0)
invalidate_cached_style (layout);
@@ -1475,25 +1475,25 @@ gtk_text_layout_get_line_display (GtkTextLayout *layout,
pango_attr_list_unref (attrs);
layout->one_display_cache = display;
-
+
return display;
}
void
gtk_text_layout_free_line_display (GtkTextLayout *layout,
- GtkTextLineDisplay *display)
+ GtkTextLineDisplay *display)
{
if (display != layout->one_display_cache)
{
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->pixbufs);
- }
-
+ {
+ g_slist_foreach (display->cursors, (GFunc)g_free, NULL);
+ g_slist_free (display->cursors);
+ g_slist_free (display->pixbufs);
+ }
+
g_free (display);
}
}
@@ -1501,7 +1501,7 @@ gtk_text_layout_free_line_display (GtkTextLayout *layout,
/* FIXME: This really doesn't belong in this file ... */
static GtkTextLineData*
gtk_text_line_data_new (GtkTextLayout *layout,
- GtkTextLine *line)
+ GtkTextLine *line)
{
GtkTextLineData *line_data;
@@ -1512,31 +1512,31 @@ gtk_text_line_data_new (GtkTextLayout *layout,
line_data->width = 0;
line_data->height = 0;
line_data->valid = FALSE;
-
+
return line_data;
}
static void
get_line_at_y (GtkTextLayout *layout,
- gint y,
- GtkTextLine **line,
- gint *line_top)
+ gint y,
+ GtkTextLine **line,
+ gint *line_top)
{
if (y < 0)
y = 0;
if (y > layout->height)
y = layout->height;
-
+
*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);
+ gtk_text_btree_line_count (_gtk_text_buffer_get_btree (layout->buffer)) - 1, NULL);
if (line_top)
- *line_top =
+ *line_top =
gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer),
- *line, layout);
+ *line, layout);
}
}
@@ -1547,15 +1547,15 @@ get_line_at_y (GtkTextLayout *layout,
* @y: the y positition
* @line_top: location to store the y coordinate of the
* top of the line. (Can by %NULL.)
- *
+ *
* Get the iter at the beginning of the line which is displayed
* at the given y.
**/
void
gtk_text_layout_get_line_at_y (GtkTextLayout *layout,
- GtkTextIter *target_iter,
- gint y,
- gint *line_top)
+ GtkTextIter *target_iter,
+ gint y,
+ gint *line_top)
{
GtkTextLine *line;
@@ -1576,10 +1576,10 @@ gtk_text_layout_get_iter_at_pixel (GtkTextLayout *layout,
gint byte_index, trailing;
gint line_top;
GtkTextLineDisplay *display;
-
+
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.
*/
@@ -1599,9 +1599,9 @@ gtk_text_layout_get_iter_at_pixel (GtkTextLayout *layout,
* hit testing works OK on the space above and below the layout
*/
y = CLAMP (y, display->top_margin, 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))
+ &byte_index, &trailing))
{
byte_index = gtk_text_line_byte_count (line);
trailing = 0;
@@ -1613,7 +1613,7 @@ gtk_text_layout_get_iter_at_pixel (GtkTextLayout *layout,
while (trailing--)
gtk_text_iter_next_char (target_iter);
-
+
gtk_text_layout_free_line_display (layout, display);
}
@@ -1623,7 +1623,7 @@ gtk_text_layout_get_iter_at_pixel (GtkTextLayout *layout,
* @iter: a #GtkTextIter
* @strong_pos: location to store the strong cursor position (may be %NULL)
* @weak_pos: location to store the weak cursor position (may be %NULL)
- *
+ *
* Given an iterator within a text laout, determine the positions that of the
* strong and weak cursors if the insertion point is at that
* iterator. The position of each cursor is stored as a zero-width
@@ -1635,9 +1635,9 @@ gtk_text_layout_get_iter_at_pixel (GtkTextLayout *layout,
**/
void
gtk_text_layout_get_cursor_locations (GtkTextLayout *layout,
- GtkTextIter *iter,
- GdkRectangle *strong_pos,
- GdkRectangle *weak_pos)
+ GtkTextIter *iter,
+ GdkRectangle *strong_pos,
+ GdkRectangle *weak_pos)
{
GtkTextLine *line;
GtkTextLineDisplay *display;
@@ -1648,7 +1648,7 @@ gtk_text_layout_get_cursor_locations (GtkTextLayout *layout,
g_return_if_fail (layout != NULL);
g_return_if_fail (iter != NULL);
-
+
line = gtk_text_iter_get_text_line (iter);
line_top = gtk_text_btree_find_line_top (_gtk_text_buffer_get_btree (layout->buffer),
line, layout);
@@ -1656,8 +1656,8 @@ gtk_text_layout_get_cursor_locations (GtkTextLayout *layout,
display = gtk_text_layout_get_line_display (layout, line, FALSE);
pango_layout_get_cursor_pos (display->layout, gtk_text_iter_get_line_index (iter),
- strong_pos ? &pango_strong_pos : NULL,
- weak_pos ? &pango_weak_pos : NULL);
+ strong_pos ? &pango_strong_pos : NULL,
+ weak_pos ? &pango_weak_pos : NULL);
if (strong_pos)
{
@@ -1686,21 +1686,21 @@ gtk_text_layout_get_cursor_locations (GtkTextLayout *layout,
* or %NULL.
* @height location to store the height of the paragraph in pixels,
* or %NULL.
- *
+ *
* Find the range of y coordinates for the paragraph containing
* the given iter.
**/
void
gtk_text_layout_get_line_yrange (GtkTextLayout *layout,
- const GtkTextIter *iter,
- gint *y,
- gint *height)
+ const GtkTextIter *iter,
+ gint *y,
+ gint *height)
{
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 (y)
@@ -1710,9 +1710,9 @@ gtk_text_layout_get_line_yrange (GtkTextLayout *layout,
{
GtkTextLineData *line_data = gtk_text_line_get_data (line, layout);
if (line_data)
- *height = line_data->height;
+ *height = line_data->height;
else
- *height = 0;
+ *height = 0;
}
}
@@ -1726,11 +1726,11 @@ gtk_text_layout_get_iter_location (GtkTextLayout *layout,
GtkTextBTree *tree;
GtkTextLineDisplay *display;
gint byte_index;
-
+
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 (rect != NULL);
-
+
tree = gtk_text_iter_get_btree (iter);
line = gtk_text_iter_get_text_line (iter);
@@ -1738,7 +1738,7 @@ gtk_text_layout_get_iter_location (GtkTextLayout *layout,
rect->y = gtk_text_btree_find_line_top (tree, line, layout);
- /* pango_layout_index_to_pos() expects the index of a character within the layout,
+ /* pango_layout_index_to_pos () expects the index of a character within the layout,
* so we have to special case the last character. FIXME: This should be moved
* to Pango.
*/
@@ -1747,7 +1747,7 @@ gtk_text_layout_get_iter_location (GtkTextLayout *layout,
PangoLayoutLine *last_line = g_slist_last (pango_layout_get_lines (display->layout))->data;
pango_layout_line_get_extents (last_line, NULL, &pango_rect);
-
+
rect->x = display->x_offset + (pango_rect.x + pango_rect.width) / PANGO_SCALE;
rect->y += display->top_margin;
rect->width = 0;
@@ -1758,13 +1758,13 @@ gtk_text_layout_get_iter_location (GtkTextLayout *layout,
byte_index = gtk_text_iter_get_line_index (iter);
pango_layout_index_to_pos (display->layout, byte_index, &pango_rect);
-
+
rect->x = display->x_offset + pango_rect.x / PANGO_SCALE;
rect->y += display->top_margin;
rect->width = pango_rect.width / PANGO_SCALE;
rect->height = pango_rect.height / PANGO_SCALE;
}
-
+
gtk_text_layout_free_line_display (layout, display);
}
@@ -1774,14 +1774,14 @@ gtk_text_layout_get_iter_location (GtkTextLayout *layout,
*/
static void
find_display_line_below (GtkTextLayout *layout,
- GtkTextIter *iter,
- gint y)
+ GtkTextIter *iter,
+ gint y)
{
GtkTextLine *line, *next;
GtkTextLine *found_line = NULL;
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);
if (!line)
@@ -1802,59 +1802,59 @@ find_display_line_below (GtkTextLayout *layout,
GSList *tmp_list = pango_layout_get_lines (display->layout);
line_top += display->top_margin;
-
+
while (tmp_list)
- {
- PangoRectangle logical_rect;
- PangoLayoutLine *layout_line = tmp_list->data;
-
- found_byte = byte_index;
-
- if (line_top >= y)
- {
- found_line = line;
- break;
- }
-
- pango_layout_line_get_extents (layout_line, NULL, &logical_rect);
- line_top += logical_rect.height / PANGO_SCALE;
-
- tmp_list = tmp_list->next;
- }
+ {
+ PangoRectangle logical_rect;
+ PangoLayoutLine *layout_line = tmp_list->data;
+
+ found_byte = byte_index;
+
+ if (line_top >= y)
+ {
+ found_line = line;
+ break;
+ }
+
+ pango_layout_line_get_extents (layout_line, NULL, &logical_rect);
+ line_top += logical_rect.height / PANGO_SCALE;
+
+ tmp_list = tmp_list->next;
+ }
line_top += display->bottom_margin;
gtk_text_layout_free_line_display (layout, display);
next = gtk_text_line_next (line);
if (!next)
- found_line = line;
+ found_line = line;
line = next;
}
-
+
gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
iter, found_line, found_byte);
}
-
+
/* Find the iter for the logical beginning of the last display line whose
* top y is >= y. If none exists, move the iter to the logical beginning
* of the first line in the buffer.
*/
static void
find_display_line_above (GtkTextLayout *layout,
- GtkTextIter *iter,
- gint y)
+ GtkTextIter *iter,
+ gint y)
{
GtkTextLine *line;
GtkTextLine *found_line = NULL;
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);
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_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);
}
@@ -1862,7 +1862,7 @@ find_display_line_above (GtkTextLayout *layout,
{
GtkTextLineDisplay *display = gtk_text_layout_get_line_display (layout, line, FALSE);
PangoRectangle logical_rect;
-
+
gint byte_index = 0;
GSList *tmp_list;
gint tmp_top;
@@ -1870,31 +1870,31 @@ find_display_line_above (GtkTextLayout *layout,
line_top -= display->top_margin + display->bottom_margin;
pango_layout_get_extents (display->layout, NULL, &logical_rect);
line_top -= logical_rect.height / PANGO_SCALE;
-
+
tmp_top = line_top + display->top_margin;
tmp_list = pango_layout_get_lines (display->layout);
while (tmp_list)
- {
- PangoLayoutLine *layout_line = tmp_list->data;
-
- found_byte = byte_index;
-
- tmp_top += logical_rect.height / PANGO_SCALE;
-
- if (tmp_top < y)
- {
- found_line = line;
- found_byte = byte_index;
- }
-
- pango_layout_line_get_extents (layout_line, NULL, &logical_rect);
-
- tmp_list = tmp_list->next;
- }
+ {
+ PangoLayoutLine *layout_line = tmp_list->data;
+
+ found_byte = byte_index;
+
+ tmp_top += logical_rect.height / PANGO_SCALE;
+
+ if (tmp_top < y)
+ {
+ found_line = line;
+ found_byte = byte_index;
+ }
+
+ pango_layout_line_get_extents (layout_line, NULL, &logical_rect);
+
+ tmp_list = tmp_list->next;
+ }
gtk_text_layout_free_line_display (layout, display);
-
+
line = gtk_text_line_previous (line);
}
@@ -1904,14 +1904,14 @@ find_display_line_above (GtkTextLayout *layout,
else
gtk_text_buffer_get_iter_at_offset (layout->buffer, iter, 0);
}
-
+
/**
* gtk_text_layout_clamp_iter_to_vrange:
* @layout: a #GtkTextLayout
* @iter: a #GtkTextIter
* @top: the top of the range
* @bottom: the bottom the range
- *
+ *
* If the iterator is not fully in the range @top <= y < @bottom,
* then, if possible, move it the minimum distance so that the
* iterator in this range.
@@ -1920,9 +1920,9 @@ find_display_line_above (GtkTextLayout *layout,
**/
gboolean
gtk_text_layout_clamp_iter_to_vrange (GtkTextLayout *layout,
- GtkTextIter *iter,
- gint top,
- gint bottom)
+ GtkTextIter *iter,
+ gint top,
+ gint bottom)
{
GdkRectangle iter_rect;
@@ -1934,7 +1934,7 @@ gtk_text_layout_clamp_iter_to_vrange (GtkTextLayout *layout,
if (iter_rect.y < top)
{
find_display_line_below (layout, iter, top);
-
+
return TRUE;
}
/* Otherwise, if the iter is at least partially below the screen, put the
@@ -1944,7 +1944,7 @@ gtk_text_layout_clamp_iter_to_vrange (GtkTextLayout *layout,
else if (iter_rect.y + iter_rect.height > bottom)
{
find_display_line_above (layout, iter, bottom);
-
+
return TRUE;
}
else
@@ -1955,13 +1955,13 @@ gtk_text_layout_clamp_iter_to_vrange (GtkTextLayout *layout,
* gtk_text_layout_move_iter_to_next_line:
* @layout: a #GtkLayout
* @iter: a #GtkTextIter
- *
+ *
* Move the iterator to the beginning of the previous line. The lines
* of a wrapped paragraph are treated as distinct for this operation.
**/
void
gtk_text_layout_move_iter_to_previous_line (GtkTextLayout *layout,
- GtkTextIter *iter)
+ GtkTextIter *iter)
{
GtkTextLine *line;
GtkTextLineDisplay *display;
@@ -1972,10 +1972,10 @@ gtk_text_layout_move_iter_to_previous_line (GtkTextLayout *layout,
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_byte = gtk_text_iter_get_line_index (iter);
-
+
display = gtk_text_layout_get_line_display (layout, line, FALSE);
tmp_list = pango_layout_get_lines (display->layout);
@@ -1986,28 +1986,28 @@ gtk_text_layout_move_iter_to_previous_line (GtkTextLayout *layout,
GtkTextLine *prev_line = gtk_text_line_previous (line);
if (prev_line)
- {
- gint byte_offset = 0;
-
- 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)
- {
- layout_line = tmp_list->data;
- tmp_list = tmp_list->next;
-
- byte_offset += layout_line->length;
- }
-
- gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
- iter, prev_line, byte_offset);
- }
+ {
+ gint byte_offset = 0;
+
+ 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)
+ {
+ layout_line = tmp_list->data;
+ tmp_list = tmp_list->next;
+
+ byte_offset += layout_line->length;
+ }
+
+ gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
+ iter, prev_line, byte_offset);
+ }
else
- 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);
}
else
{
@@ -2016,20 +2016,20 @@ gtk_text_layout_move_iter_to_previous_line (GtkTextLayout *layout,
tmp_list = tmp_list->next;
while (tmp_list)
- {
- layout_line = tmp_list->data;
-
- if (line_byte < byte_offset + layout_line->length || !tmp_list->next)
- {
- gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
- iter, line, prev_offset);
- break;
- }
-
- prev_offset = byte_offset;
- byte_offset += layout_line->length;
- tmp_list = tmp_list->next;
- }
+ {
+ layout_line = tmp_list->data;
+
+ if (line_byte < byte_offset + layout_line->length || !tmp_list->next)
+ {
+ gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
+ iter, line, prev_offset);
+ break;
+ }
+
+ prev_offset = byte_offset;
+ byte_offset += layout_line->length;
+ tmp_list = tmp_list->next;
+ }
}
gtk_text_layout_free_line_display (layout, display);
@@ -2039,55 +2039,55 @@ gtk_text_layout_move_iter_to_previous_line (GtkTextLayout *layout,
* gtk_text_layout_move_iter_to_next_line:
* @layout: a #GtkLayout
* @iter: a #GtkTextIter
- *
+ *
* Move the iterator to the beginning of the next line. The
* lines of a wrapped paragraph are treated as distinct for
* this operation.
**/
void
gtk_text_layout_move_iter_to_next_line (GtkTextLayout *layout,
- GtkTextIter *iter)
+ GtkTextIter *iter)
{
GtkTextLine *line;
GtkTextLineDisplay *display;
gint line_byte;
-
+
gboolean found = FALSE;
gboolean found_after = FALSE;
-
+
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_byte = gtk_text_iter_get_line_index (iter);
-
+
while (line && !found_after)
{
gint byte_offset = 0;
GSList *tmp_list;
-
+
display = gtk_text_layout_get_line_display (layout, line, FALSE);
tmp_list = pango_layout_get_lines (display->layout);
while (tmp_list && !found_after)
- {
- PangoLayoutLine *layout_line = tmp_list->data;
-
- if (found)
- {
- gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
- iter, line,
- byte_offset);
- found_after = TRUE;
- }
- else if (line_byte < byte_offset + layout_line->length || !tmp_list->next)
- found = TRUE;
-
- byte_offset += layout_line->length;
- tmp_list = tmp_list->next;
- }
-
+ {
+ PangoLayoutLine *layout_line = tmp_list->data;
+
+ if (found)
+ {
+ gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
+ iter, line,
+ byte_offset);
+ found_after = TRUE;
+ }
+ else if (line_byte < byte_offset + layout_line->length || !tmp_list->next)
+ found = TRUE;
+
+ byte_offset += layout_line->length;
+ tmp_list = tmp_list->next;
+ }
+
gtk_text_layout_free_line_display (layout, display);
line = gtk_text_line_next (line);
@@ -2099,27 +2099,27 @@ gtk_text_layout_move_iter_to_next_line (GtkTextLayout *layout,
* @layout: a #GtkTextLayout
* @direction: if negative, move to beginning of line, otherwise
move to end of line.
- *
+ *
* Move to the beginning or end of a display line.
**/
void
gtk_text_layout_move_iter_to_line_end (GtkTextLayout *layout,
- GtkTextIter *iter,
- gint direction)
+ GtkTextIter *iter,
+ gint direction)
{
GtkTextLine *line;
GtkTextLineDisplay *display;
gint line_byte;
gint byte_offset = 0;
GSList *tmp_list;
-
+
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_byte = gtk_text_iter_get_line_index (iter);
-
+
display = gtk_text_layout_get_line_display (layout, line, FALSE);
tmp_list = pango_layout_get_lines (display->layout);
@@ -2128,23 +2128,23 @@ gtk_text_layout_move_iter_to_line_end (GtkTextLayout *layout,
PangoLayoutLine *layout_line = tmp_list->data;
if (line_byte < byte_offset + layout_line->length || !tmp_list->next)
- {
- gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
- iter, line,
- direction < 0 ? byte_offset : layout_line->length);
-
- /* FIXME: Move back one position to avoid going to next line
- */
- if (direction < 0 && layout_line->length > 0)
- gtk_text_iter_prev_char (iter);
-
- break;
- }
-
+ {
+ gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
+ iter, line,
+ direction < 0 ? byte_offset : layout_line->length);
+
+ /* FIXME: Move back one position to avoid going to next line
+ */
+ if (direction < 0 && layout_line->length > 0)
+ gtk_text_iter_prev_char (iter);
+
+ break;
+ }
+
byte_offset += layout_line->length;
tmp_list = tmp_list->next;
}
-
+
gtk_text_layout_free_line_display (layout, display);
}
@@ -2160,22 +2160,22 @@ gtk_text_layout_move_iter_to_line_end (GtkTextLayout *layout,
**/
void
gtk_text_layout_move_iter_to_x (GtkTextLayout *layout,
- GtkTextIter *iter,
- gint x)
+ GtkTextIter *iter,
+ gint x)
{
GtkTextLine *line;
GtkTextLineDisplay *display;
gint line_byte;
gint byte_offset = 0;
GSList *tmp_list;
-
+
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_byte = gtk_text_iter_get_line_index (iter);
-
+
display = gtk_text_layout_get_line_display (layout, line, FALSE);
tmp_list = pango_layout_get_lines (display->layout);
@@ -2184,48 +2184,48 @@ gtk_text_layout_move_iter_to_x (GtkTextLayout *layout,
PangoLayoutLine *layout_line = tmp_list->data;
if (line_byte < byte_offset + layout_line->length || !tmp_list->next)
- {
- PangoRectangle logical_rect;
- gint byte_index, trailing;
- gint align = pango_layout_get_alignment (display->layout);
- gint x_offset = display->left_margin * PANGO_SCALE;
- gint width = pango_layout_get_width (display->layout);
-
- if (width < 0)
- width = display->total_width * PANGO_SCALE;
-
- pango_layout_line_get_extents (layout_line, NULL, &logical_rect);
-
- switch (align)
- {
- case PANGO_ALIGN_RIGHT:
- x_offset += width - logical_rect.width;
- break;
- case PANGO_ALIGN_CENTER:
- x_offset += (width - logical_rect.width) / 2;
- break;
- default:
- break;
- }
-
- pango_layout_line_x_to_index (layout_line,
- x * PANGO_SCALE - x_offset,
- &byte_index, &trailing);
-
- gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
- iter,
- line, byte_index);
-
- while (trailing--)
- gtk_text_iter_next_char (iter);
-
- break;
- }
-
+ {
+ PangoRectangle logical_rect;
+ gint byte_index, trailing;
+ gint align = pango_layout_get_alignment (display->layout);
+ gint x_offset = display->left_margin * PANGO_SCALE;
+ gint width = pango_layout_get_width (display->layout);
+
+ if (width < 0)
+ width = display->total_width * PANGO_SCALE;
+
+ pango_layout_line_get_extents (layout_line, NULL, &logical_rect);
+
+ switch (align)
+ {
+ case PANGO_ALIGN_RIGHT:
+ x_offset += width - logical_rect.width;
+ break;
+ case PANGO_ALIGN_CENTER:
+ x_offset += (width - logical_rect.width) / 2;
+ break;
+ default:
+ break;
+ }
+
+ pango_layout_line_x_to_index (layout_line,
+ x * PANGO_SCALE - x_offset,
+ &byte_index, &trailing);
+
+ gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
+ iter,
+ line, byte_index);
+
+ while (trailing--)
+ gtk_text_iter_next_char (iter);
+
+ break;
+ }
+
byte_offset += layout_line->length;
tmp_list = tmp_list->next;
}
-
+
gtk_text_layout_free_line_display (layout, display);
}
@@ -2234,7 +2234,7 @@ gtk_text_layout_move_iter_to_x (GtkTextLayout *layout,
* @layout: a #GtkTextLayout
* @iter: a #GtkTextIter
* @count: number of characters to move (negative moves left, positive moves right)
- *
+ *
* Move the iterator a given number of characters visually, treating
* it as the strong cursor position. If @count is positive, then the
* new strong cursor position will be @count positions to the right of
@@ -2247,15 +2247,15 @@ gtk_text_layout_move_iter_to_x (GtkTextLayout *layout,
* of the current run, and there may be jumps when the cursor
* is moved off of the end of a run.
**/
-
+
void
gtk_text_layout_move_iter_visually (GtkTextLayout *layout,
- GtkTextIter *iter,
- gint count)
+ GtkTextIter *iter,
+ gint count)
{
g_return_if_fail (layout != NULL);
g_return_if_fail (iter != NULL);
-
+
while (count != 0)
{
GtkTextLine *line = gtk_text_iter_get_text_line (iter);
@@ -2263,46 +2263,46 @@ gtk_text_layout_move_iter_visually (GtkTextLayout *layout,
GtkTextLineDisplay *display = gtk_text_layout_get_line_display (layout, line, FALSE);
int byte_count = gtk_text_line_byte_count (line);
-
+
int new_index;
int new_trailing;
-
+
if (count > 0)
- {
- pango_layout_move_cursor_visually (display->layout, line_byte, 0, 1, &new_index, &new_trailing);
- count--;
- }
+ {
+ pango_layout_move_cursor_visually (display->layout, 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);
- count++;
- }
+ {
+ pango_layout_move_cursor_visually (display->layout, line_byte, 0, -1, &new_index, &new_trailing);
+ count++;
+ }
gtk_text_layout_free_line_display (layout, display);
if (new_index < 0)
- {
- line = gtk_text_line_previous (line);
- if (!line)
- return;
-
- new_index = gtk_text_line_byte_count (line);
-
- }
+ {
+ line = gtk_text_line_previous (line);
+ if (!line)
+ return;
+
+ new_index = gtk_text_line_byte_count (line);
+
+ }
else if (new_index > byte_count)
- {
- line = gtk_text_line_next (line);
- if (!line)
- return;
-
- new_index = 0;
- }
+ {
+ line = gtk_text_line_next (line);
+ if (!line)
+ return;
+
+ new_index = 0;
+ }
gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer),
- iter,
- line, new_index);
+ iter,
+ line, new_index);
while (new_trailing--)
- gtk_text_iter_next_char (iter);
+ gtk_text_iter_next_char (iter);
}
}
@@ -2315,9 +2315,9 @@ gtk_text_layout_spew (GtkTextLayout *layout)
guint wrapped = 0;
guint paragraphs = 0;
GtkTextLine *last_line = NULL;
-
+
iter = layout->line_list;
- while (iter != NULL)
+ while (iter != NULL)
{
if (iter->line != last_line)
{
@@ -2325,21 +2325,21 @@ gtk_text_layout_spew (GtkTextLayout *layout)
++paragraphs;
last_line = iter->line;
}
-
+
printf (" %5u y: %d len: %d start: %d bytes: %d\n",
- wrapped, iter->y, iter->length, iter->byte_offset,
- iter->byte_count);
+ wrapped, iter->y, iter->length, iter->byte_offset,
+ iter->byte_count);
++wrapped;
iter = iter->next;
}
printf ("Layout %s recompute\n",
- layout->need_recompute ? "needs" : "doesn't need");
+ layout->need_recompute ? "needs" : "doesn't need");
printf ("Layout pars: %u lines: %u size: %d x %d Screen width: %d\n",
- paragraphs, wrapped, layout->width,
- layout->height, layout->screen_width);
+ paragraphs, wrapped, layout->width,
+ layout->height, layout->screen_width);
#endif
}
diff --git a/gtk/gtktextlayout.h b/gtk/gtktextlayout.h
index cfa7c88f4b..a4eb5858fb 100644
--- a/gtk/gtktextlayout.h
+++ b/gtk/gtktextlayout.h
@@ -9,9 +9,9 @@
*
* This file can be used under your choice of two licenses, the LGPL
* and the original Tk license.
- *
+ *
* LGPL:
- *
+ *
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
@@ -32,7 +32,7 @@
* California, Sun Microsystems, Inc., and other parties. The
* following terms apply to all files associated with the software
* unless explicitly disclaimed in individual files.
- *
+ *
* The authors hereby grant permission to use, copy, modify,
* distribute, and license this software and its documentation for any
* purpose, provided that existing copyright notices are retained in
@@ -42,13 +42,13 @@
* software may be copyrighted by their authors and need not follow
* the licensing terms described here, provided that the new terms are
* clearly indicated on the first page of each file where they apply.
- *
+ *
* IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY
* PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
* DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION,
* OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+ *
* THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
@@ -87,7 +87,7 @@ extern "C" {
* use by the text widget, and the text canvas item,
* but that's all. We may have to install it so the
* canvas item can use it, but users are not supposed
- * to use it.
+ * to use it.
*/
#include <gtk/gtktextbuffer.h>
@@ -99,7 +99,7 @@ extern "C" {
typedef struct _GtkTextLine GtkTextLine;
typedef struct _GtkTextLineData GtkTextLineData;
-#define GTK_TYPE_TEXT_LAYOUT (gtk_text_layout_get_type())
+#define GTK_TYPE_TEXT_LAYOUT (gtk_text_layout_get_type ())
#define GTK_TEXT_LAYOUT(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_TEXT_LAYOUT, GtkTextLayout))
#define GTK_TEXT_LAYOUT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_LAYOUT, GtkTextLayoutClass))
#define GTK_IS_TEXT_LAYOUT(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_TEXT_LAYOUT))
@@ -115,15 +115,15 @@ typedef struct _GtkTextAttrAppearance GtkTextAttrAppearance;
struct _GtkTextLayout
{
GtkObject parent_instance;
-
+
/* width of the display area on-screen,
* i.e. pixels we should wrap to fit inside. */
gint screen_width;
-
+
/* width/height of the total logical area being layed out */
gint width;
gint height;
-
+
/* Pixel offsets from the left and from the top to be used when we
* draw; these allow us to create left/top margins. We don't need
* anything special for bottom/right margins, because those don't
@@ -131,29 +131,29 @@ struct _GtkTextLayout
*/
/* gint left_edge; */
/* gint top_edge; */
-
+
GtkTextBuffer *buffer;
-
+
/* Default style used if no tags override it */
GtkTextAttributes *default_style;
-
+
/* Pango contexts used for creating layouts */
PangoContext *ltr_context;
PangoContext *rtl_context;
-
+
/* A cache of one style; this is used to ensure
* we don't constantly regenerate the style
* over long runs with the same style. */
GtkTextAttributes *one_style_cache;
-
+
/* A cache of one line display. Getting the same line
* many times in a row is the most common case.
*/
GtkTextLineDisplay *one_display_cache;
-
+
/* Whether we are allowed to wrap right now */
gint wrap_loop_count;
-
+
/* Whether to show the insertion cursor */
guint cursor_visible : 1;
};
@@ -161,30 +161,30 @@ struct _GtkTextLayout
struct _GtkTextLayoutClass
{
GtkObjectClass parent_class;
-
+
/* Some portion of the layout was invalidated
*/
- void (*invalidated) (GtkTextLayout *layout);
-
+ void (*invalidated) (GtkTextLayout *layout);
+
/* A range of the layout changed appearance and possibly height
*/
- void (*changed) (GtkTextLayout *layout,
- gint y,
- gint old_height,
- gint new_height);
- GtkTextLineData* (*wrap) (GtkTextLayout *layout,
- GtkTextLine *line,
- GtkTextLineData *line_data); /* may be NULL */
- void (*get_log_attrs) (GtkTextLayout *layout,
- GtkTextLine *line,
- PangoLogAttr **attrs,
- gint *n_attrs);
- void (*invalidate) (GtkTextLayout *layout,
- const GtkTextIter *start,
- const GtkTextIter *end);
- void (*free_line_data) (GtkTextLayout *layout,
- GtkTextLine *line,
- GtkTextLineData *line_data);
+ void (*changed) (GtkTextLayout *layout,
+ gint y,
+ gint old_height,
+ gint new_height);
+ GtkTextLineData* (*wrap) (GtkTextLayout *layout,
+ GtkTextLine *line,
+ GtkTextLineData *line_data); /* may be NULL */
+ void (*get_log_attrs) (GtkTextLayout *layout,
+ GtkTextLine *line,
+ PangoLogAttr **attrs,
+ gint *n_attrs);
+ void (*invalidate) (GtkTextLayout *layout,
+ const GtkTextIter *start,
+ const GtkTextIter *end);
+ void (*free_line_data) (GtkTextLayout *layout,
+ GtkTextLine *line,
+ GtkTextLineData *line_data);
};
struct _GtkTextAttrAppearance
{
@@ -204,18 +204,18 @@ struct _GtkTextLineDisplay
PangoLayout *layout;
GSList *cursors;
GSList *pixbufs;
-
+
GtkTextDirection direction;
-
- gint width; /* Width of layout */
- gint total_width; /* width - margins, if no width set on layout, if width set on layout, -1 */
+
+ gint width; /* Width of layout */
+ gint total_width; /* width - margins, if no width set on layout, if width set on layout, -1 */
gint height;
- gint x_offset; /* Amount layout is shifted from left edge */
+ gint x_offset; /* Amount layout is shifted from left edge */
gint left_margin;
gint right_margin;
gint top_margin;
gint bottom_margin;
-
+
gboolean size_only;
GtkTextLine *line;
};
@@ -223,68 +223,68 @@ struct _GtkTextLineDisplay
extern PangoAttrType gtk_text_attr_appearance_type;
GtkType gtk_text_layout_get_type (void) G_GNUC_CONST;
-GtkTextLayout* gtk_text_layout_new (void);
+GtkTextLayout* gtk_text_layout_new (void);
void gtk_text_layout_set_buffer (GtkTextLayout *layout,
- GtkTextBuffer *buffer);
+ GtkTextBuffer *buffer);
void gtk_text_layout_set_default_style (GtkTextLayout *layout,
- GtkTextAttributes *values);
+ GtkTextAttributes *values);
void gtk_text_layout_set_contexts (GtkTextLayout *layout,
- PangoContext *ltr_context,
- PangoContext *rtl_context);
+ PangoContext *ltr_context,
+ PangoContext *rtl_context);
void gtk_text_layout_default_style_changed (GtkTextLayout *layout);
void gtk_text_layout_set_screen_width (GtkTextLayout *layout,
- gint width);
+ gint width);
void gtk_text_layout_set_cursor_visible (GtkTextLayout *layout,
- gboolean cursor_visible);
+ gboolean cursor_visible);
gboolean gtk_text_layout_get_cursor_visible (GtkTextLayout *layout);
/* Getting the size or the lines potentially results in a call to
* recompute, which is pretty massively expensive. Thus it should
* basically only be done in an idle handler.
- *
+ *
* Long-term, we would really like to be able to do these without
* a full recompute so they may get cheaper over time.
*/
void gtk_text_layout_get_size (GtkTextLayout *layout,
- gint *width,
- gint *height);
+ gint *width,
+ gint *height);
GSList* gtk_text_layout_get_lines (GtkTextLayout *layout,
- /* [top_y, bottom_y) */
- gint top_y,
- gint bottom_y,
- gint *first_line_y);
+ /* [top_y, bottom_y) */
+ gint top_y,
+ gint bottom_y,
+ gint *first_line_y);
void gtk_text_layout_wrap_loop_start (GtkTextLayout *layout);
void gtk_text_layout_wrap_loop_end (GtkTextLayout *layout);
GtkTextLineDisplay* gtk_text_layout_get_line_display (GtkTextLayout *layout,
- GtkTextLine *line,
- gboolean size_only);
+ GtkTextLine *line,
+ gboolean size_only);
void gtk_text_layout_free_line_display (GtkTextLayout *layout,
- GtkTextLineDisplay *display);
+ GtkTextLineDisplay *display);
void gtk_text_layout_get_line_at_y (GtkTextLayout *layout,
- GtkTextIter *target_iter,
- gint y,
- gint *line_top);
+ GtkTextIter *target_iter,
+ gint y,
+ gint *line_top);
void gtk_text_layout_get_iter_at_pixel (GtkTextLayout *layout,
- GtkTextIter *iter,
- gint x,
- gint y);
+ GtkTextIter *iter,
+ gint x,
+ gint y);
void gtk_text_layout_invalidate (GtkTextLayout *layout,
- const GtkTextIter *start,
- const GtkTextIter *end);
+ const GtkTextIter *start,
+ const GtkTextIter *end);
void gtk_text_layout_free_line_data (GtkTextLayout *layout,
- GtkTextLine *line,
- GtkTextLineData *line_data);
+ GtkTextLine *line,
+ GtkTextLineData *line_data);
gboolean gtk_text_layout_is_valid (GtkTextLayout *layout);
void gtk_text_layout_validate_yrange (GtkTextLayout *layout,
- GtkTextIter *anchor_line,
- gint y0,
- gint y1);
+ GtkTextIter *anchor_line,
+ gint y0,
+ gint y1);
void gtk_text_layout_validate (GtkTextLayout *layout,
- gint max_pixels);
+ gint max_pixels);
/* This function should return the passed-in line data,
* OR remove the existing line data from the line, and
@@ -294,45 +294,45 @@ void gtk_text_layout_validate (GtkTextLayout *layout,
* stored on the btree line.
*/
GtkTextLineData* gtk_text_layout_wrap (GtkTextLayout *layout,
- GtkTextLine *line,
- GtkTextLineData *line_data); /* may be NULL */
+ GtkTextLine *line,
+ GtkTextLineData *line_data); /* may be NULL */
void gtk_text_layout_get_log_attrs (GtkTextLayout *layout,
- GtkTextLine *line,
- PangoLogAttr **attrs,
- gint *n_attrs);
+ GtkTextLine *line,
+ PangoLogAttr **attrs,
+ gint *n_attrs);
void gtk_text_layout_changed (GtkTextLayout *layout,
- gint y,
- gint old_height,
- gint new_height);
+ gint y,
+ gint old_height,
+ gint new_height);
void gtk_text_layout_get_iter_location (GtkTextLayout *layout,
- const GtkTextIter *iter,
- GdkRectangle *rect);
+ const GtkTextIter *iter,
+ GdkRectangle *rect);
void gtk_text_layout_get_line_yrange (GtkTextLayout *layout,
- const GtkTextIter *iter,
- gint *y,
- gint *height);
+ const GtkTextIter *iter,
+ gint *y,
+ gint *height);
void gtk_text_layout_get_cursor_locations (GtkTextLayout *layout,
- GtkTextIter *iter,
- GdkRectangle *strong_pos,
- GdkRectangle *weak_pos);
+ GtkTextIter *iter,
+ GdkRectangle *strong_pos,
+ GdkRectangle *weak_pos);
gboolean gtk_text_layout_clamp_iter_to_vrange (GtkTextLayout *layout,
- GtkTextIter *iter,
- gint top,
- gint bottom);
+ GtkTextIter *iter,
+ gint top,
+ gint bottom);
void gtk_text_layout_move_iter_to_line_end (GtkTextLayout *layout,
- GtkTextIter *iter,
- gint direction);
+ GtkTextIter *iter,
+ gint direction);
void gtk_text_layout_move_iter_to_previous_line (GtkTextLayout *layout,
- GtkTextIter *iter);
+ GtkTextIter *iter);
void gtk_text_layout_move_iter_to_next_line (GtkTextLayout *layout,
- GtkTextIter *iter);
+ GtkTextIter *iter);
void gtk_text_layout_move_iter_to_x (GtkTextLayout *layout,
- GtkTextIter *iter,
- gint x);
+ GtkTextIter *iter,
+ gint x);
void gtk_text_layout_move_iter_visually (GtkTextLayout *layout,
- GtkTextIter *iter,
- gint count);
+ GtkTextIter *iter,
+ gint count);
void gtk_text_layout_spew (GtkTextLayout *layout);
@@ -342,4 +342,4 @@ void gtk_text_layout_spew (GtkTextLayout *layout);
}
#endif /* __cplusplus */
-#endif /* GTK_TEXT_LAYOUT_H */
+#endif /* GTK_TEXT_LAYOUT_H */
diff --git a/gtk/gtktextmark.c b/gtk/gtktextmark.c
index c2deee5e05..bf2d1f2a07 100644
--- a/gtk/gtktextmark.c
+++ b/gtk/gtktextmark.c
@@ -1,5 +1,5 @@
/* gtktextmark.c - mark segments
- *
+ *
* Copyright (c) 1994 The Regents of the University of California.
* Copyright (c) 1994-1997 Sun Microsystems, Inc.
* Copyright (c) 2000 Red Hat, Inc.
@@ -9,7 +9,7 @@
* California, Sun Microsystems, Inc., and other parties. The
* following terms apply to all files associated with the software
* unless explicitly disclaimed in individual files.
- *
+ *
* The authors hereby grant permission to use, copy, modify,
* distribute, and license this software and its documentation for any
* purpose, provided that existing copyright notices are retained in
@@ -19,13 +19,13 @@
* software may be copyrighted by their authors and need not follow
* the licensing terms described here, provided that the new terms are
* clearly indicated on the first page of each file where they apply.
- *
+ *
* IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY
* PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
* DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION,
* OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+ *
* THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
@@ -44,7 +44,7 @@
* foregoing, the authors grant the U.S. Government and others acting
* in its behalf permission to use and distribute the software in
* accordance with the terms specified in this license.
- *
+ *
*/
@@ -76,12 +76,12 @@ gtk_text_mark_get_type (void)
0, /* n_preallocs */
(GInstanceInitFunc) gtk_text_mark_init,
};
-
+
object_type = g_type_register_static (G_TYPE_OBJECT,
"GtkTextMark",
&object_info, 0);
}
-
+
return object_type;
}
@@ -119,7 +119,7 @@ gtk_text_mark_finalize (GObject *obj)
g_warning ("GtkTextMark being finalized while still in the buffer; "
"someone removed a reference they didn't own! Crash "
"impending");
-
+
g_free (seg->body.mark.name);
g_free (seg);
@@ -128,7 +128,7 @@ gtk_text_mark_finalize (GObject *obj)
}
gboolean
-gtk_text_mark_is_visible(GtkTextMark *mark)
+gtk_text_mark_is_visible (GtkTextMark *mark)
{
GtkTextLineSegment *seg;
@@ -151,14 +151,14 @@ gboolean
gtk_text_mark_get_deleted (GtkTextMark *mark)
{
GtkTextLineSegment *seg;
-
+
g_return_val_if_fail (mark != NULL, FALSE);
seg = mark->segment;
if (seg == NULL)
return TRUE;
-
+
return seg->body.mark.tree == NULL;
}
@@ -166,8 +166,8 @@ gtk_text_mark_get_deleted (GtkTextMark *mark)
* Macro that determines the size of a mark segment:
*/
-#define MSEG_SIZE ((unsigned) (G_STRUCT_OFFSET(GtkTextLineSegment, body) \
- + sizeof(GtkTextMarkBody)))
+#define MSEG_SIZE ((unsigned) (G_STRUCT_OFFSET (GtkTextLineSegment, body) \
+ + sizeof (GtkTextMarkBody)))
GtkTextLineSegment*
@@ -184,20 +184,20 @@ _gtk_mark_segment_new (GtkTextBTree *tree,
mark->type = &gtk_text_left_mark_type;
else
mark->type = &gtk_text_right_mark_type;
-
+
mark->byte_count = 0;
mark->char_count = 0;
mark->body.mark.obj = g_object_new (GTK_TYPE_TEXT_MARK, NULL);
mark->body.mark.obj->segment = mark;
-
+
mark->body.mark.tree = tree;
mark->body.mark.line = NULL;
mark->next = NULL;
mark->body.mark.visible = FALSE;
mark->body.mark.not_deleteable = FALSE;
-
+
return mark;
}
@@ -218,23 +218,23 @@ static void mark_segment_check_func (GtkTextLineSegment *segPtr
*/
GtkTextLineSegmentClass gtk_text_right_mark_type = {
- "mark", /* name */
- FALSE, /* leftGravity */
- NULL, /* splitFunc */
- mark_segment_delete_func, /* deleteFunc */
- mark_segment_cleanup_func, /* cleanupFunc */
- NULL, /* lineChangeFunc */
- mark_segment_check_func /* checkFunc */
+ "mark", /* name */
+ FALSE, /* leftGravity */
+ NULL, /* splitFunc */
+ mark_segment_delete_func, /* deleteFunc */
+ mark_segment_cleanup_func, /* cleanupFunc */
+ NULL, /* lineChangeFunc */
+ mark_segment_check_func /* checkFunc */
};
GtkTextLineSegmentClass gtk_text_left_mark_type = {
- "mark", /* name */
- TRUE, /* leftGravity */
- NULL, /* splitFunc */
- mark_segment_delete_func, /* deleteFunc */
- mark_segment_cleanup_func, /* cleanupFunc */
- NULL, /* lineChangeFunc */
- mark_segment_check_func /* checkFunc */
+ "mark", /* name */
+ TRUE, /* leftGravity */
+ NULL, /* splitFunc */
+ mark_segment_delete_func, /* deleteFunc */
+ mark_segment_cleanup_func, /* cleanupFunc */
+ NULL, /* lineChangeFunc */
+ mark_segment_check_func /* checkFunc */
};
/*
@@ -242,15 +242,15 @@ GtkTextLineSegmentClass gtk_text_left_mark_type = {
*
* mark_segment_delete_func --
*
- * This procedure is invoked by the text B-tree code whenever
- * a mark lies in a range of characters being deleted.
+ * This procedure is invoked by the text B-tree code whenever
+ * a mark lies in a range of characters being deleted.
*
* Results:
- * Returns 1 to indicate that deletion has been rejected.
+ * Returns 1 to indicate that deletion has been rejected.
*
* Side effects:
- * None (even if the whole tree is being deleted we don't
- * free up the mark; it will be done elsewhere).
+ * None (even if the whole tree is being deleted we don't
+ * free up the mark; it will be done elsewhere).
*
*--------------------------------------------------------------
*/
@@ -268,21 +268,21 @@ mark_segment_delete_func (GtkTextLineSegment *segPtr,
*
* mark_segment_cleanup_func --
*
- * This procedure is invoked by the B-tree code whenever a
- * mark segment is moved from one line to another.
+ * This procedure is invoked by the B-tree code whenever a
+ * mark segment is moved from one line to another.
*
* Results:
- * None.
+ * None.
*
* Side effects:
- * The line field of the segment gets updated.
+ * The line field of the segment gets updated.
*
*--------------------------------------------------------------
*/
static GtkTextLineSegment *
-mark_segment_cleanup_func(GtkTextLineSegment *seg,
- GtkTextLine *line)
+mark_segment_cleanup_func (GtkTextLineSegment *seg,
+ GtkTextLine *line)
{
/* not sure why Tk did this here and not in LineChangeFunc */
seg->body.mark.line = line;
@@ -294,23 +294,23 @@ mark_segment_cleanup_func(GtkTextLineSegment *seg,
*
* mark_segment_check_func --
*
- * This procedure is invoked by the B-tree code to perform
- * consistency checks on mark segments.
+ * This procedure is invoked by the B-tree code to perform
+ * consistency checks on mark segments.
*
* Results:
- * None.
+ * None.
*
* Side effects:
- * The procedure panics if it detects anything wrong with
- * the mark.
+ * The procedure panics if it detects anything wrong with
+ * the mark.
*
*--------------------------------------------------------------
*/
static void
-mark_segment_check_func(GtkTextLineSegment *seg,
- GtkTextLine *line)
+mark_segment_check_func (GtkTextLineSegment *seg,
+ GtkTextLine *line)
{
if (seg->body.mark.line != line)
- g_error("mark_segment_check_func: seg->body.mark.line bogus");
+ g_error ("mark_segment_check_func: seg->body.mark.line bogus");
}
diff --git a/gtk/gtktextmark.h b/gtk/gtktextmark.h
index 45255f4459..cdcaeab4bc 100644
--- a/gtk/gtktextmark.h
+++ b/gtk/gtktextmark.h
@@ -1,5 +1,5 @@
/* gtktextmark.h - mark segments
- *
+ *
* Copyright (c) 1994 The Regents of the University of California.
* Copyright (c) 1994-1997 Sun Microsystems, Inc.
* Copyright (c) 2000 Red Hat, Inc.
@@ -9,7 +9,7 @@
* California, Sun Microsystems, Inc., and other parties. The
* following terms apply to all files associated with the software
* unless explicitly disclaimed in individual files.
- *
+ *
* The authors hereby grant permission to use, copy, modify,
* distribute, and license this software and its documentation for any
* purpose, provided that existing copyright notices are retained in
@@ -19,13 +19,13 @@
* software may be copyrighted by their authors and need not follow
* the licensing terms described here, provided that the new terms are
* clearly indicated on the first page of each file where they apply.
- *
+ *
* IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY
* PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
* DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION,
* OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+ *
* THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
@@ -44,7 +44,7 @@
* foregoing, the authors grant the U.S. Government and others acting
* in its behalf permission to use and distribute the software in
* accordance with the terms specified in this license.
- *
+ *
*/
#ifndef GTK_TEXT_MARK_H
@@ -68,7 +68,7 @@ typedef struct _GtkTextMarkClass GtkTextMarkClass;
struct _GtkTextMark
{
- GObject parent_instance;
+ GObject parent_instance;
gpointer segment;
};
diff --git a/gtk/gtktextsegment.c b/gtk/gtktextsegment.c
index 04ee54eaac..66f0a672b9 100644
--- a/gtk/gtktextsegment.c
+++ b/gtk/gtktextsegment.c
@@ -12,7 +12,7 @@
* California, Sun Microsystems, Inc., and other parties. The
* following terms apply to all files associated with the software
* unless explicitly disclaimed in individual files.
- *
+ *
* The authors hereby grant permission to use, copy, modify,
* distribute, and license this software and its documentation for any
* purpose, provided that existing copyright notices are retained in
@@ -22,13 +22,13 @@
* software may be copyrighted by their authors and need not follow
* the licensing terms described here, provided that the new terms are
* clearly indicated on the first page of each file where they apply.
- *
+ *
* IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY
* PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
* DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION,
* OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+ *
* THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
@@ -47,7 +47,7 @@
* foregoing, the authors grant the U.S. Government and others acting
* in its behalf permission to use and distribute the software in
* accordance with the terms specified in this license.
- *
+ *
*/
#include "gtktextbtree.h"
@@ -90,18 +90,18 @@
*/
GtkTextLineSegment*
-gtk_text_line_segment_split(const GtkTextIter *iter)
+gtk_text_line_segment_split (const GtkTextIter *iter)
{
GtkTextLineSegment *prev, *seg;
GtkTextBTree *tree;
GtkTextLine *line;
int count;
- line = gtk_text_iter_get_text_line(iter);
- tree = gtk_text_iter_get_btree(iter);
-
- count = gtk_text_iter_get_line_index(iter);
-
+ line = gtk_text_iter_get_text_line (iter);
+ tree = gtk_text_iter_get_btree (iter);
+
+ count = gtk_text_iter_get_line_index (iter);
+
prev = NULL;
seg = line->segments;
@@ -115,13 +115,13 @@ gtk_text_line_segment_split(const GtkTextIter *iter)
}
else
{
- g_assert(count != seg->byte_count);
- g_assert(seg->byte_count > 0);
-
- gtk_text_btree_segments_changed(tree);
-
+ g_assert (count != seg->byte_count);
+ g_assert (seg->byte_count > 0);
+
+ gtk_text_btree_segments_changed (tree);
+
seg = (*seg->type->splitFunc)(seg, count);
-
+
if (prev == NULL)
line->segments = seg;
else
@@ -140,7 +140,7 @@ gtk_text_line_segment_split(const GtkTextIter *iter)
prev = seg;
seg = seg->next;
}
- g_error("split_segment reached end of line!");
+ g_error ("split_segment reached end of line!");
return NULL;
}
@@ -149,77 +149,77 @@ gtk_text_line_segment_split(const GtkTextIter *iter)
* Macros that determine how much space to allocate for new segments:
*/
-#define CSEG_SIZE(chars) ((unsigned) (G_STRUCT_OFFSET(GtkTextLineSegment, body) \
+#define CSEG_SIZE(chars) ((unsigned) (G_STRUCT_OFFSET (GtkTextLineSegment, body) \
+ 1 + (chars)))
-#define TSEG_SIZE ((unsigned) (G_STRUCT_OFFSET(GtkTextLineSegment, body) \
- + sizeof(GtkTextToggleBody)))
+#define TSEG_SIZE ((unsigned) (G_STRUCT_OFFSET (GtkTextLineSegment, body) \
+ + sizeof (GtkTextToggleBody)))
/*
* Type functions
*/
static void
-char_segment_self_check(GtkTextLineSegment *seg)
+char_segment_self_check (GtkTextLineSegment *seg)
{
/* This function checks the segment itself, but doesn't
assume the segment has been validly inserted into
the btree. */
-
- g_assert(seg != NULL);
-
+
+ g_assert (seg != NULL);
+
if (seg->byte_count <= 0)
{
- g_error("char_segment_check_func: segment has size <= 0");
+ g_error ("char_segment_check_func: segment has size <= 0");
}
- if (strlen(seg->body.chars) != seg->byte_count)
+ if (strlen (seg->body.chars) != seg->byte_count)
{
- g_error("char_segment_check_func: segment has wrong size");
+ g_error ("char_segment_check_func: segment has wrong size");
}
if (g_utf8_strlen (seg->body.chars, seg->byte_count) != seg->char_count)
{
- g_error("char segment has wrong character count");
+ g_error ("char segment has wrong character count");
}
}
GtkTextLineSegment*
-_gtk_char_segment_new(const gchar *text, guint len)
+_gtk_char_segment_new (const gchar *text, guint len)
{
GtkTextLineSegment *seg;
- g_assert(gtk_text_byte_begins_utf8_char(text));
-
- seg = g_malloc(CSEG_SIZE(len));
+ g_assert (gtk_text_byte_begins_utf8_char (text));
+
+ seg = g_malloc (CSEG_SIZE (len));
seg->type = &gtk_text_char_type;
seg->next = NULL;
seg->byte_count = len;
- memcpy(seg->body.chars, text, len);
+ memcpy (seg->body.chars, text, len);
seg->body.chars[len] = '\0';
seg->char_count = g_utf8_strlen (seg->body.chars, seg->byte_count);
if (gtk_debug_flags & GTK_DEBUG_TEXT)
- char_segment_self_check(seg);
-
+ char_segment_self_check (seg);
+
return seg;
}
GtkTextLineSegment*
-_gtk_char_segment_new_from_two_strings(const gchar *text1, guint len1,
- const gchar *text2, guint len2)
+_gtk_char_segment_new_from_two_strings (const gchar *text1, guint len1,
+ const gchar *text2, guint len2)
{
GtkTextLineSegment *seg;
- g_assert(gtk_text_byte_begins_utf8_char(text1));
- g_assert(gtk_text_byte_begins_utf8_char(text2));
-
- seg = g_malloc(CSEG_SIZE(len1+len2));
+ g_assert (gtk_text_byte_begins_utf8_char (text1));
+ g_assert (gtk_text_byte_begins_utf8_char (text2));
+
+ seg = g_malloc (CSEG_SIZE (len1+len2));
seg->type = &gtk_text_char_type;
seg->next = NULL;
seg->byte_count = len1 + len2;
- memcpy(seg->body.chars, text1, len1);
- memcpy(seg->body.chars + len1, text2, len2);
+ memcpy (seg->body.chars, text1, len1);
+ memcpy (seg->body.chars + len1, text2, len2);
seg->body.chars[len1+len2] = '\0';
/* In principle this function could probably take chars1 and chars2
@@ -227,8 +227,8 @@ _gtk_char_segment_new_from_two_strings(const gchar *text1, guint len1,
seg->char_count = g_utf8_strlen (seg->body.chars, seg->byte_count);
if (gtk_debug_flags & GTK_DEBUG_TEXT)
- char_segment_self_check(seg);
-
+ char_segment_self_check (seg);
+
return seg;
}
@@ -251,35 +251,35 @@ _gtk_char_segment_new_from_two_strings(const gchar *text1, guint len1,
*/
static GtkTextLineSegment *
-char_segment_split_func(GtkTextLineSegment *seg, int index)
+char_segment_split_func (GtkTextLineSegment *seg, int index)
{
GtkTextLineSegment *new1, *new2;
- g_assert(index < seg->byte_count);
-
+ g_assert (index < seg->byte_count);
+
if (gtk_debug_flags & GTK_DEBUG_TEXT)
{
- char_segment_self_check(seg);
+ char_segment_self_check (seg);
}
-
+
new1 = _gtk_char_segment_new (seg->body.chars, index);
new2 = _gtk_char_segment_new (seg->body.chars + index, seg->byte_count - index);
- g_assert(gtk_text_byte_begins_utf8_char(new1->body.chars));
- g_assert(gtk_text_byte_begins_utf8_char(new2->body.chars));
- g_assert(new1->byte_count + new2->byte_count == seg->byte_count);
- g_assert(new1->char_count + new2->char_count == seg->char_count);
-
+ g_assert (gtk_text_byte_begins_utf8_char (new1->body.chars));
+ g_assert (gtk_text_byte_begins_utf8_char (new2->body.chars));
+ g_assert (new1->byte_count + new2->byte_count == seg->byte_count);
+ g_assert (new1->char_count + new2->char_count == seg->char_count);
+
new1->next = new2;
new2->next = seg->next;
if (gtk_debug_flags & GTK_DEBUG_TEXT)
{
- char_segment_self_check(new1);
- char_segment_self_check(new2);
+ char_segment_self_check (new1);
+ char_segment_self_check (new2);
}
-
- g_free(seg);
+
+ g_free (seg);
return new1;
}
@@ -303,17 +303,17 @@ char_segment_split_func(GtkTextLineSegment *seg, int index)
/* ARGSUSED */
static GtkTextLineSegment *
-char_segment_cleanup_func(segPtr, line)
+char_segment_cleanup_func (segPtr, line)
GtkTextLineSegment *segPtr; /* Pointer to first of two adjacent
* segments to join. */
GtkTextLine *line; /* Line containing segments (not
- * used). */
+ * used). */
{
GtkTextLineSegment *segPtr2, *newPtr;
if (gtk_debug_flags & GTK_DEBUG_TEXT)
- char_segment_self_check(segPtr);
-
+ char_segment_self_check (segPtr);
+
segPtr2 = segPtr->next;
if ((segPtr2 == NULL) || (segPtr2->type != &gtk_text_char_type))
{
@@ -327,10 +327,10 @@ char_segment_cleanup_func(segPtr, line)
newPtr->next = segPtr2->next;
if (gtk_debug_flags & GTK_DEBUG_TEXT)
- char_segment_self_check(newPtr);
-
- g_free(segPtr);
- g_free(segPtr2);
+ char_segment_self_check (newPtr);
+
+ g_free (segPtr);
+ g_free (segPtr2);
return newPtr;
}
@@ -352,14 +352,14 @@ char_segment_cleanup_func(segPtr, line)
/* ARGSUSED */
static int
-char_segment_delete_func(segPtr, line, treeGone)
+char_segment_delete_func (segPtr, line, treeGone)
GtkTextLineSegment *segPtr; /* Segment to delete. */
GtkTextLine *line; /* Line containing segment. */
int treeGone; /* Non-zero means the entire tree is
* being deleted, so everything must
* get cleaned up. */
{
- g_free((char*) segPtr);
+ g_free ((char*) segPtr);
return 0;
}
@@ -383,34 +383,34 @@ char_segment_delete_func(segPtr, line, treeGone)
/* ARGSUSED */
static void
-char_segment_check_func(segPtr, line)
+char_segment_check_func (segPtr, line)
GtkTextLineSegment *segPtr; /* Segment to check. */
GtkTextLine *line; /* Line containing segment. */
{
- char_segment_self_check(segPtr);
-
+ char_segment_self_check (segPtr);
+
if (segPtr->next == NULL)
{
if (segPtr->body.chars[segPtr->byte_count-1] != '\n')
{
- g_error("char_segment_check_func: line doesn't end with newline");
+ g_error ("char_segment_check_func: line doesn't end with newline");
}
}
else
{
if (segPtr->next->type == &gtk_text_char_type)
{
- g_error("char_segment_check_func: adjacent character segments weren't merged");
+ g_error ("char_segment_check_func: adjacent character segments weren't merged");
}
}
}
GtkTextLineSegment*
-_gtk_toggle_segment_new(GtkTextTagInfo *info, gboolean on)
+_gtk_toggle_segment_new (GtkTextTagInfo *info, gboolean on)
{
GtkTextLineSegment *seg;
- seg = g_malloc(TSEG_SIZE);
+ seg = g_malloc (TSEG_SIZE);
seg->type = on ? &gtk_text_toggle_on_type : &gtk_text_toggle_off_type;
@@ -418,7 +418,7 @@ _gtk_toggle_segment_new(GtkTextTagInfo *info, gboolean on)
seg->byte_count = 0;
seg->char_count = 0;
-
+
seg->body.toggle.info = info;
seg->body.toggle.inNodeCounts = 0;
@@ -445,7 +445,7 @@ _gtk_toggle_segment_new(GtkTextTagInfo *info, gboolean on)
*/
static int
-toggle_segment_delete_func(segPtr, line, treeGone)
+toggle_segment_delete_func (segPtr, line, treeGone)
GtkTextLineSegment *segPtr; /* Segment to check. */
GtkTextLine *line; /* Line containing segment. */
int treeGone; /* Non-zero means the entire tree is
@@ -454,7 +454,7 @@ toggle_segment_delete_func(segPtr, line, treeGone)
{
if (treeGone)
{
- g_free((char *) segPtr);
+ g_free ((char *) segPtr);
return 0;
}
@@ -468,8 +468,8 @@ toggle_segment_delete_func(segPtr, line, treeGone)
if (segPtr->body.toggle.inNodeCounts)
{
- _gtk_change_node_toggle_count(line->parent,
- segPtr->body.toggle.info, -1);
+ _gtk_change_node_toggle_count (line->parent,
+ segPtr->body.toggle.info, -1);
segPtr->body.toggle.inNodeCounts = 0;
}
return 1;
@@ -499,7 +499,7 @@ toggle_segment_delete_func(segPtr, line, treeGone)
*/
static GtkTextLineSegment *
-toggle_segment_cleanup_func(segPtr, line)
+toggle_segment_cleanup_func (segPtr, line)
GtkTextLineSegment *segPtr; /* Segment to check. */
GtkTextLine *line; /* Line that now contains segment. */
{
@@ -531,21 +531,21 @@ toggle_segment_cleanup_func(segPtr, line)
+ segPtr2->body.toggle.inNodeCounts;
if (counts != 0)
{
- _gtk_change_node_toggle_count(line->parent,
- segPtr->body.toggle.info, -counts);
+ _gtk_change_node_toggle_count (line->parent,
+ segPtr->body.toggle.info, -counts);
}
prevPtr->next = segPtr2->next;
- g_free((char *) segPtr2);
+ g_free ((char *) segPtr2);
segPtr2 = segPtr->next;
- g_free((char *) segPtr);
+ g_free ((char *) segPtr);
return segPtr2;
}
}
if (!segPtr->body.toggle.inNodeCounts)
{
- _gtk_change_node_toggle_count(line->parent,
- segPtr->body.toggle.info, 1);
+ _gtk_change_node_toggle_count (line->parent,
+ segPtr->body.toggle.info, 1);
segPtr->body.toggle.inNodeCounts = 1;
}
return segPtr;
@@ -569,7 +569,7 @@ toggle_segment_cleanup_func(segPtr, line)
*/
static void
-toggle_segment_line_change_func(segPtr, line)
+toggle_segment_line_change_func (segPtr, line)
GtkTextLineSegment *segPtr; /* Segment to check. */
GtkTextLine *line; /* Line that used to contain segment. */
{
@@ -606,9 +606,9 @@ GtkTextLineSegmentClass gtk_text_toggle_on_type = {
0, /* leftGravity */
NULL, /* splitFunc */
toggle_segment_delete_func, /* deleteFunc */
- toggle_segment_cleanup_func, /* cleanupFunc */
- toggle_segment_line_change_func, /* lineChangeFunc */
- _gtk_toggle_segment_check_func /* checkFunc */
+ toggle_segment_cleanup_func, /* cleanupFunc */
+ toggle_segment_line_change_func, /* lineChangeFunc */
+ _gtk_toggle_segment_check_func /* checkFunc */
};
/*
@@ -617,11 +617,11 @@ GtkTextLineSegmentClass gtk_text_toggle_on_type = {
*/
GtkTextLineSegmentClass gtk_text_toggle_off_type = {
- "toggleOff", /* name */
- 1, /* leftGravity */
- NULL, /* splitFunc */
- toggle_segment_delete_func, /* deleteFunc */
- toggle_segment_cleanup_func, /* cleanupFunc */
- toggle_segment_line_change_func, /* lineChangeFunc */
+ "toggleOff", /* name */
+ 1, /* leftGravity */
+ NULL, /* splitFunc */
+ toggle_segment_delete_func, /* deleteFunc */
+ toggle_segment_cleanup_func, /* cleanupFunc */
+ toggle_segment_line_change_func, /* lineChangeFunc */
_gtk_toggle_segment_check_func /* checkFunc */
};
diff --git a/gtk/gtktextsegment.h b/gtk/gtktextsegment.h
index c6930295ad..b28ec9f42d 100644
--- a/gtk/gtktextsegment.h
+++ b/gtk/gtktextsegment.h
@@ -83,23 +83,23 @@ struct _GtkTextLineSegmentClass {
GtkTextSegDeleteFunc deleteFunc; /* Procedure to call to delete
* segment. */
GtkTextSegCleanupFunc cleanupFunc; /* After any change to a line, this
- * procedure is invoked for all
- * segments left in the line to
- * perform any cleanup they wish
- * (e.g. joining neighboring
- * segments). */
+ * procedure is invoked for all
+ * segments left in the line to
+ * perform any cleanup they wish
+ * (e.g. joining neighboring
+ * segments). */
GtkTextSegLineChangeFunc lineChangeFunc;
- /* Invoked when a segment is about
- * to be moved from its current line
- * to an earlier line because of
- * a deletion. The line is that
- * for the segment's old line.
- * CleanupFunc will be invoked after
- * the deletion is finished. */
+ /* Invoked when a segment is about
+ * to be moved from its current line
+ * to an earlier line because of
+ * a deletion. The line is that
+ * for the segment's old line.
+ * CleanupFunc will be invoked after
+ * the deletion is finished. */
GtkTextSegCheckFunc checkFunc; /* Called during consistency checks
- * to check internal consistency of
- * segment. */
+ * to check internal consistency of
+ * segment. */
};
/*
@@ -113,7 +113,7 @@ struct _GtkTextLineSegment {
* line, or NULL for end of list. */
int char_count; /* # of chars of index space occupied */
-
+
int byte_count; /* Size of this segment (# of bytes
* of index space it occupies). */
union {
diff --git a/gtk/gtktexttag.c b/gtk/gtktexttag.c
index d769aa3dec..dfc46f6cc4 100644
--- a/gtk/gtktexttag.c
+++ b/gtk/gtktexttag.c
@@ -1,5 +1,5 @@
/* gtktexttag.c - text tag object
- *
+ *
* Copyright (c) 1992-1994 The Regents of the University of California.
* Copyright (c) 1994-1997 Sun Microsystems, Inc.
* Copyright (c) 2000 Red Hat, Inc.
@@ -9,7 +9,7 @@
* California, Sun Microsystems, Inc., and other parties. The
* following terms apply to all files associated with the software
* unless explicitly disclaimed in individual files.
- *
+ *
* The authors hereby grant permission to use, copy, modify,
* distribute, and license this software and its documentation for any
* purpose, provided that existing copyright notices are retained in
@@ -19,13 +19,13 @@
* software may be copyrighted by their authors and need not follow
* the licensing terms described here, provided that the new terms are
* clearly indicated on the first page of each file where they apply.
- *
+ *
* IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY
* PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL
* DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION,
* OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+ *
* THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
@@ -44,7 +44,7 @@
* foregoing, the authors grant the U.S. Government and others acting
* in its behalf permission to use and distribute the software in
* accordance with the terms specified in this license.
- *
+ *
*/
#include "gtkmain.h"
@@ -92,7 +92,7 @@ enum {
ARG_BG_FULL_HEIGHT,
ARG_LANGUAGE,
ARG_TABS,
-
+
/* Whether-a-style-arg-is-set args */
ARG_BACKGROUND_SET,
ARG_FOREGROUND_SET,
@@ -116,7 +116,7 @@ enum {
ARG_BG_FULL_HEIGHT_SET,
ARG_LANGUAGE_SET,
ARG_TABS_SET,
-
+
LAST_ARG
};
@@ -125,11 +125,11 @@ static void gtk_text_tag_class_init (GtkTextTagClass *klass);
static void gtk_text_tag_destroy (GtkObject *object);
static void gtk_text_tag_finalize (GObject *object);
static void gtk_text_tag_set_arg (GtkObject *object,
- GtkArg *arg,
- guint arg_id);
+ GtkArg *arg,
+ guint arg_id);
static void gtk_text_tag_get_arg (GtkObject *object,
- GtkArg *arg,
- guint arg_id);
+ GtkArg *arg,
+ guint arg_id);
static GtkObjectClass *parent_class = NULL;
static guint signals[LAST_SIGNAL] = { 0 };
@@ -153,8 +153,8 @@ gtk_text_tag_get_type (void)
(GtkClassInitFunc) NULL
};
- our_type = gtk_type_unique (GTK_TYPE_OBJECT, &our_info);
- }
+ our_type = gtk_type_unique (GTK_TYPE_OBJECT, &our_info);
+ }
return our_type;
}
@@ -223,7 +223,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
GTK_ARG_READWRITE, ARG_WRAP_MODE);
gtk_object_add_arg_type ("GtkTextTag::tabs", GTK_TYPE_POINTER,
GTK_ARG_READWRITE, ARG_TABS);
-
+
/* Style args are set or not */
gtk_object_add_arg_type ("GtkTextTag::background_set", GTK_TYPE_BOOL,
GTK_ARG_READWRITE, ARG_BACKGROUND_SET);
@@ -252,7 +252,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
gtk_object_add_arg_type ("GtkTextTag::left_wrapped_line_margin_set", GTK_TYPE_BOOL,
GTK_ARG_READWRITE, ARG_LEFT_WRAPPED_LINE_MARGIN_SET);
gtk_object_add_arg_type ("GtkTextTag::offset_set", GTK_TYPE_BOOL,
- GTK_ARG_READWRITE, ARG_OFFSET_SET);
+ GTK_ARG_READWRITE, ARG_OFFSET_SET);
gtk_object_add_arg_type ("GtkTextTag::pixels_above_lines_set", GTK_TYPE_BOOL,
GTK_ARG_READWRITE, ARG_PIXELS_ABOVE_LINES_SET);
gtk_object_add_arg_type ("GtkTextTag::pixels_below_lines_set", GTK_TYPE_BOOL,
@@ -270,7 +270,7 @@ gtk_text_tag_class_init (GtkTextTagClass *klass)
gtk_object_add_arg_type ("GtkTextTag::tabs_set", GTK_TYPE_BOOL,
GTK_ARG_READWRITE, ARG_TABS_SET);
-
+
signals[EVENT] =
gtk_signal_new ("event",
GTK_RUN_LAST,
@@ -297,7 +297,7 @@ gtk_text_tag_init (GtkTextTag *tkxt_tag)
{
/* 0 is basically a fine way to initialize everything in the
entire struct */
-
+
}
GtkTextTag*
@@ -307,10 +307,10 @@ gtk_text_tag_new (const gchar *name)
tag = GTK_TEXT_TAG (gtk_type_new (gtk_text_tag_get_type ()));
- tag->name = g_strdup(name);
+ tag->name = g_strdup (name);
+
+ tag->values = gtk_text_attributes_new ();
- tag->values = gtk_text_attributes_new();
-
return tag;
}
@@ -321,17 +321,17 @@ gtk_text_tag_destroy (GtkObject *object)
tkxt_tag = GTK_TEXT_TAG (object);
- g_assert(!tkxt_tag->values->realized);
-
+ g_assert (!tkxt_tag->values->realized);
+
if (tkxt_tag->table)
- gtk_text_tag_table_remove(tkxt_tag->table, tkxt_tag);
+ gtk_text_tag_table_remove (tkxt_tag->table, tkxt_tag);
- g_assert(tkxt_tag->table == NULL);
-
- gtk_text_attributes_unref(tkxt_tag->values);
+ g_assert (tkxt_tag->table == NULL);
+
+ gtk_text_attributes_unref (tkxt_tag->values);
tkxt_tag->values = NULL;
-
- (* GTK_OBJECT_CLASS(parent_class)->destroy) (object);
+
+ (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
}
static void
@@ -341,14 +341,14 @@ gtk_text_tag_finalize (GObject *object)
tkxt_tag = GTK_TEXT_TAG (object);
- g_free(tkxt_tag->name);
+ g_free (tkxt_tag->name);
tkxt_tag->name = NULL;
- (* G_OBJECT_CLASS(parent_class)->finalize) (object);
+ (* G_OBJECT_CLASS (parent_class)->finalize) (object);
}
static void
-set_bg_color(GtkTextTag *tag, GdkColor *color)
+set_bg_color (GtkTextTag *tag, GdkColor *color)
{
if (color)
{
@@ -362,7 +362,7 @@ set_bg_color(GtkTextTag *tag, GdkColor *color)
}
static void
-set_fg_color(GtkTextTag *tag, GdkColor *color)
+set_fg_color (GtkTextTag *tag, GdkColor *color)
{
if (color)
{
@@ -380,26 +380,26 @@ gtk_text_tag_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
{
GtkTextTag *tkxt_tag;
gboolean size_changed = FALSE;
-
+
tkxt_tag = GTK_TEXT_TAG (object);
- g_return_if_fail(!tkxt_tag->values->realized);
-
+ g_return_if_fail (!tkxt_tag->values->realized);
+
switch (arg_id)
{
case ARG_NAME:
- g_return_if_fail(tkxt_tag->name == NULL);
- tkxt_tag->name = g_strdup(GTK_VALUE_STRING(*arg));
+ g_return_if_fail (tkxt_tag->name == NULL);
+ tkxt_tag->name = g_strdup (GTK_VALUE_STRING (*arg));
break;
case ARG_BACKGROUND:
{
GdkColor color;
- if (gdk_color_parse(GTK_VALUE_STRING(*arg), &color))
- set_bg_color(tkxt_tag, &color);
+ if (gdk_color_parse (GTK_VALUE_STRING (*arg), &color))
+ set_bg_color (tkxt_tag, &color);
else
- g_warning("Don't know color `%s'", GTK_VALUE_STRING(*arg));
+ g_warning ("Don't know color `%s'", GTK_VALUE_STRING (*arg));
}
break;
@@ -407,41 +407,41 @@ gtk_text_tag_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
{
GdkColor color;
- if (gdk_color_parse(GTK_VALUE_STRING(*arg), &color))
- set_fg_color(tkxt_tag, &color);
+ if (gdk_color_parse (GTK_VALUE_STRING (*arg), &color))
+ set_fg_color (tkxt_tag, &color);
else
- g_warning("Don't know color `%s'", GTK_VALUE_STRING(*arg));
+ g_warning ("Don't know color `%s'", GTK_VALUE_STRING (*arg));
}
break;
-
+
case ARG_BACKGROUND_GDK:
{
- GdkColor *color = GTK_VALUE_POINTER(*arg);
- set_bg_color(tkxt_tag, color);
+ GdkColor *color = GTK_VALUE_POINTER (*arg);
+ set_bg_color (tkxt_tag, color);
}
break;
case ARG_FOREGROUND_GDK:
{
- GdkColor *color = GTK_VALUE_POINTER(*arg);
- set_fg_color(tkxt_tag, color);
+ GdkColor *color = GTK_VALUE_POINTER (*arg);
+ set_fg_color (tkxt_tag, color);
}
break;
case ARG_BACKGROUND_STIPPLE:
{
- GdkBitmap *bitmap = GTK_VALUE_POINTER(*arg);
+ GdkBitmap *bitmap = GTK_VALUE_POINTER (*arg);
tkxt_tag->bg_stipple_set = TRUE;
-
+
if (tkxt_tag->values->appearance.bg_stipple != bitmap)
{
if (bitmap != NULL)
- gdk_bitmap_ref(bitmap);
-
+ gdk_bitmap_ref (bitmap);
+
if (tkxt_tag->values->appearance.bg_stipple)
- gdk_bitmap_unref(tkxt_tag->values->appearance.bg_stipple);
-
+ gdk_bitmap_unref (tkxt_tag->values->appearance.bg_stipple);
+
tkxt_tag->values->appearance.bg_stipple = bitmap;
}
}
@@ -449,18 +449,18 @@ gtk_text_tag_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
case ARG_FOREGROUND_STIPPLE:
{
- GdkBitmap *bitmap = GTK_VALUE_POINTER(*arg);
+ GdkBitmap *bitmap = GTK_VALUE_POINTER (*arg);
tkxt_tag->fg_stipple_set = TRUE;
-
+
if (tkxt_tag->values->appearance.fg_stipple != bitmap)
{
if (bitmap != NULL)
- gdk_bitmap_ref(bitmap);
-
+ gdk_bitmap_ref (bitmap);
+
if (tkxt_tag->values->appearance.fg_stipple)
- gdk_bitmap_unref(tkxt_tag->values->appearance.fg_stipple);
-
+ gdk_bitmap_unref (tkxt_tag->values->appearance.fg_stipple);
+
tkxt_tag->values->appearance.fg_stipple = bitmap;
}
}
@@ -471,16 +471,16 @@ gtk_text_tag_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
PangoFontDescription *font_desc = NULL;
const gchar *name;
- name = GTK_VALUE_STRING(*arg);
+ name = GTK_VALUE_STRING (*arg);
if (name)
- font_desc = pango_font_description_from_string (name);
+ font_desc = pango_font_description_from_string (name);
+
+ if (tkxt_tag->values->font_desc)
+ pango_font_description_free (tkxt_tag->values->font_desc);
- if (tkxt_tag->values->font_desc)
- pango_font_description_free (tkxt_tag->values->font_desc);
-
- tkxt_tag->font_set = (font_desc != NULL);
- tkxt_tag->values->font_desc = font_desc;
+ tkxt_tag->font_set = (font_desc != NULL);
+ tkxt_tag->values->font_desc = font_desc;
size_changed = TRUE;
}
@@ -490,17 +490,17 @@ gtk_text_tag_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
{
PangoFontDescription *font_desc;
- font_desc = GTK_VALUE_BOXED(*arg);
+ font_desc = GTK_VALUE_BOXED (*arg);
- if (tkxt_tag->values->font_desc)
- pango_font_description_free (tkxt_tag->values->font_desc);
+ if (tkxt_tag->values->font_desc)
+ pango_font_description_free (tkxt_tag->values->font_desc);
- if (font_desc)
- tkxt_tag->values->font_desc = pango_font_description_copy (font_desc);
- else
- tkxt_tag->values->font_desc = NULL;
-
- tkxt_tag->font_set = (font_desc != NULL);
+ if (font_desc)
+ tkxt_tag->values->font_desc = pango_font_description_copy (font_desc);
+ else
+ tkxt_tag->values->font_desc = NULL;
+
+ tkxt_tag->font_set = (font_desc != NULL);
size_changed = TRUE;
}
@@ -508,85 +508,85 @@ gtk_text_tag_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
case ARG_PIXELS_ABOVE_LINES:
tkxt_tag->pixels_above_lines_set = TRUE;
- tkxt_tag->values->pixels_above_lines = GTK_VALUE_INT(*arg);
+ tkxt_tag->values->pixels_above_lines = GTK_VALUE_INT (*arg);
size_changed = TRUE;
break;
case ARG_PIXELS_BELOW_LINES:
tkxt_tag->pixels_below_lines_set = TRUE;
- tkxt_tag->values->pixels_below_lines = GTK_VALUE_INT(*arg);
+ tkxt_tag->values->pixels_below_lines = GTK_VALUE_INT (*arg);
size_changed = TRUE;
break;
case ARG_PIXELS_INSIDE_WRAP:
tkxt_tag->pixels_inside_wrap_set = TRUE;
- tkxt_tag->values->pixels_inside_wrap = GTK_VALUE_INT(*arg);
+ tkxt_tag->values->pixels_inside_wrap = GTK_VALUE_INT (*arg);
size_changed = TRUE;
break;
case ARG_EDITABLE:
tkxt_tag->editable_set = TRUE;
- tkxt_tag->values->editable = GTK_VALUE_BOOL(*arg);
+ tkxt_tag->values->editable = GTK_VALUE_BOOL (*arg);
break;
case ARG_WRAP_MODE:
tkxt_tag->wrap_mode_set = TRUE;
- tkxt_tag->values->wrap_mode = GTK_VALUE_ENUM(*arg);
+ tkxt_tag->values->wrap_mode = GTK_VALUE_ENUM (*arg);
size_changed = TRUE;
break;
case ARG_JUSTIFY:
tkxt_tag->justify_set = TRUE;
- tkxt_tag->values->justify = GTK_VALUE_ENUM(*arg);
+ tkxt_tag->values->justify = GTK_VALUE_ENUM (*arg);
size_changed = TRUE;
break;
case ARG_DIRECTION:
- tkxt_tag->values->direction = GTK_VALUE_ENUM(*arg);
+ tkxt_tag->values->direction = GTK_VALUE_ENUM (*arg);
break;
case ARG_LEFT_MARGIN:
tkxt_tag->left_margin_set = TRUE;
- tkxt_tag->values->left_margin = GTK_VALUE_INT(*arg);
+ tkxt_tag->values->left_margin = GTK_VALUE_INT (*arg);
size_changed = TRUE;
break;
case ARG_LEFT_WRAPPED_LINE_MARGIN:
tkxt_tag->left_wrapped_line_margin_set = TRUE;
- tkxt_tag->values->left_wrapped_line_margin = GTK_VALUE_INT(*arg);
+ tkxt_tag->values->left_wrapped_line_margin = GTK_VALUE_INT (*arg);
size_changed = TRUE;
break;
case ARG_STRIKETHROUGH:
tkxt_tag->strikethrough_set = TRUE;
- tkxt_tag->values->appearance.strikethrough = GTK_VALUE_BOOL(*arg);
+ tkxt_tag->values->appearance.strikethrough = GTK_VALUE_BOOL (*arg);
break;
-
+
case ARG_RIGHT_MARGIN:
tkxt_tag->right_margin_set = TRUE;
- tkxt_tag->values->right_margin = GTK_VALUE_INT(*arg);
+ tkxt_tag->values->right_margin = GTK_VALUE_INT (*arg);
size_changed = TRUE;
break;
-
+
case ARG_UNDERLINE:
tkxt_tag->underline_set = TRUE;
- tkxt_tag->values->appearance.underline = GTK_VALUE_ENUM(*arg);
+ tkxt_tag->values->appearance.underline = GTK_VALUE_ENUM (*arg);
break;
-
+
case ARG_OFFSET:
tkxt_tag->offset_set = TRUE;
- tkxt_tag->values->offset = GTK_VALUE_INT(*arg);
+ tkxt_tag->values->offset = GTK_VALUE_INT (*arg);
size_changed = TRUE;
break;
case ARG_BG_FULL_HEIGHT:
tkxt_tag->bg_full_height_set = TRUE;
- tkxt_tag->values->bg_full_height = GTK_VALUE_BOOL(*arg);
+ tkxt_tag->values->bg_full_height = GTK_VALUE_BOOL (*arg);
break;
case ARG_LANGUAGE:
tkxt_tag->language_set = TRUE;
- tkxt_tag->values->language = g_strdup (GTK_VALUE_STRING(*arg));
+ tkxt_tag->values->language = g_strdup (GTK_VALUE_STRING (*arg));
break;
case ARG_TABS:
@@ -594,101 +594,101 @@ gtk_text_tag_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
if (tkxt_tag->values->tabs)
pango_tab_array_free (tkxt_tag->values->tabs);
-
+
tkxt_tag->values->tabs =
pango_tab_array_copy (GTK_VALUE_POINTER (*arg));
size_changed = TRUE;
break;
-
+
/* Whether the value should be used... */
-
+
case ARG_BACKGROUND_SET:
case ARG_BACKGROUND_GDK_SET:
- tkxt_tag->bg_color_set = GTK_VALUE_BOOL(*arg);
+ tkxt_tag->bg_color_set = GTK_VALUE_BOOL (*arg);
break;
case ARG_FOREGROUND_SET:
case ARG_FOREGROUND_GDK_SET:
- tkxt_tag->fg_color_set = GTK_VALUE_BOOL(*arg);
+ tkxt_tag->fg_color_set = GTK_VALUE_BOOL (*arg);
break;
case ARG_BACKGROUND_STIPPLE_SET:
- tkxt_tag->bg_stipple_set = GTK_VALUE_BOOL(*arg);
+ tkxt_tag->bg_stipple_set = GTK_VALUE_BOOL (*arg);
break;
case ARG_FOREGROUND_STIPPLE_SET:
- tkxt_tag->fg_stipple_set = GTK_VALUE_BOOL(*arg);
+ tkxt_tag->fg_stipple_set = GTK_VALUE_BOOL (*arg);
break;
case ARG_FONT_SET:
- tkxt_tag->font_set = GTK_VALUE_BOOL(*arg);
+ tkxt_tag->font_set = GTK_VALUE_BOOL (*arg);
size_changed = TRUE;
break;
case ARG_PIXELS_ABOVE_LINES_SET:
- tkxt_tag->pixels_above_lines_set = GTK_VALUE_BOOL(*arg);
+ tkxt_tag->pixels_above_lines_set = GTK_VALUE_BOOL (*arg);
size_changed = TRUE;
break;
case ARG_PIXELS_BELOW_LINES_SET:
- tkxt_tag->pixels_below_lines_set = GTK_VALUE_BOOL(*arg);
+ tkxt_tag->pixels_below_lines_set = GTK_VALUE_BOOL (*arg);
size_changed = TRUE;
break;
case ARG_PIXELS_INSIDE_WRAP_SET:
- tkxt_tag->pixels_inside_wrap_set = GTK_VALUE_BOOL(*arg);
+ tkxt_tag->pixels_inside_wrap_set = GTK_VALUE_BOOL (*arg);
size_changed = TRUE;
break;
case ARG_EDITABLE_SET:
- tkxt_tag->editable_set = GTK_VALUE_BOOL(*arg);
+ tkxt_tag->editable_set = GTK_VALUE_BOOL (*arg);
break;
case ARG_WRAP_MODE_SET:
- tkxt_tag->wrap_mode_set = GTK_VALUE_BOOL(*arg);
+ tkxt_tag->wrap_mode_set = GTK_VALUE_BOOL (*arg);
size_changed = TRUE;
break;
case ARG_JUSTIFY_SET:
- tkxt_tag->justify_set = GTK_VALUE_BOOL(*arg);
+ tkxt_tag->justify_set = GTK_VALUE_BOOL (*arg);
size_changed = TRUE;
break;
case ARG_LEFT_MARGIN_SET:
- tkxt_tag->left_margin_set = GTK_VALUE_BOOL(*arg);
+ tkxt_tag->left_margin_set = GTK_VALUE_BOOL (*arg);
size_changed = TRUE;
break;
case ARG_LEFT_WRAPPED_LINE_MARGIN_SET:
- tkxt_tag->left_wrapped_line_margin_set = GTK_VALUE_BOOL(*arg);
+ tkxt_tag->left_wrapped_line_margin_set = GTK_VALUE_BOOL (*arg);
size_changed = TRUE;
break;
case ARG_STRIKETHROUGH_SET:
- tkxt_tag->strikethrough_set = GTK_VALUE_BOOL(*arg);
+ tkxt_tag->strikethrough_set = GTK_VALUE_BOOL (*arg);
break;
case ARG_RIGHT_MARGIN_SET:
- tkxt_tag->right_margin_set = GTK_VALUE_BOOL(*arg);
+ tkxt_tag->right_margin_set = GTK_VALUE_BOOL (*arg);
size_changed = TRUE;
break;
case ARG_UNDERLINE_SET:
- tkxt_tag->underline_set = GTK_VALUE_BOOL(*arg);
+ tkxt_tag->underline_set = GTK_VALUE_BOOL (*arg);
break;
case ARG_OFFSET_SET:
- tkxt_tag->offset_set = GTK_VALUE_BOOL(*arg);
+ tkxt_tag->offset_set = GTK_VALUE_BOOL (*arg);
size_changed = TRUE;
break;
case ARG_BG_FULL_HEIGHT_SET:
- tkxt_tag->bg_full_height_set = GTK_VALUE_BOOL(*arg);
+ tkxt_tag->bg_full_height_set = GTK_VALUE_BOOL (*arg);
break;
case ARG_LANGUAGE_SET:
- tkxt_tag->language_set = GTK_VALUE_BOOL(*arg);
+ tkxt_tag->language_set = GTK_VALUE_BOOL (*arg);
size_changed = TRUE;
break;
@@ -696,32 +696,32 @@ gtk_text_tag_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
tkxt_tag->tabs_set = GTK_VALUE_BOOL (*arg);
size_changed = TRUE;
break;
-
+
default:
- g_assert_not_reached();
+ g_assert_not_reached ();
break;
}
-
+
/* FIXME I would like to do this after all set_arg in a single
- gtk_object_set() have been called. But an idle function
+ gtk_object_set () have been called. But an idle function
won't work; we need to emit when the tag is changed, not
when we get around to the event loop. So blah, we eat some
inefficiency. */
-
+
/* This is also somewhat weird since we emit another object's
signal here, but the two objects are already tightly bound. */
-
+
if (tkxt_tag->table)
- gtk_signal_emit_by_name(GTK_OBJECT(tkxt_tag->table),
- "tag_changed",
- tkxt_tag, size_changed);
+ gtk_signal_emit_by_name (GTK_OBJECT (tkxt_tag->table),
+ "tag_changed",
+ tkxt_tag, size_changed);
}
static void
get_color_arg (GtkArg *arg, GdkColor *orig)
{
GdkColor *color;
-
+
color = g_new (GdkColor, 1);
*color = *orig;
GTK_VALUE_BOXED (*arg) = color;
@@ -737,182 +737,182 @@ gtk_text_tag_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
switch (arg_id)
{
case ARG_NAME:
- GTK_VALUE_STRING(*arg) = g_strdup(tag->name);
+ GTK_VALUE_STRING (*arg) = g_strdup (tag->name);
break;
-
+
case ARG_BACKGROUND_GDK:
- get_color_arg(arg, &tag->values->appearance.bg_color);
+ get_color_arg (arg, &tag->values->appearance.bg_color);
break;
case ARG_FOREGROUND_GDK:
- get_color_arg(arg, &tag->values->appearance.fg_color);
+ get_color_arg (arg, &tag->values->appearance.fg_color);
break;
case ARG_BACKGROUND_STIPPLE:
- GTK_VALUE_BOXED(*arg) = tag->values->appearance.bg_stipple;
+ GTK_VALUE_BOXED (*arg) = tag->values->appearance.bg_stipple;
break;
case ARG_FOREGROUND_STIPPLE:
- GTK_VALUE_BOXED(*arg) = tag->values->appearance.fg_stipple;
+ GTK_VALUE_BOXED (*arg) = tag->values->appearance.fg_stipple;
break;
case ARG_FONT:
if (tag->values->font_desc)
- GTK_VALUE_STRING(*arg) = pango_font_description_to_string (tag->values->font_desc);
+ GTK_VALUE_STRING (*arg) = pango_font_description_to_string (tag->values->font_desc);
else
- GTK_VALUE_STRING(*arg) = NULL;
+ GTK_VALUE_STRING (*arg) = NULL;
break;
case ARG_FONT_DESC:
if (tag->values->font_desc)
- GTK_VALUE_BOXED(*arg) = pango_font_description_copy (tag->values->font_desc);
+ GTK_VALUE_BOXED (*arg) = pango_font_description_copy (tag->values->font_desc);
else
- GTK_VALUE_BOXED(*arg) = NULL;
+ GTK_VALUE_BOXED (*arg) = NULL;
break;
case ARG_PIXELS_ABOVE_LINES:
- GTK_VALUE_INT(*arg) = tag->values->pixels_above_lines;
+ GTK_VALUE_INT (*arg) = tag->values->pixels_above_lines;
break;
case ARG_PIXELS_BELOW_LINES:
- GTK_VALUE_INT(*arg) = tag->values->pixels_below_lines;
+ GTK_VALUE_INT (*arg) = tag->values->pixels_below_lines;
break;
case ARG_PIXELS_INSIDE_WRAP:
- GTK_VALUE_INT(*arg) = tag->values->pixels_inside_wrap;
+ GTK_VALUE_INT (*arg) = tag->values->pixels_inside_wrap;
break;
case ARG_EDITABLE:
- GTK_VALUE_BOOL(*arg) = tag->values->editable;
- break;
+ GTK_VALUE_BOOL (*arg) = tag->values->editable;
+ break;
case ARG_WRAP_MODE:
- GTK_VALUE_ENUM(*arg) = tag->values->wrap_mode;
+ GTK_VALUE_ENUM (*arg) = tag->values->wrap_mode;
break;
case ARG_JUSTIFY:
- GTK_VALUE_ENUM(*arg) = tag->values->justify;
+ GTK_VALUE_ENUM (*arg) = tag->values->justify;
break;
case ARG_LEFT_MARGIN:
- GTK_VALUE_INT(*arg) = tag->values->left_margin;
+ GTK_VALUE_INT (*arg) = tag->values->left_margin;
break;
case ARG_LEFT_WRAPPED_LINE_MARGIN:
- GTK_VALUE_INT(*arg) = tag->values->left_wrapped_line_margin;
+ GTK_VALUE_INT (*arg) = tag->values->left_wrapped_line_margin;
break;
case ARG_STRIKETHROUGH:
- GTK_VALUE_BOOL(*arg) = tag->values->appearance.strikethrough;
+ GTK_VALUE_BOOL (*arg) = tag->values->appearance.strikethrough;
break;
-
+
case ARG_RIGHT_MARGIN:
- GTK_VALUE_INT(*arg) = tag->values->right_margin;
+ GTK_VALUE_INT (*arg) = tag->values->right_margin;
break;
-
+
case ARG_UNDERLINE:
- GTK_VALUE_ENUM(*arg) = tag->values->appearance.underline;
+ GTK_VALUE_ENUM (*arg) = tag->values->appearance.underline;
break;
case ARG_OFFSET:
- GTK_VALUE_INT(*arg) = tag->values->offset;
+ GTK_VALUE_INT (*arg) = tag->values->offset;
break;
case ARG_BG_FULL_HEIGHT:
- GTK_VALUE_BOOL(*arg) = tag->values->bg_full_height;
+ GTK_VALUE_BOOL (*arg) = tag->values->bg_full_height;
break;
case ARG_LANGUAGE:
- GTK_VALUE_STRING(*arg) = g_strdup (tag->values->language);
+ GTK_VALUE_STRING (*arg) = g_strdup (tag->values->language);
break;
case ARG_TABS:
- GTK_VALUE_POINTER (*arg) = tag->values->tabs ?
+ GTK_VALUE_POINTER (*arg) = tag->values->tabs ?
pango_tab_array_copy (tag->values->tabs) : NULL;
break;
-
+
case ARG_BACKGROUND_SET:
case ARG_BACKGROUND_GDK_SET:
- GTK_VALUE_BOOL(*arg) = tag->bg_color_set;
+ GTK_VALUE_BOOL (*arg) = tag->bg_color_set;
break;
case ARG_FOREGROUND_SET:
case ARG_FOREGROUND_GDK_SET:
- GTK_VALUE_BOOL(*arg) = tag->fg_color_set;
+ GTK_VALUE_BOOL (*arg) = tag->fg_color_set;
break;
case ARG_BACKGROUND_STIPPLE_SET:
- GTK_VALUE_BOOL(*arg) = tag->bg_stipple_set;
+ GTK_VALUE_BOOL (*arg) = tag->bg_stipple_set;
break;
case ARG_FOREGROUND_STIPPLE_SET:
- GTK_VALUE_BOOL(*arg) = tag->fg_stipple_set;
+ GTK_VALUE_BOOL (*arg) = tag->fg_stipple_set;
break;
case ARG_FONT_SET:
- GTK_VALUE_BOOL(*arg) = tag->font_set;
+ GTK_VALUE_BOOL (*arg) = tag->font_set;
break;
case ARG_PIXELS_ABOVE_LINES_SET:
- GTK_VALUE_BOOL(*arg) = tag->pixels_above_lines_set;
+ GTK_VALUE_BOOL (*arg) = tag->pixels_above_lines_set;
break;
case ARG_PIXELS_BELOW_LINES_SET:
- GTK_VALUE_BOOL(*arg) = tag->pixels_below_lines_set;
+ GTK_VALUE_BOOL (*arg) = tag->pixels_below_lines_set;
break;
case ARG_PIXELS_INSIDE_WRAP_SET:
- GTK_VALUE_BOOL(*arg) = tag->pixels_inside_wrap_set;
+ GTK_VALUE_BOOL (*arg) = tag->pixels_inside_wrap_set;
break;
case ARG_EDITABLE_SET:
- GTK_VALUE_BOOL(*arg) = tag->editable_set;
+ GTK_VALUE_BOOL (*arg) = tag->editable_set;
break;
case ARG_WRAP_MODE_SET:
- GTK_VALUE_BOOL(*arg) = tag->wrap_mode_set;
+ GTK_VALUE_BOOL (*arg) = tag->wrap_mode_set;
break;
case ARG_JUSTIFY_SET:
- GTK_VALUE_BOOL(*arg) = tag->justify_set;
+ GTK_VALUE_BOOL (*arg) = tag->justify_set;
break;
case ARG_LEFT_MARGIN_SET:
- GTK_VALUE_BOOL(*arg) = tag->left_margin_set;
+ GTK_VALUE_BOOL (*arg) = tag->left_margin_set;
break;
case ARG_LEFT_WRAPPED_LINE_MARGIN_SET:
- GTK_VALUE_BOOL(*arg) = tag->left_wrapped_line_margin_set;
+ GTK_VALUE_BOOL (*arg) = tag->left_wrapped_line_margin_set;
break;
case ARG_STRIKETHROUGH_SET:
- GTK_VALUE_BOOL(*arg) = tag->strikethrough_set;
+ GTK_VALUE_BOOL (*arg) = tag->strikethrough_set;
break;
case ARG_RIGHT_MARGIN_SET:
- GTK_VALUE_BOOL(*arg) = tag->right_margin_set;
+ GTK_VALUE_BOOL (*arg) = tag->right_margin_set;
break;
case ARG_UNDERLINE_SET:
- GTK_VALUE_BOOL(*arg) = tag->underline_set;
+ GTK_VALUE_BOOL (*arg) = tag->underline_set;
break;
case ARG_OFFSET_SET:
- GTK_VALUE_BOOL(*arg) = tag->offset_set;
+ GTK_VALUE_BOOL (*arg) = tag->offset_set;
break;
case ARG_BG_FULL_HEIGHT_SET:
- GTK_VALUE_BOOL(*arg) = tag->bg_full_height_set;
+ GTK_VALUE_BOOL (*arg) = tag->bg_full_height_set;
break;
case ARG_LANGUAGE_SET:
- GTK_VALUE_BOOL(*arg) = tag->language_set;
+ GTK_VALUE_BOOL (*arg) = tag->language_set;
break;
case ARG_TABS_SET:
GTK_VALUE_BOOL (*arg) = tag->tabs_set;
break;
-
+
case ARG_BACKGROUND:
case ARG_FOREGROUND:
default:
@@ -934,7 +934,7 @@ typedef struct {
} DeltaData;
static void
-delta_priority_foreach(GtkTextTag *tag, gpointer user_data)
+delta_priority_foreach (GtkTextTag *tag, gpointer user_data)
{
DeltaData *dd = user_data;
@@ -945,7 +945,7 @@ delta_priority_foreach(GtkTextTag *tag, gpointer user_data)
gint
gtk_text_tag_get_priority (GtkTextTag *tag)
{
- g_return_val_if_fail (GTK_IS_TEXT_TAG(tag), 0);
+ g_return_val_if_fail (GTK_IS_TEXT_TAG (tag), 0);
return tag->priority;
}
@@ -954,34 +954,34 @@ void
gtk_text_tag_set_priority (GtkTextTag *tag,
gint priority)
{
- DeltaData dd;
-
- g_return_if_fail (GTK_IS_TEXT_TAG (tag));
- g_return_if_fail (tag->table != NULL);
- g_return_if_fail (priority >= 0);
- g_return_if_fail (priority < gtk_text_tag_table_size (tag->table));
+ DeltaData dd;
- if (priority == tag->priority)
- return;
+ g_return_if_fail (GTK_IS_TEXT_TAG (tag));
+ g_return_if_fail (tag->table != NULL);
+ g_return_if_fail (priority >= 0);
+ g_return_if_fail (priority < gtk_text_tag_table_size (tag->table));
- if (priority < tag->priority)
- {
- dd.low = priority;
- dd.high = tag->priority - 1;
- dd.delta = 1;
- }
- else
- {
- dd.low = tag->priority + 1;
- dd.high = priority;
- dd.delta = -1;
- }
+ if (priority == tag->priority)
+ return;
- gtk_text_tag_table_foreach (tag->table,
- delta_priority_foreach,
- &dd);
-
- tag->priority = priority;
+ if (priority < tag->priority)
+ {
+ dd.low = priority;
+ dd.high = tag->priority - 1;
+ dd.delta = 1;
+ }
+ else
+ {
+ dd.low = tag->priority + 1;
+ dd.high = priority;
+ dd.delta = -1;
+ }
+
+ gtk_text_tag_table_foreach (tag->table,
+ delta_priority_foreach,
+ &dd);
+
+ tag->priority = priority;
}
gint
@@ -992,11 +992,11 @@ gtk_text_tag_event (GtkTextTag *tag,
{
gint retval = FALSE;
- g_return_val_if_fail(GTK_IS_TEXT_TAG(tag), FALSE);
- g_return_val_if_fail(GTK_IS_OBJECT(event_object), FALSE);
- g_return_val_if_fail(event != NULL, FALSE);
-
- gtk_signal_emit (GTK_OBJECT(tag),
+ g_return_val_if_fail (GTK_IS_TEXT_TAG (tag), FALSE);
+ g_return_val_if_fail (GTK_IS_OBJECT (event_object), FALSE);
+ g_return_val_if_fail (event != NULL, FALSE);
+
+ gtk_signal_emit (GTK_OBJECT (tag),
signals[EVENT],
event_object,
event,
@@ -1007,26 +1007,26 @@ gtk_text_tag_event (GtkTextTag *tag,
}
static int
-tag_sort_func(gconstpointer first, gconstpointer second)
+tag_sort_func (gconstpointer first, gconstpointer second)
{
- GtkTextTag *tag1, *tag2;
+ GtkTextTag *tag1, *tag2;
- tag1 = * (GtkTextTag **) first;
- tag2 = * (GtkTextTag **) second;
- return tag1->priority - tag2->priority;
+ tag1 = * (GtkTextTag **) first;
+ tag2 = * (GtkTextTag **) second;
+ return tag1->priority - tag2->priority;
}
void
-gtk_text_tag_array_sort(GtkTextTag** tag_array_p,
+gtk_text_tag_array_sort (GtkTextTag** tag_array_p,
guint len)
{
int i, j, prio;
GtkTextTag **tag;
GtkTextTag **maxPtrPtr, *tmp;
- g_return_if_fail(tag_array_p != NULL);
- g_return_if_fail(len > 0);
-
+ g_return_if_fail (tag_array_p != NULL);
+ g_return_if_fail (len > 0);
+
if (len < 2) {
return;
}
@@ -1047,19 +1047,19 @@ gtk_text_tag_array_sort(GtkTextTag** tag_array_p,
*iter = tmp;
}
} else {
- qsort((void *) tag_array_p, (unsigned) len, sizeof (GtkTextTag *),
- tag_sort_func);
+ qsort ((void *) tag_array_p, (unsigned) len, sizeof (GtkTextTag *),
+ tag_sort_func);
}
#if 0
{
- printf("Sorted tag array: \n");
+ printf ("Sorted tag array: \n");
i = 0;
while (i < len)
{
GtkTextTag *t = tag_array_p[i];
- printf(" %s priority %d\n", t->name, t->priority);
-
+ printf (" %s priority %d\n", t->name, t->priority);
+
++i;
}
}
@@ -1071,7 +1071,7 @@ gtk_text_tag_array_sort(GtkTextTag** tag_array_p,
*/
GtkTextAttributes*
-gtk_text_attributes_new(void)
+gtk_text_attributes_new (void)
{
GtkTextAttributes *values;
@@ -1082,40 +1082,40 @@ gtk_text_attributes_new(void)
values->refcount = 1;
values->language = gtk_get_default_language ();
-
+
return values;
}
void
-gtk_text_attributes_copy(GtkTextAttributes *src,
- GtkTextAttributes *dest)
+gtk_text_attributes_copy (GtkTextAttributes *src,
+ GtkTextAttributes *dest)
{
guint orig_refcount;
- g_return_if_fail(!dest->realized);
+ g_return_if_fail (!dest->realized);
if (src == dest)
return;
-
+
/* Add refs */
-
+
if (src->appearance.bg_stipple)
- gdk_bitmap_ref(src->appearance.bg_stipple);
+ gdk_bitmap_ref (src->appearance.bg_stipple);
if (src->appearance.fg_stipple)
- gdk_bitmap_ref(src->appearance.fg_stipple);
+ gdk_bitmap_ref (src->appearance.fg_stipple);
/* Remove refs */
-
+
if (dest->appearance.bg_stipple)
- gdk_bitmap_unref(dest->appearance.bg_stipple);
+ gdk_bitmap_unref (dest->appearance.bg_stipple);
if (dest->appearance.fg_stipple)
- gdk_bitmap_unref(dest->appearance.fg_stipple);
+ gdk_bitmap_unref (dest->appearance.fg_stipple);
/* Copy */
orig_refcount = dest->refcount;
-
+
*dest = *src;
dest->font_desc = pango_font_description_copy (src->font_desc);
@@ -1124,86 +1124,86 @@ gtk_text_attributes_copy(GtkTextAttributes *src,
dest->tabs = pango_tab_array_copy (src->tabs);
dest->language = g_strdup (src->language);
-
+
dest->refcount = orig_refcount;
dest->realized = FALSE;
}
void
-gtk_text_attributes_ref(GtkTextAttributes *values)
+gtk_text_attributes_ref (GtkTextAttributes *values)
{
- g_return_if_fail(values != NULL);
+ g_return_if_fail (values != NULL);
values->refcount += 1;
}
void
-gtk_text_attributes_unref(GtkTextAttributes *values)
+gtk_text_attributes_unref (GtkTextAttributes *values)
{
- g_return_if_fail(values != NULL);
- g_return_if_fail(values->refcount > 0);
+ g_return_if_fail (values != NULL);
+ g_return_if_fail (values->refcount > 0);
values->refcount -= 1;
if (values->refcount == 0)
{
- g_assert(!values->realized);
-
+ g_assert (!values->realized);
+
if (values->appearance.bg_stipple)
- gdk_bitmap_unref(values->appearance.bg_stipple);
-
+ gdk_bitmap_unref (values->appearance.bg_stipple);
+
if (values->font_desc)
pango_font_description_free (values->font_desc);
-
+
if (values->appearance.fg_stipple)
- gdk_bitmap_unref(values->appearance.fg_stipple);
+ gdk_bitmap_unref (values->appearance.fg_stipple);
if (values->tabs)
pango_tab_array_free (values->tabs);
if (values->language)
g_free (values->language);
-
- g_free(values);
+
+ g_free (values);
}
}
void
-gtk_text_attributes_realize(GtkTextAttributes *values,
- GdkColormap *cmap,
- GdkVisual *visual)
+gtk_text_attributes_realize (GtkTextAttributes *values,
+ GdkColormap *cmap,
+ GdkVisual *visual)
{
- g_return_if_fail(values != NULL);
- g_return_if_fail(values->refcount > 0);
- g_return_if_fail(!values->realized);
-
+ g_return_if_fail (values != NULL);
+ g_return_if_fail (values->refcount > 0);
+ g_return_if_fail (!values->realized);
+
/* It is wrong to use this colormap, FIXME */
- gdk_colormap_alloc_color(cmap,
- &values->appearance.fg_color,
- FALSE, TRUE);
+ gdk_colormap_alloc_color (cmap,
+ &values->appearance.fg_color,
+ FALSE, TRUE);
- gdk_colormap_alloc_color(cmap,
- &values->appearance.bg_color,
- FALSE, TRUE);
+ gdk_colormap_alloc_color (cmap,
+ &values->appearance.bg_color,
+ FALSE, TRUE);
values->realized = TRUE;
}
void
-gtk_text_attributes_unrealize(GtkTextAttributes *values,
- GdkColormap *cmap,
- GdkVisual *visual)
+gtk_text_attributes_unrealize (GtkTextAttributes *values,
+ GdkColormap *cmap,
+ GdkVisual *visual)
{
- g_return_if_fail(values != NULL);
- g_return_if_fail(values->refcount > 0);
- g_return_if_fail(values->realized);
-
- gdk_colormap_free_colors(cmap,
- &values->appearance.fg_color, 1);
-
-
- gdk_colormap_free_colors(cmap,
- &values->appearance.bg_color, 1);
+ g_return_if_fail (values != NULL);
+ g_return_if_fail (values->refcount > 0);
+ g_return_if_fail (values->realized);
+
+ gdk_colormap_free_colors (cmap,
+ &values->appearance.fg_color, 1);
+
+
+ gdk_colormap_free_colors (cmap,
+ &values->appearance.bg_color, 1);
values->appearance.fg_color.pixel = 0;
values->appearance.bg_color.pixel = 0;
@@ -1212,34 +1212,34 @@ gtk_text_attributes_unrealize(GtkTextAttributes *values,
}
void
-gtk_text_attributes_fill_from_tags(GtkTextAttributes *dest,
- GtkTextTag** tags,
- guint n_tags)
+gtk_text_attributes_fill_from_tags (GtkTextAttributes *dest,
+ GtkTextTag** tags,
+ guint n_tags)
{
guint n = 0;
- g_return_if_fail(!dest->realized);
-
+ g_return_if_fail (!dest->realized);
+
while (n < n_tags)
{
GtkTextTag *tag = tags[n];
GtkTextAttributes *vals = tag->values;
if (n > 0)
- g_assert(tags[n]->priority > tags[n-1]->priority);
-
+ g_assert (tags[n]->priority > tags[n-1]->priority);
+
if (tag->bg_color_set)
{
dest->appearance.bg_color = vals->appearance.bg_color;
-
+
dest->appearance.draw_bg = TRUE;
}
if (tag->bg_stipple_set)
{
- gdk_bitmap_ref(vals->appearance.bg_stipple);
+ gdk_bitmap_ref (vals->appearance.bg_stipple);
if (dest->appearance.bg_stipple)
- gdk_bitmap_unref(dest->appearance.bg_stipple);
+ gdk_bitmap_unref (dest->appearance.bg_stipple);
dest->appearance.bg_stipple = vals->appearance.bg_stipple;
dest->appearance.draw_bg = TRUE;
@@ -1247,7 +1247,7 @@ gtk_text_attributes_fill_from_tags(GtkTextAttributes *dest,
if (tag->fg_color_set)
dest->appearance.fg_color = vals->appearance.fg_color;
-
+
if (tag->font_set)
{
if (dest->font_desc)
@@ -1257,9 +1257,9 @@ gtk_text_attributes_fill_from_tags(GtkTextAttributes *dest,
if (tag->fg_stipple_set)
{
- gdk_bitmap_ref(vals->appearance.fg_stipple);
+ gdk_bitmap_ref (vals->appearance.fg_stipple);
if (dest->appearance.fg_stipple)
- gdk_bitmap_unref(dest->appearance.fg_stipple);
+ gdk_bitmap_unref (dest->appearance.fg_stipple);
dest->appearance.fg_stipple = vals->appearance.fg_stipple;
}
@@ -1268,7 +1268,7 @@ gtk_text_attributes_fill_from_tags(GtkTextAttributes *dest,
if (vals->direction != GTK_TEXT_DIR_NONE)
dest->direction = vals->direction;
-
+
if (tag->left_margin_set)
dest->left_margin = vals->left_margin;
@@ -1320,7 +1320,7 @@ gtk_text_attributes_fill_from_tags(GtkTextAttributes *dest,
g_free (dest->language);
dest->language = g_strdup (vals->language);
}
-
+
++n;
}
}
@@ -1330,7 +1330,7 @@ gtk_text_tag_affects_size (GtkTextTag *tag)
{
g_return_val_if_fail (GTK_IS_TEXT_TAG (tag), FALSE);
- return
+ return
tag->font_set ||
tag->justify_set ||
tag->left_margin_set ||
diff --git a/gtk/gtktexttag.h b/gtk/gtktexttag.h
index 0465fb9a39..f0d6d68604 100644
--- a/gtk/gtktexttag.h
+++ b/gtk/gtktexttag.h
@@ -21,7 +21,7 @@ typedef enum
typedef struct _GtkTextAttributes GtkTextAttributes;
-#define GTK_TYPE_TEXT_TAG (gtk_text_tag_get_type())
+#define GTK_TYPE_TEXT_TAG (gtk_text_tag_get_type ())
#define GTK_TEXT_TAG(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_TEXT_TAG, GtkTextTag))
#define GTK_TEXT_TAG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_TAG, GtkTextTagClass))
#define GTK_IS_TEXT_TAG(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_TEXT_TAG))
@@ -36,12 +36,12 @@ struct _GtkTextTag
GtkObject parent_instance;
GtkTextTagTable *table;
-
- char *name; /* Name of this tag. This field is actually
- * a pointer to the key from the entry in
- * tkxt->tagTable, so it needn't be freed
- * explicitly. */
- int priority; /* Priority of this tag within widget. 0
+
+ char *name; /* Name of this tag. This field is actually
+ * a pointer to the key from the entry in
+ * tkxt->tagTable, so it needn't be freed
+ * explicitly. */
+ int priority; /* Priority of this tag within widget. 0
* means lowest priority. Exactly one tag
* has each integer value between 0 and
* numTags-1. */
@@ -53,8 +53,8 @@ struct _GtkTextTag
* defaults if no tag specifies an override.
*/
- GtkTextAttributes *values;
-
+ GtkTextAttributes *values;
+
/* Flags for whether a given value is set; if a value is unset, then
* this tag does not affect it.
*/
@@ -97,11 +97,11 @@ GtkType gtk_text_tag_get_type (void) G_GNUC_CONST;
GtkTextTag *gtk_text_tag_new (const gchar *name);
gint gtk_text_tag_get_priority (GtkTextTag *tag);
void gtk_text_tag_set_priority (GtkTextTag *tag,
- gint priority);
+ gint priority);
gint gtk_text_tag_event (GtkTextTag *tag,
- GtkObject *event_object,
- GdkEvent *event,
- const GtkTextIter *iter);
+ GtkObject *event_object,
+ GdkEvent *event,
+ const GtkTextIter *iter);
/*
* Style object created by folding a set of tags together
@@ -116,7 +116,7 @@ struct _GtkTextAppearance
GdkBitmap *bg_stipple;
GdkBitmap *fg_stipple;
- guint underline : 4; /* PangoUnderline */
+ guint underline : 4; /* PangoUnderline */
guint strikethrough : 1;
/* Whether to use background-related values; this is irrelevant for
@@ -138,21 +138,21 @@ struct _GtkTextAttributes
guint refcount;
GtkTextAppearance appearance;
-
+
GtkJustification justify;
GtkTextDirection direction;
-
+
PangoFontDescription *font_desc;
-
+
/* lMargin1 */
gint left_margin;
-
+
/* lMargin2 */
gint left_wrapped_line_margin;
/* super/subscript offset, can be negative */
gint offset;
-
+
gint right_margin;
gint pixels_above_lines;
@@ -162,14 +162,14 @@ struct _GtkTextAttributes
gint pixels_inside_wrap;
PangoTabArray *tabs;
-
- GtkWrapMode wrap_mode; /* How to handle wrap-around for this tag.
- * Must be GTK_WRAPMODE_CHAR,
- * GTK_WRAPMODE_NONE, GTK_WRAPMODE_WORD
+
+ GtkWrapMode wrap_mode; /* How to handle wrap-around for this tag.
+ * Must be GTK_WRAPMODE_CHAR,
+ * GTK_WRAPMODE_NONE, GTK_WRAPMODE_WORD
*/
gchar *language;
-
+
/* hide the text */
guint invisible : 1;
@@ -177,7 +177,7 @@ struct _GtkTextAttributes
* baseline +/- ascent/descent (font height)
*/
guint bg_full_height : 1;
-
+
/* can edit this text */
guint editable : 1;
diff --git a/gtk/gtktexttagtable.c b/gtk/gtktexttagtable.c
index c137b6c25d..47cac78214 100644
--- a/gtk/gtktexttagtable.c
+++ b/gtk/gtktexttagtable.c
@@ -44,8 +44,8 @@ gtk_text_tag_table_get_type (void)
(GtkClassInitFunc) NULL
};
- our_type = gtk_type_unique (GTK_TYPE_OBJECT, &our_info);
- }
+ our_type = gtk_type_unique (GTK_TYPE_OBJECT, &our_info);
+ }
return our_type;
}
@@ -57,7 +57,7 @@ gtk_text_tag_table_class_init (GtkTextTagTableClass *klass)
GtkObjectClass *object_class = GTK_OBJECT_CLASS (klass);
parent_class = gtk_type_class (GTK_TYPE_OBJECT);
-
+
signals[TAG_CHANGED] =
gtk_signal_new ("tag_changed",
GTK_RUN_LAST,
@@ -89,7 +89,7 @@ gtk_text_tag_table_class_init (GtkTextTagTableClass *klass)
1,
GTK_TYPE_OBJECT);
-
+
gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
object_class->set_arg = gtk_text_tag_table_set_arg;
@@ -102,7 +102,7 @@ gtk_text_tag_table_class_init (GtkTextTagTableClass *klass)
void
gtk_text_tag_table_init (GtkTextTagTable *table)
{
- table->hash = g_hash_table_new(g_str_hash, g_str_equal);
+ table->hash = g_hash_table_new (g_str_hash, g_str_equal);
}
GtkTextTagTable*
@@ -111,7 +111,7 @@ gtk_text_tag_table_new (void)
GtkTextTagTable *table;
table = GTK_TEXT_TAG_TABLE (gtk_type_new (gtk_text_tag_table_get_type ()));
-
+
return table;
}
@@ -120,9 +120,9 @@ gtk_text_tag_table_destroy (GtkObject *object)
{
GtkTextTagTable *table;
- table = GTK_TEXT_TAG_TABLE(object);
+ table = GTK_TEXT_TAG_TABLE (object);
- (* GTK_OBJECT_CLASS(parent_class)->destroy) (object);
+ (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
}
static void
@@ -131,7 +131,7 @@ foreach_unref (GtkTextTag *tag, gpointer data)
/* We don't want to emit the remove signal here; so we just unparent
* and unref the tag.
*/
-
+
tag->table = NULL;
g_object_unref (G_OBJECT (tag));
}
@@ -141,14 +141,14 @@ gtk_text_tag_table_finalize (GObject *object)
{
GtkTextTagTable *table;
- table = GTK_TEXT_TAG_TABLE(object);
+ table = GTK_TEXT_TAG_TABLE (object);
gtk_text_tag_table_foreach (table, foreach_unref, NULL);
-
+
g_hash_table_destroy (table->hash);
g_slist_free (table->anonymous);
- (* G_OBJECT_CLASS(parent_class)->finalize) (object);
+ (* G_OBJECT_CLASS (parent_class)->finalize) (object);
}
static void
@@ -156,13 +156,13 @@ gtk_text_tag_table_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)
{
GtkTextTagTable *table;
- table = GTK_TEXT_TAG_TABLE(object);
-
+ table = GTK_TEXT_TAG_TABLE (object);
+
switch (arg_id)
{
-
+
default:
- g_assert_not_reached();
+ g_assert_not_reached ();
break;
}
}
@@ -172,7 +172,7 @@ gtk_text_tag_table_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
{
GtkTextTagTable *table;
- table = GTK_TEXT_TAG_TABLE(object);
+ table = GTK_TEXT_TAG_TABLE (object);
switch (arg_id)
{
@@ -184,73 +184,73 @@ gtk_text_tag_table_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
}
void
-gtk_text_tag_table_add(GtkTextTagTable *table, GtkTextTag *tag)
+gtk_text_tag_table_add (GtkTextTagTable *table, GtkTextTag *tag)
{
guint size;
-
- g_return_if_fail(GTK_IS_TEXT_TAG_TABLE (table));
- g_return_if_fail(GTK_IS_TEXT_TAG (tag));
- g_return_if_fail(tag->name == NULL ||
- g_hash_table_lookup(table->hash, tag->name) == NULL);
- g_return_if_fail(tag->table == NULL);
- gtk_object_ref(GTK_OBJECT(tag));
- gtk_object_sink(GTK_OBJECT(tag));
+ g_return_if_fail (GTK_IS_TEXT_TAG_TABLE (table));
+ g_return_if_fail (GTK_IS_TEXT_TAG (tag));
+ g_return_if_fail (tag->name == NULL ||
+ g_hash_table_lookup (table->hash, tag->name) == NULL);
+ g_return_if_fail (tag->table == NULL);
+
+ gtk_object_ref (GTK_OBJECT (tag));
+ gtk_object_sink (GTK_OBJECT (tag));
if (tag->name)
- g_hash_table_insert(table->hash, tag->name, tag);
+ g_hash_table_insert (table->hash, tag->name, tag);
else
{
table->anonymous = g_slist_prepend (table->anonymous, tag);
table->anon_count += 1;
}
-
+
tag->table = table;
/* We get the highest tag priority, as the most-recently-added
tag. Note that we do NOT use gtk_text_tag_set_priority,
as it assumes the tag is already in the table. */
- size = gtk_text_tag_table_size(table);
- g_assert(size > 0);
+ size = gtk_text_tag_table_size (table);
+ g_assert (size > 0);
tag->priority = size - 1;
-
- gtk_signal_emit(GTK_OBJECT(table), signals[TAG_ADDED], tag);
+
+ gtk_signal_emit (GTK_OBJECT (table), signals[TAG_ADDED], tag);
}
GtkTextTag*
-gtk_text_tag_table_lookup(GtkTextTagTable *table, const gchar *name)
+gtk_text_tag_table_lookup (GtkTextTagTable *table, const gchar *name)
{
- g_return_val_if_fail(GTK_IS_TEXT_TAG_TABLE(table), NULL);
- g_return_val_if_fail(name != NULL, NULL);
-
- return g_hash_table_lookup(table->hash, name);
+ g_return_val_if_fail (GTK_IS_TEXT_TAG_TABLE (table), NULL);
+ g_return_val_if_fail (name != NULL, NULL);
+
+ return g_hash_table_lookup (table->hash, name);
}
void
-gtk_text_tag_table_remove(GtkTextTagTable *table, GtkTextTag *tag)
+gtk_text_tag_table_remove (GtkTextTagTable *table, GtkTextTag *tag)
{
- g_return_if_fail (GTK_IS_TEXT_TAG_TABLE(table));
+ g_return_if_fail (GTK_IS_TEXT_TAG_TABLE (table));
g_return_if_fail (GTK_IS_TEXT_TAG (tag));
- g_return_if_fail (tag->table == table);
+ g_return_if_fail (tag->table == table);
/* Set ourselves to the highest priority; this means
when we're removed, there won't be any gaps in the
priorities of the tags in the table. */
- gtk_text_tag_set_priority(tag, gtk_text_tag_table_size(table) - 1);
-
+ gtk_text_tag_set_priority (tag, gtk_text_tag_table_size (table) - 1);
+
tag->table = NULL;
if (tag->name)
- g_hash_table_remove(table->hash, tag->name);
+ g_hash_table_remove (table->hash, tag->name);
else
{
table->anonymous = g_slist_remove (table->anonymous, tag);
table->anon_count -= 1;
}
-
- gtk_signal_emit(GTK_OBJECT(table), signals[TAG_REMOVED], tag);
- gtk_object_unref(GTK_OBJECT(tag));
+ gtk_signal_emit (GTK_OBJECT (table), signals[TAG_REMOVED], tag);
+
+ gtk_object_unref (GTK_OBJECT (tag));
}
struct ForeachData
@@ -265,7 +265,7 @@ hash_foreach (gpointer key, gpointer value, gpointer data)
struct ForeachData *fd = data;
g_return_if_fail (GTK_IS_TEXT_TAG (value));
-
+
(* fd->func) (value, fd->data);
}
@@ -275,31 +275,31 @@ list_foreach (gpointer data, gpointer user_data)
struct ForeachData *fd = user_data;
g_return_if_fail (GTK_IS_TEXT_TAG (data));
-
+
(* fd->func) (data, fd->data);
}
void
-gtk_text_tag_table_foreach(GtkTextTagTable *table,
- GtkTextTagTableForeach func,
- gpointer data)
+gtk_text_tag_table_foreach (GtkTextTagTable *table,
+ GtkTextTagTableForeach func,
+ gpointer data)
{
struct ForeachData d;
-
- g_return_if_fail(GTK_IS_TEXT_TAG_TABLE(table));
- g_return_if_fail(func != NULL);
+
+ g_return_if_fail (GTK_IS_TEXT_TAG_TABLE (table));
+ g_return_if_fail (func != NULL);
d.func = func;
d.data = data;
-
- g_hash_table_foreach(table->hash, hash_foreach, &d);
+
+ g_hash_table_foreach (table->hash, hash_foreach, &d);
g_slist_foreach (table->anonymous, list_foreach, &d);
}
guint
-gtk_text_tag_table_size(GtkTextTagTable *table)
+gtk_text_tag_table_size (GtkTextTagTable *table)
{
- g_return_val_if_fail(GTK_IS_TEXT_TAG_TABLE(table), 0);
+ g_return_val_if_fail (GTK_IS_TEXT_TAG_TABLE (table), 0);
- return g_hash_table_size(table->hash) + table->anon_count;
+ return g_hash_table_size (table->hash) + table->anon_count;
}
diff --git a/gtk/gtktexttagtable.h b/gtk/gtktexttagtable.h
index 8e8a9645a8..d9f60a37a9 100644
--- a/gtk/gtktexttagtable.h
+++ b/gtk/gtktexttagtable.h
@@ -11,7 +11,7 @@ extern "C" {
typedef void (* GtkTextTagTableForeach) (GtkTextTag *tag, gpointer data);
-#define GTK_TYPE_TEXT_TAG_TABLE (gtk_text_tag_table_get_type())
+#define GTK_TYPE_TEXT_TAG_TABLE (gtk_text_tag_table_get_type ())
#define GTK_TEXT_TAG_TABLE(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_TEXT_TAG_TABLE, GtkTextTagTable))
#define GTK_TEXT_TAG_TABLE_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_TAG_TABLE, GtkTextTagTableClass))
#define GTK_IS_TEXT_TAG_TABLE(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_TEXT_TAG_TABLE))
@@ -22,7 +22,7 @@ typedef struct _GtkTextTagTableClass GtkTextTagTableClass;
struct _GtkTextTagTable {
GtkObject parent_instance;
-
+
GHashTable *hash;
GSList *anonymous;
gint anon_count;
@@ -30,7 +30,7 @@ struct _GtkTextTagTable {
struct _GtkTextTagTableClass {
GtkObjectClass parent_class;
-
+
void (* tag_changed) (GtkTextTagTable *table, GtkTextTag *tag, gboolean size_changed);
void (* tag_added) (GtkTextTagTable *table, GtkTextTag *tag);
void (* tag_removed) (GtkTextTagTable *table, GtkTextTag *tag);
diff --git a/gtk/gtktexttypes.c b/gtk/gtktexttypes.c
index a740fc6b39..a0c9a98a23 100644
--- a/gtk/gtktexttypes.c
+++ b/gtk/gtktexttypes.c
@@ -7,13 +7,13 @@ const gunichar gtk_text_unknown_char = 0xFFFD;
const gchar gtk_text_unknown_char_utf8[] = { 0xEF, 0xBF, 0xBD, '\0' };
static inline gboolean
-inline_byte_begins_utf8_char(const gchar *byte)
+inline_byte_begins_utf8_char (const gchar *byte)
{
return ((*byte & 0xC0) != 0x80);
}
gboolean
-gtk_text_byte_begins_utf8_char(const gchar *byte)
+gtk_text_byte_begins_utf8_char (const gchar *byte)
{
- return inline_byte_begins_utf8_char(byte);
+ return inline_byte_begins_utf8_char (byte);
}
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 00bb626a2c..d709b4f57f 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -8,7 +8,7 @@
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
@@ -21,7 +21,7 @@
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#include <string.h>
@@ -74,91 +74,91 @@ static void gtk_text_view_class_init (GtkTextViewClass *klass);
static void gtk_text_view_destroy (GtkObject *object);
static void gtk_text_view_finalize (GObject *object);
static void gtk_text_view_set_arg (GtkObject *object,
- GtkArg *arg,
- guint arg_id);
+ GtkArg *arg,
+ guint arg_id);
static void gtk_text_view_get_arg (GtkObject *object,
- GtkArg *arg,
- guint arg_id);
+ GtkArg *arg,
+ guint arg_id);
static void gtk_text_view_size_request (GtkWidget *widget,
- GtkRequisition *requisition);
+ GtkRequisition *requisition);
static void gtk_text_view_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation);
+ GtkAllocation *allocation);
static void gtk_text_view_realize (GtkWidget *widget);
static void gtk_text_view_unrealize (GtkWidget *widget);
static void gtk_text_view_style_set (GtkWidget *widget,
- GtkStyle *previous_style);
+ GtkStyle *previous_style);
static void gtk_text_view_direction_changed (GtkWidget *widget,
- GtkTextDirection previous_direction);
+ GtkTextDirection previous_direction);
static gint gtk_text_view_event (GtkWidget *widget,
- GdkEvent *event);
+ GdkEvent *event);
static gint gtk_text_view_key_press_event (GtkWidget *widget,
- GdkEventKey *event);
+ GdkEventKey *event);
static gint gtk_text_view_key_release_event (GtkWidget *widget,
- GdkEventKey *event);
+ GdkEventKey *event);
static gint gtk_text_view_button_press_event (GtkWidget *widget,
- GdkEventButton *event);
+ GdkEventButton *event);
static gint gtk_text_view_button_release_event (GtkWidget *widget,
- GdkEventButton *event);
+ GdkEventButton *event);
static gint gtk_text_view_focus_in_event (GtkWidget *widget,
- GdkEventFocus *event);
+ GdkEventFocus *event);
static gint gtk_text_view_focus_out_event (GtkWidget *widget,
- GdkEventFocus *event);
+ GdkEventFocus *event);
static gint gtk_text_view_motion_event (GtkWidget *widget,
- GdkEventMotion *event);
+ GdkEventMotion *event);
static void gtk_text_view_draw (GtkWidget *widget,
- GdkRectangle *area);
+ GdkRectangle *area);
static gint gtk_text_view_expose_event (GtkWidget *widget,
- GdkEventExpose *expose);
+ GdkEventExpose *expose);
static void gtk_text_view_draw_focus (GtkWidget *widget);
/* Source side drag signals */
static void gtk_text_view_drag_begin (GtkWidget *widget,
- GdkDragContext *context);
+ GdkDragContext *context);
static void gtk_text_view_drag_end (GtkWidget *widget,
- GdkDragContext *context);
+ GdkDragContext *context);
static void gtk_text_view_drag_data_get (GtkWidget *widget,
- GdkDragContext *context,
- GtkSelectionData *selection_data,
- guint info,
- guint time);
+ GdkDragContext *context,
+ GtkSelectionData *selection_data,
+ guint info,
+ guint time);
static void gtk_text_view_drag_data_delete (GtkWidget *widget,
- GdkDragContext *context);
+ GdkDragContext *context);
/* Target side drag signals */
static void gtk_text_view_drag_leave (GtkWidget *widget,
- GdkDragContext *context,
- guint time);
+ GdkDragContext *context,
+ guint time);
static gboolean gtk_text_view_drag_motion (GtkWidget *widget,
- GdkDragContext *context,
- gint x,
- gint y,
- guint time);
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ guint time);
static gboolean gtk_text_view_drag_drop (GtkWidget *widget,
- GdkDragContext *context,
- gint x,
- gint y,
- guint time);
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ guint time);
static void gtk_text_view_drag_data_received (GtkWidget *widget,
- GdkDragContext *context,
- gint x,
- gint y,
- GtkSelectionData *selection_data,
- guint info,
- guint time);
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ GtkSelectionData *selection_data,
+ guint info,
+ guint time);
static void gtk_text_view_set_scroll_adjustments (GtkTextView *text_view,
- GtkAdjustment *hadj,
- GtkAdjustment *vadj);
+ GtkAdjustment *hadj,
+ GtkAdjustment *vadj);
static void gtk_text_view_move (GtkTextView *text_view,
- GtkMovementStep step,
- gint count,
- gboolean extend_selection);
+ GtkMovementStep step,
+ gint count,
+ gboolean extend_selection);
static void gtk_text_view_set_anchor (GtkTextView *text_view);
static void gtk_text_view_scroll_pages (GtkTextView *text_view,
- gint count);
+ gint count);
static void gtk_text_view_insert_at_cursor (GtkTextView *text_view,
- const gchar *str);
+ const gchar *str);
static void gtk_text_view_delete_at_cursor (GtkTextView *text_view,
GtkDeleteType type,
gint count);
@@ -170,7 +170,7 @@ static void gtk_text_view_unselect (GtkTextView *text_view);
static void gtk_text_view_validate_onscreen (GtkTextView *text_view);
static void gtk_text_view_get_first_para_iter (GtkTextView *text_view,
- GtkTextIter *iter);
+ GtkTextIter *iter);
static void gtk_text_view_scroll_calc_now (GtkTextView *text_view);
static void gtk_text_view_set_attributes_from_style (GtkTextView *text_view,
GtkTextAttributes *values,
@@ -178,32 +178,32 @@ static void gtk_text_view_set_attributes_from_style (GtkTextView *tex
static void gtk_text_view_ensure_layout (GtkTextView *text_view);
static void gtk_text_view_destroy_layout (GtkTextView *text_view);
static void gtk_text_view_start_selection_drag (GtkTextView *text_view,
- const GtkTextIter *iter,
+ const GtkTextIter *iter,
GdkEventButton *event);
static gboolean gtk_text_view_end_selection_drag (GtkTextView *text_view,
- GdkEventButton *event);
+ GdkEventButton *event);
static void gtk_text_view_start_selection_dnd (GtkTextView *text_view,
- const GtkTextIter *iter,
- GdkEventMotion *event);
+ const GtkTextIter *iter,
+ GdkEventMotion *event);
static void gtk_text_view_start_cursor_blink (GtkTextView *text_view);
static void gtk_text_view_stop_cursor_blink (GtkTextView *text_view);
static void gtk_text_view_value_changed (GtkAdjustment *adj,
GtkTextView *view);
static void gtk_text_view_commit_handler (GtkIMContext *context,
- const gchar *str,
- GtkTextView *text_view);
+ const gchar *str,
+ GtkTextView *text_view);
static void gtk_text_view_mark_set_handler (GtkTextBuffer *buffer,
- const GtkTextIter *location,
+ const GtkTextIter *location,
GtkTextMark *mark,
- gpointer data);
+ gpointer data);
static void gtk_text_view_get_virtual_cursor_pos (GtkTextView *text_view,
- gint *x,
- gint *y);
+ gint *x,
+ gint *y);
static void gtk_text_view_set_virtual_cursor_pos (GtkTextView *text_view,
- gint x,
- gint y);
+ gint x,
+ gint y);
static GtkAdjustment* get_hadjustment (GtkTextView *text_view);
static GtkAdjustment* get_vadjustment (GtkTextView *text_view);
@@ -315,32 +315,32 @@ gtk_text_view_get_type (void)
(GtkClassInitFunc) NULL
};
- our_type = gtk_type_unique (GTK_TYPE_CONTAINER, &our_info);
- }
+ our_type = gtk_type_unique (GTK_TYPE_CONTAINER, &our_info);
+ }
return our_type;
}
static void
add_move_binding (GtkBindingSet *binding_set,
- guint keyval,
- guint modmask,
- GtkMovementStep step,
- gint count)
+ guint keyval,
+ guint modmask,
+ GtkMovementStep step,
+ gint count)
{
g_return_if_fail ((modmask & GDK_SHIFT_MASK) == 0);
-
+
gtk_binding_entry_add_signal (binding_set, keyval, modmask,
- "move", 3,
- GTK_TYPE_ENUM, step,
- GTK_TYPE_INT, count,
+ "move", 3,
+ GTK_TYPE_ENUM, step,
+ GTK_TYPE_INT, count,
GTK_TYPE_BOOL, FALSE);
/* Selection-extending version */
gtk_binding_entry_add_signal (binding_set, keyval, modmask | GDK_SHIFT_MASK,
- "move", 3,
- GTK_TYPE_ENUM, step,
- GTK_TYPE_INT, count,
+ "move", 3,
+ GTK_TYPE_ENUM, step,
+ GTK_TYPE_INT, count,
GTK_TYPE_BOOL, TRUE);
}
@@ -352,7 +352,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
GtkBindingSet *binding_set;
-
+
parent_class = gtk_type_class (GTK_TYPE_CONTAINER);
/*
@@ -378,37 +378,37 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
* Signals
*/
- signals[MOVE] =
- gtk_signal_new ("move",
- GTK_RUN_LAST | GTK_RUN_ACTION,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkTextViewClass, move),
- gtk_marshal_VOID__ENUM_INT_BOOLEAN,
- GTK_TYPE_NONE, 3, GTK_TYPE_MOVEMENT_STEP, GTK_TYPE_INT, GTK_TYPE_BOOL);
-
- signals[SET_ANCHOR] =
- gtk_signal_new ("set_anchor",
- GTK_RUN_LAST | GTK_RUN_ACTION,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkTextViewClass, set_anchor),
- gtk_marshal_VOID__VOID,
- GTK_TYPE_NONE, 0);
-
- signals[INSERT_AT_CURSOR] =
- gtk_signal_new ("insert_at_cursor",
- GTK_RUN_LAST | GTK_RUN_ACTION,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkTextViewClass, insert_at_cursor),
- gtk_marshal_VOID__POINTER,
- GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
-
- signals[DELETE_AT_CURSOR] =
- gtk_signal_new ("delete_at_cursor",
- GTK_RUN_LAST | GTK_RUN_ACTION,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkTextViewClass, delete_at_cursor),
- gtk_marshal_VOID__ENUM_INT,
- GTK_TYPE_NONE, 2, GTK_TYPE_DELETE_TYPE, GTK_TYPE_INT);
+ signals[MOVE] =
+ gtk_signal_new ("move",
+ GTK_RUN_LAST | GTK_RUN_ACTION,
+ GTK_CLASS_TYPE (object_class),
+ GTK_SIGNAL_OFFSET (GtkTextViewClass, move),
+ gtk_marshal_VOID__ENUM_INT_BOOLEAN,
+ GTK_TYPE_NONE, 3, GTK_TYPE_MOVEMENT_STEP, GTK_TYPE_INT, GTK_TYPE_BOOL);
+
+ signals[SET_ANCHOR] =
+ gtk_signal_new ("set_anchor",
+ GTK_RUN_LAST | GTK_RUN_ACTION,
+ GTK_CLASS_TYPE (object_class),
+ GTK_SIGNAL_OFFSET (GtkTextViewClass, set_anchor),
+ gtk_marshal_VOID__VOID,
+ GTK_TYPE_NONE, 0);
+
+ signals[INSERT_AT_CURSOR] =
+ gtk_signal_new ("insert_at_cursor",
+ GTK_RUN_LAST | GTK_RUN_ACTION,
+ GTK_CLASS_TYPE (object_class),
+ GTK_SIGNAL_OFFSET (GtkTextViewClass, insert_at_cursor),
+ gtk_marshal_VOID__POINTER,
+ GTK_TYPE_NONE, 1, GTK_TYPE_STRING);
+
+ signals[DELETE_AT_CURSOR] =
+ gtk_signal_new ("delete_at_cursor",
+ GTK_RUN_LAST | GTK_RUN_ACTION,
+ GTK_CLASS_TYPE (object_class),
+ GTK_SIGNAL_OFFSET (GtkTextViewClass, delete_at_cursor),
+ gtk_marshal_VOID__ENUM_INT,
+ GTK_TYPE_NONE, 2, GTK_TYPE_DELETE_TYPE, GTK_TYPE_INT);
signals[CUT_CLIPBOARD] =
gtk_signal_new ("cut_clipboard",
@@ -444,12 +444,12 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
signals[SET_SCROLL_ADJUSTMENTS] = widget_class->set_scroll_adjustments_signal =
gtk_signal_new ("set_scroll_adjustments",
- GTK_RUN_LAST,
- GTK_CLASS_TYPE (object_class),
- GTK_SIGNAL_OFFSET (GtkTextViewClass, set_scroll_adjustments),
- gtk_marshal_VOID__POINTER_POINTER,
- GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
-
+ GTK_RUN_LAST,
+ GTK_CLASS_TYPE (object_class),
+ GTK_SIGNAL_OFFSET (GtkTextViewClass, set_scroll_adjustments),
+ gtk_marshal_VOID__POINTER_POINTER,
+ GTK_TYPE_NONE, 2, GTK_TYPE_ADJUSTMENT, GTK_TYPE_ADJUSTMENT);
+
gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);
/*
@@ -460,146 +460,146 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
/* Moving the insertion point */
add_move_binding (binding_set, GDK_Right, 0,
- GTK_MOVEMENT_POSITIONS, 1);
-
+ GTK_MOVEMENT_POSITIONS, 1);
+
add_move_binding (binding_set, GDK_Left, 0,
- GTK_MOVEMENT_POSITIONS, -1);
+ GTK_MOVEMENT_POSITIONS, -1);
add_move_binding (binding_set, GDK_f, GDK_CONTROL_MASK,
- GTK_MOVEMENT_CHARS, 1);
-
+ GTK_MOVEMENT_CHARS, 1);
+
add_move_binding (binding_set, GDK_b, GDK_CONTROL_MASK,
- GTK_MOVEMENT_CHARS, -1);
-
+ GTK_MOVEMENT_CHARS, -1);
+
add_move_binding (binding_set, GDK_Right, GDK_CONTROL_MASK,
- GTK_MOVEMENT_WORDS, 1);
+ GTK_MOVEMENT_WORDS, 1);
add_move_binding (binding_set, GDK_Left, GDK_CONTROL_MASK,
- GTK_MOVEMENT_WORDS, -1);
-
+ GTK_MOVEMENT_WORDS, -1);
+
/* Eventually we want to move by display lines, not paragraphs */
add_move_binding (binding_set, GDK_Up, 0,
- GTK_MOVEMENT_DISPLAY_LINES, -1);
-
+ GTK_MOVEMENT_DISPLAY_LINES, -1);
+
add_move_binding (binding_set, GDK_Down, 0,
- GTK_MOVEMENT_DISPLAY_LINES, 1);
+ GTK_MOVEMENT_DISPLAY_LINES, 1);
add_move_binding (binding_set, GDK_p, GDK_CONTROL_MASK,
- GTK_MOVEMENT_DISPLAY_LINES, -1);
-
+ GTK_MOVEMENT_DISPLAY_LINES, -1);
+
add_move_binding (binding_set, GDK_n, GDK_CONTROL_MASK,
- GTK_MOVEMENT_DISPLAY_LINES, 1);
-
+ GTK_MOVEMENT_DISPLAY_LINES, 1);
+
add_move_binding (binding_set, GDK_a, GDK_CONTROL_MASK,
- GTK_MOVEMENT_PARAGRAPH_ENDS, -1);
+ GTK_MOVEMENT_PARAGRAPH_ENDS, -1);
add_move_binding (binding_set, GDK_e, GDK_CONTROL_MASK,
- GTK_MOVEMENT_PARAGRAPH_ENDS, 1);
+ GTK_MOVEMENT_PARAGRAPH_ENDS, 1);
add_move_binding (binding_set, GDK_f, GDK_MOD1_MASK,
- GTK_MOVEMENT_WORDS, 1);
+ GTK_MOVEMENT_WORDS, 1);
add_move_binding (binding_set, GDK_b, GDK_MOD1_MASK,
- GTK_MOVEMENT_WORDS, -1);
+ GTK_MOVEMENT_WORDS, -1);
add_move_binding (binding_set, GDK_Home, 0,
- GTK_MOVEMENT_DISPLAY_LINE_ENDS, -1);
+ GTK_MOVEMENT_DISPLAY_LINE_ENDS, -1);
add_move_binding (binding_set, GDK_End, 0,
- GTK_MOVEMENT_DISPLAY_LINE_ENDS, 1);
-
+ GTK_MOVEMENT_DISPLAY_LINE_ENDS, 1);
+
add_move_binding (binding_set, GDK_Home, GDK_CONTROL_MASK,
- GTK_MOVEMENT_BUFFER_ENDS, -1);
+ GTK_MOVEMENT_BUFFER_ENDS, -1);
add_move_binding (binding_set, GDK_End, GDK_CONTROL_MASK,
- GTK_MOVEMENT_BUFFER_ENDS, 1);
+ GTK_MOVEMENT_BUFFER_ENDS, 1);
add_move_binding (binding_set, GDK_Page_Up, 0,
- GTK_MOVEMENT_PAGES, -1);
+ GTK_MOVEMENT_PAGES, -1);
add_move_binding (binding_set, GDK_Page_Down, 0,
- GTK_MOVEMENT_PAGES, 1);
-
-
+ GTK_MOVEMENT_PAGES, 1);
+
+
/* Setting the cut/paste/copy anchor */
gtk_binding_entry_add_signal (binding_set, GDK_space, GDK_CONTROL_MASK,
- "set_anchor", 0);
+ "set_anchor", 0);
/* Deleting text */
gtk_binding_entry_add_signal (binding_set, GDK_Delete, 0,
- "delete_at_cursor", 2,
- GTK_TYPE_ENUM, GTK_DELETE_CHARS,
- GTK_TYPE_INT, 1);
-
+ "delete_at_cursor", 2,
+ GTK_TYPE_ENUM, GTK_DELETE_CHARS,
+ GTK_TYPE_INT, 1);
+
gtk_binding_entry_add_signal (binding_set, GDK_d, GDK_CONTROL_MASK,
- "delete_at_cursor", 2,
- GTK_TYPE_ENUM, GTK_DELETE_CHARS,
- GTK_TYPE_INT, 1);
+ "delete_at_cursor", 2,
+ GTK_TYPE_ENUM, GTK_DELETE_CHARS,
+ GTK_TYPE_INT, 1);
gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, 0,
- "delete_at_cursor", 2,
- GTK_TYPE_ENUM, GTK_DELETE_CHARS,
- GTK_TYPE_INT, -1);
+ "delete_at_cursor", 2,
+ GTK_TYPE_ENUM, GTK_DELETE_CHARS,
+ GTK_TYPE_INT, -1);
gtk_binding_entry_add_signal (binding_set, GDK_Delete, GDK_CONTROL_MASK,
- "delete_at_cursor", 2,
- GTK_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
- GTK_TYPE_INT, 1);
+ "delete_at_cursor", 2,
+ GTK_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
+ GTK_TYPE_INT, 1);
gtk_binding_entry_add_signal (binding_set, GDK_d, GDK_MOD1_MASK,
- "delete_at_cursor", 2,
- GTK_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
- GTK_TYPE_INT, 1);
+ "delete_at_cursor", 2,
+ GTK_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
+ GTK_TYPE_INT, 1);
gtk_binding_entry_add_signal (binding_set, GDK_BackSpace, GDK_CONTROL_MASK,
- "delete_at_cursor", 2,
- GTK_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
- GTK_TYPE_INT, -1);
+ "delete_at_cursor", 2,
+ GTK_TYPE_ENUM, GTK_DELETE_WORD_ENDS,
+ GTK_TYPE_INT, -1);
gtk_binding_entry_add_signal (binding_set, GDK_k, GDK_CONTROL_MASK,
- "delete_at_cursor", 2,
- GTK_TYPE_ENUM, GTK_DELETE_PARAGRAPH_ENDS,
- GTK_TYPE_INT, 1);
+ "delete_at_cursor", 2,
+ GTK_TYPE_ENUM, GTK_DELETE_PARAGRAPH_ENDS,
+ GTK_TYPE_INT, 1);
gtk_binding_entry_add_signal (binding_set, GDK_u, GDK_CONTROL_MASK,
- "delete_at_cursor", 2,
- GTK_TYPE_ENUM, GTK_DELETE_PARAGRAPHS,
- GTK_TYPE_INT, 1);
+ "delete_at_cursor", 2,
+ GTK_TYPE_ENUM, GTK_DELETE_PARAGRAPHS,
+ GTK_TYPE_INT, 1);
gtk_binding_entry_add_signal (binding_set, GDK_space, GDK_MOD1_MASK,
- "delete_at_cursor", 2,
- GTK_TYPE_ENUM, GTK_DELETE_WHITESPACE,
- GTK_TYPE_INT, 1);
+ "delete_at_cursor", 2,
+ GTK_TYPE_ENUM, GTK_DELETE_WHITESPACE,
+ GTK_TYPE_INT, 1);
gtk_binding_entry_add_signal (binding_set, GDK_space, GDK_MOD1_MASK,
- "insert_at_cursor", 1,
- GTK_TYPE_STRING, " ");
+ "insert_at_cursor", 1,
+ GTK_TYPE_STRING, " ");
gtk_binding_entry_add_signal (binding_set, GDK_backslash, GDK_MOD1_MASK,
- "delete_at_cursor", 2,
- GTK_TYPE_ENUM, GTK_DELETE_WHITESPACE,
- GTK_TYPE_INT, 1);
-
+ "delete_at_cursor", 2,
+ GTK_TYPE_ENUM, GTK_DELETE_WHITESPACE,
+ GTK_TYPE_INT, 1);
+
/* Cut/copy/paste */
gtk_binding_entry_add_signal (binding_set, GDK_x, GDK_CONTROL_MASK,
- "cut_clipboard", 0);
+ "cut_clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_w, GDK_CONTROL_MASK,
- "cut_clipboard", 0);
-
+ "cut_clipboard", 0);
+
gtk_binding_entry_add_signal (binding_set, GDK_c, GDK_CONTROL_MASK,
- "copy_clipboard", 0);
-
+ "copy_clipboard", 0);
+
gtk_binding_entry_add_signal (binding_set, GDK_v, GDK_CONTROL_MASK,
- "paste_clipboard", 0);
+ "paste_clipboard", 0);
gtk_binding_entry_add_signal (binding_set, GDK_y, GDK_CONTROL_MASK,
- "paste_clipboard", 0);
+ "paste_clipboard", 0);
/* Overwrite */
gtk_binding_entry_add_signal (binding_set, GDK_Insert, 0,
- "toggle_overwrite", 0);
-
+ "toggle_overwrite", 0);
+
/*
* Default handlers and virtual methods
*/
@@ -626,7 +626,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
widget_class->expose_event = gtk_text_view_expose_event;
widget_class->draw = gtk_text_view_draw;
widget_class->draw_focus = gtk_text_view_draw_focus;
-
+
widget_class->drag_begin = gtk_text_view_drag_begin;
widget_class->drag_end = gtk_text_view_drag_end;
widget_class->drag_data_get = gtk_text_view_drag_data_get;
@@ -640,7 +640,7 @@ gtk_text_view_class_init (GtkTextViewClass *klass)
container_class->add = gtk_text_view_add;
container_class->remove = gtk_text_view_remove;
container_class->forall = gtk_text_view_forall;
-
+
klass->move = gtk_text_view_move;
klass->set_anchor = gtk_text_view_set_anchor;
klass->insert_at_cursor = gtk_text_view_insert_at_cursor;
@@ -656,7 +656,7 @@ void
gtk_text_view_init (GtkTextView *text_view)
{
GtkWidget *widget;
-
+
widget = GTK_WIDGET (text_view);
GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS);
@@ -664,20 +664,20 @@ gtk_text_view_init (GtkTextView *text_view)
text_view->wrap_mode = GTK_WRAPMODE_NONE;
gtk_drag_dest_set (widget,
- GTK_DEST_DEFAULT_DROP,
- target_table, G_N_ELEMENTS (target_table),
- GDK_ACTION_COPY | GDK_ACTION_MOVE);
+ GTK_DEST_DEFAULT_DROP,
+ target_table, G_N_ELEMENTS (target_table),
+ GDK_ACTION_COPY | GDK_ACTION_MOVE);
text_view->virtual_cursor_x = -1;
text_view->virtual_cursor_y = -1;
/* This object is completely private. No external entity can gain a reference
- * to it; so we create it here and destroy it in finalize().
+ * to it; so we create it here and destroy it in finalize ().
*/
text_view->im_context = gtk_im_multicontext_new ();
-
+
gtk_signal_connect (GTK_OBJECT (text_view->im_context), "commit",
- GTK_SIGNAL_FUNC (gtk_text_view_commit_handler), text_view);
+ GTK_SIGNAL_FUNC (gtk_text_view_commit_handler), text_view);
text_view->editable = TRUE;
text_view->cursor_visible = TRUE;
@@ -709,28 +709,28 @@ gtk_text_view_new_with_buffer (GtkTextBuffer *buffer)
void
gtk_text_view_set_buffer (GtkTextView *text_view,
- GtkTextBuffer *buffer)
+ GtkTextBuffer *buffer)
{
g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
g_return_if_fail (buffer == NULL || GTK_IS_TEXT_BUFFER (buffer));
-
+
if (text_view->buffer == buffer)
return;
if (text_view->buffer != NULL)
{
gtk_signal_disconnect_by_func (GTK_OBJECT (text_view->buffer),
- gtk_text_view_mark_set_handler, text_view);
+ gtk_text_view_mark_set_handler, text_view);
gtk_object_unref (GTK_OBJECT (text_view->buffer));
text_view->dnd_mark = NULL;
}
text_view->buffer = buffer;
-
+
if (buffer != NULL)
{
GtkTextIter start;
-
+
gtk_object_ref (GTK_OBJECT (buffer));
gtk_object_sink (GTK_OBJECT (buffer));
@@ -738,22 +738,22 @@ gtk_text_view_set_buffer (GtkTextView *text_view,
gtk_text_layout_set_buffer (text_view->layout, buffer);
gtk_text_buffer_get_iter_at_offset (text_view->buffer, &start, 0);
-
+
text_view->dnd_mark = gtk_text_buffer_create_mark (text_view->buffer,
- "gtk_drag_target",
- &start, FALSE);
+ "gtk_drag_target",
+ &start, FALSE);
text_view->first_para_mark = gtk_text_buffer_create_mark (text_view->buffer,
NULL,
- &start, TRUE);
-
+ &start, TRUE);
+
text_view->first_para_pixels = 0;
-
+
gtk_signal_connect (GTK_OBJECT (text_view->buffer), "mark_set",
- gtk_text_view_mark_set_handler, text_view);
+ gtk_text_view_mark_set_handler, text_view);
}
- if (GTK_WIDGET_VISIBLE (text_view))
+ if (GTK_WIDGET_VISIBLE (text_view))
gtk_widget_queue_draw (GTK_WIDGET (text_view));
}
@@ -761,7 +761,7 @@ GtkTextBuffer*
gtk_text_view_get_buffer (GtkTextView *text_view)
{
g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), NULL);
-
+
return text_view->buffer;
}
@@ -799,7 +799,7 @@ gtk_text_view_get_line_yrange (GtkTextView *text_view,
{
g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
g_return_if_fail (gtk_text_iter_get_buffer (iter) == text_view->buffer);
-
+
gtk_text_layout_get_line_yrange (text_view->layout,
iter,
y,
@@ -831,15 +831,15 @@ set_adjustment_clamped (GtkAdjustment *adj, gfloat val)
if (val < adj->lower)
val = adj->lower;
-
+
gtk_adjustment_set_value (adj, val);
}
static gboolean
gtk_text_view_scroll_to_mark_adjusted (GtkTextView *text_view,
GtkTextMark *mark,
- gint margin,
- gfloat percentage)
+ gint margin,
+ gfloat percentage)
{
GtkTextIter iter;
GdkRectangle rect;
@@ -851,12 +851,12 @@ gtk_text_view_scroll_to_mark_adjusted (GtkTextView *text_view,
gint scroll_inc;
gint current_x_scroll, current_y_scroll;
-
+
g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), FALSE);
g_return_val_if_fail (mark != NULL, FALSE);
widget = GTK_WIDGET (text_view);
-
+
if (!GTK_WIDGET_MAPPED (widget))
{
g_warning ("FIXME need to implement scroll_to_mark for unmapped GtkTextView?");
@@ -864,14 +864,14 @@ gtk_text_view_scroll_to_mark_adjusted (GtkTextView *text_view,
}
gtk_text_buffer_get_iter_at_mark (text_view->buffer, &iter, mark);
-
+
gtk_text_layout_get_iter_location (text_view->layout,
&iter,
&rect);
-
+
/* Be sure the scroll region is up-to-date */
gtk_text_view_scroll_calc_now (text_view);
-
+
current_x_scroll = text_view->xoffset;
current_y_scroll = text_view->yoffset;
@@ -884,26 +884,26 @@ gtk_text_view_scroll_to_mark_adjusted (GtkTextView *text_view,
/* Clamp margin so it's not too large. */
gint small_dimension = MIN (screen.width, screen.height);
gint max_rect_dim;
-
+
if (margin > (small_dimension/2 - 5)) /* 5 is arbitrary */
margin = (small_dimension/2 - 5);
if (margin < 0)
margin = 0;
-
+
/* make sure rectangle fits in the leftover space */
max_rect_dim = MAX (rect.width, rect.height);
-
+
if (max_rect_dim > (small_dimension - margin*2))
margin -= max_rect_dim - (small_dimension - margin*2);
-
+
if (margin < 0)
margin = 0;
}
g_assert (margin >= 0);
-
+
screen.x += margin;
screen.y += margin;
@@ -912,7 +912,7 @@ gtk_text_view_scroll_to_mark_adjusted (GtkTextView *text_view,
screen_bottom = screen.y + screen.height;
screen_right = screen.x + screen.width;
-
+
/* Vertical scroll (only vertical gets adjusted) */
scroll_inc = 0;
@@ -930,10 +930,10 @@ gtk_text_view_scroll_to_mark_adjusted (GtkTextView *text_view,
if (scroll_inc != 0)
{
set_adjustment_clamped (get_vadjustment (text_view),
- current_y_scroll + scroll_inc);
+ current_y_scroll + scroll_inc);
retval = TRUE;
}
-
+
/* Horizontal scroll */
scroll_inc = 0;
@@ -951,7 +951,7 @@ gtk_text_view_scroll_to_mark_adjusted (GtkTextView *text_view,
if (scroll_inc != 0)
{
set_adjustment_clamped (get_hadjustment (text_view),
- current_x_scroll + scroll_inc);
+ current_x_scroll + scroll_inc);
retval = TRUE;
}
@@ -964,9 +964,9 @@ gtk_text_view_scroll_to_mark (GtkTextView *text_view,
gint mark_within_margin)
{
g_return_val_if_fail (mark_within_margin >= 0, FALSE);
-
+
return gtk_text_view_scroll_to_mark_adjusted (text_view, mark,
- mark_within_margin, 1.0);
+ mark_within_margin, 1.0);
}
static gboolean
@@ -976,8 +976,8 @@ clamp_iter_onscreen (GtkTextView *text_view, GtkTextIter *iter)
gtk_text_view_get_visible_rect (text_view, &visible_rect);
return gtk_text_layout_clamp_iter_to_vrange (text_view->layout, iter,
- visible_rect.y,
- visible_rect.y + visible_rect.height);
+ visible_rect.y,
+ visible_rect.y + visible_rect.height);
}
gboolean
@@ -985,12 +985,12 @@ gtk_text_view_move_mark_onscreen (GtkTextView *text_view,
GtkTextMark *mark)
{
GtkTextIter iter;
-
+
g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), FALSE);
g_return_val_if_fail (mark != NULL, FALSE);
-
+
gtk_text_buffer_get_iter_at_mark (text_view->buffer, &iter, mark);
-
+
if (clamp_iter_onscreen (text_view, &iter))
{
gtk_text_buffer_move_mark (text_view->buffer, mark, &iter);
@@ -1002,7 +1002,7 @@ gtk_text_view_move_mark_onscreen (GtkTextView *text_view,
void
gtk_text_view_get_visible_rect (GtkTextView *text_view,
- GdkRectangle *visible_rect)
+ GdkRectangle *visible_rect)
{
GtkWidget *widget;
@@ -1010,7 +1010,7 @@ gtk_text_view_get_visible_rect (GtkTextView *text_view,
g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
widget = GTK_WIDGET (text_view);
-
+
if (visible_rect)
{
visible_rect->x = text_view->xoffset;
@@ -1022,7 +1022,7 @@ gtk_text_view_get_visible_rect (GtkTextView *text_view,
void
gtk_text_view_set_wrap_mode (GtkTextView *text_view,
- GtkWrapMode wrap_mode)
+ GtkWrapMode wrap_mode)
{
g_return_if_fail (text_view != NULL);
g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
@@ -1032,10 +1032,10 @@ gtk_text_view_set_wrap_mode (GtkTextView *text_view,
text_view->wrap_mode = wrap_mode;
if (text_view->layout)
- {
- text_view->layout->default_style->wrap_mode = wrap_mode;
- gtk_text_layout_default_style_changed (text_view->layout);
- }
+ {
+ text_view->layout->default_style->wrap_mode = wrap_mode;
+ gtk_text_layout_default_style_changed (text_view->layout);
+ }
}
}
@@ -1059,10 +1059,10 @@ gtk_text_view_set_editable (GtkTextView *text_view,
text_view->editable = setting;
if (text_view->layout)
- {
- text_view->layout->default_style->editable = text_view->editable;
- gtk_text_layout_default_style_changed (text_view->layout);
- }
+ {
+ text_view->layout->default_style->editable = text_view->editable;
+ gtk_text_layout_default_style_changed (text_view->layout);
+ }
}
}
@@ -1070,7 +1070,7 @@ gboolean
gtk_text_view_get_editable (GtkTextView *text_view)
{
g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), FALSE);
-
+
return text_view->editable;
}
@@ -1087,17 +1087,17 @@ gtk_text_view_set_cursor_visible (GtkTextView *text_view,
text_view->cursor_visible = setting;
if (GTK_WIDGET_HAS_FOCUS (text_view))
- {
- if (text_view->layout)
- {
- gtk_text_layout_set_cursor_visible (text_view->layout, setting);
-
- if (setting)
- gtk_text_view_start_cursor_blink (text_view);
- else
- gtk_text_view_stop_cursor_blink (text_view);
- }
- }
+ {
+ if (text_view->layout)
+ {
+ gtk_text_layout_set_cursor_visible (text_view->layout, setting);
+
+ if (setting)
+ gtk_text_view_start_cursor_blink (text_view);
+ else
+ gtk_text_view_stop_cursor_blink (text_view);
+ }
+ }
}
}
@@ -1114,13 +1114,13 @@ gboolean
gtk_text_view_place_cursor_onscreen (GtkTextView *text_view)
{
GtkTextIter insert;
-
+
g_return_val_if_fail (GTK_IS_TEXT_VIEW (text_view), FALSE);
-
+
gtk_text_buffer_get_iter_at_mark (text_view->buffer, &insert,
gtk_text_buffer_get_mark (text_view->buffer,
"insert"));
-
+
if (clamp_iter_onscreen (text_view, &insert))
{
gtk_text_buffer_place_cursor (text_view->buffer, &insert);
@@ -1148,7 +1148,7 @@ gtk_text_view_finalize (GObject *object)
{
GtkTextView *text_view;
- text_view = GTK_TEXT_VIEW (object);
+ text_view = GTK_TEXT_VIEW (object);
if (text_view->hadjustment)
gtk_object_unref (GTK_OBJECT (text_view->hadjustment));
@@ -1165,12 +1165,12 @@ gtk_text_view_finalize (GObject *object)
if (text_view->right_window)
text_window_free (text_view->right_window);
-
+
if (text_view->bottom_window)
text_window_free (text_view->bottom_window);
-
- gtk_object_unref (GTK_OBJECT (text_view->im_context));
-
+
+ gtk_object_unref (GTK_OBJECT (text_view->im_context));
+
(* G_OBJECT_CLASS (parent_class)->finalize) (object);
}
@@ -1248,7 +1248,7 @@ gtk_text_view_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)
static void
gtk_text_view_size_request (GtkWidget *widget,
- GtkRequisition *requisition)
+ GtkRequisition *requisition)
{
GtkTextView *text_view;
@@ -1285,9 +1285,9 @@ gtk_text_view_size_allocate (GtkWidget *widget,
GdkRectangle right_rect;
GdkRectangle top_rect;
GdkRectangle bottom_rect;
-
+
text_view = GTK_TEXT_VIEW (widget);
-
+
widget->allocation = *allocation;
if (GTK_WIDGET_REALIZED (widget))
@@ -1350,16 +1350,16 @@ gtk_text_view_size_allocate (GtkWidget *widget,
text_rect.x = left_rect.x + left_rect.width;
text_rect.y = top_rect.y + top_rect.height;
-
+
left_rect.y = text_rect.y;
right_rect.y = text_rect.y;
top_rect.x = text_rect.x;
bottom_rect.x = text_rect.x;
-
+
right_rect.x = text_rect.x + text_rect.width;
- bottom_rect.y = text_rect.y + text_rect.height;
-
+ bottom_rect.y = text_rect.y + text_rect.height;
+
text_window_size_allocate (text_view->text_window,
&text_rect);
@@ -1378,11 +1378,11 @@ gtk_text_view_size_allocate (GtkWidget *widget,
if (text_view->bottom_window)
text_window_size_allocate (text_view->bottom_window,
&bottom_rect);
-
+
gtk_text_view_ensure_layout (text_view);
gtk_text_layout_set_screen_width (text_view->layout,
SCREEN_WIDTH (text_view));
-
+
gtk_text_view_validate_onscreen (text_view);
gtk_text_view_scroll_calc_now (text_view);
@@ -1397,7 +1397,7 @@ gtk_text_view_size_allocate (GtkWidget *widget,
/* Ensure h/v adj exist */
get_hadjustment (text_view);
get_vadjustment (text_view);
-
+
vadj = text_view->vadjustment;
if (y > vadj->upper - vadj->page_size)
y = MAX (0, vadj->upper - vadj->page_size);
@@ -1407,7 +1407,7 @@ gtk_text_view_size_allocate (GtkWidget *widget,
vadj->value = text_view->yoffset = y;
yoffset_changed = TRUE;
}
-
+
text_view->hadjustment->page_size = SCREEN_WIDTH (text_view);
text_view->hadjustment->page_increment = SCREEN_WIDTH (text_view) / 2;
text_view->hadjustment->lower = 0;
@@ -1428,7 +1428,7 @@ gtk_text_view_size_allocate (GtkWidget *widget,
static void
gtk_text_view_get_first_para_iter (GtkTextView *text_view,
- GtkTextIter *iter)
+ GtkTextIter *iter)
{
gtk_text_buffer_get_iter_at_mark (text_view->buffer, iter,
text_view->first_para_mark);
@@ -1438,14 +1438,14 @@ static void
gtk_text_view_validate_onscreen (GtkTextView *text_view)
{
GtkWidget *widget = GTK_WIDGET (text_view);
-
+
if (SCREEN_HEIGHT (widget) > 0)
{
GtkTextIter first_para;
gtk_text_view_get_first_para_iter (text_view, &first_para);
gtk_text_layout_validate_yrange (text_view->layout,
- &first_para,
- 0,
+ &first_para,
+ 0,
text_view->first_para_pixels +
SCREEN_HEIGHT (widget));
}
@@ -1457,7 +1457,7 @@ first_validate_callback (gpointer data)
GtkTextView *text_view = data;
gtk_text_view_validate_onscreen (text_view);
-
+
text_view->first_validate_idle = 0;
return FALSE;
}
@@ -1479,7 +1479,7 @@ incremental_validate_callback (gpointer data)
static void
invalidated_handler (GtkTextLayout *layout,
- gpointer data)
+ gpointer data)
{
GtkTextView *text_view;
@@ -1494,16 +1494,16 @@ invalidated_handler (GtkTextLayout *layout,
static void
changed_handler (GtkTextLayout *layout,
- gint start_y,
- gint old_height,
- gint new_height,
- gpointer data)
+ gint start_y,
+ gint old_height,
+ gint new_height,
+ gpointer data)
{
GtkTextView *text_view;
GtkWidget *widget;
GdkRectangle visible_rect;
GdkRectangle redraw_rect;
-
+
text_view = GTK_TEXT_VIEW (data);
widget = GTK_WIDGET (data);
@@ -1516,16 +1516,16 @@ changed_handler (GtkTextLayout *layout,
redraw_rect.y = start_y;
if (old_height == new_height)
- redraw_rect.height = old_height;
+ redraw_rect.height = old_height;
else
- redraw_rect.height = MAX (0, visible_rect.y + visible_rect.height - start_y);
-
+ redraw_rect.height = MAX (0, visible_rect.y + visible_rect.height - start_y);
+
if (gdk_rectangle_intersect (&redraw_rect, &visible_rect, &redraw_rect))
- {
- redraw_rect.y -= text_view->yoffset;
+ {
+ redraw_rect.y -= text_view->yoffset;
text_window_invalidate_rect (text_view->text_window,
&redraw_rect);
- }
+ }
}
if (old_height != new_height)
@@ -1533,16 +1533,16 @@ changed_handler (GtkTextLayout *layout,
gboolean yoffset_changed = FALSE;
if (start_y + old_height <= text_view->yoffset - text_view->first_para_pixels)
- {
- text_view->yoffset += new_height - old_height;
- get_vadjustment (text_view)->value = text_view->yoffset;
- yoffset_changed = TRUE;
- }
+ {
+ text_view->yoffset += new_height - old_height;
+ get_vadjustment (text_view)->value = text_view->yoffset;
+ yoffset_changed = TRUE;
+ }
gtk_text_view_scroll_calc_now (text_view);
if (yoffset_changed)
- gtk_adjustment_value_changed (get_vadjustment (text_view));
+ gtk_adjustment_value_changed (get_vadjustment (text_view));
}
}
@@ -1552,10 +1552,10 @@ gtk_text_view_realize (GtkWidget *widget)
GtkTextView *text_view;
GdkWindowAttr attributes;
gint attributes_mask;
-
+
text_view = GTK_TEXT_VIEW (widget);
GTK_WIDGET_SET_FLAGS (text_view, GTK_REALIZED);
-
+
attributes.window_type = GDK_WINDOW_CHILD;
attributes.x = widget->allocation.x;
attributes.y = widget->allocation.y;
@@ -1569,7 +1569,7 @@ gtk_text_view_realize (GtkWidget *widget)
attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
widget->window = gdk_window_new (gtk_widget_get_parent_window (widget),
- &attributes, attributes_mask);
+ &attributes, attributes_mask);
gdk_window_set_user_data (widget->window, widget);
/* must come before text_window_realize calls */
@@ -1577,7 +1577,7 @@ gtk_text_view_realize (GtkWidget *widget)
gdk_window_set_background (widget->window,
&widget->style->bg[GTK_WIDGET_STATE (widget)]);
-
+
text_window_realize (text_view->text_window, widget->window);
if (text_view->left_window)
@@ -1591,11 +1591,11 @@ gtk_text_view_realize (GtkWidget *widget)
if (text_view->right_window)
text_window_realize (text_view->right_window,
widget->window);
-
+
if (text_view->bottom_window)
text_window_realize (text_view->bottom_window,
widget->window);
-
+
gtk_text_view_ensure_layout (text_view);
}
@@ -1611,7 +1611,7 @@ gtk_text_view_unrealize (GtkWidget *widget)
g_source_remove (text_view->first_validate_idle);
text_view->first_validate_idle = 0;
}
-
+
if (text_view->incremental_validate_idle)
{
g_source_remove (text_view->incremental_validate_idle);
@@ -1628,18 +1628,18 @@ gtk_text_view_unrealize (GtkWidget *widget)
if (text_view->right_window)
text_window_unrealize (text_view->right_window);
-
+
if (text_view->bottom_window)
text_window_unrealize (text_view->bottom_window);
-
+
gtk_text_view_destroy_layout (text_view);
-
+
(* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
}
-static void
+static void
gtk_text_view_style_set (GtkWidget *widget,
- GtkStyle *previous_style)
+ GtkStyle *previous_style)
{
GtkTextView *text_view = GTK_TEXT_VIEW (widget);
@@ -1647,9 +1647,9 @@ gtk_text_view_style_set (GtkWidget *widget,
{
gdk_window_set_background (widget->window,
&widget->style->bg[GTK_WIDGET_STATE (widget)]);
-
+
gdk_window_set_background (text_view->text_window->bin_window,
- &widget->style->base[GTK_WIDGET_STATE (widget)]);
+ &widget->style->base[GTK_WIDGET_STATE (widget)]);
if (text_view->left_window)
gdk_window_set_background (text_view->left_window->bin_window,
@@ -1660,12 +1660,12 @@ gtk_text_view_style_set (GtkWidget *widget,
if (text_view->top_window)
gdk_window_set_background (text_view->top_window->bin_window,
- &widget->style->bg[GTK_WIDGET_STATE (widget)]);
+ &widget->style->bg[GTK_WIDGET_STATE (widget)]);
if (text_view->bottom_window)
gdk_window_set_background (text_view->bottom_window->bin_window,
&widget->style->bg[GTK_WIDGET_STATE (widget)]);
-
+
gtk_text_view_set_attributes_from_style (text_view,
text_view->layout->default_style,
widget->style);
@@ -1673,9 +1673,9 @@ gtk_text_view_style_set (GtkWidget *widget,
}
}
-static void
+static void
gtk_text_view_direction_changed (GtkWidget *widget,
- GtkTextDirection previous_direction)
+ GtkTextDirection previous_direction)
{
GtkTextView *text_view = GTK_TEXT_VIEW (widget);
@@ -1701,7 +1701,7 @@ get_event_coordinates (GdkEvent *event, gint *x, gint *y)
*y = event->motion.y;
return TRUE;
break;
-
+
case GDK_BUTTON_PRESS:
case GDK_2BUTTON_PRESS:
case GDK_3BUTTON_PRESS:
@@ -1710,7 +1710,7 @@ get_event_coordinates (GdkEvent *event, gint *x, gint *y)
*y = event->button.y;
return TRUE;
break;
-
+
case GDK_KEY_PRESS:
case GDK_KEY_RELEASE:
case GDK_ENTER_NOTIFY:
@@ -1729,7 +1729,7 @@ get_event_coordinates (GdkEvent *event, gint *x, gint *y)
case GDK_DROP_FINISHED:
default:
return FALSE;
- break;
+ break;
}
return FALSE;
@@ -1746,9 +1746,9 @@ emit_event_on_tags (GtkWidget *widget,
GtkTextView *text_view;
text_view = GTK_TEXT_VIEW (widget);
-
+
tags = gtk_text_buffer_get_tags (text_view->buffer, iter);
-
+
tmp = tags;
while (tmp != NULL)
{
@@ -1767,22 +1767,22 @@ emit_event_on_tags (GtkWidget *widget,
return retval;
}
-
+
static gint
gtk_text_view_event (GtkWidget *widget, GdkEvent *event)
{
GtkTextView *text_view;
gint x = 0, y = 0;
-
+
text_view = GTK_TEXT_VIEW (widget);
-
+
if (text_view->layout == NULL ||
text_view->buffer == NULL)
return FALSE;
if (event->any.window != text_view->text_window->bin_window)
return FALSE;
-
+
if (get_event_coordinates (event, &x, &y))
{
GtkTextIter iter;
@@ -1806,7 +1806,7 @@ gtk_text_view_event (GtkWidget *widget, GdkEvent *event)
GtkTextIter iter;
insert = gtk_text_buffer_get_mark (text_view->buffer,
- "insert");
+ "insert");
gtk_text_buffer_get_iter_at_mark (text_view->buffer, &iter, insert);
@@ -1833,7 +1833,7 @@ gtk_text_view_key_press_event (GtkWidget *widget, GdkEventKey *event)
if (event->window != text_view->text_window->bin_window)
return FALSE;
-
+
if (gtk_im_context_filter_keypress (text_view->im_context, event))
return TRUE;
else if (event->keyval == GDK_Return)
@@ -1873,7 +1873,7 @@ gtk_text_view_button_press_event (GtkWidget *widget, GdkEventButton *event)
GtkTextView *text_view;
text_view = GTK_TEXT_VIEW (widget);
-
+
gtk_widget_grab_focus (widget);
if (event->window != text_view->text_window->bin_window)
@@ -1882,7 +1882,7 @@ gtk_text_view_button_press_event (GtkWidget *widget, GdkEventButton *event)
gtk_text_view_unselect (text_view);
return FALSE;
}
-
+
/* debug hack */
if (event->button == 3 && (event->state & GDK_CONTROL_MASK) != 0)
_gtk_text_buffer_spew (GTK_TEXT_VIEW (widget)->buffer);
@@ -1903,7 +1903,7 @@ gtk_text_view_button_press_event (GtkWidget *widget, GdkEventButton *event)
&iter,
event->x + text_view->xoffset,
event->y + text_view->yoffset);
-
+
if (gtk_text_buffer_get_selection_bounds (text_view->buffer,
&start, &end) &&
gtk_text_iter_in_range (&iter, &start, &end))
@@ -1915,7 +1915,7 @@ gtk_text_view_button_press_event (GtkWidget *widget, GdkEventButton *event)
{
gtk_text_view_start_selection_drag (text_view, &iter, event);
}
-
+
return TRUE;
}
else if (event->button == 2)
@@ -1926,10 +1926,10 @@ gtk_text_view_button_press_event (GtkWidget *widget, GdkEventButton *event)
&iter,
event->x + text_view->xoffset,
event->y + text_view->yoffset);
-
+
gtk_text_buffer_paste_primary (text_view->buffer,
- &iter,
- text_view->editable);
+ &iter,
+ text_view->editable);
return TRUE;
}
else if (event->button == 3)
@@ -1940,7 +1940,7 @@ gtk_text_view_button_press_event (GtkWidget *widget, GdkEventButton *event)
return FALSE;
}
}
-
+
return FALSE;
}
@@ -1950,10 +1950,10 @@ gtk_text_view_button_release_event (GtkWidget *widget, GdkEventButton *event)
GtkTextView *text_view;
text_view = GTK_TEXT_VIEW (widget);
-
+
if (event->window != text_view->text_window->bin_window)
return FALSE;
-
+
if (event->button == 1)
{
if (text_view->drag_start_x >= 0)
@@ -1981,10 +1981,10 @@ static gint
gtk_text_view_focus_in_event (GtkWidget *widget, GdkEventFocus *event)
{
GtkTextView *text_view = GTK_TEXT_VIEW (widget);
-
+
GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);
gtk_widget_draw_focus (widget);
-
+
if (text_view->cursor_visible && text_view->layout)
{
gtk_text_layout_set_cursor_visible (text_view->layout, TRUE);
@@ -1992,7 +1992,7 @@ gtk_text_view_focus_in_event (GtkWidget *widget, GdkEventFocus *event)
}
gtk_im_context_focus_in (GTK_TEXT_VIEW (widget)->im_context);
-
+
return FALSE;
}
@@ -2000,10 +2000,10 @@ static gint
gtk_text_view_focus_out_event (GtkWidget *widget, GdkEventFocus *event)
{
GtkTextView *text_view = GTK_TEXT_VIEW (widget);
-
+
GTK_WIDGET_UNSET_FLAGS (widget, GTK_HAS_FOCUS);
gtk_widget_draw_focus (widget);
-
+
if (text_view->cursor_visible && text_view->layout)
{
gtk_text_layout_set_cursor_visible (text_view->layout, FALSE);
@@ -2011,7 +2011,7 @@ gtk_text_view_focus_out_event (GtkWidget *widget, GdkEventFocus *event)
}
gtk_im_context_focus_out (GTK_TEXT_VIEW (widget)->im_context);
-
+
return FALSE;
}
@@ -2019,16 +2019,16 @@ static gint
gtk_text_view_motion_event (GtkWidget *widget, GdkEventMotion *event)
{
GtkTextView *text_view = GTK_TEXT_VIEW (widget);
-
+
if (event->window == text_view->text_window->bin_window &&
text_view->drag_start_x >= 0)
{
gint x, y;
gint dx, dy;
-
+
gdk_window_get_pointer (text_view->text_window->bin_window,
&x, &y, NULL);
-
+
dx = text_view->drag_start_x - x;
dy = text_view->drag_start_y - y;
@@ -2044,16 +2044,16 @@ gtk_text_view_motion_event (GtkWidget *widget, GdkEventMotion *event)
text_view->drag_start_y,
&buffer_x,
&buffer_y);
-
+
gtk_text_layout_get_iter_at_pixel (text_view->layout,
&iter,
buffer_x, buffer_y);
-
+
gtk_text_view_start_selection_dnd (text_view, &iter, event);
return TRUE;
}
}
-
+
return FALSE;
}
@@ -2061,28 +2061,28 @@ static void
gtk_text_view_paint (GtkWidget *widget, GdkRectangle *area)
{
GtkTextView *text_view;
-
+
text_view = GTK_TEXT_VIEW (widget);
g_return_if_fail (text_view->layout != NULL);
g_return_if_fail (text_view->xoffset >= 0);
g_return_if_fail (text_view->yoffset >= 0);
-
+
gtk_text_view_validate_onscreen (text_view);
#if 0
printf ("painting %d,%d %d x %d\n",
- area->x, area->y,
- area->width, area->height);
+ area->x, area->y,
+ area->width, area->height);
#endif
-
+
gtk_text_layout_draw (text_view->layout,
widget,
text_view->text_window->bin_window,
text_view->xoffset,
text_view->yoffset,
- area->x, area->y,
- area->width, area->height);
+ area->x, area->y,
+ area->width, area->height);
}
static void
@@ -2091,7 +2091,7 @@ send_expose (GtkTextView *text_view,
GdkRectangle *area)
{
GdkEventExpose event;
-
+
event.type = GDK_EXPOSE;
event.send_event = TRUE;
event.window = win->bin_window;
@@ -2105,7 +2105,7 @@ send_expose (GtkTextView *text_view,
event.area.y,
&event.area.x,
&event.area.y);
-
+
gtk_text_view_buffer_to_window_coords (text_view,
win->type,
event.area.x,
@@ -2113,7 +2113,7 @@ send_expose (GtkTextView *text_view,
&event.area.x,
&event.area.y);
-
+
gdk_window_ref (event.window);
gtk_widget_event (GTK_WIDGET (text_view), (GdkEvent*) &event);
gdk_window_unref (event.window);
@@ -2126,7 +2126,7 @@ gtk_text_view_draw (GtkWidget *widget, GdkRectangle *area)
GtkTextView *text_view;
text_view = GTK_TEXT_VIEW (widget);
-
+
gtk_text_view_paint (widget, area);
/* If the area overlaps the "edge" of the widget, draw the focus
@@ -2146,7 +2146,7 @@ gtk_text_view_draw (GtkWidget *widget, GdkRectangle *area)
gdk_rectangle_intersect (area, &text_view->left_window->allocation,
&intersection))
send_expose (text_view, text_view->left_window, &intersection);
-
+
if (text_view->right_window &&
gdk_rectangle_intersect (area, &text_view->right_window->allocation,
&intersection))
@@ -2156,7 +2156,7 @@ gtk_text_view_draw (GtkWidget *widget, GdkRectangle *area)
gdk_rectangle_intersect (area, &text_view->top_window->allocation,
&intersection))
send_expose (text_view, text_view->top_window, &intersection);
-
+
if (text_view->bottom_window &&
gdk_rectangle_intersect (area, &text_view->bottom_window->allocation,
&intersection))
@@ -2172,7 +2172,7 @@ gtk_text_view_expose_event (GtkWidget *widget, GdkEventExpose *event)
if (event->window == widget->window)
gtk_widget_draw_focus (widget);
-
+
return TRUE;
}
@@ -2182,13 +2182,13 @@ gtk_text_view_draw_focus (GtkWidget *widget)
if (GTK_WIDGET_DRAWABLE (widget))
{
if (GTK_WIDGET_HAS_FOCUS (widget))
- {
- gtk_paint_focus (widget->style, widget->window,
- NULL, widget, "textview",
- 0, 0,
- widget->allocation.width - 1,
- widget->allocation.height - 1);
- }
+ {
+ gtk_paint_focus (widget->style, widget->window,
+ NULL, widget, "textview",
+ 0, 0,
+ widget->allocation.width - 1,
+ widget->allocation.height - 1);
+ }
else
{
gdk_window_clear (widget->window);
@@ -2221,11 +2221,11 @@ gtk_text_view_remove (GtkContainer *container,
GSList *iter;
GtkTextView *text_view;
GtkTextViewChild *vc;
-
+
g_return_if_fail (GTK_IS_TEXT_VIEW (container));
g_return_if_fail (GTK_IS_WIDGET (child));
g_return_if_fail (child->parent == (GtkWidget*) container);
-
+
text_view = GTK_TEXT_VIEW (container);
vc = NULL;
@@ -2242,11 +2242,11 @@ gtk_text_view_remove (GtkContainer *container,
}
g_assert (iter != NULL); /* be sure we had the child in the list */
-
+
text_view->children = g_slist_remove (text_view->children, vc);
gtk_widget_unparent (vc->widget);
-
+
text_view_child_free (vc);
}
@@ -2263,7 +2263,7 @@ gtk_text_view_forall (GtkContainer *container,
g_return_if_fail (callback != NULL);
text_view = GTK_TEXT_VIEW (container);
-
+
iter = text_view->children;
while (iter != NULL)
@@ -2271,7 +2271,7 @@ gtk_text_view_forall (GtkContainer *container,
GtkTextViewChild *vc = iter->data;
(* callback) (vc->widget, callback_data);
-
+
iter = g_slist_next (iter);
}
}
@@ -2284,13 +2284,13 @@ static gint
blink_cb (gpointer data)
{
GtkTextView *text_view;
-
+
text_view = GTK_TEXT_VIEW (data);
g_assert (text_view->layout && GTK_WIDGET_HAS_FOCUS (text_view) && text_view->cursor_visible);
gtk_text_layout_set_cursor_visible (text_view->layout,
- !gtk_text_layout_get_cursor_visible (text_view->layout));
+ !gtk_text_layout_get_cursor_visible (text_view->layout));
return TRUE;
}
@@ -2319,8 +2319,8 @@ gtk_text_view_stop_cursor_blink (GtkTextView *text_view)
static void
gtk_text_view_move_iter_by_lines (GtkTextView *text_view,
- GtkTextIter *newplace,
- gint count)
+ GtkTextIter *newplace,
+ gint count)
{
while (count < 0)
{
@@ -2337,13 +2337,13 @@ gtk_text_view_move_iter_by_lines (GtkTextView *text_view,
static void
gtk_text_view_move (GtkTextView *text_view,
- GtkMovementStep step,
- gint count,
- gboolean extend_selection)
+ GtkMovementStep step,
+ gint count,
+ gboolean extend_selection)
{
GtkTextIter insert;
GtkTextIter newplace;
-
+
gint cursor_x_pos = 0;
if (step == GTK_MOVEMENT_PAGES)
@@ -2351,7 +2351,7 @@ gtk_text_view_move (GtkTextView *text_view,
gtk_text_view_scroll_pages (text_view, count);
return;
}
-
+
gtk_text_buffer_get_iter_at_mark (text_view->buffer, &insert,
gtk_text_buffer_get_mark (text_view->buffer,
"insert"));
@@ -2368,73 +2368,73 @@ gtk_text_view_move (GtkTextView *text_view,
case GTK_MOVEMENT_POSITIONS:
gtk_text_layout_move_iter_visually (text_view->layout,
- &newplace, count);
+ &newplace, count);
break;
case GTK_MOVEMENT_WORDS:
if (count < 0)
- gtk_text_iter_backward_word_starts (&newplace, -count);
+ gtk_text_iter_backward_word_starts (&newplace, -count);
else if (count > 0)
- gtk_text_iter_forward_word_ends (&newplace, count);
+ gtk_text_iter_forward_word_ends (&newplace, count);
break;
case GTK_MOVEMENT_DISPLAY_LINES:
gtk_text_view_move_iter_by_lines (text_view, &newplace, count);
gtk_text_layout_move_iter_to_x (text_view->layout, &newplace, cursor_x_pos);
break;
-
+
case GTK_MOVEMENT_DISPLAY_LINE_ENDS:
if (count > 1)
- gtk_text_view_move_iter_by_lines (text_view, &newplace, --count);
+ gtk_text_view_move_iter_by_lines (text_view, &newplace, --count);
else if (count < -1)
- gtk_text_view_move_iter_by_lines (text_view, &newplace, ++count);
+ gtk_text_view_move_iter_by_lines (text_view, &newplace, ++count);
if (count != 0)
- gtk_text_layout_move_iter_to_line_end (text_view->layout, &newplace, count);
+ gtk_text_layout_move_iter_to_line_end (text_view->layout, &newplace, count);
break;
-
+
case GTK_MOVEMENT_PARAGRAPHS:
/* This should almost certainly instead be doing the parallel thing to WORD */
/* gtk_text_iter_down_lines (&newplace, count); */
/* FIXME */
break;
-
+
case GTK_MOVEMENT_PARAGRAPH_ENDS:
if (count > 0)
- gtk_text_iter_forward_to_newline (&newplace);
+ gtk_text_iter_forward_to_newline (&newplace);
else if (count < 0)
- gtk_text_iter_set_line_offset (&newplace, 0);
+ gtk_text_iter_set_line_offset (&newplace, 0);
break;
-
+
case GTK_MOVEMENT_BUFFER_ENDS:
if (count > 0)
- gtk_text_buffer_get_last_iter (text_view->buffer, &newplace);
+ gtk_text_buffer_get_last_iter (text_view->buffer, &newplace);
else if (count < 0)
- gtk_text_buffer_get_iter_at_offset (text_view->buffer, &newplace, 0);
+ gtk_text_buffer_get_iter_at_offset (text_view->buffer, &newplace, 0);
break;
-
+
default:
break;
}
-
+
if (!gtk_text_iter_equal (&insert, &newplace))
{
if (extend_selection)
- gtk_text_buffer_move_mark (text_view->buffer,
+ gtk_text_buffer_move_mark (text_view->buffer,
gtk_text_buffer_get_mark (text_view->buffer,
"insert"),
&newplace);
else
- gtk_text_buffer_place_cursor (text_view->buffer, &newplace);
-
+ gtk_text_buffer_place_cursor (text_view->buffer, &newplace);
+
gtk_text_view_scroll_to_mark (text_view,
gtk_text_buffer_get_mark (text_view->buffer,
"insert"), 0);
if (step == GTK_MOVEMENT_DISPLAY_LINES)
- {
- gtk_text_view_set_virtual_cursor_pos (text_view, cursor_x_pos, -1);
- }
+ {
+ gtk_text_view_set_virtual_cursor_pos (text_view, cursor_x_pos, -1);
+ }
}
}
@@ -2442,7 +2442,7 @@ static void
gtk_text_view_set_anchor (GtkTextView *text_view)
{
GtkTextIter insert;
-
+
gtk_text_buffer_get_iter_at_mark (text_view->buffer, &insert,
gtk_text_buffer_get_mark (text_view->buffer,
"insert"));
@@ -2452,7 +2452,7 @@ gtk_text_view_set_anchor (GtkTextView *text_view)
static void
gtk_text_view_scroll_pages (GtkTextView *text_view,
- gint count)
+ gint count)
{
gfloat newval;
GtkAdjustment *adj;
@@ -2460,7 +2460,7 @@ gtk_text_view_scroll_pages (GtkTextView *text_view,
GtkTextIter new_insert;
GtkTextIter anchor;
gint y0, y1;
-
+
g_return_if_fail (text_view->vadjustment != NULL);
adj = text_view->vadjustment;
@@ -2479,7 +2479,7 @@ gtk_text_view_scroll_pages (GtkTextView *text_view,
y0 = count * adj->page_increment + adj->page_size;
y1 = 0;
}
-
+
gtk_text_layout_validate_yrange (text_view->layout, &anchor, y0, y1);
gtk_text_view_get_virtual_cursor_pos (text_view, &cursor_x_pos, &cursor_y_pos);
@@ -2520,7 +2520,7 @@ not_whitespace (gunichar ch, gpointer user_data)
static gboolean
find_whitepace_region (const GtkTextIter *center,
- GtkTextIter *start, GtkTextIter *end)
+ GtkTextIter *start, GtkTextIter *end)
{
*start = *center;
*end = *center;
@@ -2529,7 +2529,7 @@ find_whitepace_region (const GtkTextIter *center,
gtk_text_iter_next_char (start); /* we want the first whitespace... */
if (whitespace (gtk_text_iter_get_char (end), NULL))
gtk_text_iter_forward_find_char (end, not_whitespace, NULL);
-
+
return !gtk_text_iter_equal (start, end);
}
@@ -2538,19 +2538,19 @@ gtk_text_view_insert_at_cursor (GtkTextView *text_view,
const gchar *str)
{
gtk_text_buffer_insert_interactive_at_cursor (text_view->buffer, str, -1,
- text_view->editable);
+ text_view->editable);
}
static void
gtk_text_view_delete_at_cursor (GtkTextView *text_view,
- GtkDeleteType type,
- gint count)
+ GtkDeleteType type,
+ gint count)
{
GtkTextIter insert;
GtkTextIter start;
GtkTextIter end;
gboolean leave_one = FALSE;
-
+
if (type == GTK_DELETE_CHARS)
{
/* Char delete deletes the selection, if one exists */
@@ -2558,7 +2558,7 @@ gtk_text_view_delete_at_cursor (GtkTextView *text_view,
text_view->editable))
return;
}
-
+
gtk_text_buffer_get_iter_at_mark (text_view->buffer,
&insert,
gtk_text_buffer_get_mark (text_view->buffer,
@@ -2566,23 +2566,23 @@ gtk_text_view_delete_at_cursor (GtkTextView *text_view,
start = insert;
end = insert;
-
+
switch (type)
{
case GTK_DELETE_CHARS:
gtk_text_iter_forward_chars (&end, count);
break;
-
+
case GTK_DELETE_WORD_ENDS:
if (count > 0)
gtk_text_iter_forward_word_ends (&end, count);
else if (count < 0)
gtk_text_iter_backward_word_starts (&start, 0 - count);
break;
-
+
case GTK_DELETE_WORDS:
break;
-
+
case GTK_DELETE_DISPLAY_LINE_ENDS:
break;
@@ -2611,7 +2611,7 @@ gtk_text_view_delete_at_cursor (GtkTextView *text_view,
/* FIXME figure out what a negative count means
and support that */
break;
-
+
case GTK_DELETE_PARAGRAPHS:
if (count > 0)
{
@@ -2622,13 +2622,13 @@ gtk_text_view_delete_at_cursor (GtkTextView *text_view,
while (count > 1)
{
gtk_text_iter_forward_to_newline (&end);
-
+
--count;
}
}
/* FIXME negative count? */
-
+
break;
case GTK_DELETE_WHITESPACE:
@@ -2636,7 +2636,7 @@ gtk_text_view_delete_at_cursor (GtkTextView *text_view,
find_whitepace_region (&insert, &start, &end);
}
break;
-
+
default:
break;
}
@@ -2651,7 +2651,7 @@ gtk_text_view_delete_at_cursor (GtkTextView *text_view,
" ", 1,
text_view->editable);
}
-
+
gtk_text_view_scroll_to_mark (text_view,
gtk_text_buffer_get_mark (text_view->buffer, "insert"),
0);
@@ -2722,7 +2722,7 @@ move_insert_to_pointer_and_scroll (GtkTextView *text_view, gboolean partial_scro
GtkTextIter newplace;
gint adjust = 0;
gboolean in_threshold = FALSE;
-
+
gdk_window_get_pointer (text_view->text_window->bin_window,
&x, &y, &state);
@@ -2730,14 +2730,14 @@ move_insert_to_pointer_and_scroll (GtkTextView *text_view, gboolean partial_scro
get an acceleration effect. The exact numbers are
pretty arbitrary. We have a threshold before we
start to accelerate. */
- /* uncommenting this printf helps visualize how it works. */
+ /* uncommenting this printf helps visualize how it works. */
/* printf ("%d\n", text_view->scrolling_accel_factor); */
-
+
if (text_view->scrolling_accel_factor > 10)
adjust = (text_view->scrolling_accel_factor - 10) * 75;
-
+
if (y < 0) /* scrolling upward */
- adjust = -adjust;
+ adjust = -adjust;
/* No adjust if the pointer has moved back inside the window for sure.
Also I'm adding a small threshold where no adjust is added,
@@ -2751,52 +2751,52 @@ move_insert_to_pointer_and_scroll (GtkTextView *text_view, gboolean partial_scro
adjust = 0;
in_threshold = TRUE;
}
-
+
gtk_text_layout_get_iter_at_pixel (text_view->layout,
&newplace,
x + text_view->xoffset,
y + text_view->yoffset + adjust);
-
+
{
- gboolean scrolled = FALSE;
- GtkTextMark *insert_mark =
- gtk_text_buffer_get_mark (text_view->buffer, "insert");
-
- gtk_text_buffer_move_mark (text_view->buffer,
- insert_mark,
- &newplace);
-
- if (partial_scroll)
- scrolled = gtk_text_view_scroll_to_mark_adjusted (text_view, insert_mark, 0, 0.7);
- else
- scrolled = gtk_text_view_scroll_to_mark_adjusted (text_view, insert_mark, 0, 1.0);
+ gboolean scrolled = FALSE;
+ GtkTextMark *insert_mark =
+ gtk_text_buffer_get_mark (text_view->buffer, "insert");
- if (scrolled)
- {
- /* We want to avoid rapid jump to super-accelerated when you
- leave the slow scroll threshold after scrolling for a
- while. So we slowly decrease accel when scrolling inside
- the threshold.
- */
- if (in_threshold)
- {
- if (text_view->scrolling_accel_factor > 1)
- text_view->scrolling_accel_factor -= 2;
- }
- else
- text_view->scrolling_accel_factor += 1;
- }
- else
- {
- /* If we don't scroll we're probably inside the window, but
- potentially just a bit outside. We decrease acceleration
- while the user is fooling around inside the window.
- Acceleration decreases faster than it increases. */
- if (text_view->scrolling_accel_factor > 4)
- text_view->scrolling_accel_factor -= 5;
- }
-
- return scrolled;
+ gtk_text_buffer_move_mark (text_view->buffer,
+ insert_mark,
+ &newplace);
+
+ if (partial_scroll)
+ scrolled = gtk_text_view_scroll_to_mark_adjusted (text_view, insert_mark, 0, 0.7);
+ else
+ scrolled = gtk_text_view_scroll_to_mark_adjusted (text_view, insert_mark, 0, 1.0);
+
+ if (scrolled)
+ {
+ /* We want to avoid rapid jump to super-accelerated when you
+ leave the slow scroll threshold after scrolling for a
+ while. So we slowly decrease accel when scrolling inside
+ the threshold.
+ */
+ if (in_threshold)
+ {
+ if (text_view->scrolling_accel_factor > 1)
+ text_view->scrolling_accel_factor -= 2;
+ }
+ else
+ text_view->scrolling_accel_factor += 1;
+ }
+ else
+ {
+ /* If we don't scroll we're probably inside the window, but
+ potentially just a bit outside. We decrease acceleration
+ while the user is fooling around inside the window.
+ Acceleration decreases faster than it increases. */
+ if (text_view->scrolling_accel_factor > 4)
+ text_view->scrolling_accel_factor -= 5;
+ }
+
+ return scrolled;
}
}
@@ -2829,11 +2829,11 @@ selection_motion_event_handler (GtkTextView *text_view, GdkEventMotion *event, g
and we'll need to scroll again. */
if (text_view->selection_drag_scan_timeout != 0) /* reset on every motion event */
gtk_timeout_remove (text_view->selection_drag_scan_timeout);
-
+
text_view->selection_drag_scan_timeout =
gtk_timeout_add (50, selection_scan_timeout, text_view);
}
-
+
return TRUE;
}
@@ -2845,19 +2845,19 @@ gtk_text_view_start_selection_drag (GtkTextView *text_view,
GtkTextIter newplace;
g_return_if_fail (text_view->selection_drag_handler == 0);
-
+
gtk_grab_add (GTK_WIDGET (text_view));
text_view->scrolling_accel_factor = 0;
newplace = *iter;
-
+
gtk_text_buffer_place_cursor (text_view->buffer, &newplace);
text_view->selection_drag_handler = gtk_signal_connect (GTK_OBJECT (text_view),
- "motion_notify_event",
- GTK_SIGNAL_FUNC (selection_motion_event_handler),
- NULL);
+ "motion_notify_event",
+ GTK_SIGNAL_FUNC (selection_motion_event_handler),
+ NULL);
}
/* returns whether we were really dragging */
@@ -2871,7 +2871,7 @@ gtk_text_view_end_selection_drag (GtkTextView *text_view, GdkEventButton *event)
text_view->selection_drag_handler = 0;
text_view->scrolling_accel_factor = 0;
-
+
if (text_view->selection_drag_scan_timeout != 0)
{
gtk_timeout_remove (text_view->selection_drag_scan_timeout);
@@ -2880,9 +2880,9 @@ gtk_text_view_end_selection_drag (GtkTextView *text_view, GdkEventButton *event)
/* one last update to current position */
move_insert_to_pointer_and_scroll (text_view, FALSE);
-
+
gtk_grab_remove (GTK_WIDGET (text_view));
-
+
return TRUE;
}
@@ -2897,18 +2897,18 @@ gtk_text_view_set_adjustment_upper (GtkAdjustment *adj, gfloat upper)
{
gfloat min = MAX (0., upper - adj->page_size);
gboolean value_changed = FALSE;
-
+
adj->upper = upper;
-
+
if (adj->value > min)
- {
- adj->value = min;
- value_changed = TRUE;
- }
-
+ {
+ adj->value = min;
+ value_changed = TRUE;
+ }
+
gtk_signal_emit_by_name (GTK_OBJECT (adj), "changed");
if (value_changed)
- gtk_signal_emit_by_name (GTK_OBJECT (adj), "value_changed");
+ gtk_signal_emit_by_name (GTK_OBJECT (adj), "value_changed");
}
}
@@ -2916,13 +2916,13 @@ static void
gtk_text_view_scroll_calc_now (GtkTextView *text_view)
{
gint width = 0, height = 0;
-
+
gtk_text_view_ensure_layout (text_view);
-
+
gtk_text_layout_set_screen_width (text_view->layout,
SCREEN_WIDTH (text_view));
-
+
gtk_text_layout_get_size (text_view->layout, &width, &height);
#if 0
@@ -2942,18 +2942,18 @@ gtk_text_view_scroll_calc_now (GtkTextView *text_view)
{
#if 0
printf ("layout size set, widget width is %d\n",
- GTK_WIDGET (text_view)->allocation.width);
+ GTK_WIDGET (text_view)->allocation.width);
#endif
text_view->width = width;
text_view->height = height;
-
+
gtk_text_view_set_adjustment_upper (get_hadjustment (text_view),
- MAX (SCREEN_WIDTH (text_view), width));
- gtk_text_view_set_adjustment_upper (get_vadjustment (text_view),
- MAX (SCREEN_HEIGHT (text_view), height));
+ MAX (SCREEN_WIDTH (text_view), width));
+ gtk_text_view_set_adjustment_upper (get_vadjustment (text_view),
+ MAX (SCREEN_HEIGHT (text_view), height));
/* hadj/vadj exist since we called get_hadjustment/get_vadjustment above */
-
+
/* Set up the step sizes; we'll say that a page is
our allocation minus one step, and a step is
1/10 of our allocation. */
@@ -2966,7 +2966,7 @@ gtk_text_view_scroll_calc_now (GtkTextView *text_view)
SCREEN_HEIGHT (text_view) / 10.0;
text_view->vadjustment->page_increment =
SCREEN_HEIGHT (text_view) * 0.9;
- }
+ }
}
static void
@@ -2976,7 +2976,7 @@ gtk_text_view_set_attributes_from_style (GtkTextView *text_view,
{
values->appearance.bg_color = style->base[GTK_STATE_NORMAL];
values->appearance.fg_color = style->fg[GTK_STATE_NORMAL];
-
+
if (values->font_desc)
pango_font_description_free (values->font_desc);
@@ -2989,32 +2989,32 @@ gtk_text_view_ensure_layout (GtkTextView *text_view)
GtkWidget *widget;
widget = GTK_WIDGET (text_view);
-
+
if (text_view->layout == NULL)
{
GtkTextAttributes *style;
PangoContext *ltr_context, *rtl_context;
-
+
text_view->layout = gtk_text_layout_new ();
gtk_signal_connect (GTK_OBJECT (text_view->layout),
- "invalidated",
- GTK_SIGNAL_FUNC (invalidated_handler),
- text_view);
+ "invalidated",
+ GTK_SIGNAL_FUNC (invalidated_handler),
+ text_view);
gtk_signal_connect (GTK_OBJECT (text_view->layout),
- "changed",
- GTK_SIGNAL_FUNC (changed_handler),
- text_view);
-
+ "changed",
+ GTK_SIGNAL_FUNC (changed_handler),
+ text_view);
+
if (text_view->buffer)
gtk_text_layout_set_buffer (text_view->layout, text_view->buffer);
if ((GTK_WIDGET_HAS_FOCUS (text_view) && text_view->cursor_visible))
- gtk_text_view_start_cursor_blink (text_view);
+ gtk_text_view_start_cursor_blink (text_view);
else
- gtk_text_layout_set_cursor_visible (text_view->layout, FALSE);
-
+ gtk_text_layout_set_cursor_visible (text_view->layout, FALSE);
+
ltr_context = gtk_widget_create_pango_context (GTK_WIDGET (text_view));
pango_context_set_base_dir (ltr_context, PANGO_DIRECTION_LTR);
rtl_context = gtk_widget_create_pango_context (GTK_WIDGET (text_view));
@@ -3030,17 +3030,17 @@ gtk_text_view_ensure_layout (GtkTextView *text_view)
gtk_widget_ensure_style (widget);
gtk_text_view_set_attributes_from_style (text_view,
style, widget->style);
-
+
style->pixels_above_lines = 2;
style->pixels_below_lines = 2;
style->pixels_inside_wrap = 1;
-
+
style->wrap_mode = text_view->wrap_mode;
style->justify = GTK_JUSTIFY_LEFT;
style->direction = gtk_widget_get_direction (GTK_WIDGET (text_view));
-
+
gtk_text_layout_set_default_style (text_view->layout, style);
-
+
gtk_text_attributes_unref (style);
}
}
@@ -3052,11 +3052,11 @@ gtk_text_view_destroy_layout (GtkTextView *text_view)
{
gtk_text_view_stop_cursor_blink (text_view);
gtk_text_view_end_selection_drag (text_view, NULL);
-
+
gtk_signal_disconnect_by_func (GTK_OBJECT (text_view->layout),
- invalidated_handler, text_view);
+ invalidated_handler, text_view);
gtk_signal_disconnect_by_func (GTK_OBJECT (text_view->layout),
- changed_handler, text_view);
+ changed_handler, text_view);
gtk_object_unref (GTK_OBJECT (text_view->layout));
text_view->layout = NULL;
}
@@ -3077,7 +3077,7 @@ gtk_text_view_start_selection_dnd (GtkTextView *text_view,
text_view->drag_start_x = -1;
text_view->drag_start_y = -1;
-
+
target_list = gtk_target_list_new (target_table, G_N_ELEMENTS (target_table));
context = gtk_drag_begin (GTK_WIDGET (text_view), target_list,
@@ -3099,7 +3099,7 @@ static void
gtk_text_view_drag_begin (GtkWidget *widget,
GdkDragContext *context)
{
-
+
}
static void
@@ -3127,15 +3127,15 @@ gtk_text_view_drag_data_get (GtkWidget *widget,
GtkTextView *text_view;
text_view = GTK_TEXT_VIEW (widget);
-
+
str = NULL;
length = 0;
-
+
if (gtk_text_buffer_get_selection_bounds (text_view->buffer, &start, &end))
{
/* Extract the selected text */
str = gtk_text_iter_get_visible_text (&start, &end);
-
+
length = strlen (str);
}
@@ -3153,7 +3153,7 @@ gtk_text_view_drag_data_delete (GtkWidget *widget,
GtkTextView *text_view;
text_view = GTK_TEXT_VIEW (widget);
-
+
gtk_text_buffer_delete_selection (GTK_TEXT_VIEW (widget)->buffer,
TRUE, GTK_TEXT_VIEW (widget)->editable);
}
@@ -3169,10 +3169,10 @@ gtk_text_view_drag_leave (GtkWidget *widget,
static gboolean
gtk_text_view_drag_motion (GtkWidget *widget,
- GdkDragContext *context,
- gint x,
- gint y,
- guint time)
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ guint time)
{
GtkTextIter newplace;
GtkTextView *text_view;
@@ -3180,7 +3180,7 @@ gtk_text_view_drag_motion (GtkWidget *widget,
GtkTextIter end;
GdkRectangle target_rect;
gint bx, by;
-
+
text_view = GTK_TEXT_VIEW (widget);
target_rect = text_view->text_window->allocation;
@@ -3195,9 +3195,9 @@ gtk_text_view_drag_motion (GtkWidget *widget,
GTK_TEXT_WINDOW_WIDGET,
x, y,
&bx, &by);
-
+
gtk_text_layout_get_iter_at_pixel (text_view->layout,
- &newplace,
+ &newplace,
bx, by);
if (gtk_text_buffer_get_selection_bounds (text_view->buffer,
@@ -3214,7 +3214,7 @@ gtk_text_view_drag_motion (GtkWidget *widget,
{
gtk_text_mark_set_visible (text_view->dnd_mark,
text_view->cursor_visible);
-
+
gdk_drag_status (context, context->suggested_action, time);
}
else
@@ -3235,33 +3235,33 @@ gtk_text_view_drag_motion (GtkWidget *widget,
the edge. We have to scroll whether or not we're inside
the selection. */
gint margin;
-
+
margin = MIN (SCREEN_WIDTH (widget), SCREEN_HEIGHT (widget));
margin /= 5;
-
+
gtk_text_view_scroll_to_mark_adjusted (text_view,
gtk_text_buffer_get_mark (text_view->buffer,
"gtk_drag_target"),
margin, 1.0);
}
-
+
return TRUE;
}
static gboolean
gtk_text_view_drag_drop (GtkWidget *widget,
- GdkDragContext *context,
- gint x,
- gint y,
- guint time)
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ guint time)
{
#if 0
/* called automatically. */
if (context->targets)
{
- gtk_drag_get_data (widget, context,
- GPOINTER_TO_INT (context->targets->data),
- time);
+ gtk_drag_get_data (widget, context,
+ GPOINTER_TO_INT (context->targets->data),
+ time);
return TRUE;
}
else
@@ -3272,23 +3272,23 @@ gtk_text_view_drag_drop (GtkWidget *widget,
static void
gtk_text_view_drag_data_received (GtkWidget *widget,
- GdkDragContext *context,
- gint x,
- gint y,
- GtkSelectionData *selection_data,
- guint info,
- guint time)
+ GdkDragContext *context,
+ gint x,
+ gint y,
+ GtkSelectionData *selection_data,
+ guint info,
+ guint time)
{
GtkTextIter drop_point;
GtkTextView *text_view;
GtkTextMark *drag_target_mark;
gchar *str;
-
+
text_view = GTK_TEXT_VIEW (widget);
-
+
drag_target_mark = gtk_text_buffer_get_mark (text_view->buffer,
"gtk_drag_target");
-
+
if (drag_target_mark == NULL)
return;
@@ -3301,8 +3301,8 @@ gtk_text_view_drag_data_received (GtkWidget *widget,
if (str)
{
gtk_text_buffer_insert_interactive (text_view->buffer,
- &drop_point, str, -1,
- text_view->editable);
+ &drop_point, str, -1,
+ text_view->editable);
g_free (str);
}
}
@@ -3336,8 +3336,8 @@ get_vadjustment (GtkTextView *text_view)
static void
gtk_text_view_set_scroll_adjustments (GtkTextView *text_view,
- GtkAdjustment *hadj,
- GtkAdjustment *vadj)
+ GtkAdjustment *hadj,
+ GtkAdjustment *vadj)
{
gboolean need_adjust = FALSE;
@@ -3352,40 +3352,40 @@ gtk_text_view_set_scroll_adjustments (GtkTextView *text_view,
g_return_if_fail (GTK_IS_ADJUSTMENT (vadj));
else
vadj = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0));
-
+
if (text_view->hadjustment && (text_view->hadjustment != hadj))
{
gtk_signal_disconnect_by_data (GTK_OBJECT (text_view->hadjustment), text_view);
gtk_object_unref (GTK_OBJECT (text_view->hadjustment));
}
-
+
if (text_view->vadjustment && (text_view->vadjustment != vadj))
{
gtk_signal_disconnect_by_data (GTK_OBJECT (text_view->vadjustment), text_view);
gtk_object_unref (GTK_OBJECT (text_view->vadjustment));
}
-
+
if (text_view->hadjustment != hadj)
{
text_view->hadjustment = hadj;
gtk_object_ref (GTK_OBJECT (text_view->hadjustment));
gtk_object_sink (GTK_OBJECT (text_view->hadjustment));
-
+
gtk_signal_connect (GTK_OBJECT (text_view->hadjustment), "value_changed",
- (GtkSignalFunc) gtk_text_view_value_changed,
- text_view);
+ (GtkSignalFunc) gtk_text_view_value_changed,
+ text_view);
need_adjust = TRUE;
}
-
+
if (text_view->vadjustment != vadj)
{
text_view->vadjustment = vadj;
gtk_object_ref (GTK_OBJECT (text_view->vadjustment));
gtk_object_sink (GTK_OBJECT (text_view->vadjustment));
-
+
gtk_signal_connect (GTK_OBJECT (text_view->vadjustment), "value_changed",
- (GtkSignalFunc) gtk_text_view_value_changed,
- text_view);
+ (GtkSignalFunc) gtk_text_view_value_changed,
+ text_view);
need_adjust = TRUE;
}
@@ -3395,7 +3395,7 @@ gtk_text_view_set_scroll_adjustments (GtkTextView *text_view,
static void
gtk_text_view_value_changed (GtkAdjustment *adj,
- GtkTextView *text_view)
+ GtkTextView *text_view)
{
GtkTextIter iter;
gint line_top;
@@ -3413,13 +3413,13 @@ gtk_text_view_value_changed (GtkAdjustment *adj,
text_view->yoffset = adj->value;
if (text_view->layout)
- {
- gtk_text_layout_get_line_at_y (text_view->layout, &iter, adj->value, &line_top);
-
- gtk_text_buffer_move_mark (text_view->buffer, text_view->first_para_mark, &iter);
-
- text_view->first_para_pixels = adj->value - line_top;
- }
+ {
+ gtk_text_layout_get_line_at_y (text_view->layout, &iter, adj->value, &line_top);
+
+ gtk_text_buffer_move_mark (text_view->buffer, text_view->first_para_mark, &iter);
+
+ text_view->first_para_pixels = adj->value - line_top;
+ }
}
if (dx != 0 || dy != 0)
@@ -3451,8 +3451,8 @@ gtk_text_view_value_changed (GtkAdjustment *adj,
static void
gtk_text_view_commit_handler (GtkIMContext *context,
- const gchar *str,
- GtkTextView *text_view)
+ const gchar *str,
+ GtkTextView *text_view)
{
gtk_text_buffer_delete_selection (text_view->buffer, TRUE,
text_view->editable);
@@ -3465,11 +3465,11 @@ gtk_text_view_commit_handler (GtkIMContext *context,
else
{
if (text_view->overwrite_mode)
- gtk_text_view_delete_at_cursor (text_view, GTK_DELETE_CHARS, 1);
+ gtk_text_view_delete_at_cursor (text_view, GTK_DELETE_CHARS, 1);
gtk_text_buffer_insert_interactive_at_cursor (text_view->buffer, str, -1,
text_view->editable);
}
-
+
gtk_text_view_scroll_to_mark (text_view,
gtk_text_buffer_get_mark (text_view->buffer,
"insert"),
@@ -3478,9 +3478,9 @@ gtk_text_view_commit_handler (GtkIMContext *context,
static void
gtk_text_view_mark_set_handler (GtkTextBuffer *buffer,
- const GtkTextIter *location,
+ const GtkTextIter *location,
GtkTextMark *mark,
- gpointer data)
+ gpointer data)
{
GtkTextView *text_view = GTK_TEXT_VIEW (data);
@@ -3493,8 +3493,8 @@ gtk_text_view_mark_set_handler (GtkTextBuffer *buffer,
static void
gtk_text_view_get_virtual_cursor_pos (GtkTextView *text_view,
- gint *x,
- gint *y)
+ gint *x,
+ gint *y)
{
GdkRectangle strong_pos;
GtkTextIter insert;
@@ -3502,7 +3502,7 @@ gtk_text_view_get_virtual_cursor_pos (GtkTextView *text_view,
gtk_text_buffer_get_iter_at_mark (text_view->buffer, &insert,
gtk_text_buffer_get_mark (text_view->buffer,
"insert"));
-
+
if ((x && text_view->virtual_cursor_x == -1) ||
(y && text_view->virtual_cursor_y == -1))
gtk_text_layout_get_cursor_locations (text_view->layout, &insert, &strong_pos, NULL);
@@ -3510,24 +3510,24 @@ gtk_text_view_get_virtual_cursor_pos (GtkTextView *text_view,
if (x)
{
if (text_view->virtual_cursor_x != -1)
- *x = text_view->virtual_cursor_x;
+ *x = text_view->virtual_cursor_x;
else
- *x = strong_pos.x;
+ *x = strong_pos.x;
}
if (y)
{
if (text_view->virtual_cursor_x != -1)
- *y = text_view->virtual_cursor_y;
+ *y = text_view->virtual_cursor_y;
else
- *y = strong_pos.y + strong_pos.height / 2;
+ *y = strong_pos.y + strong_pos.height / 2;
}
}
static void
gtk_text_view_set_virtual_cursor_pos (GtkTextView *text_view,
- gint x,
- gint y)
+ gint x,
+ gint y)
{
GdkRectangle strong_pos;
GtkTextIter insert;
@@ -3535,7 +3535,7 @@ gtk_text_view_set_virtual_cursor_pos (GtkTextView *text_view,
gtk_text_buffer_get_iter_at_mark (text_view->buffer, &insert,
gtk_text_buffer_get_mark (text_view->buffer,
"insert"));
-
+
if (x == -1 || y == -1)
gtk_text_layout_get_cursor_locations (text_view->layout, &insert, &strong_pos, NULL);
@@ -3568,7 +3568,7 @@ text_window_new (GtkTextWindowType type,
win->allocation.height = height_request;
win->allocation.x = 0;
win->allocation.y = 0;
-
+
return win;
}
@@ -3588,7 +3588,7 @@ text_window_realize (GtkTextWindow *win,
GdkWindowAttr attributes;
gint attributes_mask;
GdkCursor *cursor;
-
+
attributes.window_type = GDK_WINDOW_CHILD;
attributes.x = win->allocation.x;
attributes.y = win->allocation.y;
@@ -3613,13 +3613,13 @@ text_window_realize (GtkTextWindow *win,
attributes.width = win->allocation.width;
attributes.height = win->allocation.height;
attributes.event_mask = (GDK_EXPOSURE_MASK |
- GDK_SCROLL_MASK |
- GDK_KEY_PRESS_MASK |
- GDK_BUTTON_PRESS_MASK |
- GDK_BUTTON_RELEASE_MASK |
- GDK_POINTER_MOTION_MASK |
- GDK_POINTER_MOTION_HINT_MASK |
- gtk_widget_get_events (win->widget));
+ GDK_SCROLL_MASK |
+ GDK_KEY_PRESS_MASK |
+ GDK_BUTTON_PRESS_MASK |
+ GDK_BUTTON_RELEASE_MASK |
+ GDK_POINTER_MOTION_MASK |
+ GDK_POINTER_MOTION_HINT_MASK |
+ gtk_widget_get_events (win->widget));
win->bin_window = gdk_window_new (win->window,
&attributes,
@@ -3634,7 +3634,7 @@ text_window_realize (GtkTextWindow *win,
cursor = gdk_cursor_new (GDK_XTERM);
gdk_window_set_cursor (win->bin_window, cursor);
gdk_cursor_destroy (cursor);
-
+
gtk_im_context_set_client_window (GTK_TEXT_VIEW (win->widget)->im_context,
win->window);
@@ -3647,7 +3647,7 @@ text_window_realize (GtkTextWindow *win,
gdk_window_set_background (win->bin_window,
&win->widget->style->bg[GTK_WIDGET_STATE (win->widget)]);
}
-
+
g_object_set_qdata (G_OBJECT (win->window),
g_quark_from_static_string ("gtk-text-view-text-window"),
win);
@@ -3679,13 +3679,13 @@ text_window_size_allocate (GtkTextWindow *win,
GdkRectangle *rect)
{
win->allocation = *rect;
-
+
if (win->window)
{
gdk_window_move_resize (win->window,
rect->x, rect->y,
rect->width, rect->height);
-
+
gdk_window_resize (win->bin_window,
rect->width, rect->height);
}
@@ -3743,32 +3743,32 @@ gtk_text_view_get_window (GtkTextView *text_view,
case GTK_TEXT_WINDOW_WIDGET:
return GTK_WIDGET (text_view)->window;
break;
-
+
case GTK_TEXT_WINDOW_TEXT:
return text_view->text_window->bin_window;
break;
-
+
case GTK_TEXT_WINDOW_LEFT:
if (text_view->left_window)
return text_view->left_window->bin_window;
else
return NULL;
break;
-
+
case GTK_TEXT_WINDOW_RIGHT:
if (text_view->right_window)
return text_view->right_window->bin_window;
else
return NULL;
break;
-
+
case GTK_TEXT_WINDOW_TOP:
if (text_view->top_window)
return text_view->top_window->bin_window;
else
return NULL;
break;
-
+
case GTK_TEXT_WINDOW_BOTTOM:
if (text_view->bottom_window)
return text_view->bottom_window->bin_window;
@@ -3794,7 +3794,7 @@ gtk_text_view_get_window_type (GtkTextView *text_view,
if (window == GTK_WIDGET (text_view)->window)
return GTK_TEXT_WINDOW_WIDGET;
-
+
win = g_object_get_qdata (G_OBJECT (window),
g_quark_try_string ("gtk-text-view-text-window"));
@@ -3821,7 +3821,7 @@ buffer_to_widget (GtkTextView *text_view,
if (text_view->left_window)
*window_x += text_view->left_window->allocation.width;
}
-
+
if (window_y)
{
*window_y = buffer_y - text_view->yoffset + FOCUS_EDGE_WIDTH;
@@ -3858,7 +3858,7 @@ buffer_to_text_window (GtkTextView *text_view,
"for a nonexistent child window of GtkTextView");
return;
}
-
+
buffer_to_widget (text_view,
buffer_x, buffer_y,
window_x, window_y);
@@ -3887,35 +3887,35 @@ gtk_text_view_buffer_to_window_coords (GtkTextView *text_view,
buffer_x, buffer_y,
window_x, window_y);
break;
-
+
case GTK_TEXT_WINDOW_TEXT:
if (window_x)
*window_x = buffer_x - text_view->xoffset;
if (window_y)
*window_y = buffer_y - text_view->yoffset;
break;
-
+
case GTK_TEXT_WINDOW_LEFT:
buffer_to_text_window (text_view,
text_view->left_window,
buffer_x, buffer_y,
window_x, window_y);
break;
-
+
case GTK_TEXT_WINDOW_RIGHT:
buffer_to_text_window (text_view,
text_view->right_window,
buffer_x, buffer_y,
window_x, window_y);
break;
-
+
case GTK_TEXT_WINDOW_TOP:
buffer_to_text_window (text_view,
text_view->top_window,
buffer_x, buffer_y,
window_x, window_y);
break;
-
+
case GTK_TEXT_WINDOW_BOTTOM:
buffer_to_text_window (text_view,
text_view->bottom_window,
@@ -3942,7 +3942,7 @@ widget_to_buffer (GtkTextView *text_view,
if (text_view->left_window)
*buffer_x -= text_view->left_window->allocation.width;
}
-
+
if (buffer_y)
{
*buffer_y = widget_y - FOCUS_EDGE_WIDTH + text_view->yoffset;
@@ -3979,7 +3979,7 @@ text_window_to_buffer (GtkTextView *text_view,
"coordinates for a nonexistent child window.");
return;
}
-
+
text_window_to_widget (win,
window_x,
window_y,
@@ -4010,35 +4010,35 @@ gtk_text_view_window_to_buffer_coords (GtkTextView *text_view,
window_x, window_y,
buffer_x, buffer_y);
break;
-
+
case GTK_TEXT_WINDOW_TEXT:
if (buffer_x)
*buffer_x = window_x + text_view->xoffset;
if (buffer_y)
*buffer_y = window_y + text_view->yoffset;
break;
-
+
case GTK_TEXT_WINDOW_LEFT:
text_window_to_buffer (text_view,
text_view->left_window,
window_x, window_y,
buffer_x, buffer_y);
break;
-
+
case GTK_TEXT_WINDOW_RIGHT:
text_window_to_buffer (text_view,
text_view->right_window,
window_x, window_y,
buffer_x, buffer_y);
break;
-
+
case GTK_TEXT_WINDOW_TOP:
text_window_to_buffer (text_view,
text_view->top_window,
window_x, window_y,
buffer_x, buffer_y);
break;
-
+
case GTK_TEXT_WINDOW_BOTTOM:
text_window_to_buffer (text_view,
text_view->bottom_window,
@@ -4129,7 +4129,7 @@ gtk_text_view_set_border_window_size (GtkTextView *text_view,
g_return_if_fail (size >= 0);
g_return_if_fail (type != GTK_TEXT_WINDOW_WIDGET);
g_return_if_fail (type != GTK_TEXT_WINDOW_TEXT);
-
+
switch (type)
{
case GTK_TEXT_WINDOW_LEFT:
@@ -4164,7 +4164,7 @@ gtk_text_view_set_text_window_size (GtkTextView *text_view,
gint height)
{
GtkTextWindow *win;
-
+
g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
g_return_if_fail (width > 0);
g_return_if_fail (height > 0);
@@ -4195,14 +4195,14 @@ text_view_child_new_anchored (GtkWidget *child,
vc->widget = child;
vc->anchor = anchor;
-
+
g_object_ref (G_OBJECT (vc->widget));
gtk_text_child_anchor_ref (vc->anchor);
gtk_object_set_data (GTK_OBJECT (child),
"gtk-text-view-child",
vc);
-
+
return vc;
}
@@ -4218,7 +4218,7 @@ text_view_child_new_window (GtkWidget *child,
vc->widget = child;
vc->anchor = NULL;
-
+
g_object_ref (G_OBJECT (vc->widget));
vc->type = type;
@@ -4234,10 +4234,10 @@ text_view_child_free (GtkTextViewChild *child)
gtk_object_remove_data (GTK_OBJECT (child->widget),
"gtk-text-view-child");
-
+
g_object_unref (G_OBJECT (child->widget));
gtk_text_child_anchor_unref (child->anchor);
-
+
g_free (child);
}
@@ -4253,9 +4253,9 @@ text_view_child_realize (GtkTextView *text_view,
GdkWindow *window;
window = gtk_text_view_get_window (text_view,
vc->type);
- gtk_widget_set_parent_window (vc->widget, window);
+ gtk_widget_set_parent_window (vc->widget, window);
}
-
+
gtk_widget_realize (vc->widget);
}
@@ -4276,11 +4276,11 @@ add_child (GtkTextView *text_view,
if (GTK_WIDGET_REALIZED (text_view))
text_view_child_realize (text_view, vc);
-
+
if (GTK_WIDGET_VISIBLE (text_view) && GTK_WIDGET_VISIBLE (vc->widget))
{
if (GTK_WIDGET_MAPPED (text_view))
- gtk_widget_map (vc->widget);
+ gtk_widget_map (vc->widget);
gtk_widget_queue_resize (vc->widget);
}
@@ -4292,12 +4292,12 @@ gtk_text_view_add_child_at_anchor (GtkTextView *text_view,
GtkTextChildAnchor *anchor)
{
GtkTextViewChild *vc;
-
+
g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
g_return_if_fail (GTK_IS_WIDGET (child));
g_return_if_fail (anchor != NULL);
g_return_if_fail (child->parent == NULL);
-
+
vc = text_view_child_new_anchored (child, anchor);
add_child (text_view, vc);
@@ -4311,7 +4311,7 @@ gtk_text_view_add_child_in_window (GtkTextView *text_view,
gint ypos)
{
GtkTextViewChild *vc;
-
+
g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
g_return_if_fail (GTK_IS_WIDGET (child));
g_return_if_fail (xpos >= 0);
@@ -4331,7 +4331,7 @@ gtk_text_view_move_child (GtkTextView *text_view,
gint ypos)
{
GtkTextViewChild *vc;
-
+
g_return_if_fail (GTK_IS_TEXT_VIEW (text_view));
g_return_if_fail (GTK_IS_WIDGET (child));
g_return_if_fail (xpos >= 0);
diff --git a/gtk/gtktextview.h b/gtk/gtktextview.h
index fccc7fad45..23a855986f 100644
--- a/gtk/gtktextview.h
+++ b/gtk/gtktextview.h
@@ -8,7 +8,7 @@
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
@@ -21,7 +21,7 @@
* Modified by the GTK+ Team and others 1997-2000. See the AUTHORS
* file for a list of people on the GTK+ Team. See the ChangeLog
* files for a list of changes. These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
#ifndef GTK_TEXT_VIEW_H
@@ -35,7 +35,7 @@
extern "C" {
#endif /* __cplusplus */
-#define GTK_TYPE_TEXT_VIEW (gtk_text_view_get_type())
+#define GTK_TYPE_TEXT_VIEW (gtk_text_view_get_type ())
#define GTK_TEXT_VIEW(obj) (GTK_CHECK_CAST ((obj), GTK_TYPE_TEXT_VIEW, GtkTextView))
#define GTK_TEXT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_VIEW, GtkTextViewClass))
#define GTK_IS_TEXT_VIEW(obj) (GTK_CHECK_TYPE ((obj), GTK_TYPE_TEXT_VIEW))
@@ -70,26 +70,26 @@ struct _GtkTextView {
gboolean overwrite_mode;
- GtkWrapMode wrap_mode; /* Default wrap mode */
+ GtkWrapMode wrap_mode; /* Default wrap mode */
gboolean editable; /* default editability */
gboolean cursor_visible;
-
+
GtkTextWindow *text_window;
GtkTextWindow *left_window;
GtkTextWindow *right_window;
GtkTextWindow *top_window;
GtkTextWindow *bottom_window;
-
+
GtkAdjustment *hadjustment;
GtkAdjustment *vadjustment;
- gint xoffset; /* Offsets between widget coordinates and buffer coordinates */
+ gint xoffset; /* Offsets between widget coordinates and buffer coordinates */
gint yoffset;
- gint width; /* Width and height of the buffer */
+ gint width; /* Width and height of the buffer */
gint height;
-
+
/* The virtual cursor position is normally the same as the
* actual (strong) cursor position, except in two circumstances:
*
@@ -99,16 +99,16 @@ struct _GtkTextView {
* In case a), virtual_cursor_x is preserved, but not virtual_cursor_y
* In case b), both virtual_cursor_x and virtual_cursor_y are preserved.
*/
- gint virtual_cursor_x; /* -1 means use actual cursor position */
- gint virtual_cursor_y; /* -1 means use actual cursor position */
-
- GtkTextMark *first_para_mark; /* Mark at the beginning of the first onscreen paragraph */
- gint first_para_pixels; /* Offset of top of screen in the first onscreen paragraph */
+ gint virtual_cursor_x; /* -1 means use actual cursor position */
+ gint virtual_cursor_y; /* -1 means use actual cursor position */
+
+ GtkTextMark *first_para_mark; /* Mark at the beginning of the first onscreen paragraph */
+ gint first_para_pixels; /* Offset of top of screen in the first onscreen paragraph */
GtkTextMark *dnd_mark;
guint blink_timeout;
- guint first_validate_idle; /* Idle to revalidate onscreen portion, runs before resize */
+ guint first_validate_idle; /* Idle to revalidate onscreen portion, runs before resize */
guint incremental_validate_idle; /* Idle to revalidate offscreen portions, runs after redraw */
GtkIMContext *im_context;
@@ -140,27 +140,27 @@ struct _GtkTextViewClass {
/* overwrite */
void (* toggle_overwrite) (GtkTextView *text_view);
void (* set_scroll_adjustments) (GtkTextView *text_view,
- GtkAdjustment *hadjustment,
- GtkAdjustment *vadjustment);
+ GtkAdjustment *hadjustment,
+ GtkAdjustment *vadjustment);
};
GtkType gtk_text_view_get_type (void) G_GNUC_CONST;
GtkWidget * gtk_text_view_new (void);
GtkWidget * gtk_text_view_new_with_buffer (GtkTextBuffer *buffer);
void gtk_text_view_set_buffer (GtkTextView *text_view,
- GtkTextBuffer *buffer);
+ GtkTextBuffer *buffer);
GtkTextBuffer *gtk_text_view_get_buffer (GtkTextView *text_view);
gboolean gtk_text_view_scroll_to_mark (GtkTextView *text_view,
GtkTextMark *mark,
- gint mark_within_margin);
+ gint mark_within_margin);
gboolean gtk_text_view_move_mark_onscreen (GtkTextView *text_view,
GtkTextMark *mark);
gboolean gtk_text_view_place_cursor_onscreen (GtkTextView *text_view);
void gtk_text_view_get_visible_rect (GtkTextView *text_view,
- GdkRectangle *visible_rect);
+ GdkRectangle *visible_rect);
void gtk_text_view_set_wrap_mode (GtkTextView *text_view,
- GtkWrapMode wrap_mode);
+ GtkWrapMode wrap_mode);
GtkWrapMode gtk_text_view_get_wrap_mode (GtkTextView *text_view);
void gtk_text_view_set_editable (GtkTextView *text_view,
@@ -175,9 +175,9 @@ void gtk_text_view_get_iter_location (GtkTextView *text_view,
const GtkTextIter *iter,
GdkRectangle *location);
void gtk_text_view_get_iter_at_location (GtkTextView *text_view,
- GtkTextIter *iter,
- gint x,
- gint y);
+ GtkTextIter *iter,
+ gint x,
+ gint y);
void gtk_text_view_get_line_yrange (GtkTextView *text_view,
const GtkTextIter *iter,
gint *y,
View Lorry Controller Status