#include <config.h>
-#include <glib/gi18n-lib.h>
-
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkbutton.h>
+#include <gtk/gtk.h>
#include <modest-text-utils.h>
#include <modest-recpt-editor.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtk.h>
#include <modest-ui-constants.h>
+#include <modest-toolkit-factory.h>
+#include <modest-runtime.h>
-/* FIXNE: we should have no maemo-deps in widgets/ */
-#ifndef MODEST_TOOLKIT_GTK
+#ifdef MODEST_TOOLKIT_HILDON2
#include "modest-hildon-includes.h"
-#endif /*!MODEST_TOOLKIT_GTK*/
+#endif
#define RECPT_BUTTON_WIDTH_HILDON2 118
GtkWidget *abook_button;
GtkWidget *scrolled_window;
gchar *recipients;
-
+ gulong on_mark_set_handler;
+ gboolean show_abook;
};
#define MODEST_RECPT_EDITOR_GET_PRIVATE(o) \
/* widget events */
static void modest_recpt_editor_on_abook_clicked (GtkButton *button,
ModestRecptEditor *editor);
-static void modest_recpt_editor_move_cursor_to_end (ModestRecptEditor *editor);
+static void modest_recpt_editor_add_tags (ModestRecptEditor *editor,
+ const gchar * recipient_id);
static gboolean modest_recpt_editor_on_focus_in (GtkTextView *text_view,
GdkEventFocus *event,
ModestRecptEditor *editor);
gchar *text,
gint len,
ModestRecptEditor *editor);
+static void modest_recpt_editor_on_insert_text_after (GtkTextBuffer *buffer,
+ GtkTextIter *location,
+ gchar *text,
+ gint len,
+ ModestRecptEditor *editor);
static gboolean modest_recpt_editor_on_key_press_event (GtkTextView *text_view,
GdkEventKey *key,
ModestRecptEditor *editor);
/* static gunichar iter_next_char (GtkTextIter *iter); */
static GtkTextTag *prev_iter_has_recipient (GtkTextIter *iter);
/* static GtkTextTag *next_iter_has_recipient (GtkTextIter *iter); */
-static void select_tag_of_iter (GtkTextIter *iter, GtkTextTag *tag);
+static void select_tag_of_iter (GtkTextIter *iter, GtkTextTag *tag, gboolean grow, gboolean left_not_right);
static gboolean quote_opened (GtkTextIter *iter);
static gboolean is_valid_insert (const gchar *text, gint len);
static gchar *create_valid_text (const gchar *text, gint len);
g_return_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor));
priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor);
-#ifdef MODEST_TOOLKIT_HILDON2
- buffer = hildon_text_view_get_buffer (HILDON_TEXT_VIEW (priv->text_view));
-#else
- buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->text_view));
-#endif
+ buffer = modest_text_view_get_buffer (priv->text_view);
valid_recipients = create_valid_text (recipients, -1);
g_signal_handlers_block_by_func (buffer, modest_recpt_editor_on_insert_text, recpt_editor);
+ g_signal_handlers_block_by_func (buffer, modest_recpt_editor_on_insert_text_after, recpt_editor);
gtk_text_buffer_set_text (buffer, valid_recipients, -1);
g_free (valid_recipients);
if (GTK_WIDGET_REALIZED (recpt_editor))
gtk_widget_queue_resize (GTK_WIDGET (recpt_editor));
g_signal_handlers_unblock_by_func (buffer, modest_recpt_editor_on_insert_text, recpt_editor);
+ g_signal_handlers_unblock_by_func (buffer, modest_recpt_editor_on_insert_text_after, recpt_editor);
}
if (recipients == NULL)
return;
-#ifdef MODEST_TOOLKIT_HILDON2
- buffer = hildon_text_view_get_buffer (HILDON_TEXT_VIEW (priv->text_view));
-#else
- buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->text_view));
-#endif
+ buffer = modest_text_view_get_buffer (priv->text_view);
if (gtk_text_buffer_get_char_count (buffer) > 0) {
string_to_add = g_strconcat (";\n", recipients, NULL);
gtk_text_buffer_get_end_iter (buffer, &iter);
g_signal_handlers_block_by_func (buffer, modest_recpt_editor_on_insert_text, recpt_editor);
+ g_signal_handlers_block_by_func (buffer, modest_recpt_editor_on_insert_text_after, recpt_editor);
gtk_text_buffer_insert (buffer, &iter, string_to_add, -1);
-
+
g_signal_handlers_unblock_by_func (buffer, modest_recpt_editor_on_insert_text, recpt_editor);
+ g_signal_handlers_unblock_by_func (buffer, modest_recpt_editor_on_insert_text_after, recpt_editor);
if (GTK_WIDGET_REALIZED (recpt_editor))
gtk_widget_queue_resize (GTK_WIDGET (recpt_editor));
ModestRecptEditorPrivate *priv;
GtkTextBuffer *buffer = NULL;
GtkTextIter start, end, iter;
- GtkTextTag *tag = NULL;
GSList *node;
gboolean is_first_recipient = TRUE;
g_return_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor));
priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor);
-#ifdef MODEST_TOOLKIT_HILDON2
- buffer = hildon_text_view_get_buffer (HILDON_TEXT_VIEW (priv->text_view));
-#else
- buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->text_view));
-#endif
+ buffer = modest_text_view_get_buffer (priv->text_view);
g_signal_handlers_block_by_func (buffer, modest_recpt_editor_on_insert_text, recpt_editor);
+ g_signal_handlers_block_by_func (buffer, modest_recpt_editor_on_insert_text_after, recpt_editor);
gtk_text_buffer_get_bounds (buffer, &start, &end);
if (gtk_text_buffer_get_char_count (buffer) > 0) {
gchar * buffer_contents;
gtk_text_buffer_get_bounds (buffer, &start, &end);
buffer_contents = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
+ g_strstrip (buffer_contents);
if (!g_str_has_suffix (buffer_contents, "\n")) {
if (g_str_has_suffix (buffer_contents, ";")||(g_str_has_suffix (buffer_contents, ",")))
gtk_text_buffer_insert (buffer, &end, "\n", -1);
- else
+ else
gtk_text_buffer_insert (buffer, &end, ";\n", -1);
}
g_free (buffer_contents);
gtk_text_buffer_get_end_iter (buffer, &iter);
- tag = gtk_text_buffer_create_tag (buffer, NULL,
- "underline", PANGO_UNDERLINE_SINGLE,
- "wrap-mode", GTK_WRAP_NONE,
- "editable", TRUE, NULL);
-
- g_object_set_data (G_OBJECT (tag), "recipient-tag-id", GINT_TO_POINTER (RECIPIENT_TAG_ID));
- g_object_set_data_full (G_OBJECT (tag), "recipient-id", g_strdup (recipient_id), (GDestroyNotify) g_free);
-
for (node = email_list; node != NULL; node = g_slist_next (node)) {
gchar *recipient = (gchar *) node->data;
if ((recipient) && (strlen (recipient) != 0)) {
if (!is_first_recipient)
- gtk_text_buffer_insert (buffer, &iter, "\n", -1);
+ gtk_text_buffer_insert (buffer, &iter, "\n", -1);
- gtk_text_buffer_insert_with_tags (buffer, &iter, recipient, -1, tag, NULL);
+ gtk_text_buffer_insert (buffer, &iter, recipient, -1);
gtk_text_buffer_insert (buffer, &iter, ";", -1);
is_first_recipient = FALSE;
}
}
- g_signal_handlers_unblock_by_func (buffer, modest_recpt_editor_on_insert_text, recpt_editor);
-
- modest_recpt_editor_move_cursor_to_end (recpt_editor);
+ modest_recpt_editor_add_tags (recpt_editor, recipient_id);
+ g_signal_handlers_unblock_by_func (buffer, modest_recpt_editor_on_insert_text, recpt_editor);
+ g_signal_handlers_unblock_by_func (buffer, modest_recpt_editor_on_insert_text_after, recpt_editor);
}
void
g_return_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor));
priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor);
-#ifdef MODEST_TOOLKIT_HILDON2
- buffer = hildon_text_view_get_buffer (HILDON_TEXT_VIEW (priv->text_view));
-#else
- buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->text_view));
-#endif
+ buffer = modest_text_view_get_buffer (priv->text_view);
g_signal_handlers_block_by_func (buffer, modest_recpt_editor_on_insert_text, recpt_editor);
+ g_signal_handlers_block_by_func (buffer, modest_recpt_editor_on_insert_text_after, recpt_editor);
gtk_text_buffer_delete (buffer, start, end);
- while (email_lists_list) {
+ while (email_lists_list && recipient_ids_list) {
gchar *recipient_id = (gchar *) recipient_ids_list->data;
GSList *email_list = (GSList *) email_lists_list->data;
-
-
+
tag = gtk_text_buffer_create_tag (buffer, NULL,
"underline", PANGO_UNDERLINE_SINGLE,
"wrap-mode", GTK_WRAP_NONE,
g_object_set_data (G_OBJECT (tag), "recipient-tag-id", GINT_TO_POINTER (RECIPIENT_TAG_ID));
g_object_set_data_full (G_OBJECT (tag), "recipient-id", g_strdup (recipient_id), (GDestroyNotify) g_free);
-
+
for (node = email_list; node != NULL; node = g_slist_next (node)) {
gchar *recipient = (gchar *) node->data;
if ((recipient) && (strlen (recipient) != 0)) {
-
- if (!is_first_recipient)
+
+ if (!is_first_recipient || !gtk_text_iter_is_start(start))
gtk_text_buffer_insert (buffer, start, "\n", -1);
gtk_text_buffer_insert_with_tags (buffer, start, recipient, -1, tag, NULL);
-
+
if (node->next != NULL)
gtk_text_buffer_insert (buffer, start, ";", -1);
is_first_recipient = FALSE;
email_lists_list = g_slist_next (email_lists_list);
recipient_ids_list = g_slist_next (recipient_ids_list);
+
+ /* Add a separator between lists of emails*/
+ if (recipient_ids_list)
+ gtk_text_buffer_insert (buffer, start, ";", -1);
}
g_signal_handlers_unblock_by_func (buffer, modest_recpt_editor_on_insert_text, recpt_editor);
+ g_signal_handlers_unblock_by_func (buffer, modest_recpt_editor_on_insert_text_after, recpt_editor);
}
ModestRecptEditorPrivate *priv;
GtkTextBuffer *buffer = NULL;
GtkTextIter start, end;
- gchar *c;
g_return_val_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor), NULL);
priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor);
priv->recipients = NULL;
}
-#ifdef MODEST_TOOKIT_HILDON2
- buffer = hildon_text_view_get_buffer (HILDON_TEXT_VIEW (priv->text_view));
-#else
- buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->text_view));
-#endif
+ buffer = modest_text_view_get_buffer (priv->text_view);
gtk_text_buffer_get_start_iter (buffer, &start);
gtk_text_buffer_get_end_iter (buffer, &end);
priv->recipients = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
- for (c = priv->recipients; *c != '\0'; c = g_utf8_next_char (c)) {
- if (*c == '\n') {
- *c = ' ';
- }
- }
return priv->recipients;
priv = MODEST_RECPT_EDITOR_GET_PRIVATE (instance);
+ priv->show_abook = TRUE;
priv->abook_button = gtk_button_new ();
+ gtk_widget_set_no_show_all (GTK_WIDGET (priv->abook_button), TRUE);
+ gtk_widget_show (priv->abook_button);
#ifdef MODEST_TOOLKIT_HILDON2
gtk_widget_set_size_request (priv->abook_button, RECPT_BUTTON_WIDTH_HILDON2, -1);
#else
#endif
gtk_container_add (GTK_CONTAINER (priv->abook_button), abook_icon);
-#ifdef MODEST_TOOLKIT_HILDON2
- priv->text_view = hildon_text_view_new ();
-#else
- priv->text_view = gtk_text_view_new ();
-#endif
+ priv->text_view = modest_toolkit_factory_create_text_view (modest_runtime_get_toolkit_factory ());
/* Auto-capitalization is the default, so let's turn it off: */
#ifdef MAEMO_CHANGES
hildon_gtk_text_view_set_input_mode (GTK_TEXT_VIEW (priv->text_view),
gtk_widget_set_size_request (priv->text_view, 75, -1);
-#ifdef MODEST_TOOLKIT_HILDON2
- buffer = hildon_text_view_get_buffer (HILDON_TEXT_VIEW (priv->text_view));
-#else
- buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->text_view));
-#endif
+ buffer = modest_text_view_get_buffer (priv->text_view);
g_signal_connect (G_OBJECT (priv->abook_button), "clicked", G_CALLBACK (modest_recpt_editor_on_abook_clicked), instance);
g_signal_connect (G_OBJECT (priv->text_view), "key-press-event", G_CALLBACK (modest_recpt_editor_on_key_press_event), instance);
g_signal_connect (G_OBJECT (priv->text_view), "focus-in-event", G_CALLBACK (modest_recpt_editor_on_focus_in), instance);
- g_signal_connect (G_OBJECT (buffer), "insert-text", G_CALLBACK (modest_recpt_editor_on_insert_text), instance);
- g_signal_connect (G_OBJECT (buffer), "mark-set", G_CALLBACK (modest_recpt_editor_on_mark_set), instance);
+ g_signal_connect (G_OBJECT (buffer), "insert-text",
+ G_CALLBACK (modest_recpt_editor_on_insert_text),
+ instance);
+ g_signal_connect_after (G_OBJECT (buffer), "insert-text",
+ G_CALLBACK (modest_recpt_editor_on_insert_text_after),
+ instance);
-/* gtk_container_set_focus_child (GTK_CONTAINER (instance), priv->text_view); */
+ priv->on_mark_set_handler = g_signal_connect (G_OBJECT (buffer), "mark-set",
+ G_CALLBACK (modest_recpt_editor_on_mark_set),
+ instance);
return;
}
g_return_val_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor), NULL);
priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor);
-#ifdef MODEST_TOOLKIT_HILDON2
- return hildon_text_view_get_buffer (HILDON_TEXT_VIEW (priv->text_view));
-#else
- return gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->text_view));
-#endif
+ return modest_text_view_get_buffer (priv->text_view);
}
static void
ModestRecptEditor *recpt_editor)
{
ModestRecptEditorPrivate *priv;
- GtkTextIter start, end;
+ GtkTextIter insert_iter, selection_iter;
GtkTextMark *selection_bound;
+ GtkTextMark *insert;
GtkTextTag *tag;
gboolean selection_changed = FALSE;
-
+ gboolean select_to_left;
+
priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor);
buffer = modest_recpt_editor_get_buffer (recpt_editor);
selection_bound = gtk_text_buffer_get_selection_bound (buffer);
+ insert = gtk_text_buffer_get_insert (buffer);
- if (mark != selection_bound)
+ if (mark != selection_bound && mark != insert)
return;
- gtk_text_buffer_get_selection_bounds (buffer, &start, &end);
+ gtk_text_buffer_get_iter_at_mark (buffer, &insert_iter, insert);
+ gtk_text_buffer_get_iter_at_mark (buffer, &selection_iter, selection_bound);
- tag = iter_has_recipient (&start);
- if (tag != NULL)
- if (!gtk_text_iter_begins_tag (&start, tag)) {
- gtk_text_iter_backward_to_tag_toggle (&start, tag);
- selection_changed = TRUE;
- }
+ select_to_left = gtk_text_iter_get_offset (&selection_iter) > gtk_text_iter_get_offset (&insert_iter);
- tag = iter_has_recipient (&end);
- if (tag != NULL)
- if (!gtk_text_iter_ends_tag (&end, tag)) {
- gtk_text_iter_forward_to_tag_toggle (&end, tag);
+ tag = iter_has_recipient (&insert_iter);
+ if (tag) {
+ if (select_to_left) {
+ if (!gtk_text_iter_begins_tag (&insert_iter, tag)) {
+ gtk_text_iter_backward_to_tag_toggle (&insert_iter, tag);
+ selection_changed = TRUE;
+ }
+ } else {
+ gtk_text_iter_forward_to_tag_toggle (&insert_iter, tag);
selection_changed = TRUE;
}
-
+ }
+
+ tag = iter_has_recipient (&selection_iter);
+ if (tag != NULL) {
+ if (select_to_left) {
+ gtk_text_iter_forward_to_tag_toggle (&selection_iter, tag);
+ selection_changed = TRUE;
+ } else {
+ if (!gtk_text_iter_begins_tag (&selection_iter, tag)) {
+ gtk_text_iter_backward_to_tag_toggle (&selection_iter, tag);
+ selection_changed = TRUE;
+ }
+ }
+ }
+
if (selection_changed) {
- gtk_text_buffer_select_range (buffer, &start, &end);
+ /* We block this signal handler in order to prevent a
+ stack overflow caused by recursive calls to this
+ handler as the select_range call could issue a
+ "mark-set" signal */
+ g_signal_handler_block (buffer, priv->on_mark_set_handler);
+ gtk_text_buffer_select_range (buffer, &insert_iter, &selection_iter);
+ g_signal_handler_unblock (buffer, priv->on_mark_set_handler);
}
}
next_c = g_utf8_get_char (g_utf8_next_char (current));
else
next_c = 0;
- if (c != 0x2022 && c != 0xfffc &&
+ if (c != 0x2022 && c != 0xfffc &&
c != g_utf8_get_char ("\n") &&
c != g_utf8_get_char ("\t"))
str = g_string_append_unichar (str, c);
if (!quoted && ((c == g_utf8_get_char(",") || c == g_utf8_get_char (";")))) {
- if ((next_c != 0) && (next_c != g_utf8_get_char ("\n")))
- str = g_string_append_c (str, '\n');
+ if ((next_c != 0) && (next_c != g_utf8_get_char ("\n"))) {
+ gchar *last_separator = MAX (g_utf8_strrchr(str->str, -1, g_utf8_get_char (",")),
+ g_utf8_strrchr(str->str, -1, g_utf8_get_char (";")));
+ if (last_separator) {
+ gchar *last_at = g_utf8_strrchr (str->str, -1, g_utf8_get_char ("@"));
+ if (last_at) {
+ if (last_at < last_separator)
+ str = g_string_append_c (str, '\n');
+ }
+ } else {
+ if (g_utf8_strrchr (str->str, -1, g_utf8_get_char ("@")))
+ str = g_string_append_c (str, '\n');
+ }
+ }
}
if (c == g_utf8_get_char ("\""))
quoted = !quoted;
current = g_utf8_next_char (current);
i = current - text;
}
+
return g_string_free (str, FALSE);
}
-static void
+/* Called after the default handler, and thus after the text was
+ inserted. We use this to insert a break after a ',' or a ';'*/
+static void
+modest_recpt_editor_on_insert_text_after (GtkTextBuffer *buffer,
+ GtkTextIter *location,
+ gchar *text,
+ gint len,
+ ModestRecptEditor *editor)
+{
+ GtkTextIter prev;
+ gunichar prev_char;
+ ModestRecptEditorPrivate *priv = MODEST_RECPT_EDITOR_GET_PRIVATE (editor);
+
+ prev = *location;
+ /* We must go backwards twice as location points to the next
+ valid position to insert text */
+ if (!gtk_text_iter_backward_chars (&prev, 2))
+ return;
+
+ prev_char = gtk_text_iter_get_char (&prev);
+ g_signal_handlers_block_by_func (buffer, modest_recpt_editor_on_insert_text, editor);
+ g_signal_handlers_block_by_func (buffer, modest_recpt_editor_on_insert_text_after, editor);
+ if ((prev_char == ';'||prev_char == ',')&&(!quote_opened(&prev))) {
+ GtkTextMark *insert;
+ gtk_text_iter_forward_char (&prev);
+ gtk_text_buffer_insert (buffer, &prev, "\n",-1);
+ insert = gtk_text_buffer_get_insert (buffer);
+ gtk_text_view_scroll_to_iter (GTK_TEXT_VIEW (priv->text_view), &prev, 0.0,TRUE, 0.0, 1.0);
+ }
+ g_signal_handlers_unblock_by_func (buffer, modest_recpt_editor_on_insert_text, editor);
+ g_signal_handlers_unblock_by_func (buffer, modest_recpt_editor_on_insert_text_after, editor);
+}
+
+/* Called before the default handler, we use it to validate the inputs */
+static void
modest_recpt_editor_on_insert_text (GtkTextBuffer *buffer,
GtkTextIter *location,
gchar *text,
gint len,
ModestRecptEditor *editor)
{
- GtkTextIter prev;
- gunichar prev_char;
- ModestRecptEditorPrivate *priv = MODEST_RECPT_EDITOR_GET_PRIVATE (editor);
-
if (len > 1024)
len = 1024;
if (!is_valid_insert (text, len)) {
gchar *new_text = create_valid_text (text, len);
g_signal_stop_emission_by_name (G_OBJECT (buffer), "insert-text");
- g_signal_handlers_block_by_func (buffer, modest_recpt_editor_on_insert_text,
- editor);
+ g_signal_handlers_block_by_func (buffer, modest_recpt_editor_on_insert_text, editor);
+ g_signal_handlers_block_by_func (buffer, modest_recpt_editor_on_insert_text_after, editor);
gtk_text_buffer_insert (buffer, location, new_text, -1);
- g_signal_handlers_unblock_by_func (buffer,
- modest_recpt_editor_on_insert_text,
- editor);
+ g_signal_handlers_unblock_by_func (buffer, modest_recpt_editor_on_insert_text, editor);
+ g_signal_handlers_unblock_by_func (buffer, modest_recpt_editor_on_insert_text_after, editor);
g_free (new_text);
return;
}
gtk_text_buffer_get_end_iter (buffer, location);
gtk_text_buffer_place_cursor (buffer, location);
}
-
- if (gtk_text_iter_is_start (location))
- return;
-
- if (gtk_text_iter_is_end (location)) {
- prev = *location;
- if (!gtk_text_iter_backward_char (&prev))
- return;
- prev_char = gtk_text_iter_get_char (&prev);
- g_signal_handlers_block_by_func (buffer, modest_recpt_editor_on_insert_text, editor);
- if ((prev_char == ';'||prev_char == ',')&&(!quote_opened(location))) {
- GtkTextMark *insert;
- gtk_text_buffer_insert (buffer, location, "\n",-1);
- insert = gtk_text_buffer_get_insert (buffer);
- gtk_text_view_scroll_to_iter (GTK_TEXT_VIEW (priv->text_view), location, 0.0,TRUE, 0.0, 1.0);
- }
- g_signal_handlers_unblock_by_func (buffer, modest_recpt_editor_on_insert_text, editor);
-
- }
-
}
static GtkTextTag *
/* } */
static void
-select_tag_of_iter (GtkTextIter *iter, GtkTextTag *tag)
+select_tag_of_iter (GtkTextIter *iter, GtkTextTag *tag, gboolean grow, gboolean left_not_right)
{
GtkTextIter start, end;
start = *iter;
- if (!gtk_text_iter_begins_tag (&start, tag))
+ if (!gtk_text_iter_begins_tag (&start, tag)) {
gtk_text_iter_backward_to_tag_toggle (&start, tag);
+ } else {
+ if (!left_not_right) {
+ gtk_text_buffer_select_range (gtk_text_iter_get_buffer (iter), &start, &start);
+ return;
+ }
+ }
end = *iter;
- if (!gtk_text_iter_ends_tag (&end, tag))
+ if (!gtk_text_iter_ends_tag (&end, tag)) {
gtk_text_iter_forward_to_tag_toggle (&end, tag);
- gtk_text_buffer_select_range (gtk_text_iter_get_buffer (iter), &start, &end);
+ } else {
+ if (left_not_right) {
+ gtk_text_buffer_select_range (gtk_text_iter_get_buffer (iter), &end, &end);
+ return;
+ }
+ }
+ if (grow) {
+ if (left_not_right)
+ gtk_text_buffer_select_range (gtk_text_iter_get_buffer (iter), &start, &end);
+ else
+ gtk_text_buffer_select_range (gtk_text_iter_get_buffer (iter), &end, &start);
+ } else {
+ if (left_not_right)
+ gtk_text_buffer_select_range (gtk_text_iter_get_buffer (iter), &start, &start);
+ else
+ gtk_text_buffer_select_range (gtk_text_iter_get_buffer (iter), &end, &end);
+ }
+ *iter = left_not_right?start:end;
}
static gboolean
GtkTextBuffer * buffer;
GtkTextIter location, selection_loc;
GtkTextTag *tag;
+ gboolean shift_pressed;
+ gboolean select_to_left;
+ gboolean has_selection;
-#ifdef MODEST_TOOLKIT_HILDON2
- buffer = hildon_text_view_get_buffer (HILDON_TEXT_VIEW (text_view));
-#else
- buffer = gtk_text_view_get_buffer (text_view);
-#endif
+ buffer = modest_text_view_get_buffer (GTK_WIDGET (text_view));
insert = gtk_text_buffer_get_insert (buffer);
selection = gtk_text_buffer_get_selection_bound (buffer);
gtk_text_buffer_get_iter_at_mark (buffer, &location, insert);
gtk_text_buffer_get_iter_at_mark (buffer, &selection_loc, selection);
+ select_to_left = gtk_text_iter_get_offset (&selection_loc) > gtk_text_iter_get_offset (&location);
+ has_selection = gtk_text_iter_get_offset (&selection_loc) != gtk_text_iter_get_offset (&location);
+ shift_pressed = key->state & GDK_SHIFT_MASK;
+
switch (key->keyval) {
case GDK_Left:
case GDK_KP_Left:
{
gboolean cursor_ready = FALSE;
+ GtkTextIter prev_location;
+ gboolean moved = TRUE;
+
+ prev_location = location;
while (!cursor_ready) {
- if (iter_previous_char (&location) == '\n') {
- gtk_text_iter_backward_char (&location);
+ if (moved && (iter_previous_char (&location) == '\n')) {
+ moved = gtk_text_iter_backward_char (&location);
} else {
cursor_ready = TRUE;
}
}
tag = iter_has_recipient (&location);
+ if (has_selection && gtk_text_iter_ends_tag (&prev_location, tag)) {
+ gtk_text_iter_backward_to_tag_toggle (&prev_location, tag);
+ location = prev_location;
+ cursor_ready = FALSE;
+ moved = TRUE;
+ while (moved && !cursor_ready) {
+ if (iter_previous_char (&location) == '\n') {
+ moved = gtk_text_iter_backward_char (&location);
+ } else {
+ cursor_ready = TRUE;
+ }
+ }
+ }
+
if ((tag != NULL)&& (gtk_text_iter_is_start (&location) || !(gtk_text_iter_begins_tag (&location, tag)))) {
- select_tag_of_iter (&location, tag);
+ if (has_selection) {
+ gtk_text_buffer_select_range (buffer, &location, &location);
+ } else {
+ select_tag_of_iter (&location, tag, select_to_left, TRUE);
+ }
gtk_text_view_scroll_to_mark (GTK_TEXT_VIEW (text_view), insert, 0.0, FALSE, 0.0, 1.0);
+
+ if (shift_pressed) {
+ gtk_text_buffer_select_range (buffer, &location, &selection_loc);
+ }
return TRUE;
}
gtk_text_iter_backward_char (&location);
tag = iter_has_recipient (&location);
if (tag != NULL)
- select_tag_of_iter (&location, tag);
+ select_tag_of_iter (&location, tag, select_to_left, TRUE);
else {
gtk_text_buffer_place_cursor (buffer, &location);
}
gtk_text_view_scroll_to_mark (GTK_TEXT_VIEW (text_view), insert, 0.0, FALSE, 0.0, 1.0);
+ if (shift_pressed) {
+ gtk_text_buffer_select_range (buffer, &location, &selection_loc);
+ }
+
return TRUE;
}
break;
case GDK_KP_Right:
{
gboolean cursor_moved = FALSE;
+ gboolean moved = TRUE;
tag = iter_has_recipient (&location);
if ((tag != NULL)&&(!gtk_text_iter_ends_tag (&location, tag))) {
gtk_text_iter_forward_to_tag_toggle (&location, tag);
- while (gtk_text_iter_get_char (&location) == '\n')
- gtk_text_iter_forward_char (&location);
+ moved = TRUE;
+ while (moved && (gtk_text_iter_get_char (&location) == '\n'))
+ moved = gtk_text_iter_forward_char (&location);
gtk_text_buffer_place_cursor (buffer, &location);
gtk_text_view_scroll_to_mark (GTK_TEXT_VIEW (text_view), insert, 0.0, FALSE, 0.0, 1.0);
+
+ if (shift_pressed) {
+ gtk_text_buffer_select_range (buffer, &location, &selection_loc);
+ }
return TRUE;
}
- while (gtk_text_iter_get_char (&location) == '\n') {
- gtk_text_iter_forward_char (&location);
+ moved = TRUE;
+ while (moved && (gtk_text_iter_get_char (&location) == '\n')) {
+ moved = gtk_text_iter_forward_char (&location);
cursor_moved = TRUE;
}
if (!cursor_moved)
gtk_text_iter_forward_char (&location);
- while (gtk_text_iter_get_char (&location) == '\n') {
- gtk_text_iter_forward_char (&location);
+
+ moved = TRUE;
+ while (moved && (gtk_text_iter_get_char (&location) == '\n')) {
+ moved = gtk_text_iter_forward_char (&location);
cursor_moved = TRUE;
}
tag = iter_has_recipient (&location);
if (tag != NULL)
- select_tag_of_iter (&location, tag);
+ select_tag_of_iter (&location, tag, !select_to_left, FALSE);
else
gtk_text_buffer_place_cursor (buffer, &location);
gtk_text_view_scroll_to_mark (GTK_TEXT_VIEW (text_view), insert, 0.0, FALSE, 0.0, 1.0);
+
+ if (shift_pressed) {
+ gtk_text_buffer_select_range (buffer, &location, &selection_loc);
+ }
return TRUE;
}
break;
insert_offset = gtk_text_iter_get_offset (&location);
selection_offset = gtk_text_iter_get_offset (&selection_loc);
g_signal_handlers_block_by_func (buffer, modest_recpt_editor_on_insert_text, editor);
+ g_signal_handlers_block_by_func (buffer, modest_recpt_editor_on_insert_text_after, editor);
if (selection_offset > insert_offset)
location = selection_loc;
tag = iter_has_recipient (&location);
}
}
g_signal_handlers_unblock_by_func (buffer, modest_recpt_editor_on_insert_text, editor);
+ g_signal_handlers_unblock_by_func (buffer, modest_recpt_editor_on_insert_text_after, editor);
return TRUE;
}
break;
GtkTextIter iter_in_tag;
iter_in_tag = location;
gtk_text_iter_backward_char (&iter_in_tag);
- select_tag_of_iter (&iter_in_tag, tag);
+ select_tag_of_iter (&iter_in_tag, tag, FALSE, TRUE);
gtk_text_buffer_delete_selection (buffer, TRUE, TRUE);
return TRUE;
}
}
}
-static void
-modest_recpt_editor_move_cursor_to_end (ModestRecptEditor *editor)
+static void _discard_chars (GtkTextIter *start, GtkTextIter *end)
{
+ while (!gtk_text_iter_equal (start, end)) {
+ gunichar c = gtk_text_iter_get_char (start);
+
+ if (c == '\n' || c == ';' || c == ',' || c == ' ') {
+ if (!gtk_text_iter_forward_char (start))
+ break;
+ } else {
+ break;
+ }
+
+ }
+}
+
+/* NOTE: before calling this function be sure that both
+ modest_recpt_editor_on_insert_text and
+ modest_recpt_editor_on_insert_text_after won't be triggered during
+ the execution of the procedure. You'll have to block both signal
+ handlers otherwise you'll get an infinite loop and most likely a
+ SIGSEV caused by a stack overflow */
+static void
+modest_recpt_editor_add_tags (ModestRecptEditor *editor,
+ const gchar * recipient_id)
+{
+
ModestRecptEditorPrivate *priv = MODEST_RECPT_EDITOR_GET_PRIVATE (editor);
-#ifdef MODEST_TOOLKIT_HILDON2
- GtkTextBuffer *buffer = hildon_text_view_get_buffer (HILDON_TEXT_VIEW (priv->text_view));
-#else
- GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->text_view));
-#endif
+ GtkTextBuffer *buffer = modest_text_view_get_buffer (priv->text_view);
+ GtkTextTag *tag;
GtkTextIter start, end;
+ gchar * buffer_contents;
+ GtkTextIter start_match, end_match;
- gtk_text_buffer_get_end_iter (buffer, &start);
- end = start;
- gtk_text_buffer_select_range (buffer, &start, &end);
+ /* This would move the cursor to the end of the buffer
+ containing new line character. */
+ gtk_text_buffer_get_bounds (buffer, &start, &end);
+ buffer_contents = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
+ gtk_text_buffer_set_text(buffer,buffer_contents,strlen(buffer_contents));
+ tag = gtk_text_buffer_create_tag (buffer, NULL,
+ "underline", PANGO_UNDERLINE_SINGLE,
+ "wrap-mode", GTK_WRAP_NONE,
+ "editable", TRUE, NULL);
+ g_object_set_data (G_OBJECT (tag), "recipient-tag-id", GINT_TO_POINTER (RECIPIENT_TAG_ID));
+ g_object_set_data_full (G_OBJECT (tag), "recipient-id", g_strdup (recipient_id), (GDestroyNotify) g_free);
+
+ /* Formatting the buffer content by applying tag */
+ gtk_text_buffer_get_bounds (buffer, &start, &end);
+ _discard_chars (&start, &end);
+ while (gtk_text_iter_forward_search(&start, ";",
+ GTK_TEXT_SEARCH_TEXT_ONLY |
+ GTK_TEXT_SEARCH_VISIBLE_ONLY,
+ &start_match, &end_match, &end )) {
+ int offset;
+
+ gtk_text_buffer_apply_tag(buffer, tag, &start, &start_match);
+ offset = gtk_text_iter_get_offset (&end_match);
+ gtk_text_buffer_get_iter_at_offset(buffer, &start, offset);
+ _discard_chars (&start, &end);
+ }
+ g_free (buffer_contents);
}
void
gtk_widget_is_focus (priv->text_view);
}
+void
+modest_recpt_editor_set_show_abook_button (ModestRecptEditor *recpt_editor, gboolean show)
+{
+ ModestRecptEditorPrivate *priv;
+
+ g_return_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor));
+ priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor);
+
+ priv->show_abook = show;
+
+ if (show)
+ gtk_widget_show (priv->abook_button);
+ else
+ gtk_widget_hide (priv->abook_button);
+}
+
+gboolean
+modest_recpt_editor_get_show_abook_button (ModestRecptEditor *recpt_editor, gboolean show)
+{
+ ModestRecptEditorPrivate *priv;
+
+ g_return_val_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor), FALSE);
+ priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor);
+
+ return priv->show_abook;
+
+}
+
static void
modest_recpt_editor_finalize (GObject *object)
{
ModestRecptEditorPrivate *priv;
priv = MODEST_RECPT_EDITOR_GET_PRIVATE (object);
+ if (g_signal_handler_is_connected (object, priv->on_mark_set_handler))
+ g_signal_handler_disconnect (object, priv->on_mark_set_handler);
+ priv->on_mark_set_handler = 0;
+
if (priv->recipients) {
g_free (priv->recipients);
priv->recipients = NULL;
modest_recpt_editor_class_init (ModestRecptEditorClass *klass)
{
GObjectClass *object_class;
- GtkWidgetClass *widget_class;
parent_class = g_type_class_peek_parent (klass);
object_class = (GObjectClass*) klass;
- widget_class = GTK_WIDGET_CLASS (klass);
object_class->finalize = modest_recpt_editor_finalize;
projects / modest / blobdiff