Added; a new test program that demonstrates objects in ETexts.

2001-01-26  Jon Trowbridge  <trow@gnu.org>

        * gal/e-text/e-text-model-test.c: Added; a new test program that
        demonstrates objects in ETexts.

        * gal/e-text/e-text-model-uri.c: Added; a text model that converts
        URIs in the text into objects that are passed off to the GNOME URI
        handler when activated.  This is actually still extremely broken;
        I got it just working enough to test out my EText changes.

        * gal/e-text/e-text.c: A whole lot of changes, designed to make
        ETextModel objects render properly.  The basic idea of the changes
        is pretty simple, though.
        (text_width_with_objects): First of all, this function is an
        alternative to e_font_utf8_text_width that takes into the account
        the embedded \1s in the text string and properly accounts for the
        width of the object strings.
        (unicode_strlen_with_objects): Next, this function finds the
        proper strlen of a string, expanding the \1s.
        (text_draw_with_objects): Finally, this is just a replacement for
        e_font_draw_utf8_text that does the right thing for objects.  I've
        gone through all of e-text.c and replace calls by those original
        functions with my new object-enabled alternatives.
        (split_into_lines): Some tweaking to get line breaking to work
        properly.  Made \1 into a "break character", so that we can break
        lines between multiple adjacent objects.  (Which seemed like the
        right thing to do, but there may be cases where that is
        undesireable.)
        (_get_position_from_xy): Fixed to properly handle embedded
        objects, and to get the right selection semantics for objects.
        (Or at least semantics that feel right to me.)  Also fixed a bug
        that caused selection, etc. to not work properly if the text was
        anchored anywhere other than with GTK_ANCHOR_NORTH*.
        (_get_position): Hacked to cause objects to activate when they are
        double-clicked.  There is probably a better way to do this.

        * gal/e-text/e-text-model.c (e_text_model_real_object_count):
        Provide a default implementation of an object counter.  Derived
        classes might want to override this for efficiency reasons.
        (e_text_model_strdup_expanded_text): Added.  Allocates and returns
        a string contains the model's text with the objects "expanded"
        within.

        * gal/e-text/e-text-model.h: Added obj_count, get_nth_obj, and
        activate_nth_obj virtual methods to ETextModelClass.

svn path=/trunk/; revision=7842

1 files changed, 134 insertions, 0 deletions

diff --git a/widgets/text/e-text-model.c b/widgets/text/e-text-model.c
index 6ca650867c..acd08ecb04 100644
--- a/widgets/text/e-text-model.c
+++ b/widgets/text/e-text-model.c
@@ -37,6 +37,11 @@ static void e_text_model_real_insert(ETextModel *model, gint postion, gchar *tex
 static void e_text_model_real_insert_length(ETextModel *model, gint postion, gchar *text, gint length);
 static void e_text_model_real_delete(ETextModel *model, gint postion, gint length);
 
+static gint e_text_model_real_object_count(ETextModel *model);
+static const gchar *e_text_model_real_get_nth_object(ETextModel *model, gint n);
+static void e_text_model_real_activate_nth_object(ETextModel *mode, gint n);
+
+
 static GtkObject *parent_class;
 
 
@@ -99,6 +104,9 @@ e_text_model_class_init (ETextModelClass *klass)
 	klass->insert = e_text_model_real_insert;
 	klass->insert_length = e_text_model_real_insert_length;
 	klass->delete = e_text_model_real_delete;
+	klass->obj_count = e_text_model_real_object_count;
+	klass->get_nth_obj = e_text_model_real_get_nth_object;
+	klass->activate_nth_obj = e_text_model_real_activate_nth_object;
 	
 	object_class->destroy = e_text_model_destroy;
 }
@@ -173,6 +181,34 @@ e_text_model_real_delete(ETextModel *model, gint position, gint length)
 	e_text_model_changed(model);
 }
 
