*/
+#include <config.h>
#include <string.h>
#include <stdarg.h>
+
#define GTK_TEXT_USE_INTERNAL_UNSUPPORTED_API
#include "gtkclipboard.h"
#include "gtkinvisible.h"
#include "gtkmarshalers.h"
-#include "gtksignal.h"
#include "gtktextbuffer.h"
#include "gtktextbtree.h"
#include "gtktextiterprivate.h"
-#include <string.h>
+#include "gtkprivate.h"
+#include "gtkintl.h"
+#include "gtkalias.h"
+
typedef struct _ClipboardRequest ClipboardRequest;
};
enum {
- ARG_0,
- LAST_ARG
+ PROP_0,
+
+ /* Construct */
+ PROP_TAG_TABLE,
+
+ /* Normal */
+ PROP_TEXT,
+ PROP_HAS_SELECTION
};
enum {
const GtkTextIter *start_char,
const GtkTextIter *end_char);
static void gtk_text_buffer_real_changed (GtkTextBuffer *buffer);
+static void gtk_text_buffer_real_mark_set (GtkTextBuffer *buffer,
+ const GtkTextIter *iter,
+ GtkTextMark *mark);
static GtkTextBTree* get_btree (GtkTextBuffer *buffer);
static void free_log_attr_cache (GtkTextLogAttrCache *cache);
-static void remove_all_clipboard_contents_buffers (GtkTextBuffer *buffer);
static void remove_all_selection_clipboards (GtkTextBuffer *buffer);
static void update_selection_clipboards (GtkTextBuffer *buffer);
-static GtkObjectClass *parent_class = NULL;
+static GtkTextBuffer *create_clipboard_contents_buffer (GtkTextBuffer *buffer);
+
+static GObjectClass *parent_class = NULL;
static guint signals[LAST_SIGNAL] = { 0 };
+static void gtk_text_buffer_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
+static void gtk_text_buffer_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+
+
GType
gtk_text_buffer_get_type (void)
{
(GInstanceInitFunc) gtk_text_buffer_init
};
- our_type = g_type_register_static (G_TYPE_OBJECT,
- "GtkTextBuffer",
- &our_info,
- 0);
+ our_type = g_type_register_static (G_TYPE_OBJECT, I_("GtkTextBuffer"),
+ &our_info, 0);
}
return our_type;
parent_class = g_type_class_peek_parent (klass);
object_class->finalize = gtk_text_buffer_finalize;
-
+ object_class->set_property = gtk_text_buffer_set_property;
+ object_class->get_property = gtk_text_buffer_get_property;
+
klass->insert_text = gtk_text_buffer_real_insert_text;
klass->insert_pixbuf = gtk_text_buffer_real_insert_pixbuf;
klass->insert_child_anchor = gtk_text_buffer_real_insert_anchor;
klass->apply_tag = gtk_text_buffer_real_apply_tag;
klass->remove_tag = gtk_text_buffer_real_remove_tag;
klass->changed = gtk_text_buffer_real_changed;
+ klass->mark_set = gtk_text_buffer_real_mark_set;
+
+ /* Construct */
+ g_object_class_install_property (object_class,
+ PROP_TAG_TABLE,
+ g_param_spec_object ("tag-table",
+ P_("Tag Table"),
+ P_("Text Tag Table"),
+ GTK_TYPE_TEXT_TAG_TABLE,
+ GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+
+ /* Normal properties*/
+
+ /**
+ * GtkTextBuffer:text:
+ *
+ * The text content of the buffer. Without child widgets and images,
+ * see gtk_text_buffer_get_text () for more information.
+ *
+ * Since: 2.8
+ */
+ g_object_class_install_property (object_class,
+ PROP_TEXT,
+ g_param_spec_string ("text",
+ P_("Text"),
+ P_("Current text of the buffer"),
+ "",
+ GTK_PARAM_READWRITE));
+
+ /**
+ * GtkTextBuffer:has-selection:
+ *
+ * Whether the buffer has some text currently selected.
+ *
+ * Since: 2.10
+ */
+ g_object_class_install_property (object_class,
+ PROP_HAS_SELECTION,
+ g_param_spec_boolean ("has-selection",
+ P_("Has selection"),
+ P_("Whether the buffer has some text currently selected"),
+ FALSE,
+ G_PARAM_READABLE));
signals[INSERT_TEXT] =
- g_signal_new ("insert_text",
+ g_signal_new (I_("insert_text"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextBufferClass, insert_text),
NULL, NULL,
_gtk_marshal_VOID__BOXED_STRING_INT,
- GTK_TYPE_NONE,
+ G_TYPE_NONE,
3,
GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE,
- GTK_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE,
- GTK_TYPE_INT);
+ G_TYPE_STRING | G_SIGNAL_TYPE_STATIC_SCOPE,
+ G_TYPE_INT);
signals[INSERT_PIXBUF] =
- g_signal_new ("insert_pixbuf",
+ g_signal_new (I_("insert_pixbuf"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextBufferClass, insert_pixbuf),
NULL, NULL,
_gtk_marshal_VOID__BOXED_OBJECT,
- GTK_TYPE_NONE,
+ G_TYPE_NONE,
2,
GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE,
GDK_TYPE_PIXBUF);
signals[INSERT_CHILD_ANCHOR] =
- g_signal_new ("insert_child_anchor",
+ g_signal_new (I_("insert_child_anchor"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextBufferClass, insert_child_anchor),
NULL, NULL,
_gtk_marshal_VOID__BOXED_OBJECT,
- GTK_TYPE_NONE,
+ G_TYPE_NONE,
2,
GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE,
GTK_TYPE_TEXT_CHILD_ANCHOR);
+ /**
+ * GtkTextBuffer::delete_range:
+ * @buffer: the object which received the signal.
+ * @start: the start of the range to be deleted
+ * @end: the end of the range to be deleted
+ *
+ * The ::delete_range signal is emitted to delete a range from
+ * a #GtkTextBuffer. Note that your handler must not invalidate the
+ * @start and @end iters (or has to revalidate them), if it runs before the
+ * default handler. There is no need to keep the iters valid in handlers
+ * which run after the default handler (see g_signal_connect_after()), but
+ * those don't have access to the deleted text.
+ */
signals[DELETE_RANGE] =
- g_signal_new ("delete_range",
+ g_signal_new (I_("delete_range"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextBufferClass, delete_range),
NULL, NULL,
_gtk_marshal_VOID__BOXED_BOXED,
- GTK_TYPE_NONE,
+ G_TYPE_NONE,
2,
GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE,
GTK_TYPE_TEXT_ITER | G_SIGNAL_TYPE_STATIC_SCOPE);
signals[CHANGED] =
- g_signal_new ("changed",
+ g_signal_new (I_("changed"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextBufferClass, changed),
NULL, NULL,
_gtk_marshal_VOID__VOID,
- GTK_TYPE_NONE,
+ G_TYPE_NONE,
0);
signals[MODIFIED_CHANGED] =
- g_signal_new ("modified_changed",
+ g_signal_new (I_("modified_changed"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextBufferClass, modified_changed),
NULL, NULL,
_gtk_marshal_VOID__VOID,
- GTK_TYPE_NONE,
+ G_TYPE_NONE,
0);
signals[MARK_SET] =
- g_signal_new ("mark_set",
+ g_signal_new (I_("mark_set"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextBufferClass, mark_set),
NULL, NULL,
_gtk_marshal_VOID__BOXED_OBJECT,
- GTK_TYPE_NONE,
+ G_TYPE_NONE,
2,
GTK_TYPE_TEXT_ITER,
GTK_TYPE_TEXT_MARK);
signals[MARK_DELETED] =
- g_signal_new ("mark_deleted",
+ g_signal_new (I_("mark_deleted"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextBufferClass, mark_deleted),
NULL, NULL,
_gtk_marshal_VOID__OBJECT,
- GTK_TYPE_NONE,
+ G_TYPE_NONE,
1,
GTK_TYPE_TEXT_MARK);
signals[APPLY_TAG] =
- g_signal_new ("apply_tag",
+ g_signal_new (I_("apply_tag"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextBufferClass, apply_tag),
NULL, NULL,
_gtk_marshal_VOID__OBJECT_BOXED_BOXED,
- GTK_TYPE_NONE,
+ G_TYPE_NONE,
3,
GTK_TYPE_TEXT_TAG,
GTK_TYPE_TEXT_ITER,
GTK_TYPE_TEXT_ITER);
signals[REMOVE_TAG] =
- g_signal_new ("remove_tag",
+ g_signal_new (I_("remove_tag"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextBufferClass, remove_tag),
NULL, NULL,
_gtk_marshal_VOID__OBJECT_BOXED_BOXED,
- GTK_TYPE_NONE,
+ G_TYPE_NONE,
3,
GTK_TYPE_TEXT_TAG,
GTK_TYPE_TEXT_ITER,
GTK_TYPE_TEXT_ITER);
signals[BEGIN_USER_ACTION] =
- g_signal_new ("begin_user_action",
+ g_signal_new (I_("begin_user_action"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextBufferClass, begin_user_action),
NULL, NULL,
_gtk_marshal_VOID__VOID,
- GTK_TYPE_NONE,
+ G_TYPE_NONE,
0);
signals[END_USER_ACTION] =
- g_signal_new ("end_user_action",
+ g_signal_new (I_("end_user_action"),
G_OBJECT_CLASS_TYPE (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTextBufferClass, end_user_action),
NULL, NULL,
_gtk_marshal_VOID__VOID,
- GTK_TYPE_NONE,
+ G_TYPE_NONE,
0);
}
gtk_text_buffer_init (GtkTextBuffer *buffer)
{
buffer->clipboard_contents_buffers = NULL;
+ buffer->tag_table = NULL;
+}
+
+static void
+set_table (GtkTextBuffer *buffer, GtkTextTagTable *table)
+{
+ g_return_if_fail (buffer->tag_table == NULL);
+
+ if (table)
+ {
+ buffer->tag_table = table;
+ g_object_ref (buffer->tag_table);
+ _gtk_text_tag_table_add_buffer (table, buffer);
+ }
+}
+
+static GtkTextTagTable*
+get_table (GtkTextBuffer *buffer)
+{
+ if (buffer->tag_table == NULL)
+ {
+ buffer->tag_table = gtk_text_tag_table_new ();
+ _gtk_text_tag_table_add_buffer (buffer->tag_table, buffer);
+ }
+
+ return buffer->tag_table;
+}
+
+static void
+gtk_text_buffer_set_property (GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ GtkTextBuffer *text_buffer;
+
+ text_buffer = GTK_TEXT_BUFFER (object);
+
+ switch (prop_id)
+ {
+ case PROP_TAG_TABLE:
+ set_table (text_buffer, g_value_get_object (value));
+ break;
+
+ case PROP_TEXT:
+ gtk_text_buffer_set_text (text_buffer,
+ g_value_get_string (value), -1);
+ break;
+
+ default:
+ break;
+ }
+}
+
+static void
+gtk_text_buffer_get_property (GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GtkTextBuffer *text_buffer;
+
+ text_buffer = GTK_TEXT_BUFFER (object);
+
+ switch (prop_id)
+ {
+ case PROP_TAG_TABLE:
+ g_value_set_object (value, get_table (text_buffer));
+ break;
+
+ case PROP_TEXT:
+ {
+ GtkTextIter start, end;
+
+ gtk_text_buffer_get_start_iter (text_buffer, &start);
+ gtk_text_buffer_get_end_iter (text_buffer, &end);
+
+ g_value_set_string (value,
+ gtk_text_buffer_get_text (text_buffer, &start, &end, FALSE));
+ break;
+ }
+
+ case PROP_HAS_SELECTION:
+ g_value_set_boolean (value, text_buffer->has_selection);
+ break;
+
+ default:
+ break;
+ }
}
/**
{
GtkTextBuffer *text_buffer;
- text_buffer = GTK_TEXT_BUFFER (g_object_new (gtk_text_buffer_get_type (), NULL));
-
- if (table)
- {
- text_buffer->tag_table = table;
+ text_buffer = g_object_new (GTK_TYPE_TEXT_BUFFER, "tag-table", table, NULL);
- g_object_ref (G_OBJECT (text_buffer->tag_table));
-
- _gtk_text_tag_table_add_buffer (table, text_buffer);
- }
-
return text_buffer;
}
buffer = GTK_TEXT_BUFFER (object);
- remove_all_clipboard_contents_buffers (buffer);
remove_all_selection_clipboards (buffer);
if (buffer->tag_table)
{
_gtk_text_tag_table_remove_buffer (buffer->tag_table, buffer);
- g_object_unref (G_OBJECT (buffer->tag_table));
+ g_object_unref (buffer->tag_table);
buffer->tag_table = NULL;
}
G_OBJECT_CLASS (parent_class)->finalize (object);
}
-static GtkTextTagTable*
-get_table (GtkTextBuffer *buffer)
-{
- if (buffer->tag_table == NULL)
- {
- buffer->tag_table = gtk_text_tag_table_new ();
- _gtk_text_tag_table_add_buffer (buffer->tag_table, buffer);
- }
-
- return buffer->tag_table;
-}
-
static GtkTextBTree*
get_btree (GtkTextBuffer *buffer)
{
gtk_text_buffer_get_iter_at_offset (buffer, &start, 0);
gtk_text_buffer_insert (buffer, &start, text, len);
}
+
+ g_object_notify (G_OBJECT (buffer), "text");
}
+
+
/*
* Insertion
*/
_gtk_text_btree_insert (iter, text, len);
- g_signal_emit (G_OBJECT (buffer), signals[CHANGED], 0);
+ g_signal_emit (buffer, signals[CHANGED], 0);
}
static void
if (len > 0)
{
- g_signal_emit (G_OBJECT (buffer), signals[INSERT_TEXT], 0,
+ g_signal_emit (buffer, signals[INSERT_TEXT], 0,
iter, text, len);
}
}
* @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).
r = g_new (Range, 1);
r->buffer = gtk_text_iter_get_buffer (range_start);
- g_object_ref (G_OBJECT (r->buffer));
+ g_object_ref (r->buffer);
r->start_mark =
gtk_text_buffer_create_mark (gtk_text_iter_get_buffer (range_start),
NULL,
range_start,
- TRUE);
+ FALSE);
r->end_mark =
gtk_text_buffer_create_mark (gtk_text_iter_get_buffer (range_start),
NULL,
range_end,
- FALSE);
+ TRUE);
r->whole_end_mark =
gtk_text_buffer_create_mark (gtk_text_iter_get_buffer (range_start),
NULL,
whole_end,
- FALSE);
+ TRUE);
r->range_start = range_start;
r->range_end = range_end;
gtk_text_buffer_get_iter_at_mark (r->buffer,
r->whole_end,
- r->whole_end_mark);
-
+ r->whole_end_mark);
+
gtk_text_buffer_delete_mark (r->buffer, r->start_mark);
gtk_text_buffer_delete_mark (r->buffer, r->end_mark);
gtk_text_buffer_delete_mark (r->buffer, r->whole_end_mark);
- g_object_unref (G_OBJECT (r->buffer));
+ /* Due to the gravities on the marks, the ordering could have
+ * gotten mangled; we switch to an empty range in that
+ * case
+ */
+
+ if (gtk_text_iter_compare (r->range_start, r->range_end) > 0)
+ *r->range_start = *r->range_end;
+
+ if (gtk_text_iter_compare (r->range_end, r->whole_end) > 0)
+ *r->range_end = *r->whole_end;
+
+ g_object_unref (r->buffer);
g_free (r);
}
GtkTextIter range_start;
GtkTextIter range_end;
GtkTextIter start, end;
- GtkTextBuffer *src_buffer;
Range *r;
if (gtk_text_iter_equal (orig_start, orig_end))
start = *orig_start;
end = *orig_end;
- src_buffer = gtk_text_iter_get_buffer (&start);
-
range_start = start;
range_end = start;
}
static void
-gtk_text_buffer_real_insert_range (GtkTextBuffer *buffer,
- GtkTextIter *iter,
- const GtkTextIter *orig_start,
- const GtkTextIter *orig_end,
- gboolean interactive)
+insert_range_not_inside_self (GtkTextBuffer *buffer,
+ GtkTextIter *iter,
+ const GtkTextIter *orig_start,
+ const GtkTextIter *orig_end,
+ gboolean interactive)
{
/* Find each range of uniformly-tagged text, insert it,
* then apply the tags.
GtkTextIter end = *orig_end;
GtkTextIter range_start;
GtkTextIter range_end;
- GtkTextBuffer *src_buffer;
- Range *r;
if (gtk_text_iter_equal (orig_start, orig_end))
return;
-
- if (interactive)
- gtk_text_buffer_begin_user_action (buffer);
-
- src_buffer = gtk_text_iter_get_buffer (orig_start);
gtk_text_iter_order (&start, &end);
range_start = start;
- range_end = start;
-
+ range_end = start;
+
while (TRUE)
{
gint start_offset;
GtkTextIter start_iter;
GSList *tags;
GSList *tmp_list;
+ Range *r;
if (gtk_text_iter_equal (&range_start, &end))
break; /* All done */
range_start = range_end;
}
+}
+
+static void
+gtk_text_buffer_real_insert_range (GtkTextBuffer *buffer,
+ GtkTextIter *iter,
+ const GtkTextIter *orig_start,
+ const GtkTextIter *orig_end,
+ gboolean interactive)
+{
+ GtkTextBuffer *src_buffer;
+
+ /* Find each range of uniformly-tagged text, insert it,
+ * then apply the tags.
+ */
+ if (gtk_text_iter_equal (orig_start, orig_end))
+ return;
+ if (interactive)
+ gtk_text_buffer_begin_user_action (buffer);
+
+ src_buffer = gtk_text_iter_get_buffer (orig_start);
+
+ if (gtk_text_iter_get_buffer (iter) != src_buffer ||
+ !gtk_text_iter_in_range (iter, orig_start, orig_end))
+ {
+ insert_range_not_inside_self (buffer, iter, orig_start, orig_end, interactive);
+ }
+ else
+ {
+ /* If you insert a range into itself, it could loop infinitely
+ * because the region being copied keeps growing as we insert. So
+ * we have to separately copy the range before and after
+ * the insertion point.
+ */
+ GtkTextIter start = *orig_start;
+ GtkTextIter end = *orig_end;
+ GtkTextIter range_start;
+ GtkTextIter range_end;
+ Range *first_half;
+ Range *second_half;
+
+ gtk_text_iter_order (&start, &end);
+
+ range_start = start;
+ range_end = *iter;
+ first_half = save_range (&range_start, &range_end, &end);
+
+ range_start = *iter;
+ range_end = end;
+ second_half = save_range (&range_start, &range_end, &end);
+
+ restore_range (first_half);
+ insert_range_not_inside_self (buffer, iter, &range_start, &range_end, interactive);
+
+ restore_range (second_half);
+ insert_range_not_inside_self (buffer, iter, &range_start, &range_end, interactive);
+ }
+
if (interactive)
gtk_text_buffer_end_user_action (buffer);
}
/* may have deleted the selection... */
update_selection_clipboards (buffer);
- g_signal_emit (G_OBJECT (buffer), signals[CHANGED], 0);
+ g_signal_emit (buffer, signals[CHANGED], 0);
}
static void
gtk_text_iter_order (start, end);
- g_signal_emit (G_OBJECT (buffer),
+ g_signal_emit (buffer,
signals[DELETE_RANGE],
0,
start, end);
start_iter, TRUE);
end_mark = gtk_text_buffer_create_mark (buffer, NULL,
end_iter, FALSE);
- iter = *start_iter;
+
+ gtk_text_buffer_get_iter_at_mark (buffer, &iter, start_mark);
current_state = gtk_text_iter_editable (&iter, default_editable);
*
* 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
+ * @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
*
* 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. The returned string includes a
+ * @include_hidden_chars is %FALSE. The returned string includes a
* 0xFFFC character whenever the buffer contains
* embedded images, so byte and character indexes into
* the returned string <emphasis>do</emphasis> correspond to byte
{
_gtk_text_btree_insert_pixbuf (iter, pixbuf);
- g_signal_emit (G_OBJECT (buffer), signals[CHANGED], 0);
+ g_signal_emit (buffer, signals[CHANGED], 0);
}
/**
g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
g_return_if_fail (gtk_text_iter_get_buffer (iter) == buffer);
- g_signal_emit (G_OBJECT (buffer), signals[INSERT_PIXBUF], 0,
+ g_signal_emit (buffer, signals[INSERT_PIXBUF], 0,
iter, pixbuf);
}
{
_gtk_text_btree_insert_child_anchor (iter, anchor);
- g_signal_emit (G_OBJECT (buffer), signals[CHANGED], 0);
+ g_signal_emit (buffer, signals[CHANGED], 0);
}
/**
g_return_if_fail (GTK_IS_TEXT_CHILD_ANCHOR (anchor));
g_return_if_fail (gtk_text_iter_get_buffer (iter) == buffer);
- g_signal_emit (G_OBJECT (buffer), signals[INSERT_CHILD_ANCHOR], 0,
+ g_signal_emit (buffer, signals[INSERT_CHILD_ANCHOR], 0,
iter, anchor);
}
gtk_text_buffer_insert_child_anchor (buffer, iter, anchor);
- g_object_unref (G_OBJECT (anchor));
+ g_object_unref (anchor);
return anchor;
}
* default behavior.
*/
- g_object_ref (G_OBJECT (mark));
+ g_object_ref (mark);
- g_signal_emit (G_OBJECT (buffer),
+ g_signal_emit (buffer,
signals[MARK_SET],
0,
location,
mark);
- g_object_unref (G_OBJECT (mark));
+ g_object_unref (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));
+ g_object_ref (mark);
_gtk_text_btree_remove_mark (get_btree (buffer), mark);
* removing the mark, rather than removing the mark in a default
* handler.
*/
- g_signal_emit (G_OBJECT (buffer), signals[MARK_DELETED],
+ g_signal_emit (buffer, signals[MARK_DELETED],
0,
mark);
- g_object_unref (G_OBJECT (mark));
+ g_object_unref (mark);
}
/**
gtk_text_buffer_place_cursor (GtkTextBuffer *buffer,
const GtkTextIter *where)
{
- GtkTextIter real;
+ gtk_text_buffer_select_range (buffer, where, where);
+}
+
+
+/**
+ * gtk_text_buffer_select_range:
+ * @buffer: a #GtkTextBuffer
+ * @ins: where to put the "insert" mark
+ * @bound: where to put the "selection_bound" mark
+ *
+ * This function moves the "insert" and "selection_bound" marks
+ * simultaneously. If you move them in two steps
+ * 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
+ * be optimized.
+ *
+ * Since: 2.4
+ **/
+void
+gtk_text_buffer_select_range (GtkTextBuffer *buffer,
+ const GtkTextIter *ins,
+ const GtkTextIter *bound)
+{
+ GtkTextIter real_ins;
+ GtkTextIter real_bound;
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
- real = *where;
+ real_ins = *ins;
+ real_bound = *bound;
- _gtk_text_btree_place_cursor (get_btree (buffer), &real);
- gtk_text_buffer_mark_set (buffer, &real,
+ _gtk_text_btree_select_range (get_btree (buffer), &real_ins, &real_bound);
+ gtk_text_buffer_mark_set (buffer, &real_ins,
gtk_text_buffer_get_mark (buffer,
"insert"));
- gtk_text_buffer_mark_set (buffer, &real,
+ gtk_text_buffer_mark_set (buffer, &real_bound,
gtk_text_buffer_get_mark (buffer,
"selection_bound"));
+ update_selection_clipboards (buffer);
}
/*
gtk_text_buffer_set_modified (buffer, TRUE);
}
+static void
+gtk_text_buffer_real_mark_set (GtkTextBuffer *buffer,
+ const GtkTextIter *iter,
+ GtkTextMark *mark)
+{
+ if (mark == gtk_text_buffer_get_insert (buffer) ||
+ mark == gtk_text_buffer_get_selection_bound (buffer))
+ {
+ gboolean has_selection;
+
+ has_selection = gtk_text_buffer_get_selection_bounds (buffer,
+ NULL,
+ NULL);
+
+ if (has_selection != buffer->has_selection)
+ {
+ buffer->has_selection = has_selection;
+ g_object_notify (G_OBJECT (buffer), "has-selection");
+ }
+ }
+}
+
static void
gtk_text_buffer_emit_tag (GtkTextBuffer *buffer,
GtkTextTag *tag,
gtk_text_iter_order (&start_tmp, &end_tmp);
if (apply)
- g_signal_emit (G_OBJECT (buffer), signals[APPLY_TAG],
+ g_signal_emit (buffer, signals[APPLY_TAG],
0,
tag, &start_tmp, &end_tmp);
else
- g_signal_emit (G_OBJECT (buffer), signals[REMOVE_TAG],
+ g_signal_emit (buffer, signals[REMOVE_TAG],
0,
tag, &start_tmp, &end_tmp);
}
* gtk_text_buffer_get_iter_at_offset:
* @buffer: a #GtkTextBuffer
* @iter: iterator to initialize
- * @char_offset: char offset from start of buffer, counting from 0
+ * @char_offset: char offset from start of buffer, counting from 0, or -1
*
* Initializes @iter to a position @char_offset chars from the start
- * of the entire buffer.
- *
+ * of the entire buffer. If @char_offset is -1 or greater than the number
+ * of characters in the buffer, @iter is initialized to the end iterator,
+ * the iterator one past the last valid character in the buffer.
**/
void
gtk_text_buffer_get_iter_at_offset (GtkTextBuffer *buffer,
* 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
* the iter at character offset 0.
- *
**/
void
gtk_text_buffer_get_start_iter (GtkTextBuffer *buffer,
else
{
buffer->modified = fixed_setting;
- g_signal_emit (G_OBJECT (buffer), signals[MODIFIED_CHANGED], 0);
+ g_signal_emit (buffer, signals[MODIFIED_CHANGED], 0);
}
}
+/**
+ * gtk_text_buffer_get_has_selection:
+ * @buffer: a #GtkTextBuffer
+ *
+ * Indicates whether the buffer has some text currently selected.
+ *
+ * Return value: %TRUE if the there is text selected
+ *
+ * Since: 2.10
+ **/
+gboolean
+gtk_text_buffer_get_has_selection (GtkTextBuffer *buffer)
+{
+ g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
+
+ return buffer->has_selection;
+}
+
/*
* Assorted other stuff
if (gtk_text_buffer_get_selection_bounds (buffer, &start, &end))
{
if (selection_data->target ==
- gdk_atom_intern ("GTK_TEXT_BUFFER_CONTENTS", FALSE))
+ gdk_atom_intern_static_string ("GTK_TEXT_BUFFER_CONTENTS"))
{
/* Provide the address of the buffer; this will only be
* used within-process
*/
gtk_selection_data_set (selection_data,
- gdk_atom_intern ("GTK_TEXT_BUFFER_CONTENTS", FALSE),
+ gdk_atom_intern_static_string ("GTK_TEXT_BUFFER_CONTENTS"),
8, /* bytes */
(void*)&buffer,
sizeof (buffer));
}
}
-typedef struct
-{
- GtkClipboard *clipboard;
- GtkTextBuffer *buffer;
-} ContentsBuffer;
-
-static void
-remove_all_clipboard_contents_buffers (GtkTextBuffer *buffer)
-{
- GSList *tmp_list = buffer->clipboard_contents_buffers;
- while (tmp_list)
- {
- ContentsBuffer *contents_buffer = tmp_list->data;
-
- g_object_unref (contents_buffer->buffer);
- g_free (contents_buffer);
-
- tmp_list = tmp_list->next;
- }
-
- g_slist_free (buffer->clipboard_contents_buffers);
- buffer->clipboard_contents_buffers = NULL;
-}
-
-static void
-remove_clipboard_contents_buffer (GtkTextBuffer *buffer,
- GtkClipboard *clipboard)
-{
- GSList *tmp_list = buffer->clipboard_contents_buffers;
- while (tmp_list)
- {
- ContentsBuffer *contents_buffer = tmp_list->data;
-
- if (contents_buffer->clipboard == clipboard)
- {
- buffer->clipboard_contents_buffers = g_slist_remove (buffer->clipboard_contents_buffers, contents_buffer);
-
- g_object_unref (contents_buffer->buffer);
- g_free (contents_buffer);
-
- return;
- }
-
- tmp_list = tmp_list->next;
- }
-}
-
static GtkTextBuffer *
-get_clipboard_contents_buffer (GtkTextBuffer *buffer,
- GtkClipboard *clipboard,
- gboolean create)
+create_clipboard_contents_buffer (GtkTextBuffer *buffer)
{
- ContentsBuffer *contents_buffer;
- GSList *tmp_list;
-
- tmp_list = buffer->clipboard_contents_buffers;
- while (tmp_list)
- {
- contents_buffer = tmp_list->data;
- if (contents_buffer->clipboard == clipboard)
- return contents_buffer->buffer;
- }
-
- if (create)
- {
- contents_buffer = g_new (ContentsBuffer, 1);
- contents_buffer->clipboard = clipboard;
- contents_buffer->buffer = gtk_text_buffer_new (gtk_text_buffer_get_tag_table (buffer));
+ GtkTextBuffer *contents;
- g_object_set_data (G_OBJECT (contents_buffer->buffer), "gtk-text-buffer-clipboard",
- GUINT_TO_POINTER (1));
+ contents = gtk_text_buffer_new (gtk_text_buffer_get_tag_table (buffer));
- buffer->clipboard_contents_buffers = g_slist_prepend (buffer->clipboard_contents_buffers, contents_buffer);
-
-
- return contents_buffer->buffer;
- }
- else
- return NULL;
+ g_object_set_data (G_OBJECT (contents), I_("gtk-text-buffer-clipboard"), GINT_TO_POINTER (1));
+
+ return contents;
}
/* Provide cut/copied data */
guint info,
gpointer data)
{
- GtkTextBuffer *buffer = GTK_TEXT_BUFFER (data);
- GtkTextBuffer *contents = get_clipboard_contents_buffer (buffer, clipboard, FALSE);
+ GtkTextBuffer *contents;
+ contents = GTK_TEXT_BUFFER (data);
+
g_assert (contents); /* This should never be called unless we own the clipboard */
if (selection_data->target ==
- gdk_atom_intern ("GTK_TEXT_BUFFER_CONTENTS", FALSE))
+ gdk_atom_intern_static_string ("GTK_TEXT_BUFFER_CONTENTS"))
{
/* Provide the address of the clipboard buffer; this will only
* be used within-process. OK to supply a NULL value for contents.
*/
gtk_selection_data_set (selection_data,
- gdk_atom_intern ("GTK_TEXT_BUFFER_CONTENTS", FALSE),
+ gdk_atom_intern_static_string ("GTK_TEXT_BUFFER_CONTENTS"),
8, /* bytes */
(void*)&contents,
sizeof (contents));
clipboard_clear_contents_cb (GtkClipboard *clipboard,
gpointer data)
{
- GtkTextBuffer *buffer = GTK_TEXT_BUFFER (data);
+ GtkTextBuffer *contents = GTK_TEXT_BUFFER (data);
- remove_clipboard_contents_buffer (buffer, clipboard);
+ g_object_unref (contents);
}
static void
}
}
+static void
+free_clipboard_request (ClipboardRequest *request_data)
+{
+ g_object_unref (request_data->buffer);
+ g_free (request_data);
+}
+
/* Called when we request a paste and receive the text data
*/
static void
if (str)
{
GtkTextIter insert_point;
+
+ if (request_data->interactive)
+ gtk_text_buffer_begin_user_action (buffer);
pre_paste_prep (request_data, &insert_point);
- if (request_data->interactive)
- gtk_text_buffer_insert_interactive (buffer, &insert_point,
- str, -1, request_data->default_editable);
+ if (request_data->interactive)
+ gtk_text_buffer_insert_interactive (buffer, &insert_point,
+ str, -1, request_data->default_editable);
else
gtk_text_buffer_insert (buffer, &insert_point,
str, -1);
post_paste_cleanup (request_data);
+
+ if (request_data->interactive)
+ gtk_text_buffer_end_user_action (buffer);
}
- g_object_unref (G_OBJECT (buffer));
- g_free (request_data);
+ free_clipboard_request (request_data);
}
static GtkTextBuffer*
GtkTextBuffer *src_buffer = NULL;
/* If we can get the owner, the selection is in-process */
- owner = gdk_selection_owner_get (selection_data->selection);
+ owner = gdk_selection_owner_get_for_display (selection_data->display,
+ selection_data->selection);
if (owner == NULL)
return NULL;
- if (selection_data->type != gdk_atom_intern ("GTK_TEXT_BUFFER_CONTENTS", FALSE))
+ if (gdk_window_get_window_type (owner) == GDK_WINDOW_FOREIGN)
+ return NULL;
+
+ if (selection_data->type != gdk_atom_intern_static_string ("GTK_TEXT_BUFFER_CONTENTS"))
return NULL;
if (selection_data->length != sizeof (src_buffer))
const GtkTextIter *end)
{
GtkTextIter insert_point;
+ GtkTextBuffer *buffer = request_data->buffer;
/* We're about to emit a bunch of signals, so be safe */
- g_object_ref (G_OBJECT (src_buffer));
+ g_object_ref (src_buffer);
pre_paste_prep (request_data, &insert_point);
+ if (request_data->interactive)
+ gtk_text_buffer_begin_user_action (buffer);
+
if (!gtk_text_iter_equal (start, end))
{
- gtk_text_buffer_real_insert_range (request_data->buffer,
- &insert_point,
- start,
- end,
- request_data->interactive);
+ if (!request_data->interactive ||
+ (gtk_text_iter_can_insert (&insert_point,
+ request_data->default_editable)))
+ gtk_text_buffer_real_insert_range (buffer,
+ &insert_point,
+ start,
+ end,
+ request_data->interactive);
}
post_paste_cleanup (request_data);
- g_object_unref (G_OBJECT (src_buffer));
+ if (request_data->interactive)
+ gtk_text_buffer_end_user_action (buffer);
+
+ g_object_unref (src_buffer);
+
+ free_clipboard_request (request_data);
}
static void
"gtk_paste_point_override",
override_location, FALSE);
- data->buffer = buffer;
- g_object_ref (G_OBJECT (buffer));
+ data->buffer = g_object_ref (buffer);
data->interactive = TRUE;
data->default_editable = default_editable;
data->replace_selection = TRUE;
gtk_clipboard_request_contents (clipboard,
- gdk_atom_intern ("GTK_TEXT_BUFFER_CONTENTS", FALSE),
+ gdk_atom_intern_static_string ("GTK_TEXT_BUFFER_CONTENTS"),
clipboard_clipboard_buffer_received, data);
}
}
}
+/**
+ * gtk_text_buffer_backspace:
+ * @buffer: a #GtkTextBuffer
+ * @iter: a position in @buffer
+ * @interactive: whether the deletion is caused by user interaction
+ * @default_editable: whether the buffer is editable by default
+ *
+ * Performs the appropriate action as if the user hit the delete
+ * key with the cursor at the position specified by @iter. In the
+ * normal case a single character will be deleted, but when
+ * combining accents are involved, more than one character can
+ * be deleted, and when precomposed character and accent combinations
+ * are involved, less than one character will be deleted.
+ *
+ * Because the buffer is modified, all outstanding iterators become
+ * invalid after calling this function; however, the @iter will be
+ * re-initialized to point to the location where text was deleted.
+ *
+ * Return value: %TRUE if the buffer was modified
+
+ * Since: 2.6
+ **/
+gboolean
+gtk_text_buffer_backspace (GtkTextBuffer *buffer,
+ GtkTextIter *iter,
+ gboolean interactive,
+ gboolean default_editable)
+{
+ gchar *cluster_text;
+ GtkTextIter start;
+ GtkTextIter end;
+ gboolean retval = FALSE;
+ const PangoLogAttr *attrs;
+ int offset;
+ gboolean backspace_deletes_character;
+
+ g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+ start = *iter;
+ end = *iter;
+
+ attrs = _gtk_text_buffer_get_line_log_attrs (buffer, &start, NULL);
+
+ /* For no good reason, attrs is NULL for the empty last line in
+ * a buffer. Special case that here. (#156164)
+ */
+ if (attrs)
+ {
+ offset = gtk_text_iter_get_line_offset (&start);
+ backspace_deletes_character = attrs[offset].backspace_deletes_character;
+ }
+ else
+ backspace_deletes_character = FALSE;
+
+ gtk_text_iter_backward_cursor_position (&start);
+
+ if (gtk_text_iter_equal (&start, &end))
+ return FALSE;
+
+ cluster_text = gtk_text_iter_get_text (&start, &end);
+
+ if (interactive)
+ gtk_text_buffer_begin_user_action (buffer);
+
+ if (gtk_text_buffer_delete_interactive (buffer, &start, &end,
+ default_editable))
+ {
+ if (backspace_deletes_character)
+ {
+ gchar *normalized_text = g_utf8_normalize (cluster_text,
+ strlen (cluster_text),
+ G_NORMALIZE_NFD);
+ glong len = g_utf8_strlen (normalized_text, -1);
+
+ if (len > 1)
+ gtk_text_buffer_insert_interactive (buffer,
+ &start,
+ normalized_text,
+ g_utf8_offset_to_pointer (normalized_text, len - 1) - normalized_text,
+ default_editable);
+
+ g_free (normalized_text);
+ }
+
+ retval = TRUE;
+ }
+
+ if (interactive)
+ gtk_text_buffer_end_user_action (buffer);
+
+ g_free (cluster_text);
+
+ /* Revalidate the users iter */
+ *iter = start;
+
+ return retval;
+}
+
static void
cut_or_copy (GtkTextBuffer *buffer,
GtkClipboard *clipboard,
*/
GtkTextIter start;
GtkTextIter end;
-
- remove_clipboard_contents_buffer (buffer, clipboard);
if (!gtk_text_buffer_get_selection_bounds (buffer, &start, &end))
{
{
GtkTextIter ins;
GtkTextBuffer *contents;
-
- contents = get_clipboard_contents_buffer (buffer, clipboard, TRUE);
+
+ contents = create_clipboard_contents_buffer (buffer);
gtk_text_buffer_get_iter_at_offset (contents, &ins, 0);
gtk_text_buffer_insert_range (contents, &ins, &start, &end);
- if (!gtk_clipboard_set_with_owner (clipboard, targets, G_N_ELEMENTS (targets),
- clipboard_get_contents_cb,
- clipboard_clear_contents_cb,
- G_OBJECT (buffer)))
- clipboard_clear_contents_cb (clipboard, buffer);
-
+ if (!gtk_clipboard_set_with_data (clipboard, targets, G_N_ELEMENTS (targets),
+ clipboard_get_contents_cb,
+ clipboard_clear_contents_cb,
+ contents))
+ g_object_unref (contents);
+ else
+ gtk_clipboard_set_can_store (clipboard, (GtkTargetEntry *)targets, G_N_ELEMENTS (targets) -1);
+
if (delete_region_after)
{
if (interactive)
if (buffer->user_action_count == 1)
{
/* Outermost nested user action begin emits the signal */
- g_signal_emit (G_OBJECT (buffer), signals[BEGIN_USER_ACTION], 0);
+ g_signal_emit (buffer, signals[BEGIN_USER_ACTION], 0);
}
}
if (buffer->user_action_count == 0)
{
/* Ended the outermost-nested user action end, so emit the signal */
- g_signal_emit (G_OBJECT (buffer), signals[END_USER_ACTION], 0);
+ g_signal_emit (buffer, signals[END_USER_ACTION], 0);
}
}
{
_gtk_text_btree_spew (get_btree (buffer));
}
+
+#define __GTK_TEXT_BUFFER_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff