prevent secondary selection claim after "add to sender" dialog

[claws.git] / src / textview.c

diff --git a/src/textview.c b/src/textview.c
index f96309c0223d172feb14df5bde1a33a977bc3c6d..3af5cc4e3493ed25c295b30d45f678aacf16bf1f 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -45,6 +45,7 @@
 #include "gtkutils.h"
 #include "procmime.h"
 #include "html.h"
+#include "enriched.h"
 #include "compose.h"
 #include "addressbook.h"
 #include "displayheader.h"
@@ -97,6 +98,9 @@ static GdkColor error_color = {
 
 static GdkFont *spacingfont;
 
+static void textview_show_ertf         (TextView       *textview,
+                                        FILE           *fp,
+                                        CodeConverter  *conv);
 static void textview_show_html         (TextView       *textview,
                                         FILE           *fp,
                                         CodeConverter  *conv);
@@ -290,7 +294,8 @@ void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
                boundary_len = strlen(boundary);
        }
 
-       if (!boundary && mimeinfo->mime_type == MIME_TEXT) {
+       if (!boundary && (mimeinfo->mime_type == MIME_TEXT || mimeinfo->mime_type == MIME_TEXT_HTML || mimeinfo->mime_type == MIME_TEXT_ENRICHED)) {
+       
                if (fseek(fp, mimeinfo->fpos, SEEK_SET) < 0)
                        perror("fseek");
                headers = textview_scan_header(textview, fp);
@@ -299,8 +304,13 @@ void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
                        glong fpos;
                        MimeInfo *parent = mimeinfo->parent;
 
-                       while (parent->parent)
+                       while (parent->parent) {
+                               if (parent->main &&
+                                   parent->main->mime_type ==
+                                       MIME_MESSAGE_RFC822)
+                                       break;
                                parent = parent->parent;
+                       }
 
                        if ((fpos = ftell(fp)) < 0)
                                perror("ftell");
@@ -312,6 +322,7 @@ void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
                                        perror("fseek");
                        }
                }
+               /* skip MIME part headers */
                while (fgets(buf, sizeof(buf), fp) != NULL)
                        if (buf[0] == '\r' || buf[0] == '\n') break;
        }
