From b0046a3699f814f39e31192e21c17c15b0dd8474 Mon Sep 17 00:00:00 2001 From: Jon Trowbridge Date: Mon, 29 Jan 2001 20:27:38 +0000 Subject: Connect to the model's "position" signal. (e_text_init): Set default value 2001-01-29 Jon Trowbridge * gal/e-text/e-text.c (e_text_init): Connect to the model's "position" signal. (e_text_init): Set default value for rgba_object as blue. (e_text_destroy): Disconnect model position signal. (fix_selection): Some extra sanity checking to keep the selection from spilling outside of the bounds of the text string as it expands or contracts. Should be obsolete due to the changes to objectify_uris --- but I'll leave this in here for now, in an attempt to avoid non-\0-terminated strings, segfaults, and all of that fun stuff. (e_text_text_model_position): Move our cursor according to the suggestions made by our ETextModel, via the "position" signal. (text_width_with_objects): Check that text is not NULL. (text_draw_with_objects): Accept an extra GdkGC for use in drawing objects. (e_text_set_arg): Properly handle the "position" signal when changing models. (e_text_draw): Initialize the GC for drawing objects, if necessary. (_insert): Comment out the code that adjustes text->selection_*. The cursor is now moved by the ETextModel directly via the position signal, not by the view. * gal/e-text/e-text-model-uri.c (objectify_uris): Add more sophisticated uri recognition via regular expressions. (objectify_uris): Changed to track position changes as model->text expands and contracts along with the objects. Block the objectification of any chunks of text that straddle our current position. (e_text_model_uri_set_text): Added position info to objectify_uris call. (e_text_model_uri_insert): Added position info to objectify_uris call. (e_text_model_uri_insert_length): Added position info to objectify_uris call. (e_text_model_uri_delete): Added position info to objectify_uris call. * gal/e-text/e-text-model.c (e_text_model_class_init): Added a "position" signal that allows the ETextModel to send cursor positioning information back to any view. We need this for text with objects, where the text string can grow and shrink in ways that the view doesn't expect. (e_text_model_real_insert): Added sanity checking of args and a position emission. (e_text_model_real_insert_length): Added sanity checking of args and a position emission. (e_text_model_real_delete): Added sanity checking of args. (e_text_model_suggest_position): A wrapper around the "position" signal emitter. svn path=/trunk/; revision=7894 --- widgets/text/e-text.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'widgets/text/e-text.h') diff --git a/widgets/text/e-text.h b/widgets/text/e-text.h index 5a1e843b7d..568402417c 100644 --- a/widgets/text/e-text.h +++ b/widgets/text/e-text.h @@ -110,6 +110,7 @@ struct _EText { ETextModel *model; gint model_changed_signal_id; + gint model_position_signal_id; char *text; /* Text to display */ gpointer lines; /* Text split into lines (private field) */ @@ -210,6 +211,9 @@ struct _EText { gint dbl_timeout; /* Double click timeout */ gint tpl_timeout; /* Triple click timeout */ + + guint32 rgba_object; /* RGBA color for objects */ + GdkGC *gc_object; /* GC for drawing objects */ }; struct _ETextClass { -- cgit