X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-recpt-editor.c;h=357c1bd2fa3e2aaad08f0c0db696603b9a304b3f;hb=89c621790370dcbaddb8ff9b9dd233a7211e8d61;hp=1cab400cd65d7635e89d05afc021e1d749d417b9;hpb=bdf3144895871178bf6883bff6d29dbbbd0d7fae;p=modest

diff --git a/src/widgets/modest-recpt-editor.c b/src/widgets/modest-recpt-editor.c
index 1cab400..357c1bd 100644
--- a/src/widgets/modest-recpt-editor.c
+++ b/src/widgets/modest-recpt-editor.c
@@ -44,6 +44,12 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
+/* FIXNE: we should have no maemo-deps in widgets/ */
+#ifdef MODEST_PLATFORM_MAEMO
+#include "maemo/modest-hildon-includes.h"
+#endif /*MODEST_PLATFORM_MAEMO*/
+
+
 static GObjectClass *parent_class = NULL;
 
 #define RECIPIENT_TAG_ID "recpt-id"
@@ -333,9 +339,15 @@ modest_recpt_editor_instance_init (GTypeInstance *instance, gpointer g_class)
 	gtk_container_add (GTK_CONTAINER (priv->abook_button), abook_icon);
 
 	priv->text_view = gtk_text_view_new ();
+	/* 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), 
+		HILDON_GTK_INPUT_MODE_FULL);
+#endif
+	
 	priv->recipients = NULL;
 
-	priv->scrolled_window = modest_scroll_text_new (GTK_TEXT_VIEW (priv->text_view), 5);
+	priv->scrolled_window = modest_scroll_text_new (GTK_TEXT_VIEW (priv->text_view), 1024);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->scrolled_window), GTK_POLICY_NEVER,
 					GTK_POLICY_AUTOMATIC);
 	gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->scrolled_window), GTK_SHADOW_IN);
@@ -431,7 +443,11 @@ modest_recpt_editor_on_button_release_event (GtkWidget *widget,
 			selection_changed = TRUE;
 		}
 
-	gtk_text_buffer_select_range (buffer, &start, &end);
+	if (selection_changed) {
+		gtk_text_buffer_select_range (buffer, &start, &end);
+	} else {
+		GTK_TEXT_VIEW (priv->text_view)->pending_place_cursor_button = 0;
+	}
 
 	return FALSE;
 }
@@ -451,6 +467,7 @@ is_valid_insert (const gchar *text, gint len)
 	gunichar c;
 	gunichar next_c;
 	gint i= 0;
+	gboolean quoted = FALSE;
 	const gchar *current, *next_current;
 	if (text == NULL)
 		return TRUE;
@@ -463,14 +480,20 @@ is_valid_insert (const gchar *text, gint len)
 			next_c = g_utf8_get_char (g_utf8_next_char (current));
 		else
 			next_c = 0;
-		if (c == g_utf8_get_char(",") || c == g_utf8_get_char (";")) {
+		if (!quoted && ((c == g_utf8_get_char(",") || c == g_utf8_get_char (";")))) {
 			if ((next_c != 0) && (next_c != g_utf8_get_char ("\n")))
 				return FALSE;
+			else {
+			  current = g_utf8_next_char (next_current);
+			  continue;
+			}
 		}
 		if (c == 0x2022 || c == 0xfffc ||
 		    c == g_utf8_get_char ("\n") ||
 		    c == g_utf8_get_char ("\t"))
 			return FALSE;
+		if (c == g_utf8_get_char ("\""))
+			quoted = !quoted;
 		current = g_utf8_next_char (current);
 		i = current - text;
 	}
@@ -484,6 +507,7 @@ create_valid_text (const gchar *text, gint len)
 	gunichar next_c;
 	gint i= 0;
 	GString *str;
+	gboolean quoted = FALSE;
 	const gchar *current, *next_current;
 
 	if (text == NULL)
@@ -503,10 +527,12 @@ create_valid_text (const gchar *text, gint len)
 		    c != g_utf8_get_char ("\n") &&
 		    c != g_utf8_get_char ("\t"))
 			str = g_string_append_unichar (str, c);
-		if (c == g_utf8_get_char(",") || c == g_utf8_get_char (";")) {
+		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 (c == g_utf8_get_char ("\""))
+			quoted = !quoted;
 		current = g_utf8_next_char (current);
 		i = current - text;
 	}
@@ -523,12 +549,16 @@ modest_recpt_editor_on_insert_text (GtkTextBuffer *buffer,
 	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");
 		gtk_text_buffer_insert (buffer, location, new_text, -1);
 		g_free (new_text);
+		return;
 	}
 
 	if (iter_has_recipient (location)) {
@@ -661,12 +691,14 @@ modest_recpt_editor_on_key_press_event (GtkTextView *text_view,
 					  ModestRecptEditor *editor)
 {
 	GtkTextMark *insert;
+	GtkTextMark *selection;
 	GtkTextBuffer * buffer;
-	GtkTextIter location;
+	GtkTextIter location, selection_loc;
 	GtkTextTag *tag;
      
 	buffer = gtk_text_view_get_buffer (text_view);
 	insert = gtk_text_buffer_get_insert (buffer);
+	selection = gtk_text_buffer_get_selection_bound (buffer);
 
 	/* cases to cover:
 	 *    * cursor is on resolved recipient:
@@ -688,6 +720,7 @@ modest_recpt_editor_on_key_press_event (GtkTextView *text_view,
 	 */
 
 	gtk_text_buffer_get_iter_at_mark (buffer, &location, insert);
+	gtk_text_buffer_get_iter_at_mark (buffer, &selection_loc, selection);
 
 	switch (key->keyval) {
 	case GDK_Left:
@@ -757,7 +790,12 @@ modest_recpt_editor_on_key_press_event (GtkTextView *text_view,
 	case GDK_Return:
 	case GDK_KP_Enter:
 	{
+		gint insert_offset, selection_offset;
+		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);
+		if (selection_offset > insert_offset)
+			location = selection_loc;
 		tag = iter_has_recipient (&location);
 		if (tag != NULL) {
 			gtk_text_buffer_get_end_iter (buffer, &location);
@@ -836,6 +874,17 @@ modest_recpt_editor_grab_focus (ModestRecptEditor *recpt_editor)
 	gtk_widget_grab_focus (priv->text_view);
 }
 
+gboolean
+modest_recpt_editor_has_focus (ModestRecptEditor *recpt_editor)
+{
+	ModestRecptEditorPrivate *priv;
+	
+	g_return_val_if_fail (MODEST_IS_RECPT_EDITOR (recpt_editor), FALSE);
+	priv = MODEST_RECPT_EDITOR_GET_PRIVATE (recpt_editor);
+
+	return gtk_widget_is_focus (priv->text_view);
+}
+
 static void
 modest_recpt_editor_finalize (GObject *object)
 {