#include "gtktextiterprivate.h"
#include "gtkprivate.h"
#include "gtkintl.h"
-#include "gtkalias.h"
-#define GTK_TEXT_BUFFER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_TEXT_BUFFER, GtkTextBufferPrivate))
-
-typedef struct _GtkTextBufferPrivate GtkTextBufferPrivate;
+typedef struct _GtkTextLogAttrCache GtkTextLogAttrCache;
struct _GtkTextBufferPrivate
{
GtkTargetList *paste_target_list;
GtkTargetEntry *paste_target_entries;
gint n_paste_target_entries;
+
+ GtkTextTagTable *tag_table;
+ GtkTextBTree *btree;
+
+ GSList *clipboard_contents_buffers;
+ GSList *selection_clipboards;
+
+ GtkTextLogAttrCache *log_attr_cache;
+
+ guint user_action_count;
+
+ /* Whether the buffer has been modified since last save */
+ guint modified : 1;
+
+ guint has_selection : 1;
};
struct _ClipboardRequest
{
GtkTextBuffer *buffer;
- gboolean interactive;
- gboolean default_editable;
- gboolean is_clipboard;
- gboolean replace_selection;
+ guint interactive : 1;
+ guint default_editable : 1;
+ guint replace_selection : 1;
};
enum {
static void
gtk_text_buffer_init (GtkTextBuffer *buffer)
{
- buffer->clipboard_contents_buffers = NULL;
- buffer->tag_table = NULL;
+ buffer->priv = G_TYPE_INSTANCE_GET_PRIVATE (buffer,
+ GTK_TYPE_TEXT_BUFFER,
+ GtkTextBufferPrivate);
+
+ buffer->priv->clipboard_contents_buffers = NULL;
+ buffer->priv->tag_table = NULL;
/* allow copying of arbiatray stuff in the internal rich text format */
gtk_text_buffer_register_serialize_tagset (buffer, NULL);
static void
set_table (GtkTextBuffer *buffer, GtkTextTagTable *table)
{
- g_return_if_fail (buffer->tag_table == NULL);
+ GtkTextBufferPrivate *priv = buffer->priv;
+
+ g_return_if_fail (priv->tag_table == NULL);
if (table)
{
- buffer->tag_table = table;
- g_object_ref (buffer->tag_table);
+ priv->tag_table = table;
+ g_object_ref (priv->tag_table);
_gtk_text_tag_table_add_buffer (table, buffer);
}
}
static GtkTextTagTable*
get_table (GtkTextBuffer *buffer)
{
- if (buffer->tag_table == NULL)
+ GtkTextBufferPrivate *priv = buffer->priv;
+
+ if (priv->tag_table == NULL)
{
- buffer->tag_table = gtk_text_tag_table_new ();
- _gtk_text_tag_table_add_buffer (buffer->tag_table, buffer);
+ priv->tag_table = gtk_text_tag_table_new ();
+ _gtk_text_tag_table_add_buffer (priv->tag_table, buffer);
}
- return buffer->tag_table;
+ return priv->tag_table;
}
static void
}
case PROP_HAS_SELECTION:
- g_value_set_boolean (value, text_buffer->has_selection);
+ g_value_set_boolean (value, text_buffer->priv->has_selection);
break;
case PROP_CURSOR_POSITION:
/**
* gtk_text_buffer_new:
- * @table: a tag table, or %NULL to create a new one
+ * @table: (allow-none): a tag table, or %NULL to create a new one
*
* Creates a new text buffer.
*
gtk_text_buffer_finalize (GObject *object)
{
GtkTextBuffer *buffer;
+ GtkTextBufferPrivate *priv;
buffer = GTK_TEXT_BUFFER (object);
+ priv = buffer->priv;
remove_all_selection_clipboards (buffer);
- if (buffer->tag_table)
+ if (priv->tag_table)
{
- _gtk_text_tag_table_remove_buffer (buffer->tag_table, buffer);
- g_object_unref (buffer->tag_table);
- buffer->tag_table = NULL;
+ _gtk_text_tag_table_remove_buffer (priv->tag_table, buffer);
+ g_object_unref (priv->tag_table);
+ priv->tag_table = NULL;
}
- if (buffer->btree)
+ if (priv->btree)
{
- _gtk_text_btree_unref (buffer->btree);
- buffer->btree = NULL;
+ _gtk_text_btree_unref (priv->btree);
+ priv->btree = NULL;
}
- if (buffer->log_attr_cache)
- free_log_attr_cache (buffer->log_attr_cache);
+ if (priv->log_attr_cache)
+ free_log_attr_cache (priv->log_attr_cache);
- buffer->log_attr_cache = NULL;
+ priv->log_attr_cache = NULL;
gtk_text_buffer_free_target_lists (buffer);
static GtkTextBTree*
get_btree (GtkTextBuffer *buffer)
{
- if (buffer->btree == NULL)
- buffer->btree = _gtk_text_btree_new (gtk_text_buffer_get_tag_table (buffer),
- buffer);
+ GtkTextBufferPrivate *priv = buffer->priv;
- return buffer->btree;
+ if (priv->btree == NULL)
+ priv->btree = _gtk_text_btree_new (gtk_text_buffer_get_tag_table (buffer),
+ buffer);
+
+ return priv->btree;
}
GtkTextBTree*
*
* Get the #GtkTextTagTable associated with this buffer.
*
- * Return value: the buffer's tag table
+ * Return value: (transfer none): the buffer's tag table
**/
GtkTextTagTable*
gtk_text_buffer_get_tag_table (GtkTextBuffer *buffer)
* gtk_text_buffer_insert:
* @buffer: a #GtkTextBuffer
* @iter: a position in the buffer
- * @text: UTF-8 format text to insert
+ * @text: text in UTF-8 format
* @len: length of text in bytes, or -1
*
* Inserts @len bytes of @text at position @iter. If @len is -1,
/**
* gtk_text_buffer_insert_at_cursor:
* @buffer: a #GtkTextBuffer
- * @text: some text in UTF-8 format
+ * @text: text in UTF-8 format
* @len: length of text, in bytes
*
* Simply calls gtk_text_buffer_insert(), using the current
g_return_if_fail (end != NULL);
g_return_if_fail (gtk_text_iter_get_buffer (start) ==
gtk_text_iter_get_buffer (end));
- g_return_if_fail (gtk_text_iter_get_buffer (start)->tag_table ==
- buffer->tag_table);
+ g_return_if_fail (gtk_text_iter_get_buffer (start)->priv->tag_table ==
+ buffer->priv->tag_table);
g_return_if_fail (gtk_text_iter_get_buffer (iter) == buffer);
gtk_text_buffer_real_insert_range (buffer, iter, start, end, FALSE);
g_return_val_if_fail (end != NULL, FALSE);
g_return_val_if_fail (gtk_text_iter_get_buffer (start) ==
gtk_text_iter_get_buffer (end), FALSE);
- g_return_val_if_fail (gtk_text_iter_get_buffer (start)->tag_table ==
- buffer->tag_table, FALSE);
+ g_return_val_if_fail (gtk_text_iter_get_buffer (start)->priv->tag_table ==
+ buffer->priv->tag_table, FALSE);
if (gtk_text_iter_can_insert (iter, default_editable))
{
{
GtkTextTag *tag;
- tag = gtk_text_tag_table_lookup (buffer->tag_table,
+ tag = gtk_text_tag_table_lookup (buffer->priv->tag_table,
tag_name);
if (tag == NULL)
update_selection_clipboards (buffer);
has_selection = gtk_text_buffer_get_selection_bounds (buffer, NULL, NULL);
- if (has_selection != buffer->has_selection)
+ if (has_selection != buffer->priv->has_selection)
{
- buffer->has_selection = has_selection;
+ buffer->priv->has_selection = has_selection;
g_object_notify (G_OBJECT (buffer), "has-selection");
}
* owned by the buffer; no reference count is returned to
* the caller of gtk_text_buffer_create_child_anchor().
*
- * Return value: the created child anchor
+ * Return value: (transfer none): the created child anchor
**/
GtkTextChildAnchor*
gtk_text_buffer_create_child_anchor (GtkTextBuffer *buffer,
/**
* gtk_text_buffer_create_mark:
* @buffer: a #GtkTextBuffer
- * @mark_name: name for mark, or %NULL
+ * @mark_name: (allow-none): name for mark, or %NULL
* @where: location to place mark
* @left_gravity: whether the mark has left gravity
*
* Emits the "mark-set" signal as notification of the mark's initial
* placement.
*
- * Return value: the new #GtkTextMark object
+ * Return value: (transfer none): the new #GtkTextMark object
**/
GtkTextMark*
gtk_text_buffer_create_mark (GtkTextBuffer *buffer,
/**
* gtk_text_buffer_get_iter_at_mark:
* @buffer: a #GtkTextBuffer
- * @iter: iterator to initialize
+ * @iter: (out): iterator to initialize
* @mark: a #GtkTextMark in @buffer
*
* Initializes @iter with the current position of @mark.
* Returns the mark named @name in buffer @buffer, or %NULL if no such
* mark exists in the buffer.
*
- * Return value: a #GtkTextMark, or %NULL
+ * Return value: (transfer none): a #GtkTextMark, or %NULL
**/
GtkTextMark*
gtk_text_buffer_get_mark (GtkTextBuffer *buffer,
* named "insert", but very slightly more efficient, and involves less
* typing.
*
- * Return value: insertion point mark
+ * Return value: (transfer none): insertion point mark
**/
GtkTextMark*
gtk_text_buffer_get_insert (GtkTextBuffer *buffer)
* 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
+ * Return value: (transfer none): selection bound mark
**/
GtkTextMark*
gtk_text_buffer_get_selection_bound (GtkTextBuffer *buffer)
/**
* gtk_text_buffer_get_iter_at_child_anchor:
* @buffer: a #GtkTextBuffer
- * @iter: an iterator to be initialized
+ * @iter: (out): an iterator to be initialized
* @anchor: a child anchor that appears in @buffer
*
* Obtains the location of @anchor within @buffer.
/**
* gtk_text_buffer_create_tag:
* @buffer: a #GtkTextBuffer
- * @tag_name: name of the new tag, or %NULL
- * @first_property_name: name of first property to set, or %NULL
+ * @tag_name: (allow-none): name of the new tag, or %NULL
+ * @first_property_name: (allow-none): name of first property to set, or %NULL
* @Varargs: %NULL-terminated list of property names and values
*
- *
* Creates a tag and adds it to the tag table for @buffer.
* Equivalent to calling gtk_text_tag_new() and then adding the
* tag to the buffer's tag table. The returned tag is owned by
* The @first_property_name argument and subsequent arguments are a list
* of properties to set on the tag, as with g_object_set().
*
- * Return value: a new tag
- **/
+ * Return value: (transfer none): a new tag
+ */
GtkTextTag*
gtk_text_buffer_create_tag (GtkTextBuffer *buffer,
const gchar *tag_name,
const GtkTextIter *start,
const GtkTextIter *end)
{
- if (tag->table != buffer->tag_table)
+ if (tag->table != buffer->priv->tag_table)
{
g_warning ("Can only apply tags that are in the tag table for the buffer");
return;
const GtkTextIter *start,
const GtkTextIter *end)
{
- if (tag->table != buffer->tag_table)
+ if (tag->table != buffer->priv->tag_table)
{
g_warning ("Can only remove tags that are in the tag table for the buffer");
return;
NULL,
NULL);
- if (has_selection != buffer->has_selection)
+ if (has_selection != buffer->priv->has_selection)
{
- buffer->has_selection = has_selection;
+ buffer->priv->has_selection = has_selection;
g_object_notify (G_OBJECT (buffer), "has-selection");
}
}
g_return_if_fail (end != NULL);
g_return_if_fail (gtk_text_iter_get_buffer (start) == buffer);
g_return_if_fail (gtk_text_iter_get_buffer (end) == buffer);
- g_return_if_fail (tag->table == buffer->tag_table);
+ g_return_if_fail (tag->table == buffer->priv->tag_table);
gtk_text_buffer_emit_tag (buffer, tag, TRUE, start, end);
}
g_return_if_fail (end != NULL);
g_return_if_fail (gtk_text_iter_get_buffer (start) == buffer);
g_return_if_fail (gtk_text_iter_get_buffer (end) == buffer);
- g_return_if_fail (tag->table == buffer->tag_table);
+ g_return_if_fail (tag->table == buffer->priv->tag_table);
gtk_text_buffer_emit_tag (buffer, tag, FALSE, start, end);
}
/**
* gtk_text_buffer_get_iter_at_line_offset:
* @buffer: a #GtkTextBuffer
- * @iter: iterator to initialize
+ * @iter: (out): iterator to initialize
* @line_number: line number counting from 0
* @char_offset: char offset from start of line
*
/**
* gtk_text_buffer_get_iter_at_line_index:
* @buffer: a #GtkTextBuffer
- * @iter: iterator to initialize
+ * @iter: (out): iterator to initialize
* @line_number: line number counting from 0
* @byte_index: byte index from start of line
*
/**
* gtk_text_buffer_get_iter_at_line:
* @buffer: a #GtkTextBuffer
- * @iter: iterator to initialize
+ * @iter: (out): iterator to initialize
* @line_number: line number counting from 0
*
* Initializes @iter to the start of the given line.
/**
* gtk_text_buffer_get_iter_at_offset:
* @buffer: a #GtkTextBuffer
- * @iter: iterator to initialize
+ * @iter: (out): iterator to initialize
* @char_offset: char offset from start of buffer, counting from 0, or -1
*
* Initializes @iter to a position @char_offset chars from the start
/**
* gtk_text_buffer_get_start_iter:
* @buffer: a #GtkTextBuffer
- * @iter: iterator to initialize
+ * @iter: (out): iterator to initialize
*
* Initialized @iter with the first position in the text buffer. This
* is the same as using gtk_text_buffer_get_iter_at_offset() to get
/**
* gtk_text_buffer_get_end_iter:
* @buffer: a #GtkTextBuffer
- * @iter: iterator to initialize
+ * @iter: (out): iterator to initialize
*
* Initializes @iter with the "end iterator," one past the last valid
* character in the text buffer. If dereferenced with
/**
* gtk_text_buffer_get_bounds:
* @buffer: a #GtkTextBuffer
- * @start: iterator to initialize with first position in the buffer
- * @end: iterator to initialize with the end iterator
+ * @start: (out): iterator to initialize with first position in the buffer
+ * @end: (out): iterator to initialize with the end iterator
*
* Retrieves the first and last iterators in the buffer, i.e. the
* entire buffer lies within the range [@start,@end).
{
g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
- return buffer->modified;
+ return buffer->priv->modified;
}
/**
fixed_setting = setting != FALSE;
- if (buffer->modified == fixed_setting)
+ if (buffer->priv->modified == fixed_setting)
return;
else
{
- buffer->modified = fixed_setting;
+ buffer->priv->modified = fixed_setting;
g_signal_emit (buffer, signals[MODIFIED_CHANGED], 0);
}
}
{
g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
- return buffer->has_selection;
+ return buffer->priv->has_selection;
}
update_selection_clipboards (GtkTextBuffer *buffer)
{
GtkTextBufferPrivate *priv;
- GSList *tmp_list = buffer->selection_clipboards;
+ GSList *tmp_list = buffer->priv->selection_clipboards;
- priv = GTK_TEXT_BUFFER_GET_PRIVATE (buffer);
+ priv = buffer->priv;
gtk_text_buffer_get_copy_target_list (buffer);
find_selection_clipboard (GtkTextBuffer *buffer,
GtkClipboard *clipboard)
{
- GSList *tmp_list = buffer->selection_clipboards;
+ GSList *tmp_list = buffer->priv->selection_clipboards;
while (tmp_list)
{
SelectionClipboard *selection_clipboard = tmp_list->data;
selection_clipboard->clipboard = clipboard;
selection_clipboard->ref_count = 1;
- buffer->selection_clipboards = g_slist_prepend (buffer->selection_clipboards, selection_clipboard);
+ buffer->priv->selection_clipboards = g_slist_prepend (buffer->priv->selection_clipboards,
+ selection_clipboard);
}
}
if (gtk_clipboard_get_owner (selection_clipboard->clipboard) == G_OBJECT (buffer))
gtk_clipboard_clear (selection_clipboard->clipboard);
- buffer->selection_clipboards = g_slist_remove (buffer->selection_clipboards,
- selection_clipboard);
+ buffer->priv->selection_clipboards = g_slist_remove (buffer->priv->selection_clipboards,
+ selection_clipboard);
g_free (selection_clipboard);
}
static void
remove_all_selection_clipboards (GtkTextBuffer *buffer)
{
- g_slist_foreach (buffer->selection_clipboards, (GFunc)g_free, NULL);
- g_slist_free (buffer->selection_clipboards);
- buffer->selection_clipboards = NULL;
+ GtkTextBufferPrivate *priv = buffer->priv;
+
+ g_slist_foreach (priv->selection_clipboards, (GFunc)g_free, NULL);
+ g_slist_free (priv->selection_clipboards);
+ priv->selection_clipboards = NULL;
}
/**
* gtk_text_buffer_paste_clipboard:
* @buffer: a #GtkTextBuffer
* @clipboard: the #GtkClipboard to paste from
- * @override_location: location to insert pasted text, or %NULL for
+ * @override_location: (allow-none): location to insert pasted text, or %NULL for
* at the cursor
* @default_editable: whether the buffer is editable by default
*
- * Pastes the contents of a clipboard at the insertion point, or at
- * @override_location. (Note: pasting is asynchronous, that is, we'll
- * ask for the paste data and return, and at some point later after
- * the main loop runs, the paste data will be inserted.)
+ * Pastes the contents of a clipboard at the insertion point, or
+ * at @override_location. (Note: pasting is asynchronous, that is,
+ * we'll ask for the paste data and return, and at some point later
+ * after the main loop runs, the paste data will be inserted.)
**/
void
gtk_text_buffer_paste_clipboard (GtkTextBuffer *buffer,
data->buffer = g_object_ref (buffer);
data->interactive = TRUE;
- data->default_editable = default_editable;
+ data->default_editable = !!default_editable;
/* When pasting with the cursor inside the selection area, you
* replace the selection with the new text, otherwise, you
GtkTextIter start;
GtkTextIter end;
- priv = GTK_TEXT_BUFFER_GET_PRIVATE (buffer);
+ priv = buffer->priv;
gtk_text_buffer_get_copy_target_list (buffer);
gtk_text_buffer_copy_clipboard (GtkTextBuffer *buffer,
GtkClipboard *clipboard)
{
- gtk_text_buffer_begin_user_action (buffer);
cut_or_copy (buffer, clipboard, FALSE, TRUE, TRUE);
- gtk_text_buffer_end_user_action (buffer);
}
/**
* gtk_text_buffer_get_selection_bounds:
* @buffer: a #GtkTextBuffer a #GtkTextBuffer
- * @start: iterator to initialize with selection start
- * @end: iterator to initialize with selection end
+ * @start: (out): iterator to initialize with selection start
+ * @end: (out): 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,
{
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
- buffer->user_action_count += 1;
+ buffer->priv->user_action_count += 1;
- if (buffer->user_action_count == 1)
+ if (buffer->priv->user_action_count == 1)
{
/* Outermost nested user action begin emits the signal */
g_signal_emit (buffer, signals[BEGIN_USER_ACTION], 0);
gtk_text_buffer_end_user_action (GtkTextBuffer *buffer)
{
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
- g_return_if_fail (buffer->user_action_count > 0);
+ g_return_if_fail (buffer->priv->user_action_count > 0);
- buffer->user_action_count -= 1;
+ buffer->priv->user_action_count -= 1;
- if (buffer->user_action_count == 0)
+ if (buffer->priv->user_action_count == 0)
{
/* Ended the outermost-nested user action end, so emit the signal */
g_signal_emit (buffer, signals[END_USER_ACTION], 0);
static void
gtk_text_buffer_free_target_lists (GtkTextBuffer *buffer)
{
- GtkTextBufferPrivate *priv = GTK_TEXT_BUFFER_GET_PRIVATE (buffer);
+ GtkTextBufferPrivate *priv = buffer->priv;
if (priv->copy_target_list)
{
g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
- priv = GTK_TEXT_BUFFER_GET_PRIVATE (buffer);
+ priv = buffer->priv;
if (! priv->copy_target_list)
priv->copy_target_list =
g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
- priv = GTK_TEXT_BUFFER_GET_PRIVATE (buffer);
+ priv = buffer->priv;
if (! priv->paste_target_list)
priv->paste_target_list =
const GtkTextIter *anywhere_in_line,
gint *char_len)
{
+ GtkTextBufferPrivate *priv;
gint line;
GtkTextLogAttrCache *cache;
gint i;
g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
g_return_val_if_fail (anywhere_in_line != NULL, NULL);
+ priv = buffer->priv;
+
/* special-case for empty last line in buffer */
if (gtk_text_iter_is_end (anywhere_in_line) &&
gtk_text_iter_get_line_offset (anywhere_in_line) == 0)
* the start of a paragraph changes
*/
- if (buffer->log_attr_cache == NULL)
+ if (priv->log_attr_cache == NULL)
{
- buffer->log_attr_cache = g_new0 (GtkTextLogAttrCache, 1);
- buffer->log_attr_cache->chars_changed_stamp =
+ priv->log_attr_cache = g_new0 (GtkTextLogAttrCache, 1);
+ priv->log_attr_cache->chars_changed_stamp =
_gtk_text_btree_get_chars_changed_stamp (get_btree (buffer));
}
- else if (buffer->log_attr_cache->chars_changed_stamp !=
+ else if (priv->log_attr_cache->chars_changed_stamp !=
_gtk_text_btree_get_chars_changed_stamp (get_btree (buffer)))
{
- clear_log_attr_cache (buffer->log_attr_cache);
+ clear_log_attr_cache (priv->log_attr_cache);
}
- cache = buffer->log_attr_cache;
+ cache = priv->log_attr_cache;
line = gtk_text_iter_get_line (anywhere_in_line);
i = 0;
* code messing things up at this point; the tag MUST be removed
* entirely.
*/
- if (buffer->btree)
- _gtk_text_btree_notify_will_remove_tag (buffer->btree, tag);
+ if (buffer->priv->btree)
+ _gtk_text_btree_notify_will_remove_tag (buffer->priv->btree, tag);
}
/*
{
_gtk_text_btree_spew (get_btree (buffer));
}
-
-#define __GTK_TEXT_BUFFER_C__
-#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff