aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--widgets/text/e-text-model-test.c67
-rw-r--r--widgets/text/e-text-model-uri.c174
-rw-r--r--widgets/text/e-text-model-uri.h41
-rw-r--r--widgets/text/e-text-model.c134
-rw-r--r--widgets/text/e-text-model.h19
-rw-r--r--widgets/text/e-text.c452
6 files changed, 776 insertions, 111 deletions
diff --git a/widgets/text/e-text-model-test.c b/widgets/text/e-text-model-test.c
new file mode 100644
index 0000000000..0c758cd4ba
--- /dev/null
+++ b/widgets/text/e-text-model-test.c
@@ -0,0 +1,67 @@
+/*
+ ETextModelTest
+*/
+
+#include <gnome.h>
+#include <gal/widgets/e-canvas.h>
+#include "e-text-model.h"
+#include "e-text-model-uri.h"
+#include "e-text.h"
+
+static void
+describe_model (ETextModel *model)
+{
+ gint i, N;
+ g_return_if_fail (E_IS_TEXT_MODEL (model));
+
+ N = e_text_model_object_count (model);
+
+ g_print ("text: %s\n", e_text_model_get_text (model));
+ if (N > 0) {
+ gchar *s = e_text_model_strdup_expanded_text (model);
+ g_print ("expd: %s\n", s);
+ g_free (s);
+ }
+ g_print ("objs: %d\n", N);
+
+ for (i=0; i<N; ++i)
+ g_print ("obj%d: %s\n", i, e_text_model_get_nth_object (model, i));
+}
+
+int
+main (int argc, gchar **argv)
+{
+ GtkWidget *win, *canvas;
+ GnomeCanvasItem *item;
+ ETextModel *model;
+
+ gnome_init ("ETextModelTest", "0.0", argc, argv);
+
+ model = e_text_model_uri_new ();
+ e_text_model_set_text (model, "My favorite website is http://www.ximian.com. My next favorite is http://www.gnome.org.");
+
+ win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+
+ gtk_widget_push_visual (gdk_rgb_get_visual ());
+ gtk_widget_push_colormap (gdk_rgb_get_cmap ());
+ canvas = e_canvas_new ();
+ gtk_widget_pop_visual ();
+ gtk_widget_pop_colormap ();
+
+ item = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (canvas)),
+ e_text_get_type (),
+ "model", model,
+ "font", "-adobe-helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1",
+ "anchor", GTK_ANCHOR_SOUTH_WEST,
+ "line_wrap", TRUE,
+ "width", 150.0,
+ "editable", TRUE,
+ NULL);
+
+ gtk_container_add (GTK_CONTAINER (win), canvas);
+ gtk_widget_show_all (win);
+
+ gtk_main ();
+
+ return 0;
+}
diff --git a/widgets/text/e-text-model-uri.c b/widgets/text/e-text-model-uri.c
new file mode 100644
index 0000000000..bd8dbb18e8
--- /dev/null
+++ b/widgets/text/e-text-model-uri.c
@@ -0,0 +1,174 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+/* ETextModelURI - A Text Model w/ clickable URIs
+ * Copyright (C) 2001 Ximian, Inc.
+ *
+ * Author: Jon Trowbridge <trow@gnu.org>
+ *
+ */
+
+#include <config.h>
+#include <ctype.h>
+#include "e-text-model-uri.h"
+
+static void e_text_model_uri_class_init (ETextModelURIClass *class);
+static void e_text_model_uri_init (ETextModelURI *model);
+static void e_text_model_uri_destroy (GtkObject *object);
+
+static void objectify_uris (ETextModelURI *model);
+
+static void e_text_model_uri_set_text (ETextModel *model, gchar *text);
+static const gchar *e_text_model_uri_get_nth_object (ETextModel *model, gint);
+static void e_text_model_uri_activate_nth_object (ETextModel *model, gint);
+
+static GtkObject *parent_class;
+
+GtkType
+e_text_model_uri_get_type (void)
+{
+ static GtkType model_uri_type = 0;
+
+ if (!model_uri_type) {
+ GtkTypeInfo model_uri_info = {
+ "ETextModelURI",
+ sizeof (ETextModelURI),
+ sizeof (ETextModelURIClass),
+ (GtkClassInitFunc) e_text_model_uri_class_init,
+ (GtkObjectInitFunc) e_text_model_uri_init,
+ NULL, /* reserved_1 */
+ NULL, /* reserved_2 */
+ (GtkClassInitFunc) NULL
+ };
+
+ model_uri_type = gtk_type_unique (e_text_model_get_type (), &model_uri_info);
+ }
+
+ return model_uri_type;
+}
+
+static void
+e_text_model_uri_class_init (ETextModelURIClass *klass)
+{
+ GtkObjectClass *object_class;
+ ETextModelClass *model_class;
+
+ object_class = (GtkObjectClass *) klass;
+ model_class = E_TEXT_MODEL_CLASS (klass);
+
+ parent_class = gtk_type_class (e_text_model_get_type ());
+
+ object_class->destroy = e_text_model_uri_destroy;
+
+ model_class->set_text = e_text_model_uri_set_text;
+ model_class->get_nth_obj = e_text_model_uri_get_nth_object;
+ model_class->activate_nth_obj = e_text_model_uri_activate_nth_object;
+}
+
+static void
+e_text_model_uri_init (ETextModelURI *model)
+{
+
+}
+
+static void
+e_text_model_uri_destroy (GtkObject *object)
+{
+ if (GTK_OBJECT_CLASS (parent_class)->destroy)
+ (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
+
+}
+
+static gchar *
+extract_uri (gchar **in_str)
+{
+ gchar *s = *in_str;
+ if (strncmp (s, "http://", 7) == 0) {
+ gint periods=0;
+ gchar *uri;
+
+ s += 7;
+
+ while (*s && (isalnum((gint) *s) || (*s == '.' && periods < 2))) {
+ if (*s == '.')
+ ++periods;
+ ++s;
+ }
+
+ uri = g_strndup (*in_str, s - *in_str);
+ *in_str = s;
+ return uri;
+
+ } else {
+ *in_str = s+1;
+ return NULL;
+ }
+}
+
+static void
+objectify_uris (ETextModelURI *model_uri)
+{
+ ETextModel *model = E_TEXT_MODEL (model_uri);
+ gchar *new_text;
+ gchar *src, *dest;
+ GList *uris = NULL;
+
+ if (model->text == NULL)
+ return;
+
+ new_text = g_new0 (gchar, strlen (model->text)+1);
+
+ src = model->text;
+ dest = new_text;
+
+ while (*src) {
+ gchar *uri_str;
+ gchar *next = src;
+ if ( (uri_str = extract_uri (&next)) ) {
+ uris = g_list_append (uris, uri_str);
+ *dest = '\1';
+ } else {
+ *dest = *src;
+ }
+ ++dest;
+ src = next;
+ }
+
+ g_free (model->text);
+ model->text = new_text;
+
+ /* Leaking old list */
+ model_uri->uris = uris;
+}
+
+static void
+e_text_model_uri_set_text (ETextModel *model, gchar *text)
+{
+ if (E_TEXT_MODEL_CLASS(parent_class)->set_text)
+ E_TEXT_MODEL_CLASS(parent_class)->set_text (model, text);
+
+ objectify_uris (E_TEXT_MODEL_URI (model));
+}
+
+static const gchar *
+e_text_model_uri_get_nth_object (ETextModel *model, gint i)
+{
+ return (const gchar *) g_list_nth_data (E_TEXT_MODEL_URI (model)->uris, i);
+}
+
+static void
+e_text_model_uri_activate_nth_object (ETextModel *model, gint i)
+{
+ const gchar *obj_str;
+
+ obj_str = e_text_model_get_nth_object (model, i);
+ gnome_url_show (obj_str);
+}
+
+ETextModel *
+e_text_model_uri_new (void)
+{
+ return E_TEXT_MODEL (gtk_type_new (e_text_model_uri_get_type ()));
+}
+
+
+/* $Id$ */
diff --git a/widgets/text/e-text-model-uri.h b/widgets/text/e-text-model-uri.h
new file mode 100644
index 0000000000..293c9151e8
--- /dev/null
+++ b/widgets/text/e-text-model-uri.h
@@ -0,0 +1,41 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
+/* ETextModelURI - A Text Model w/ clickable URIs
+ * Copyright (C) 2001 Ximian, Inc.
+ *
+ * Author: Jon Trowbridge <trow@gnu.org>
+ *
+ */
+
+#ifndef E_TEXT_MODEL_URI_H
+#define E_TEXT_MODEL_URI_H
+
+#include <gnome.h>
+#include <gal/e-text/e-text-model.h>
+
+BEGIN_GNOME_DECLS
+
+#define E_TYPE_TEXT_MODEL_URI (e_text_model_get_type ())
+#define E_TEXT_MODEL_URI(obj) (GTK_CHECK_CAST ((obj), E_TYPE_TEXT_MODEL_URI, ETextModelURI))
+#define E_TEXT_MODEL_URI_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_TEXT_MODEL_URI, ETextModelURIClass))
+#define E_IS_TEXT_MODEL_URI(obj) (GTK_CHECK_TYPE ((obj), E_TYPE_TEXT_MODEL_URI))
+#define E_IS_TEXT_MODEL_URI_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_TEXT_MODEL_URI))
+
+typedef struct _ETextModelURI ETextModelURI;
+typedef struct _ETextModelURIClass ETextModelURIClass;
+
+struct _ETextModelURI {
+ ETextModel item;
+ GList *uris;
+};
+
+struct _ETextModelURIClass {
+ ETextModelClass parent_class;
+};
+
+GtkType e_text_model_uri_get_type (void);
+ETextModel *e_text_model_uri_new (void);
+
+END_GNOME_DECLS
+
+#endif
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)
{
diff --git a/widgets/text/e-text-model.h b/widgets/text/e-text-model.h
index 5b15ccb117..7006b24eca 100644
--- a/widgets/text/e-text-model.h
+++ b/widgets/text/e-text-model.h
@@ -37,7 +37,6 @@ struct _ETextModel {
GtkObject item;
char *text; /* Text to display */
- int length;
};
struct _ETextModelClass {
@@ -47,11 +46,14 @@ struct _ETextModelClass {
void (* changed) (ETextModel *model);
/* 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);
+ 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);
};
@@ -66,6 +68,11 @@ 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
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index 245ca00bda..fbbe77dc0d 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -50,6 +50,7 @@ struct line {
int length; /* Line's length IN BYTES */
int width; /* Line's width in pixels */
int ellipsis_length; /* Length before adding ellipsis */
+ gint first_obj; /* First embedded object number */
};
/* Object argument IDs */
@@ -151,6 +152,10 @@ static void e_suck_font_free (ETextSuckFont *suckfont);
static void e_text_free_lines(EText *text);
+static gint text_width_with_objects (ETextModel *model, gint first_object,
+ EFont *font, EFontStyle style,
+ gchar *text, gint bytelen);
+
static void calc_height (EText *text);
static void calc_line_widths (EText *text);
static void split_into_lines (EText *text);
@@ -732,8 +737,9 @@ calc_line_widths (EText *text)
for (i = 0; i < text->num_lines; i++) {
if (lines->length != 0) {
if (text->font) {
- lines->width = e_font_utf8_text_width (text->font, E_FONT_PLAIN,
- lines->text, lines->length);
+ lines->width = text_width_with_objects (text->model, lines->first_obj,
+ text->font, E_FONT_PLAIN,
+ lines->text, lines->length);
lines->ellipsis_length = 0;
} else {
lines->width = 0;
@@ -747,8 +753,10 @@ calc_line_widths (EText *text)
if (text->font) {
lines->ellipsis_length = 0;
for (p = lines->text; p && *p && (p - lines->text) < lines->length; p = unicode_next_utf8 (p)) {
- if (e_font_utf8_text_width (text->font, E_FONT_PLAIN, lines->text, p - lines->text) +
- text->ellipsis_width <= clip_width)
+ gint text_width = text_width_with_objects (text->model, lines->first_obj,
+ text->font, E_FONT_PLAIN,
+ lines->text, p - lines->text);
+ if (clip_width >= text_width + text->ellipsis_width)
lines->ellipsis_length = p - lines->text;
else
break;
@@ -756,7 +764,9 @@ calc_line_widths (EText *text)
}
else
lines->ellipsis_length = 0;
- lines->width = e_font_utf8_text_width (text->font, E_FONT_PLAIN, lines->text, lines->ellipsis_length) +
+ lines->width = text_width_with_objects (text->model, lines->first_obj,
+ text->font, E_FONT_PLAIN,
+ lines->text, lines->ellipsis_length) +
text->ellipsis_width;
}
else
@@ -780,6 +790,121 @@ e_text_free_lines(EText *text)
text->num_lines = 0;
}
+static gint
+text_width_with_objects (ETextModel *model, gint object_num,
+ EFont *font, EFontStyle style,
+ gchar *text, gint numbytes)
+{
+ gchar *c;
+ gint width = 0;
+
+ while (*text && numbytes > 0) {
+
+ c = text;
+
+ while (*c && *c != '\1' && numbytes > 0) {
+ ++c;
+ --numbytes;
+ }
+
+ width += e_font_utf8_text_width (font, style, text, c-text);
+
+ if (*c == '\1' && numbytes > 0) {
+ const gchar *obj_str;
+ g_assert (object_num < e_text_model_object_count (model));
+ obj_str = e_text_model_get_nth_object (model, object_num);
+ width += e_font_utf8_text_width (font, E_FONT_BOLD, obj_str, strlen (obj_str));
+ ++object_num;
+ ++c;
+ --numbytes;
+ }
+
+ text = c;
+ }
+
+ return width;
+}
+
+static gint
+unicode_strlen_with_objects(ETextModel *model, gint object_num, gchar *s)
+{
+ gint unival;
+ gint len=0;
+ gchar *p;
+
+ for (p = unicode_get_utf8 (s, &unival); (unival && p); p = unicode_get_utf8 (p, &unival)) {
+ if (unival == '\1') {
+ const gchar *obj_str = e_text_model_get_nth_object (model, object_num);
+ len += unicode_strlen (obj_str, -1);
+ ++object_num;
+ } else {
+ ++len;
+ }
+ }
+
+ return len;
+}
+
+static void
+text_draw_with_objects (ETextModel *model, gint object_num,
+ GdkDrawable *drawable,
+ EFont *font, EFontStyle style,
+ GdkGC *gc,
+ gint x, gint y,
+ gchar *text, gint numbytes)
+{
+ gchar *c;
+
+ while (*text && numbytes > 0) {
+
+ c = text;
+
+ while (*c && *c != '\1' && numbytes > 0) {
+ ++c;
+ --numbytes;
+ }
+
+ e_font_draw_utf8_text (drawable, font, style, gc, x, y, text, c-text);
+ x += e_font_utf8_text_width (font, style, text, c-text);
+
+ if (*c == '\1' && numbytes > 0) {
+ const gchar *obj_str;
+ gint start_x = x;
+ gint len;
+ g_assert (object_num < e_text_model_object_count (model));
+
+ obj_str = e_text_model_get_nth_object (model, object_num);
+
+ len = strlen (obj_str);
+ e_font_draw_utf8_text (drawable, font, style, gc, x, y, obj_str, len);
+ x += e_font_utf8_text_width (font, style, obj_str, len);
+
+ /* We underline our objects. */
+ gdk_draw_line (drawable, gc, start_x, y+1, x, y+1);
+
+ ++object_num;
+ ++c;
+ --numbytes;
+ }
+
+ text = c;
+ }
+}
+
+static gint
+object_number_advance (gint object_num, gchar *start, gint numbytes)
+{
+ while (*start && numbytes > 0) {
+ if (*start == '\1')
+ ++object_num;
+ ++start;
+ --numbytes;
+ }
+
+ return object_num;
+}
+
+
#define IS_BREAKCHAR(text,c) ((text)->break_characters && unicode_strchr ((text)->break_characters, (c)))
/* Splits the text of the text item into lines */
static void
@@ -794,6 +919,7 @@ split_into_lines (EText *text)
char *linestart;
double clip_width;
unicode_char_t unival;
+ int object_num;
/* Free old array of lines */
e_text_free_lines(text);
@@ -815,13 +941,18 @@ split_into_lines (EText *text)
}
cp = text->text;
+ object_num = 0;
for (p = unicode_get_utf8 (cp, &unival); (unival && p); cp = p, p = unicode_get_utf8 (p, &unival)) {
if (text->line_wrap && (unicode_isspace (unival) || unival == '\n')) {
if (laststart != lastend
- && e_font_utf8_text_width(text->font, E_FONT_PLAIN, linestart, cp - linestart)
- > clip_width ) {
+ && clip_width < text_width_with_objects (text->model, object_num,
+ text->font, E_FONT_PLAIN,
+ linestart, cp - linestart)) {
text->num_lines ++;
+
+ object_num = object_number_advance (object_num, linestart, lastend-linestart);
+
linestart = laststart;
laststart = p;
lastend = cp;
@@ -829,12 +960,17 @@ split_into_lines (EText *text)
laststart = p;
lastend = cp;
}
- } else if (text->line_wrap && (IS_BREAKCHAR(text, unival))) {
- if (laststart != lastend
- && unicode_index_to_offset (linestart, cp - linestart) != 1
- && e_font_utf8_text_width(text->font, E_FONT_PLAIN, linestart, p - linestart)
- > clip_width ) {
+ } else if (text->line_wrap && (IS_BREAKCHAR(text, unival) || unival == '\1')) {
+
+ if ((unival == '\1' || laststart != lastend)
+ && (unival == '\1' || unicode_index_to_offset (linestart, cp - linestart) != 1)
+ && clip_width < text_width_with_objects (text->model, object_num,
+ text->font, E_FONT_PLAIN,
+ linestart, p - linestart)) {
text->num_lines ++;
+
+ object_num = object_number_advance (object_num, linestart, lastend-linestart);
+
linestart = laststart;
laststart = p;
lastend = p;
@@ -842,24 +978,27 @@ split_into_lines (EText *text)
laststart = p;
lastend = p;
}
- }
+ }
if (unival == '\n') {
text->num_lines ++;
+
+ object_num = object_number_advance (object_num, linestart, lastend-linestart);
+
lastend = p;
laststart = p;
linestart = p;
}
}
- /* fixme: */
- if (text->line_wrap) {
- if ( p
- && laststart != lastend
- && e_font_utf8_text_width(text->font, E_FONT_PLAIN, linestart, cp - linestart)
- > clip_width ) {
- text->num_lines ++;
- }
- }
+ if ( text->line_wrap
+ && p
+ && laststart != lastend
+ && clip_width < text_width_with_objects (text->model, object_num,
+ text->font, E_FONT_PLAIN,
+ linestart, cp - linestart)) {
+ text->num_lines ++;
+ object_num = object_number_advance (object_num, linestart, lastend-linestart);
+ }
text->num_lines++;
@@ -876,15 +1015,23 @@ split_into_lines (EText *text)
laststart = text->text;
cp = text->text;
+ object_num = 0;
+
for (p = unicode_get_utf8 (cp, &unival); p && unival && line_num < text->num_lines; cp = p, p = unicode_get_utf8 (p, &unival)) {
gboolean handled = FALSE;
+
if (len == 0)
lines->text = cp;
if (text->line_wrap && (unicode_isspace (unival) || unival == '\n')) {
- if (e_font_utf8_text_width (text->font, E_FONT_PLAIN, lines->text, cp - lines->text)
- > clip_width
+ if (clip_width < text_width_with_objects (text->model, object_num,
+ text->font, E_FONT_PLAIN,
+ lines->text, cp - lines->text)
&& laststart != lastend) {
+
lines->length = lastend - lines->text;
+ lines->first_obj = object_num;
+ object_num = object_number_advance (object_num, lines->text, lines->length);
+
lines++;
line_num++;
len = cp - laststart;
@@ -897,12 +1044,17 @@ split_into_lines (EText *text)
len ++;
}
handled = TRUE;
- } else if (text->line_wrap && (IS_BREAKCHAR(text, unival))) {
- if (laststart != lastend
- && unicode_index_to_offset (lines->text, cp - lines->text) != 1
- && e_font_utf8_text_width (text->font, E_FONT_PLAIN, lines->text, p - lines->text)
- > clip_width ) {
+ } else if (text->line_wrap && (IS_BREAKCHAR(text, unival) || unival == '\1')) {
+ if ((unival == '\1' || laststart != lastend)
+ && (unival == '\1' || unicode_index_to_offset (lines->text, cp - lines->text) != 1)
+ && clip_width < text_width_with_objects (text->model, object_num,
+ text->font, E_FONT_PLAIN,
+ lines->text, p - lines->text)) {
+
lines->length = lastend - lines->text;
+ lines->first_obj = object_num;
+ object_num = object_number_advance (object_num, lines->text, lines->length);
+
lines++;
line_num++;
len = p - laststart;
@@ -918,7 +1070,11 @@ split_into_lines (EText *text)
if (line_num >= text->num_lines)
break;
if (unival == '\n') {
+
lines->length = cp - lines->text;
+ lines->first_obj = object_num;
+ object_num = object_number_advance (object_num, lines->text, lines->length);
+
lines++;
line_num++;
len = 0;
@@ -931,10 +1087,15 @@ split_into_lines (EText *text)
}
if ( line_num < text->num_lines && text->line_wrap ) {
- if (e_font_utf8_text_width(text->font, E_FONT_PLAIN, lines->text, cp - lines->text)
- > clip_width
+ if (clip_width < text_width_with_objects (text->model, object_num,
+ text->font, E_FONT_PLAIN,
+ lines->text, cp - lines->text)
&& laststart != lastend ) {
+
lines->length = lastend - lines->text;
+ lines->first_obj = object_num;
+ object_num = object_number_advance (object_num, lines->text, lines->length);
+
lines++;
line_num++;
len = cp - laststart;
@@ -947,6 +1108,7 @@ split_into_lines (EText *text)
if (len == 0)
lines->text = cp;
lines->length = strlen (lines->text);
+ lines->first_obj = object_num;
}
/* Convenience function to set the text's GC's foreground color */
@@ -1516,9 +1678,10 @@ e_text_reflow (GnomeCanvasItem *item, int flags)
}
lines --;
i--;
- x = e_font_utf8_text_width(text->font, E_FONT_PLAIN,
- lines->text,
- text->selection_end - (lines->text - text->text));
+ x = text_width_with_objects (text->model, lines->first_obj,
+ text->font, E_FONT_PLAIN,
+ lines->text,
+ text->selection_end - (lines->text - text->text));
if (x < text->xofs_edit) {
@@ -1863,6 +2026,7 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
gnome_canvas_set_stipple_origin (item->canvas, text->gc);
for (i = 0; i < text->num_lines; i++) {
+
xpos = get_line_xpos (text, lines);
if (text->editing) {
xpos -= text->xofs_edit;
@@ -1880,13 +2044,15 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
if ( sel_end > end_char )
sel_end = end_char;
if ( sel_start < sel_end ) {
- sel_rect.x = xpos - x + e_font_utf8_text_width (text->font, E_FONT_PLAIN,
- lines->text,
- sel_start - start_char);
+ sel_rect.x = xpos - x + text_width_with_objects (text->model, lines->first_obj,
+ text->font, E_FONT_PLAIN,
+ lines->text,
+ sel_start - start_char);
sel_rect.y = ypos - y - e_font_ascent (text->font);
- sel_rect.width = e_font_utf8_text_width (text->font, E_FONT_PLAIN,
- lines->text + sel_start - start_char,
- sel_end - sel_start);
+ sel_rect.width = text_width_with_objects (text->model, lines->first_obj,
+ text->font, E_FONT_PLAIN,
+ lines->text + sel_start - start_char,
+ sel_end - sel_start);
sel_rect.height = e_font_height (text->font);
gtk_paint_flat_box(GTK_WIDGET(item->canvas)->style,
drawable,
@@ -1901,39 +2067,45 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
sel_rect.y,
sel_rect.width,
sel_rect.height);
- e_font_draw_utf8_text (drawable,
- text->font, E_FONT_PLAIN,
- text->gc,
- xpos - x,
- ypos - y,
- lines->text,
- sel_start - start_char);
- e_font_draw_utf8_text (drawable,
- text->font, E_FONT_PLAIN,
- fg_gc,
- xpos - x + e_font_utf8_text_width (text->font, E_FONT_PLAIN,
- lines->text,
- sel_start - start_char),
- ypos - y,
- lines->text + sel_start - start_char,
- sel_end - sel_start);
- e_font_draw_utf8_text (drawable,
- text->font, E_FONT_PLAIN,
- text->gc,
- xpos - x + e_font_utf8_text_width (text->font, E_FONT_PLAIN,
- lines->text,
- sel_end - start_char),
- ypos - y,
- lines->text + sel_end - start_char,
- end_char - sel_end);
+ text_draw_with_objects (text->model, lines->first_obj,
+ drawable,
+ text->font, E_FONT_PLAIN,
+ text->gc,
+ xpos - x,
+ ypos - y,
+ lines->text,
+ sel_start - start_char);
+ text_draw_with_objects (text->model, lines->first_obj,
+ drawable,
+ text->font, E_FONT_PLAIN,
+ fg_gc,
+ xpos - x + text_width_with_objects (text->model, lines->first_obj,
+ text->font, E_FONT_PLAIN,
+ lines->text,
+ sel_start - start_char),
+ ypos - y,
+ lines->text + sel_start - start_char,
+ sel_end - sel_start);
+ text_draw_with_objects (text->model, lines->first_obj,
+ drawable,
+ text->font, E_FONT_PLAIN,
+ text->gc,
+ xpos - x + text_width_with_objects (text->model, lines->first_obj,
+ text->font, E_FONT_PLAIN,
+ lines->text,
+ sel_end - start_char),
+ ypos - y,
+ lines->text + sel_end - start_char,
+ end_char - sel_end);
} else {
- e_font_draw_utf8_text (drawable,
- text->font, E_FONT_PLAIN,
- text->gc,
- xpos - x,
- ypos - y,
- lines->text,
- lines->length);
+ text_draw_with_objects (text->model, lines->first_obj,
+ drawable,
+ text->font, E_FONT_PLAIN,
+ text->gc,
+ xpos - x,
+ ypos - y,
+ lines->text,
+ lines->length);
}
if (text->selection_start == text->selection_end &&
text->selection_start >= start_char &&
@@ -1942,22 +2114,24 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
gdk_draw_rectangle (drawable,
text->gc,
TRUE,
- xpos - x + e_font_utf8_text_width (text->font, E_FONT_PLAIN,
- lines->text,
- sel_start - start_char),
+ xpos - x + text_width_with_objects (text->model, lines->first_obj,
+ text->font, E_FONT_PLAIN,
+ lines->text,
+ sel_start - start_char),
ypos - y - e_font_ascent (text->font),
1,
e_font_height (text->font));
}
} else {
if (text->clip && text->use_ellipsis && lines->ellipsis_length < lines->length) {
- e_font_draw_utf8_text (drawable,
- text->font, E_FONT_PLAIN,
- text->gc,
- xpos - x,
- ypos - y,
- lines->text,
- lines->ellipsis_length);
+ text_draw_with_objects (text->model, lines->first_obj,
+ drawable,
+ text->font, E_FONT_PLAIN,
+ text->gc,
+ xpos - x,
+ ypos - y,
+ lines->text,
+ lines->ellipsis_length);
e_font_draw_utf8_text (drawable,
text->font, E_FONT_PLAIN,
text->gc,
@@ -1966,13 +2140,14 @@ e_text_draw (GnomeCanvasItem *item, GdkDrawable *drawable,
text->ellipsis ? text->ellipsis : "...",
text->ellipsis ? strlen (text->ellipsis) : 3);
} else
- e_font_draw_utf8_text (drawable,
- text->font, E_FONT_PLAIN,
- text->gc,
- xpos - x,
- ypos - y,
- lines->text,
- lines->length);
+ text_draw_with_objects (text->model, lines->first_obj,
+ drawable,
+ text->font, E_FONT_PLAIN,
+ text->gc,
+ xpos - x,
+ ypos - y,
+ lines->text,
+ lines->length);
}
ypos += e_font_height (text->font);
@@ -2269,9 +2444,10 @@ _get_xy_from_position (EText *text, gint position, gint *xp, gint *yp)
lines --;
y -= e_font_descent (text->font);
- x += e_font_utf8_text_width (text->font, E_FONT_PLAIN,
- lines->text,
- position - (lines->text - text->text));
+ x += text_width_with_objects (text->model, lines->first_obj,
+ text->font, E_FONT_PLAIN,
+ lines->text,
+ position - (lines->text - text->text));
x -= text->xofs_edit;
xd = x; yd = y;
@@ -2294,7 +2470,8 @@ _get_position_from_xy (EText *text, gint x, gint y)
double xd, yd;
char *p;
unicode_char_t unival;
-
+ gint object_num;
+ gint font_ht, adjust=0;
struct line *lines;
xd = x; yd = y;
@@ -2303,13 +2480,29 @@ _get_position_from_xy (EText *text, gint x, gint y)
x = xd; y = yd;
y += text->yofs_edit;
+ font_ht = e_font_height (text->font);
if (text->draw_borders)
ypos += BORDER_INDENT;
+ switch (text->anchor) {
+ case GTK_ANCHOR_WEST:
+ case GTK_ANCHOR_CENTER:
+ case GTK_ANCHOR_EAST:
+ y += (text->num_lines * font_ht)/2;
+ break;
+ case GTK_ANCHOR_SOUTH:
+ case GTK_ANCHOR_SOUTH_EAST:
+ case GTK_ANCHOR_SOUTH_WEST:
+ y += text->num_lines * font_ht;
+ default:
+ /* Do nothing */
+ }
+
+
j = 0;
while (y > ypos) {
- ypos += e_font_height (text->font);
+ ypos += font_ht;
j ++;
}
j--;
@@ -2327,21 +2520,38 @@ _get_position_from_xy (EText *text, gint x, gint y)
x += text->xofs_edit;
xpos = get_line_xpos_item_relative (text, lines);
+ object_num = lines->first_obj;
for (i = 0, p = lines->text; p && i < lines->length; i++, p = unicode_get_utf8 (p, &unival)) {
int charwidth;
+ int step1, step2;
+
+ if (unival == '\1') {
+ const gchar *obj_str = e_text_model_get_nth_object (text->model, object_num);
+ charwidth = e_font_utf8_text_width (text->font, E_FONT_PLAIN, obj_str, strlen (obj_str));
+ ++object_num;
- charwidth = e_font_utf8_char_width (text->font, E_FONT_PLAIN, p);
+ step1 = charwidth;
+ step2 = 0;
+ adjust = -1;
+
+ } else {
+ charwidth = e_font_utf8_char_width (text->font, E_FONT_PLAIN, p);
+
+ step1 = charwidth / 2;
+ step2 = (charwidth + 1) / 2;
+ adjust = 0;
+ }
- xpos += charwidth / 2;
+ xpos += step1;
if (xpos > x) {
break;
}
- xpos += (charwidth + 1) / 2;
+ xpos += step2;
}
if (!p) return 0;
-
- return p - text->text;
+
+ return MAX (p - text->text + adjust, 0);
}
#define SCROLL_WAIT_TIME 30000
@@ -2518,7 +2728,8 @@ _do_tooltip (gpointer data)
for (lines = text->lines, i = 0; i < text->num_lines; lines++, i++) {
gdouble line_width;
- line_width = e_font_utf8_text_width (text->font, E_FONT_PLAIN, lines->text, lines->length);
+ line_width = text_width_with_objects (text->model, lines->first_obj,
+ text->font, E_FONT_PLAIN, lines->text, lines->length);
max_width = MAX (max_width, line_width);
}
@@ -2913,7 +3124,7 @@ _get_position(EText *text, ETextEventProcessorCommand *command)
case E_TEP_START_OF_BUFFER:
return 0;
case E_TEP_END_OF_BUFFER:
- return unicode_strlen (text->text, -1);
+ return unicode_strlen_with_objects (text->model, 0, text->text);
case E_TEP_START_OF_LINE:
@@ -2930,7 +3141,7 @@ _get_position(EText *text, ETextEventProcessorCommand *command)
return 0;
case E_TEP_END_OF_LINE:
- length = strlen(text->text);
+ length = strlen (text->text);
if (text->selection_end >= length) return length;
p = unicode_next_utf8 (text->text + text->selection_end);
@@ -2998,6 +3209,35 @@ _get_position(EText *text, ETextEventProcessorCommand *command)
case E_TEP_SELECT_WORD:
+ {
+ /* This is a silly hack to cause double-clicking on an object
+ to activate that object.
+ (Normally, double click == select word, which is why this is here.) */
+
+ gchar c = text->text[text->selection_start];
+ gint i;
+ gint obj_num=0;
+
+ if (c == '\0'
+ && text->selection_start > 0
+ && text->text[text->selection_start-1] == '\1') {
+ c = '\1';
+ --text->selection_start;
+ }
+
+ if (c == '\1') {
+
+ for (i=0; i<text->selection_start; ++i)
+ if (text->text[i] == '\1')
+ ++obj_num;
+
+ e_text_model_activate_nth_object (text->model, obj_num);
+
+ return text->selection_start;
+ }
+ }
+
+
if (text->selection_end < 1) return 0;
p = unicode_previous_utf8 (text->text, text->text + text->selection_end);
if (p == text->text) return 0;
@@ -3020,6 +3260,7 @@ _get_position(EText *text, ETextEventProcessorCommand *command)
length = strlen (text->text);
if (text->selection_end >= length) return length;
+
p = unicode_next_utf8 (text->text + text->selection_end);
while (*p) {
@@ -3169,9 +3410,10 @@ e_text_command(ETextEventProcessor *tep, ETextEventProcessorCommand *command, gp
}
lines --;
i --;
- x = e_font_utf8_text_width(text->font, E_FONT_PLAIN,
- lines->text,
- text->selection_end - (lines->text - text->text));
+ x = text_width_with_objects (text->model, lines->first_obj,
+ text->font, E_FONT_PLAIN,
+ lines->text,
+ text->selection_end - (lines->text - text->text));
if (x < text->xofs_edit) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 15:02:52 +0800