@@ -354,6 +365,8 @@ void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
        if (tmpfp) {
                if (mimeinfo->mime_type == MIME_TEXT_HTML)
                        textview_show_html(textview, tmpfp, conv);
+               else if (mimeinfo->mime_type == MIME_TEXT_ENRICHED)
+                       textview_show_ertf(textview, tmpfp, conv);
                else
                        while (fgets(buf, sizeof(buf), tmpfp) != NULL)
                                textview_write_line(textview, buf, conv);
@@ -460,6 +473,22 @@ static void textview_show_html(TextView *textview, FILE *fp,
        html_parser_destroy(parser);
 }
 
+static void textview_show_ertf(TextView *textview, FILE *fp,
+                              CodeConverter *conv)
+{
+       ERTFParser *parser;
+       gchar *str;
+       gchar* url = NULL;
+
+       parser = ertf_parser_new(fp, conv);
+       g_return_if_fail(parser != NULL);
+
+       while ((str = ertf_parse(parser)) != NULL) {
+               textview_write_line(textview, str, NULL);
+       }
+       ertf_parser_destroy(parser);
+}
+
 /* get_uri_part() - retrieves a URI starting from scanpos.
                    Returns TRUE if succesful */
 static gboolean get_uri_part(const gchar *start, const gchar *scanpos,
@@ -486,8 +515,7 @@ static gboolean get_uri_part(const gchar *start, const gchar *scanpos,
         * should pass some URI type to this function and decide on that whether
         * to perform punctuation stripping */
 
-#define IS_REAL_PUNCT(ch) \
-       (ispunct(ch) && ((ch) != '/')) 
+#define IS_REAL_PUNCT(ch)      (ispunct(ch) && ((ch) != '/')) 
 
        for (; ep_ - 1 > scanpos + 1 && IS_REAL_PUNCT(*(ep_ - 1)); ep_--)
                ;
@@ -512,6 +540,8 @@ static gchar *make_uri_string(const gchar *bp, const gchar *ep)
         !isspace(ch) && \
         !strchr("()<>\"", (ch)))
 
+/* alphabet and number within 7bit ASCII */
+#define IS_ASCII_ALNUM(ch)     (isascii(ch) && isalnum(ch))
 #define IS_QUOTE(ch) ((ch) == '\'' || (ch) == '"')
 
 /* get_email_part() - retrieves an email address. Returns TRUE if succesful */
@@ -541,7 +571,7 @@ static gboolean get_email_part(const gchar *start, const gchar *scanpos,
 
        /* TODO: should start with an alnum? */
        bp_++;
-       for (; bp_ < scanpos && !isalnum(*bp_); bp_++)
+       for (; bp_ < scanpos && !IS_ASCII_ALNUM(*bp_); bp_++)
                ;
 
        if (bp_ != scanpos) {
@@ -550,7 +580,7 @@ static gboolean get_email_part(const gchar *start, const gchar *scanpos,
                        ;
 
                /* TODO: really should terminate with an alnum? */
-               for (; ep_ > scanpos  && !isalnum(*ep_); --ep_)
+               for (; ep_ > scanpos && !IS_ASCII_ALNUM(*ep_); --ep_)
                        ;
                ep_++;
 
@@ -918,8 +948,8 @@ void textview_set_font(TextView *textview, const gchar *codeset)
                GtkWidget *parent;
 
                parent = textview->scrolledwin_mb->parent;
-               gtk_editable_select_region
-                       (GTK_EDITABLE(textview->text_mb), 0, 0);
+               gtk_editable_claim_selection(GTK_EDITABLE(textview->text_mb),
+                                            FALSE, GDK_CURRENT_TIME);
                gtk_container_remove(GTK_CONTAINER(parent),
                                     textview->scrolledwin_mb);
                gtk_container_add(GTK_CONTAINER(parent),
@@ -931,8 +961,8 @@ void textview_set_font(TextView *textview, const gchar *codeset)
                GtkWidget *parent;
 
                parent = textview->scrolledwin_sb->parent;
-               gtk_editable_select_region
-                       (GTK_EDITABLE(textview->text_sb), 0, 0);
+               gtk_editable_claim_selection(GTK_EDITABLE(textview->text_sb),
+                                            FALSE, GDK_CURRENT_TIME);
                gtk_container_remove(GTK_CONTAINER(parent),
                                     textview->scrolledwin_sb);
                gtk_container_add(GTK_CONTAINER(parent),
@@ -1434,14 +1464,31 @@ static void textview_button_pressed(GtkWidget *widget, GdkEventButton *event,
                                if (!g_strncasecmp(uri->uri, "mailto:", 7)) {
                                        if (event->button == 3) {
                                                gchar *fromname, *fromaddress;
+                                               GdkEventButton tmpev;   
+                                               
                                                /* extract url */
                                                fromaddress = g_strdup(uri->uri + 7);
                                                /* Hiroyuki: please put this function in utils.c! */
                                                fromname = procheader_get_fromname(fromaddress);
                                                extract_address(fromaddress);
                                                g_message("adding from textview %s <%s>", fromname, fromaddress);
-                                               // Add to address book - Match
+                                               /* Add to address book - Match */
                                                addressbook_add_contact( fromname, fromaddress, NULL );
+                                               
+                                               /* force press and release at (0, 0) to work around secondary 
+                                                * selection claim */
+                                               tmpev         = *event;
+                                               tmpev.x_root -= tmpev.x;
+                                               tmpev.y_root -= tmpev.y;
+                                               tmpev.x       = 0;
+                                               tmpev.y       = 0;
+                                               tmpev.time    = GDK_CURRENT_TIME;
+                                               gtk_widget_event(widget, (GdkEvent *)&tmpev);
+
+                                               tmpev.type    = GDK_BUTTON_RELEASE;
+                                               tmpev.time    = GDK_CURRENT_TIME;
+                                               gtk_widget_event(widget, (GdkEvent *)&tmpev);
+
                                                g_free(fromaddress);
                                                g_free(fromname);
                                        } else {
@@ -1455,6 +1502,7 @@ static void textview_button_pressed(GtkWidget *widget, GdkEventButton *event,
                        }
                }
        }
+       return TRUE;
 }
 
 static void textview_uri_list_remove_all(GSList *uri_list)