AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-20 14:00:10 +00:00
Code Issues Projects Releases Wiki Activity

Add marshallers for changed GtkTextBuffer signals.

Browse Source 
2000-08-30  Havoc Pennington  <hp@pobox.com>

* gtk/gtkmarshal.list: Add marshallers for changed GtkTextBuffer
signals.

* gtk/gtktextbuffer.h: Add "interactive" arg to insert_text and
delete_text signals. This allows the signals to be used for
implementing undo.

* gtk/gtktextbuffer.c: Change signal handler signatures;
provide "interactive" argument when emitting insert_text or
delete_text signal.
This commit is contained in:
Havoc Pennington 2000-08-31 03:48:50 +00:00 committed by Havoc Pennington
parent b968041627
commit a9de95392e
11 changed files with 125 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
2000-08-30 Havoc Pennington <hp@pobox.com>
* gtk/gtkmarshal.list: Add marshallers for changed GtkTextBuffer
signals.
* gtk/gtktextbuffer.h: Add "interactive" arg to insert_text and
delete_text signals. This allows the signals to be used for
implementing undo.
* gtk/gtktextbuffer.c: Change signal handler signatures;
provide "interactive" argument when emitting insert_text or
delete_text signal.
2000-08-30 Havoc Pennington <hp@pobox.com> 2000-08-30 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbuffer.c: Docs * gtk/gtktextbuffer.c: Docs

13
ChangeLog.pre-2-0
View File

@ -1,3 +1,16 @@
2000-08-30 Havoc Pennington <hp@pobox.com>
* gtk/gtkmarshal.list: Add marshallers for changed GtkTextBuffer
signals.
* gtk/gtktextbuffer.h: Add "interactive" arg to insert_text and
delete_text signals. This allows the signals to be used for
implementing undo.
* gtk/gtktextbuffer.c: Change signal handler signatures;
provide "interactive" argument when emitting insert_text or
delete_text signal.
2000-08-30 Havoc Pennington <hp@pobox.com> 2000-08-30 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbuffer.c: Docs * gtk/gtktextbuffer.c: Docs

13
ChangeLog.pre-2-10
View File

@ -1,3 +1,16 @@
2000-08-30 Havoc Pennington <hp@pobox.com>
* gtk/gtkmarshal.list: Add marshallers for changed GtkTextBuffer
signals.
* gtk/gtktextbuffer.h: Add "interactive" arg to insert_text and
delete_text signals. This allows the signals to be used for
implementing undo.
* gtk/gtktextbuffer.c: Change signal handler signatures;
provide "interactive" argument when emitting insert_text or
delete_text signal.
2000-08-30 Havoc Pennington <hp@pobox.com> 2000-08-30 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbuffer.c: Docs * gtk/gtktextbuffer.c: Docs

13
ChangeLog.pre-2-2
View File

@ -1,3 +1,16 @@
2000-08-30 Havoc Pennington <hp@pobox.com>
* gtk/gtkmarshal.list: Add marshallers for changed GtkTextBuffer
signals.
* gtk/gtktextbuffer.h: Add "interactive" arg to insert_text and
delete_text signals. This allows the signals to be used for
implementing undo.
* gtk/gtktextbuffer.c: Change signal handler signatures;
provide "interactive" argument when emitting insert_text or
delete_text signal.
2000-08-30 Havoc Pennington <hp@pobox.com> 2000-08-30 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbuffer.c: Docs * gtk/gtktextbuffer.c: Docs

13
ChangeLog.pre-2-4
View File

@ -1,3 +1,16 @@
2000-08-30 Havoc Pennington <hp@pobox.com>
* gtk/gtkmarshal.list: Add marshallers for changed GtkTextBuffer
signals.
* gtk/gtktextbuffer.h: Add "interactive" arg to insert_text and
delete_text signals. This allows the signals to be used for
implementing undo.
* gtk/gtktextbuffer.c: Change signal handler signatures;
provide "interactive" argument when emitting insert_text or
delete_text signal.
2000-08-30 Havoc Pennington <hp@pobox.com> 2000-08-30 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbuffer.c: Docs * gtk/gtktextbuffer.c: Docs

13
ChangeLog.pre-2-6
View File

@ -1,3 +1,16 @@
2000-08-30 Havoc Pennington <hp@pobox.com>
* gtk/gtkmarshal.list: Add marshallers for changed GtkTextBuffer
signals.
* gtk/gtktextbuffer.h: Add "interactive" arg to insert_text and
delete_text signals. This allows the signals to be used for
implementing undo.
* gtk/gtktextbuffer.c: Change signal handler signatures;
provide "interactive" argument when emitting insert_text or
delete_text signal.
2000-08-30 Havoc Pennington <hp@pobox.com> 2000-08-30 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbuffer.c: Docs * gtk/gtktextbuffer.c: Docs

13
ChangeLog.pre-2-8
View File