+static gint
+e_text_model_real_object_count(ETextModel *model)
+{
+	gint count = 0;
+	gchar *c = model->text;
+
+	if (c) {
+		while (*c) {
+			if (*c == '\1')
+				++count;
+			++c;
+		}
+	}
+	return count;
+}
+
+static const gchar *
+e_text_model_real_get_nth_object(ETextModel *model, gint n)
+{
+	return "";
+}
+
+static void
+e_text_model_real_activate_nth_object(ETextModel *model, gint n)
+{
+	/* By default, do nothing */
+}
+
 void
 e_text_model_changed(ETextModel *model)
 {
@@ -235,6 +271,104 @@ e_text_model_delete(ETextModel *model, gint position, gint length)
 		E_TEXT_MODEL_CLASS(GTK_OBJECT(model)->klass)->delete(model, position, length);
 }
 
+gint
+e_text_model_object_count(ETextModel *model)
+{
+	g_return_val_if_fail (model != NULL, 0);
+	g_return_val_if_fail (E_IS_TEXT_MODEL (model), 0);
+
+	if ( E_TEXT_MODEL_CLASS(GTK_OBJECT(model)->klass)->obj_count)
+		return E_TEXT_MODEL_CLASS(GTK_OBJECT(model)->klass)->obj_count(model);
+	else
+		return 0;
+}
+
+const gchar *
+e_text_model_get_nth_object(ETextModel *model, gint n)
+{
+	g_return_val_if_fail (model != NULL, NULL);
+	g_return_val_if_fail (E_IS_TEXT_MODEL (model), NULL);
+	g_return_val_if_fail (n >= 0, NULL);
+
+	if ( E_TEXT_MODEL_CLASS(GTK_OBJECT(model)->klass)->get_nth_obj )
+		return E_TEXT_MODEL_CLASS(GTK_OBJECT(model)->klass)->get_nth_obj(model, n);
+	else
+		return "";
+}
+
+void
+e_text_model_activate_nth_object(ETextModel *model, gint n)
+{
+	g_return_if_fail (model != NULL);
+	g_return_if_fail (E_IS_TEXT_MODEL (model));
+	g_return_if_fail (n >= 0);
+
+	if ( E_TEXT_MODEL_CLASS(GTK_OBJECT(model)->klass)->activate_nth_obj )
+		E_TEXT_MODEL_CLASS(GTK_OBJECT(model)->klass)->activate_nth_obj(model, n);
+}
+
+gchar *
+e_text_model_strdup_expanded_text(ETextModel *model)
+{
+	gint len = 0, i, N;
+	gchar *expanded, *dest;
+	const gchar *src;
+
+	g_return_val_if_fail (model != NULL, NULL);
+	g_return_val_if_fail (E_IS_TEXT_MODEL (model), NULL);
+
+	if (model->text == NULL)
+		return NULL;
+
+	N = e_text_model_object_count (model);
+	if (N == 0)
+		return g_strdup (model->text);
+
+	/* First, compute the length of the expanded string. */
+
+	len = strlen (model->text);
+	len -= N; /* Subtract out the \1s that signify the objects. */
+
+	for (i=0; i<N; ++i)
+		len += strlen (e_text_model_get_nth_object (model ,i));
+	
+
+	/* Next, allocate and build the expanded string. */
+	expanded = g_new0 (gchar, len+1);
+
+	src = model->text;
+	dest = expanded;
+	i = 0;
+	while (*src) {
+		if (*src == '\1') {
+			const gchar *src_obj;
+			
+			g_assert (i < N);
+			src_obj = e_text_model_get_nth_object (model, i);
+
+			if (src_obj) {
+				while (*src_obj) {
+					*dest = *src_obj;
+					++src_obj;
+					++dest;
+				}
+			}
+			
+			++src;
+			++i;
+
+		} else {
+
+			*dest = *src;
+			++src;
+			++dest;
+
+		}
+	}
+
+	return expanded;
+}
+
 ETextModel *
 e_text_model_new(void)
 {