update to reflect text widget changes.
2000-07-25 Havoc Pennington <hp@redhat.com> * gtk/testtext.c, gtk/testtextbuffer.c: update to reflect text widget changes. * gtk/gtktextview.h: To be consistent with usage of "line" throughout the API to mean "newline-terminated thingy", change MOVEMENT_LINE to be MOVEMENT_WRAPPED_LINE, and MOVEMENT_PARAGRAPH to MOVEMENT_LINE. (GtkTextView): Add flags for default editability, and whether to show the cursor. Add functions to get/set that. Add (gtk_text_view_get_iter_location): new function * gtk/gtktexttypes.h: Move GtkTextLine typedef from here to gtktextlayout.h (g_convert): Add g_convert temporarily, will go in glib in a bit * gtk/gtktexttagtable.h: include gtktexttag.h, and define GtkTextTagTableForeach instead of brokenly using GHFunc. Change gtk_text_tag_table_foreach() so it doesn't use GHFunc. * gtk/gtktexttagprivate.h: Remove GtkTextStyleValues from here, moved to public header. * gtk/gtktexttag.h: Rename the "elide" attribute of tags to "invisible", since "elide" was a bad name. (gtk_text_tag_get_priority): Added (GtkTextStyleValues): put this in public header, along with functions to use it. * gtk/gtktextmarkprivate.h: Include more headers, since we no longer include gtktextbtree.h. * gtk/gtktextmark.h: Add gtk_text_mark_ref, gtk_text_mark_unref, gtk_text_mark_deleted * gtk/gtktextlayout.h: Don't include the "really private" headers, only buffer/iter. Forward declare GtkTextLIne and GtkTextLineData to make this possible. Now we only need to install gtktextlayout.h, not gtktextbtree.h and gtktext*private.h. (However the Makefile.am isn't changed yet because of the logistics of merging gtk-hp-patches piecemeal) * gtk/gtktextiterprivate.h: include btree header, so it compiles; rename gtk_text_iter_get_line to gtk_text_iter_get_text_line since gtk_text_iter_get_line is now used in the public API for a different purpose. * gtk/gtktextiter.h: Clean up function names to be more consistent. Always call char offset "offset" and byte index "index". A "line" is always a line number. (gtk_text_iter_is_last): new function, more efficient than the existing way to check (gtk_text_iter_is_first): new function, also more efficient (gtk_text_iter_up_lines, gtk_text_iter_down_lines): Remove these (gtk_text_iter_next_char, gtk_text_iter_prev_char): Renamed from gtk_text_iter_forward_char, etc. (gtk_text_iter_forward_to_tag_toggle): Renamed from forward_find_tag_toggle, since this isn't a linear search (GtkTextCharPredicate): rename from GtkTextViewCharPredicate (gtk_text_iter_forward_search, gtk_text_iter_backward_search): New functions, search for a buffer substring. * gtk/gtktextbuffer.h: Add fields to store whether a paste is interactive and default editable (since we need to store that info until we receive the selection data). Remove all the _at_char and at_line etc. versions of functions; only have iterator versions. Add _interactive() versions of functions, that consider the editability of text. (FIXME add interactive flag to the insert/delete signals per Darin's suggestion) (gtk_text_buffer_get_tag_table): new function, demand-creates the tag table if necessary Remove declaration of gtk_text_buffer_get_iter_from_string (_gtk_text_buffer_get_btree): private/internal function, added. * gtk/gtktextbtree.h: Remove forward decl of GtkTextLineData. (gtk_text_line_is_last): new function
This commit is contained in:
Havoc Pennington
committed by
Havoc Pennington
Havoc Pennington
parent
f56297c534
commit
a4762fbff4
@ -30,7 +30,7 @@ struct _GtkTextBuffer {
|
||||
GtkObject parent_instance;
|
||||
|
||||
GtkTextTagTable *tag_table;
|
||||
GtkTextBTree *tree;
|
||||
GtkTextBTree *btree;
|
||||
|
||||
/* Text currently pasted to the clipboard */
|
||||
gchar *clipboard_text;
|
||||
@ -42,6 +42,8 @@ struct _GtkTextBuffer {
|
||||
GtkWidget *selection_widget;
|
||||
gboolean have_selection;
|
||||
gboolean selection_handlers_installed;
|
||||
gboolean paste_interactive;
|
||||
gboolean paste_default_editable;
|
||||
};
|
||||
|
||||
struct _GtkTextBufferClass {
|
||||
@ -95,6 +97,7 @@ gint gtk_text_buffer_get_line_count (GtkTextBuffer *buffer);
|
||||
gint gtk_text_buffer_get_char_count (GtkTextBuffer *buffer);
|
||||
|
||||
|
||||
GtkTextTagTable* gtk_text_buffer_get_tag_table (GtkTextBuffer *buffer);
|
||||
|
||||
/* Insert into the buffer */
|
||||
void gtk_text_buffer_insert (GtkTextBuffer *buffer,
|
||||
@ -104,71 +107,45 @@ void gtk_text_buffer_insert (GtkTextBuffer *buffer,
|
||||
void gtk_text_buffer_insert_at_cursor (GtkTextBuffer *buffer,
|
||||
const gchar *text,
|
||||
gint len);
|
||||
void gtk_text_buffer_insert_at_char (GtkTextBuffer *buffer,
|
||||
gint char_pos,
|
||||
const gchar *text,
|
||||
gint len);
|
||||
void gtk_text_buffer_insert_after_line (GtkTextBuffer *buffer,
|
||||
gint after_this_line,
|
||||
const gchar *text,
|
||||
gint len);
|
||||
|
||||
gboolean gtk_text_buffer_insert_interactive (GtkTextBuffer *buffer,
|
||||
GtkTextIter *iter,
|
||||
const gchar *text,
|
||||
gint len,
|
||||
gboolean default_editable);
|
||||
gboolean gtk_text_buffer_insert_interactive_at_cursor (GtkTextBuffer *buffer,
|
||||
const gchar *text,
|
||||
gint len,
|
||||
gboolean default_editable);
|
||||
|
||||
|
||||
/* Delete from the buffer */
|
||||
void gtk_text_buffer_delete (GtkTextBuffer *buffer,
|
||||
GtkTextIter *start_iter,
|
||||
GtkTextIter *end_iter);
|
||||
gboolean gtk_text_buffer_delete_interactive (GtkTextBuffer *buffer,
|
||||
GtkTextIter *start_iter,
|
||||
GtkTextIter *end_iter,
|
||||
gboolean default_editable);
|
||||
|
||||
|
||||
|
||||
void gtk_text_buffer_delete (GtkTextBuffer *buffer,
|
||||
GtkTextIter *start_iter,
|
||||
GtkTextIter *end_iter);
|
||||
void gtk_text_buffer_delete_chars (GtkTextBuffer *buffer,
|
||||
gint start_char,
|
||||
gint end_char);
|
||||
void gtk_text_buffer_delete_lines (GtkTextBuffer *buffer,
|
||||
gint start_line,
|
||||
gint end_line);
|
||||
void gtk_text_buffer_delete_from_line (GtkTextBuffer *buffer,
|
||||
gint line,
|
||||
gint start_char,
|
||||
gint end_char);
|
||||
/* Obtain strings from the buffer */
|
||||
gchar *gtk_text_buffer_get_text (GtkTextBuffer *buffer,
|
||||
const GtkTextIter *start_iter,
|
||||
const GtkTextIter *end_iter,
|
||||
gboolean include_hidden_chars);
|
||||
gchar *gtk_text_buffer_get_text_chars (GtkTextBuffer *buffer,
|
||||
gint start_char,
|
||||
gint end_char,
|
||||
gboolean include_hidden_chars);
|
||||
gchar *gtk_text_buffer_get_text_from_line (GtkTextBuffer *buffer,
|
||||
gint line,
|
||||
gint start_char,
|
||||
gint end_char,
|
||||
gboolean include_hidden_chars);
|
||||
|
||||
gchar *gtk_text_buffer_get_slice (GtkTextBuffer *buffer,
|
||||
const GtkTextIter *start_iter,
|
||||
const GtkTextIter *end_iter,
|
||||
gboolean include_hidden_chars);
|
||||
gchar *gtk_text_buffer_get_slice_chars (GtkTextBuffer *buffer,
|
||||
gint start_char,
|
||||
gint end_char,
|
||||
gboolean include_hidden_chars);
|
||||
gchar *gtk_text_buffer_get_slice_from_line (GtkTextBuffer *buffer,
|
||||
gint line,
|
||||
gint start_char,
|
||||
gint end_char,
|
||||
gboolean include_hidden_chars);
|
||||
|
||||
/* Insert a pixmap */
|
||||
void gtk_text_buffer_insert_pixmap (GtkTextBuffer *buffer,
|
||||
GtkTextIter *iter,
|
||||
GdkPixmap *pixmap,
|
||||
GdkBitmap *mask);
|
||||
void gtk_text_buffer_insert_pixmap_at_char (GtkTextBuffer *buffer,
|
||||
gint char_index,
|
||||
GdkPixmap *pixmap,
|
||||
GdkBitmap *mask);
|
||||
|
||||
|
||||
|
||||
/* Mark manipulation */
|
||||
GtkTextMark *gtk_text_buffer_create_mark (GtkTextBuffer *buffer,
|
||||
@ -191,68 +168,56 @@ void gtk_text_buffer_place_cursor (GtkTextBuffer *buffer,
|
||||
|
||||
|
||||
/* Tag manipulation */
|
||||
void gtk_text_buffer_apply_tag_to_chars (GtkTextBuffer *buffer,
|
||||
const gchar *name,
|
||||
gint start_char,
|
||||
gint end_char);
|
||||
void gtk_text_buffer_remove_tag_from_chars (GtkTextBuffer *buffer,
|
||||
const gchar *name,
|
||||
gint start_char,
|
||||
gint end_char);
|
||||
void gtk_text_buffer_apply_tag (GtkTextBuffer *buffer,
|
||||
const gchar *name,
|
||||
GtkTextTag *tag,
|
||||
const GtkTextIter *start_index,
|
||||
const GtkTextIter *end_index);
|
||||
void gtk_text_buffer_remove_tag (GtkTextBuffer *buffer,
|
||||
GtkTextTag *tag,
|
||||
const GtkTextIter *start_index,
|
||||
const GtkTextIter *end_index);
|
||||
void gtk_text_buffer_apply_tag_by_name (GtkTextBuffer *buffer,
|
||||
const gchar *name,
|
||||
const GtkTextIter *start_index,
|
||||
const GtkTextIter *end_index);
|
||||
void gtk_text_buffer_remove_tag_by_name (GtkTextBuffer *buffer,
|
||||
const gchar *name,
|
||||
const GtkTextIter *start_index,
|
||||
const GtkTextIter *end_index);
|
||||
|
||||
|
||||
|
||||
/* You can either ignore the return value, or use it to
|
||||
set the attributes of the tag */
|
||||
* set the attributes of the tag. tag_name can be NULL
|
||||
*/
|
||||
GtkTextTag *gtk_text_buffer_create_tag (GtkTextBuffer *buffer,
|
||||
const gchar *tag_name);
|
||||
|
||||
/* Obtain iterators pointed at various places, then you can move the
|
||||
iterator around using the GtkTextIter operators */
|
||||
void gtk_text_buffer_get_iter_at_line_offset (GtkTextBuffer *buffer,
|
||||
GtkTextIter *iter,
|
||||
gint line_number,
|
||||
gint char_offset);
|
||||
void gtk_text_buffer_get_iter_at_offset (GtkTextBuffer *buffer,
|
||||
GtkTextIter *iter,
|
||||
gint char_offset);
|
||||
void gtk_text_buffer_get_iter_at_line (GtkTextBuffer *buffer,
|
||||
GtkTextIter *iter,
|
||||
gint line_number);
|
||||
void gtk_text_buffer_get_last_iter (GtkTextBuffer *buffer,
|
||||
GtkTextIter *iter);
|
||||
void gtk_text_buffer_get_bounds (GtkTextBuffer *buffer,
|
||||
GtkTextIter *start,
|
||||
GtkTextIter *end);
|
||||
void gtk_text_buffer_get_iter_at_mark (GtkTextBuffer *buffer,
|
||||
GtkTextIter *iter,
|
||||
GtkTextMark *mark);
|
||||
|
||||
void gtk_text_buffer_get_iter_at_line_char (GtkTextBuffer *buffer,
|
||||
GtkTextIter *iter,
|
||||
gint line_number,
|
||||
gint char_number);
|
||||
void gtk_text_buffer_get_iter_at_char (GtkTextBuffer *buffer,
|
||||
GtkTextIter *iter,
|
||||
gint char_index);
|
||||
void gtk_text_buffer_get_iter_at_line (GtkTextBuffer *buffer,
|
||||
GtkTextIter *iter,
|
||||
gint line_number);
|
||||
void gtk_text_buffer_get_last_iter (GtkTextBuffer *buffer,
|
||||
GtkTextIter *iter);
|
||||
void gtk_text_buffer_get_bounds (GtkTextBuffer *buffer,
|
||||
GtkTextIter *start,
|
||||
GtkTextIter *end);
|
||||
void gtk_text_buffer_get_iter_at_mark (GtkTextBuffer *buffer,
|
||||
GtkTextIter *iter,
|
||||
GtkTextMark *mark);
|
||||
|
||||
|
||||
/* There's no get_first_iter because you just get the iter for
|
||||
line or char 0 */
|
||||
|
||||
/*
|
||||
Parses a string, read the man page for the Tk text widget; the only
|
||||
variation from that is we don't support getting the index at a
|
||||
certain pixel since the buffer has no pixel knowledge. This
|
||||
function is mostly useful for language bindings I think.
|
||||
*/
|
||||
gboolean gtk_text_buffer_get_iter_from_string (GtkTextBuffer *buffer,
|
||||
GtkTextIter *iter,
|
||||
const gchar *iter_string);
|
||||
|
||||
|
||||
|
||||
GSList *gtk_text_buffer_get_tags (GtkTextBuffer *buffer,
|
||||
const GtkTextIter *iter);
|
||||
|
||||
@ -269,16 +234,26 @@ void gtk_text_buffer_set_modified (GtkTextBuffer *buffer,
|
||||
void gtk_text_buffer_set_clipboard_contents (GtkTextBuffer *buffer,
|
||||
const gchar *text);
|
||||
const gchar *gtk_text_buffer_get_clipboard_contents (GtkTextBuffer *buffer);
|
||||
|
||||
|
||||
void gtk_text_buffer_paste_primary_selection (GtkTextBuffer *buffer,
|
||||
GtkTextIter *override_location,
|
||||
guint32 time);
|
||||
gboolean gtk_text_buffer_delete_selection (GtkTextBuffer *buffer);
|
||||
guint32 time,
|
||||
gboolean interactive,
|
||||
gboolean default_editable);
|
||||
gboolean gtk_text_buffer_delete_selection (GtkTextBuffer *buffer,
|
||||
gboolean interactive,
|
||||
gboolean default_editable);
|
||||
void gtk_text_buffer_cut (GtkTextBuffer *buffer,
|
||||
guint32 time);
|
||||
guint32 time,
|
||||
gboolean interactive,
|
||||
gboolean default_editable);
|
||||
void gtk_text_buffer_copy (GtkTextBuffer *buffer,
|
||||
guint32 time);
|
||||
void gtk_text_buffer_paste_clipboard (GtkTextBuffer *buffer,
|
||||
guint32 time);
|
||||
guint32 time,
|
||||
gboolean interactive,
|
||||
gboolean default_editable);
|
||||
gboolean gtk_text_buffer_get_selection_bounds (GtkTextBuffer *buffer,
|
||||
GtkTextIter *start,
|
||||
GtkTextIter *end);
|
||||
@ -302,6 +277,8 @@ gboolean gtk_text_buffer_find_regexp(GtkTextBuffer *buffer,
|
||||
/* INTERNAL private stuff */
|
||||
void gtk_text_buffer_spew (GtkTextBuffer *buffer);
|
||||
|
||||
GtkTextBTree* _gtk_text_buffer_get_btree (GtkTextBuffer *buffer);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
|
||||
Reference in New Issue
Block a user