@ -1,3 +1,16 @@
2000-08-30 Havoc Pennington <hp@pobox.com>
* gtk/gtkmarshal.list: Add marshallers for changed GtkTextBuffer
signals.
* gtk/gtktextbuffer.h: Add "interactive" arg to insert_text and
delete_text signals. This allows the signals to be used for
implementing undo.
* gtk/gtktextbuffer.c: Change signal handler signatures;
provide "interactive" argument when emitting insert_text or
delete_text signal.
2000-08-30 Havoc Pennington <hp@pobox.com> 2000-08-30 Havoc Pennington <hp@pobox.com>
* gtk/gtktextbuffer.c: Docs * gtk/gtktextbuffer.c: Docs

1
gtk/gtkmarshal.list
View File

@ -37,4 +37,5 @@ NONE:UINT
NONE:UINT,POINTER,UINT,ENUM,ENUM,POINTER NONE:UINT,POINTER,UINT,ENUM,ENUM,POINTER
NONE:UINT,POINTER,UINT,UINT,ENUM NONE:UINT,POINTER,UINT,UINT,ENUM
NONE:UINT,STRING NONE:UINT,STRING
NONE:POINTER,POINTER,INT,INT
NONE:POINTER,POINTER,INT NONE:POINTER,POINTER,INT

1
gtk/gtkmarshalers.list
View File

@ -37,4 +37,5 @@ NONE:UINT
NONE:UINT,POINTER,UINT,ENUM,ENUM,POINTER NONE:UINT,POINTER,UINT,ENUM,ENUM,POINTER
NONE:UINT,POINTER,UINT,UINT,ENUM NONE:UINT,POINTER,UINT,UINT,ENUM
NONE:UINT,STRING NONE:UINT,STRING
NONE:POINTER,POINTER,INT,INT
NONE:POINTER,POINTER,INT NONE:POINTER,POINTER,INT

47
gtk/gtktextbuffer.c
View File

