/* 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);
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);
}
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;
#endif
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_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 (!is_first_recipient)
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
buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (priv->text_view));
#endif
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);
}
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), "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);
priv->on_mark_set_handler = g_signal_connect (G_OBJECT (buffer), "mark-set",
G_CALLBACK (modest_recpt_editor_on_mark_set),
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;
+ 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);
+ g_signal_handlers_block_by_func (buffer, modest_recpt_editor_on_insert_text_after, 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);
+ 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 *
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;
}
}
-static void
-modest_recpt_editor_move_cursor_to_end (ModestRecptEditor *editor)
+/* 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
+ 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);
+ 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);
+ }
+ g_free (buffer_contents);
}
void
projects / modest / blobdiff