Added. Allows you to attach an ECompletion to an EEntry, and have that

2001-02-19  Jon Trowbridge  <trow@ximian.com>

        * gal/e-text/e-entry.c (e_entry_enable_completion_full): Added.
        Allows you to attach an ECompletion to an EEntry, and have that
        ECompletion be used for (obviously enough) completions.

        * gal/e-text/e-completion-view.h, gal/e-text/e-completion-view.c:
        Added.  ECompletionView is a widget for displaying the results of
        a completion request in a format that is appropriate for a
        drop-down window.

        * gal/e-text/e-completion.h, gal/e-text/e-completion.c: Added.
        ECompletion is a "pure virtual base class" for completion-type
        operations.  It is implemented so that completions can be either
        synchronous or asynchronous.

        * gal/e-text/e-text.c: Lots of changes to accomodate the
        ETextModel changes.  First of all, we render embedded text objects
        as being underlined.  We also cause the model to emit the
        appropriate object activation signal when an embedded object is
        double-clicked.  Also, all of the code that moves the cursor in
        response to user input has been removed.  Instead, the EText now
        listens for "reposition" events from the underlying model, and
        bases all cursor motions on those.
        (get_bounds_item_relative): Fixed bug in the handling of
        differently-anchored text.  Being differently-anchored is not a
        crime or a perversion --- it is an alternative lifestyle that we
        have to respect.

        * gal/e-text/e-text-model-uri.h, gal/e-text/e-text-model-uri.c: A
        sample ETextModel that converts URIs into embedded objects that
        get opened in the browser when you double-click them.

        * gal/e-text/e-text-model-repos.h,
        gal/e-text/e-text-model-repos.c: Added.  A group of simple
        structures & functions for handling various cursor movement rules.
        These are the sorts of things that are passed as arguments to
        ETextModel "reposition" event handlers.

        * gal/e-text/e-text-model.h, gal/e-text/e-text-model.c: Privitized
        the ETextModel struct and "methodized" all of the operations, so
        that derived classes can do arbitrarily respond to get/set
        requests in arbitrarily strange ways.  Also added the concept of
        declaring regions of the text as "embedded text objects".
        Finally, caused operations that change the text to emit a
        "reposition" signal that passes information that can be used by a
        view (like an EText) to move the cursor or selection in an
        intelligent way in response to those changes.  This means that you
        can now open two ETexts that look at the same ETextModel, and have
        the cursor in one do the right thing when you edit the other.  (As
	opposed to producing a lot of potential segfaults, as it was
	before.)

svn path=/trunk/; revision=8280

1 files changed, 56 insertions, 23 deletions

diff --git a/widgets/text/e-text-model.h b/widgets/text/e-text-model.h
index 7006b24eca..afd9b79960 100644
--- a/widgets/text/e-text-model.h
+++ b/widgets/text/e-text-model.h
@@ -16,6 +16,7 @@
  *
  * Author: Federico Mena <federico@nuclecu.unam.mx> */
 
+
 #ifndef E_TEXT_MODEL_H
 #define E_TEXT_MODEL_H
 
@@ -33,46 +34,78 @@ BEGIN_GNOME_DECLS
 typedef struct _ETextModel ETextModel;
 typedef struct _ETextModelClass ETextModelClass;
 