@ -48,10 +48,12 @@ static void gtk_text_buffer_update_clipboard_selection (GtkTextBuffer *buffe
static void gtk_text_buffer_real_insert_text (GtkTextBuffer *buffer, static void gtk_text_buffer_real_insert_text (GtkTextBuffer *buffer,
GtkTextIter *iter, GtkTextIter *iter,
const gchar *text, const gchar *text,
gint len); gint len,
gboolean interactive);
static void gtk_text_buffer_real_delete_text (GtkTextBuffer *buffer, static void gtk_text_buffer_real_delete_text (GtkTextBuffer *buffer,
GtkTextIter *start, GtkTextIter *start,
GtkTextIter *end); GtkTextIter *end,
gboolean interactive);
static void gtk_text_buffer_real_apply_tag (GtkTextBuffer *buffer, static void gtk_text_buffer_real_apply_tag (GtkTextBuffer *buffer,
GtkTextTag *tag, GtkTextTag *tag,
const GtkTextIter *start_char, const GtkTextIter *start_char,
@ -114,23 +116,25 @@ gtk_text_buffer_class_init (GtkTextBufferClass *klass)
GTK_RUN_LAST, GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkTextBufferClass, insert_text), GTK_SIGNAL_OFFSET (GtkTextBufferClass, insert_text),
gtk_marshal_NONE__POINTER_POINTER_INT, gtk_marshal_NONE__POINTER_POINTER_INT_INT,
GTK_TYPE_NONE, GTK_TYPE_NONE,
3, 4,
GTK_TYPE_POINTER, GTK_TYPE_POINTER,
GTK_TYPE_POINTER, GTK_TYPE_POINTER,
GTK_TYPE_INT); GTK_TYPE_INT,
GTK_TYPE_BOOL);
signals[DELETE_TEXT] = signals[DELETE_TEXT] =
gtk_signal_new ("delete_text", gtk_signal_new ("delete_text",
GTK_RUN_LAST, GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class), GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (GtkTextBufferClass, delete_text), GTK_SIGNAL_OFFSET (GtkTextBufferClass, delete_text),
gtk_marshal_NONE__POINTER_POINTER, gtk_marshal_NONE__POINTER_POINTER_INT,
GTK_TYPE_NONE, GTK_TYPE_NONE,
2, 3,
GTK_TYPE_POINTER, GTK_TYPE_POINTER,
GTK_TYPE_POINTER); GTK_TYPE_POINTER,
GTK_TYPE_BOOL);
signals[CHANGED] = signals[CHANGED] =
gtk_signal_new ("changed", gtk_signal_new ("changed",
@ -379,7 +383,8 @@ static void
gtk_text_buffer_real_insert_text(GtkTextBuffer *buffer, gtk_text_buffer_real_insert_text(GtkTextBuffer *buffer,
GtkTextIter *iter, GtkTextIter *iter,
const gchar *text, const gchar *text,
gint len) gint len,
gboolean interactive)
{ {
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(iter != NULL);
@ -395,7 +400,8 @@ static void
gtk_text_buffer_emit_insert(GtkTextBuffer *buffer, gtk_text_buffer_emit_insert(GtkTextBuffer *buffer,
GtkTextIter *iter, GtkTextIter *iter,
const gchar *text, const gchar *text,
gint len) gint len,
gboolean interactive)
{ {
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(iter != NULL);
@ -407,7 +413,7 @@ gtk_text_buffer_emit_insert(GtkTextBuffer *buffer,
if (len > 0) if (len > 0)
{ {
gtk_signal_emit(GTK_OBJECT(buffer), signals[INSERT_TEXT], gtk_signal_emit(GTK_OBJECT(buffer), signals[INSERT_TEXT],
iter, text, len); iter, text, len, interactive);
} }
} }
@ -437,7 +443,7 @@ gtk_text_buffer_insert (GtkTextBuffer *buffer,
g_return_if_fail(iter != NULL); g_return_if_fail(iter != NULL);
g_return_if_fail(text != NULL); g_return_if_fail(text != NULL);
gtk_text_buffer_emit_insert(buffer, iter, text, len); gtk_text_buffer_emit_insert(buffer, iter, text, len, FALSE);
} }
/** /**
@ -493,7 +499,7 @@ gtk_text_buffer_insert_interactive(GtkTextBuffer *buffer,
if (gtk_text_iter_editable (iter, editable_by_default)) if (gtk_text_iter_editable (iter, editable_by_default))
{ {
gtk_text_buffer_insert (buffer, iter, text, len); gtk_text_buffer_emit_insert (buffer, iter, text, len, TRUE);
return TRUE; return TRUE;
} }
else else
@ -538,7 +544,8 @@ gtk_text_buffer_insert_interactive_at_cursor (GtkTextBuffer *buffer,
static void static void
gtk_text_buffer_real_delete_text(GtkTextBuffer *buffer, gtk_text_buffer_real_delete_text(GtkTextBuffer *buffer,
GtkTextIter *start, GtkTextIter *start,
GtkTextIter *end) GtkTextIter *end,
gboolean interactive)
{ {
g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer)); g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
g_return_if_fail(start != NULL); g_return_if_fail(start != NULL);
@ -557,7 +564,8 @@ gtk_text_buffer_real_delete_text(GtkTextBuffer *buffer,
static void static void
gtk_text_buffer_emit_delete(GtkTextBuffer *buffer, gtk_text_buffer_emit_delete(GtkTextBuffer *buffer,
GtkTextIter *start, GtkTextIter *start,
GtkTextIter *end) GtkTextIter *end,
gboolean interactive)
{ {
g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer)); g_return_if_fail(GTK_IS_TEXT_BUFFER(buffer));
g_return_if_fail(start != NULL); g_return_if_fail(start != NULL);
@ -575,7 +583,8 @@ gtk_text_buffer_emit_delete(GtkTextBuffer *buffer,
gtk_signal_emit(GTK_OBJECT(buffer), gtk_signal_emit(GTK_OBJECT(buffer),
signals[DELETE_TEXT], signals[DELETE_TEXT],
start, end); start, end,
interactive);
} }
/** /**
@ -607,7 +616,7 @@ gtk_text_buffer_delete (GtkTextBuffer *buffer,
g_return_if_fail(start != NULL); g_return_if_fail(start != NULL);
g_return_if_fail(end != NULL); g_return_if_fail(end != NULL);
gtk_text_buffer_emit_delete(buffer, start, end); gtk_text_buffer_emit_delete(buffer, start, end, FALSE);
} }
/** /**
@ -680,7 +689,7 @@ gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
gtk_text_buffer_get_iter_at_mark (buffer, &start, start_mark); gtk_text_buffer_get_iter_at_mark (buffer, &start, start_mark);
gtk_text_buffer_delete (buffer, &start, &iter); gtk_text_buffer_emit_delete (buffer, &start, &iter, TRUE);
deleted_stuff = TRUE; deleted_stuff = TRUE;
} }
@ -698,7 +707,7 @@ gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
gtk_text_buffer_get_iter_at_mark (buffer, &start, start_mark); gtk_text_buffer_get_iter_at_mark (buffer, &start, start_mark);
gtk_text_buffer_delete (buffer, &start, &iter); gtk_text_buffer_emit_delete (buffer, &start, &iter, TRUE);
current_state = FALSE; current_state = FALSE;
deleted_stuff = TRUE; deleted_stuff = TRUE;

6
gtk/gtktextbuffer.h
View File

@ -52,12 +52,14 @@ struct _GtkTextBufferClass {
void (* insert_text) (GtkTextBuffer *buffer, void (* insert_text) (GtkTextBuffer *buffer,
GtkTextIter *pos, GtkTextIter *pos,
const gchar *text, const gchar *text,
gint length); gint length,
gboolean interactive);
void (* delete_text) (GtkTextBuffer *buffer, void (* delete_text) (GtkTextBuffer *buffer,
GtkTextIter *start, GtkTextIter *start,
GtkTextIter *end); GtkTextIter *end,
gboolean interactive);
/* Only for text changed, marks/tags don't cause this /* Only for text changed, marks/tags don't cause this
to be emitted */ to be emitted */