+struct _ETextModelPrivate;
+
+typedef gint (*ETextModelReposFn) (gint, gpointer);
+
 struct _ETextModel {
 	GtkObject item;
 
-	char *text;			/* Text to display */
+	struct _ETextModelPrivate *priv;
 };
 
 struct _ETextModelClass {
 	GtkObjectClass parent_class;
 
 	/* Signal */
-	void  (* changed)   (ETextModel *model);
+	void  (* changed)          (ETextModel *model);
+	void  (* reposition)       (ETextModel *model, ETextModelReposFn fn, gpointer repos_fn_data);
+	void  (* object_activated) (ETextModel *model, gint obj_num);
 
 	/* Virtual methods */
-	char *(* get_text)           (ETextModel *model);
-	void  (* set_text)           (ETextModel *model, gchar *text);
-	void  (* insert)             (ETextModel *model, gint position, gchar *text);
-	void  (* insert_length)      (ETextModel *model, gint position, gchar *text, gint length);
-	void  (* delete)             (ETextModel *model, gint position, gint length);
-	gint  (* obj_count)          (ETextModel *model);
-	const gchar *(* get_nth_obj) (ETextModel *model, gint n);
-	void  (* activate_nth_obj)   (ETextModel *model, gint n);
+
+	gint  (* validate_pos) (ETextModel *model, gint pos);
+
+	const char *(* get_text)      (ETextModel *model);
+	gint        (* get_text_len)  (ETextModel *model);
+	void        (* set_text)      (ETextModel *model, const gchar *text);
+	void        (* insert)        (ETextModel *model, gint position, const gchar *text);
+	void        (* insert_length) (ETextModel *model, gint position, const gchar *text, gint length);
+	void        (* delete)        (ETextModel *model, gint position, gint length);
+
+	void         (* objectify)          (ETextModel *model);
+	gint         (* obj_count)          (ETextModel *model);
+	const gchar *(* get_nth_obj)        (ETextModel *model, gint n, gint *len);
+	gint         (* obj_at_offset)      (ETextModel *model, gint offset);
 };
 
+GtkType     e_text_model_get_type (void);
+
+ETextModel *e_text_model_new (void);
+
+void        e_text_model_changed (ETextModel *model);
+
+void        e_text_model_reposition        (ETextModel *model, ETextModelReposFn fn, gpointer repos_data);
+gint        e_text_model_validate_position (ETextModel *model, gint pos);
+
+
+/* Functions for manipulating the underlying text. */
+
+const gchar *e_text_model_get_text        (ETextModel *model);
+gint         e_text_model_get_text_length (ETextModel *model);
+void         e_text_model_set_text        (ETextModel *model, const gchar *text);
+void         e_text_model_insert          (ETextModel *model, gint position, const gchar *text);
+void         e_text_model_insert_length   (ETextModel *model, gint position, const gchar *text, gint length);
+void         e_text_model_prepend         (ETextModel *model, const gchar *text);
+void         e_text_model_append          (ETextModel *model, const gchar *text);
+void         e_text_model_delete          (ETextModel *model, gint position, gint length);
+
+
+/* Functions for accessing embedded objects. */
+
+gint         e_text_model_object_count          (ETextModel *model);
+const gchar *e_text_model_get_nth_object        (ETextModel *model, gint n, gint *len);
+gchar       *e_text_model_strdup_nth_object     (ETextModel *model, gint n);
+void         e_text_model_get_nth_object_bounds (ETextModel *model, gint n, gint *start_pos, gint *end_pos);
+gint         e_text_model_get_object_at_offset  (ETextModel *model, gint offset);
+gint         e_text_model_get_object_at_pointer (ETextModel *model, const gchar *c);
+void         e_text_model_activate_nth_object   (ETextModel *model, gint n);
+
+
 
-/* Standard Gtk function */
-GtkType e_text_model_get_type (void);
-ETextModel *e_text_model_new(void);
 
-void e_text_model_changed(ETextModel *model);
-gchar *e_text_model_get_text(ETextModel *model);
-void e_text_model_set_text(ETextModel *model, gchar *text);
-void e_text_model_insert(ETextModel *model, gint position, gchar *text);
-void e_text_model_insert_length(ETextModel *model, gint position, gchar *text, gint length);
-void e_text_model_delete(ETextModel *model, gint position, gint length);
 
-gint e_text_model_object_count(ETextModel *model);
-const gchar *e_text_model_get_nth_object(ETextModel *model, gint n);
-void e_text_model_activate_nth_object(ETextModel *model, gint n);
 
-gchar *e_text_model_strdup_expanded_text(ETextModel *model);
 
 END_GNOME_DECLS