2004-11-14 [colin] 0.9.12cvs146.9
[claws.git] / src / textview.c
index d9b839724577ec52b55d31210341b4317825307e..ba97f5076b9b1dc80d443a93bb81ebf4a75321dc 100644 (file)
@@ -52,8 +52,6 @@
 #include "mimeview.h"
 #include "alertpanel.h"
 
-typedef struct _RemoteURI      RemoteURI;
-
 struct _RemoteURI
 {
        gchar *uri;
@@ -99,6 +97,9 @@ static GdkColor error_color = {
 #endif
 
 
+static GdkCursor *hand_cursor = NULL;
+static GdkCursor *text_cursor = NULL;
+
 #define TEXTVIEW_STATUSBAR_PUSH(textview, str)                                     \
 {                                                                          \
        gtk_statusbar_push(GTK_STATUSBAR(textview->messageview->statusbar), \
@@ -119,8 +120,7 @@ static void textview_add_part               (TextView       *textview,
 static void textview_add_parts         (TextView       *textview,
                                         MimeInfo       *mimeinfo);
 static void textview_write_body                (TextView       *textview,
-                                        MimeInfo       *mimeinfo,
-                                        const gchar    *charset);
+                                        MimeInfo       *mimeinfo);
 static void textview_show_html         (TextView       *textview,
                                         FILE           *fp,
                                         CodeConverter  *conv);
@@ -138,12 +138,40 @@ static GPtrArray *textview_scan_header    (TextView       *textview,
 static void textview_show_header       (TextView       *textview,
                                         GPtrArray      *headers);
 
-static gint textview_key_pressed       (GtkWidget      *widget,
-                                        GdkEventKey    *event,
-                                        TextView       *textview);
-static gboolean textview_uri_button_pressed(GtkTextTag *tag, GObject *obj,
-                                           GdkEvent *event, GtkTextIter *iter,
-                                           TextView *textview);
+static gint textview_key_pressed               (GtkWidget      *widget,
+                                                GdkEventKey    *event,
+                                                TextView       *textview);
+static gboolean textview_motion_notify         (GtkWidget      *widget,
+                                                GdkEventMotion *motion,
+                                                TextView       *textview);
+static gboolean textview_leave_notify          (GtkWidget      *widget,
+                                                GdkEventCrossing *event,
+                                                TextView       *textview);
+static gboolean textview_visibility_notify     (GtkWidget      *widget,
+                                                GdkEventVisibility *event,
+                                                TextView       *textview);
+static void textview_uri_update                        (TextView       *textview,
+                                                gint           x,
+                                                gint           y);
+static gboolean textview_get_uri_range         (TextView       *textview,
+                                                GtkTextIter    *iter,
+                                                GtkTextTag     *tag,
+                                                GtkTextIter    *start_iter,
+                                                GtkTextIter    *end_iter);
+static RemoteURI *textview_get_uri_from_range  (TextView       *textview,
+                                                GtkTextIter    *iter,
+                                                GtkTextTag     *tag,
+                                                GtkTextIter    *start_iter,
+                                                GtkTextIter    *end_iter);
+static RemoteURI *textview_get_uri             (TextView       *textview,
+                                                GtkTextIter    *iter,
+                                                GtkTextTag     *tag);
+static gboolean textview_uri_button_pressed    (GtkTextTag     *tag,
+                                                GObject        *obj,
+                                                GdkEvent       *event,
+                                                GtkTextIter    *iter,
+                                                TextView       *textview);
+
 static void textview_smooth_scroll_do          (TextView       *textview,
                                                 gfloat          old_value,
                                                 gfloat          last_value,
@@ -186,9 +214,10 @@ TextView *textview_create(void)
 
        /* create GtkSText widgets for single-byte and multi-byte character */
        text = gtk_text_view_new();
+       gtk_widget_add_events(text, GDK_LEAVE_NOTIFY_MASK);
        gtk_widget_show(text);
        gtk_text_view_set_editable(GTK_TEXT_VIEW(text), FALSE);
-       gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text), GTK_WRAP_WORD);
+       gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text), GTK_WRAP_WORD_CHAR);
        gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(text), FALSE);
        g_signal_connect(G_OBJECT(text), "populate-popup",
                 G_CALLBACK(populate_popup), NULL);
@@ -212,9 +241,23 @@ TextView *textview_create(void)
 
        gtk_container_add(GTK_CONTAINER(scrolledwin), text);
 
+       if (!hand_cursor)
+               hand_cursor = gdk_cursor_new(GDK_HAND2);
+       if (!text_cursor)
+               text_cursor = gdk_cursor_new(GDK_XTERM);
+
        g_signal_connect(G_OBJECT(text), "key_press_event",
                         G_CALLBACK(textview_key_pressed),
                         textview);
+       g_signal_connect(G_OBJECT(text), "motion_notify_event",
+                        G_CALLBACK(textview_motion_notify),
+                        textview);
+       g_signal_connect(G_OBJECT(text), "leave_notify_event",
+                        G_CALLBACK(textview_leave_notify),
+                        textview);
+       g_signal_connect(G_OBJECT(text), "visibility_notify_event",
+                        G_CALLBACK(textview_visibility_notify),
+                        textview);
 
        gtk_widget_show(scrolledwin);
 
@@ -230,7 +273,6 @@ TextView *textview_create(void)
        textview->body_pos         = 0;
        textview->show_all_headers = FALSE;
        textview->last_buttonpress = GDK_NOTHING;
-       textview->show_url_msgid   = 0;
 
        return textview;
 }
@@ -269,6 +311,9 @@ static void textview_create_tags(GtkTextView *text, TextView *textview)
        tag = gtk_text_buffer_create_tag(buffer, "link",
                                         "foreground-gdk", &uri_color,
                                         NULL);
+       gtk_text_buffer_create_tag(buffer, "link-hover",
+                                  "underline", PANGO_UNDERLINE_SINGLE,
+                                  NULL);
 
        g_signal_connect(G_OBJECT(tag), "event",
                          G_CALLBACK(textview_uri_button_pressed), textview);
@@ -310,39 +355,14 @@ void textview_show_message(TextView *textview, MimeInfo *mimeinfo,
                           const gchar *file)
 {
        FILE *fp;
-       const gchar *charset = NULL;
 
        if ((fp = fopen(file, "rb")) == NULL) {
                FILE_OP_ERROR(file, "fopen");
                return;
        }
 
-       if (textview->messageview->forced_charset)
-               charset = textview->messageview->forced_charset;
-       else if (prefs_common.force_charset)
-               charset = prefs_common.force_charset;
-       else
-               charset = procmime_mimeinfo_get_parameter(mimeinfo, "charset");
-
-       textview_set_font(textview, charset);
        textview_clear(textview);
 
-
-/*
-       if (fseek(fp, mimeinfo->offset, SEEK_SET) < 0) perror("fseek");
-       headers = textview_scan_header(textview, fp);
-       if (headers) {
-               GtkTextView *text = GTK_TEXT_VIEW(textview->text);
-               GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
-               GtkTextIter iter;
-
-               textview_show_header(textview, headers);
-               procheader_header_array_destroy(headers);
-
-               gtk_text_buffer_get_end_iter(buffer, &iter);
-               textview->body_pos = gtk_text_iter_get_offset(&iter);
-       }
-*/
        textview_add_parts(textview, mimeinfo);
 
        fclose(fp);
@@ -353,13 +373,12 @@ void textview_show_message(TextView *textview, MimeInfo *mimeinfo,
 void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
 {
        GtkTextView *text;
-       const gchar *charset = NULL;
 
        g_return_if_fail(mimeinfo != NULL);
        g_return_if_fail(fp != NULL);
 
        if ((mimeinfo->type == MIMETYPE_MULTIPART) ||
-           ((mimeinfo->type == MIMETYPE_MESSAGE) && !g_strcasecmp(mimeinfo->subtype, "rfc822"))) {
+           ((mimeinfo->type == MIMETYPE_MESSAGE) && !g_ascii_strcasecmp(mimeinfo->subtype, "rfc822"))) {
                textview_clear(textview);
                textview_add_parts(textview, mimeinfo);
                return;
@@ -367,40 +386,13 @@ void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
 
        if (fseek(fp, mimeinfo->offset, SEEK_SET) < 0)
                perror("fseek");
-/*
-       headers = textview_scan_header(textview, fp);
-*/
-       if (textview->messageview->forced_charset)
-               charset = textview->messageview->forced_charset;
-       else if (prefs_common.force_charset)
-               charset = prefs_common.force_charset;
-       else
-               charset = procmime_mimeinfo_get_parameter(mimeinfo, "charset");
-
-       textview_set_font(textview, charset);
 
        textview_clear(textview);
 
-/*
-       if (headers) {
-               GtkTextView *text = GTK_TEXT_VIEW(textview->text);
-               GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
-               GtkTextIter iter;
-
-               textview_show_header(textview, headers);
-               procheader_header_array_destroy(headers);
-
-               gtk_text_buffer_get_end_iter(buffer, &iter);
-               textview->body_pos = gtk_text_iter_get_offset(&iter);
-               if (!mimeinfo->main) {
-                       gtk_text_buffer_insert(buffer, &iter, "\n", 1);
-               }
-       }
-*/
        if (mimeinfo->type == MIMETYPE_MULTIPART)
                textview_add_parts(textview, mimeinfo);
        else
-               textview_write_body(textview, mimeinfo, charset);
+               textview_write_body(textview, mimeinfo);
 
 }
 
@@ -410,9 +402,9 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
        GtkTextBuffer *buffer;
        GtkTextIter iter;
        gchar buf[BUFFSIZE];
-       const gchar *charset = NULL;
        GPtrArray *headers = NULL;
        const gchar *name;
+       gchar *content_type;
        gint charcount;
 
        g_return_if_fail(mimeinfo != NULL);
@@ -423,10 +415,10 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
 
        if (mimeinfo->type == MIMETYPE_MULTIPART) return;
 
-       if ((mimeinfo->type == MIMETYPE_MESSAGE) && !g_strcasecmp(mimeinfo->subtype, "rfc822")) {
+       if ((mimeinfo->type == MIMETYPE_MESSAGE) && !g_ascii_strcasecmp(mimeinfo->subtype, "rfc822")) {
                FILE *fp;
 
-               fp = fopen(mimeinfo->filename, "rb");
+               fp = fopen(mimeinfo->data.filename, "rb");
                fseek(fp, mimeinfo->offset, SEEK_SET);
                headers = textview_scan_header(textview, fp);
                if (headers) {
@@ -440,55 +432,29 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
        }
 
        name = procmime_mimeinfo_get_parameter(mimeinfo, "filename");
+       content_type = procmime_get_content_type_str(mimeinfo->type,
+                                                    mimeinfo->subtype);
        if (name == NULL)
                name = procmime_mimeinfo_get_parameter(mimeinfo, "name");
        if (name != NULL)
-               g_snprintf(buf, sizeof(buf), "\n[%s  %s/%s (%d bytes)]\n",
-                          name,
-                          procmime_get_type_str(mimeinfo->type),
-                          mimeinfo->subtype, mimeinfo->length);
+               g_snprintf(buf, sizeof(buf), "\n[%s  %s (%d bytes)]\n",
+                          name, content_type, mimeinfo->length);
        else
-               g_snprintf(buf, sizeof(buf), "\n[%s/%s (%d bytes)]\n",
-                          procmime_get_type_str(mimeinfo->type),
-                          mimeinfo->subtype, mimeinfo->length);
+               g_snprintf(buf, sizeof(buf), "\n[%s (%d bytes)]\n",
+                          content_type, mimeinfo->length);
+
+       g_free(content_type);                      
 
        if (mimeinfo->type != MIMETYPE_TEXT) {
                gtk_text_buffer_insert(buffer, &iter, buf, -1);
        } else if (mimeinfo->disposition != DISPOSITIONTYPE_ATTACHMENT) {
                if (prefs_common.display_header && (charcount > 0))
                        gtk_text_buffer_insert(buffer, &iter, "\n", 1);
-               if (textview->messageview->forced_charset)
-                       charset = textview->messageview->forced_charset;
-               else if (prefs_common.force_charset)
-                       charset = prefs_common.force_charset;
-               else
-                       charset = procmime_mimeinfo_get_parameter(mimeinfo, "charset");
 
-               textview_write_body(textview, mimeinfo, charset);
+               textview_write_body(textview, mimeinfo);
        }
 }
 
-#if 0
-static gboolean add_parts_func(GNode *node, gpointer data)
-{
-       MimeInfo *mimeinfo = (MimeInfo *) node->data;
-       TextView *textview = (TextView *) data;
-
-       g_return_val_if_fail(mimeinfo != NULL, FALSE);
-
-       textview_add_part(textview, mimeinfo);
-
-       return FALSE;
-}
-
-static void textview_add_parts(TextView *textview, MimeInfo *mimeinfo)
-{
-       g_return_if_fail(mimeinfo != NULL);
-
-       g_node_traverse(mimeinfo->node, G_PRE_ORDER, G_TRAVERSE_ALL, -1, add_parts_func, textview);
-}
-#endif
-
 static void recursive_add_parts(TextView *textview, GNode *node)
 {
         GNode * iter;
@@ -502,7 +468,7 @@ static void recursive_add_parts(TextView *textview, GNode *node)
             (mimeinfo->type != MIMETYPE_MESSAGE))
                 return;
         
-        if (strcasecmp(mimeinfo->subtype, "alternative") == 0) {
+        if (g_ascii_strcasecmp(mimeinfo->subtype, "alternative") == 0) {
                 GNode * prefered_body;
                 int prefered_score;
                 
@@ -514,8 +480,8 @@ static void recursive_add_parts(TextView *textview, GNode *node)
                 prefered_body = NULL;
                 prefered_score = 0;
                 
-                for(iter = g_node_first_child(node) ; iter != NULL ;
-                    iter = g_node_next_sibling(iter)) {
+                for (iter = g_node_first_child(node) ; iter != NULL ;
+                     iter = g_node_next_sibling(iter)) {
                         int score;
                         MimeInfo * submime;
                         
@@ -525,7 +491,7 @@ static void recursive_add_parts(TextView *textview, GNode *node)
                                 score = 2;
                         
                         if (submime->subtype != NULL) {
-                                if (strcasecmp(submime->subtype, "plain") == 0)
+                                if (g_ascii_strcasecmp(submime->subtype, "plain") == 0)
                                         score = 3;
                         }
                         
@@ -540,8 +506,8 @@ static void recursive_add_parts(TextView *textview, GNode *node)
                 }
         }
         else {
-                for(iter = g_node_first_child(node) ; iter != NULL ;
-                    iter = g_node_next_sibling(iter)) {
+                for (iter = g_node_first_child(node) ; iter != NULL ;
+                     iter = g_node_next_sibling(iter)) {
                         recursive_add_parts(textview, iter);
                 }
         }
@@ -605,23 +571,29 @@ void textview_show_mime_part(TextView *textview, MimeInfo *partinfo)
 
 #undef TEXT_INSERT
 
-static void textview_write_body(TextView *textview, MimeInfo *mimeinfo,
-                               const gchar *charset)
+static void textview_write_body(TextView *textview, MimeInfo *mimeinfo)
 {
        FILE *tmpfp;
        gchar buf[BUFFSIZE];
        CodeConverter *conv;
+       const gchar *charset;
+       
+       if (textview->messageview->forced_charset)
+               charset = textview->messageview->forced_charset;
+       else
+               charset = procmime_mimeinfo_get_parameter(mimeinfo, "charset");
+
+       textview_set_font(textview, charset);
 
        conv = conv_code_converter_new(charset);
 
+       procmime_force_encoding(textview->messageview->forced_encoding);
+       
        textview->is_in_signature = FALSE;
 
-       if(mimeinfo->encoding_type != ENC_BINARY && 
-          mimeinfo->encoding_type != ENC_7BIT && 
-          mimeinfo->encoding_type != ENC_8BIT)
-               procmime_decode_content(mimeinfo);
+       procmime_decode_content(mimeinfo);
 
-       if (!g_strcasecmp(mimeinfo->subtype, "html")) {
+       if (!g_ascii_strcasecmp(mimeinfo->subtype, "html")) {
                gchar *filename;
                
                filename = procmime_get_tmp_file_name(mimeinfo);
@@ -632,7 +604,7 @@ static void textview_write_body(TextView *textview, MimeInfo *mimeinfo,
                        unlink(filename);
                }
                g_free(filename);
-       } else if (!g_strcasecmp(mimeinfo->subtype, "enriched")) {
+       } else if (!g_ascii_strcasecmp(mimeinfo->subtype, "enriched")) {
                gchar *filename;
                
                filename = procmime_get_tmp_file_name(mimeinfo);
@@ -644,7 +616,7 @@ static void textview_write_body(TextView *textview, MimeInfo *mimeinfo,
                }
                g_free(filename);
        } else {
-               tmpfp = fopen(mimeinfo->filename, "rb");
+               tmpfp = fopen(mimeinfo->data.filename, "rb");
                fseek(tmpfp, mimeinfo->offset, SEEK_SET);
                debug_print("Viewing text content of type: %s (length: %d)\n", mimeinfo->subtype, mimeinfo->length);
                while ((fgets(buf, sizeof(buf), tmpfp) != NULL) && 
@@ -654,6 +626,7 @@ static void textview_write_body(TextView *textview, MimeInfo *mimeinfo,
        }
 
        conv_code_converter_destroy(conv);
+       procmime_force_encoding(0);
 }
 
 static void textview_show_html(TextView *textview, FILE *fp,
@@ -673,7 +646,7 @@ static void textview_show_html(TextView *textview, FILE *fp,
                                 * if still inside an <a>, but already parsed past HREF */
                                str = strtok(str, " ");
                                if (str) { 
-                                       parser->href = strdup(str);
+                                       parser->href = g_strdup(str);
                                        /* the URL may (or not) be followed by the
                                         * referenced text */
                                        str = strtok(NULL, "");
@@ -720,7 +693,7 @@ static gboolean get_uri_part(const gchar *start, const gchar *scanpos,
        /* find end point of URI */
        for (ep_ = scanpos; *ep_ != '\0'; ep_++) {
                if (!isgraph(*(const guchar *)ep_) ||
-                   !isascii(*(const guchar *)ep_) ||
+                   !IS_ASCII(*(const guchar *)ep_) ||
                    strchr("()<>\"", *ep_))
                        break;
        }
@@ -752,14 +725,14 @@ static gchar *make_uri_string(const gchar *bp, const gchar *ep)
 
 /* valid mail address characters */
 #define IS_RFC822_CHAR(ch) \
-       (isascii(ch) && \
+       (IS_ASCII(ch) && \
         (ch) > 32   && \
         (ch) != 127 && \
         !isspace(ch) && \
         !strchr("(),;<>\"", (ch)))
 
 /* alphabet and number within 7bit ASCII */
-#define IS_ASCII_ALNUM(ch)     (isascii(ch) && isalnum(ch))
+#define IS_ASCII_ALNUM(ch)     (IS_ASCII(ch) && isalnum(ch))
 #define IS_QUOTE(ch) ((ch) == '\'' || (ch) == '"')
 
 static GHashTable *create_domain_tab(void)
@@ -832,7 +805,7 @@ static gboolean get_email_part(const gchar *start, const gchar *scanpos,
        const gchar *last_dot = NULL;
        const gchar *prelast_dot = NULL;
        const gchar *last_tld_char = NULL;
-
+       
        /* the informative part of the email address (describing the name
         * of the email address owner) may contain quoted parts. the
         * closure stack stores the last encountered quotes. */
@@ -900,8 +873,30 @@ static gboolean get_email_part(const gchar *start, const gchar *scanpos,
 
        if (!result) return FALSE;
 
+       if (*(bp_ - 1) == '"' && *(ep_) == '"' 
+       && *(ep_ + 1) == ' ' && *(ep_ + 2) == '<'
+       && IS_RFC822_CHAR(*(ep_ + 3))) {
+               /* this informative part with an @ in it is 
+                * followed by the email address */
+               ep_ += 3;
+               
+               /* go to matching '>' (or next non-rfc822 char, like \n) */
+               for (; *ep_ != '>' && *ep != '\0' && IS_RFC822_CHAR(*ep_); ep_++)
+                       ;
+                       
+               /* include the bracket */
+               if (*ep_ == '>') ep_++;
+               
+               /* include the leading quote */         
+               bp_--;
+
+               *ep = ep_;
+               *bp = bp_;
+               return TRUE;
+       }
+
        /* skip if it's between quotes "'alfons@proteus.demon.nl'" <alfons@proteus.demon.nl> */
-       if (bp_ - 1 > start && IS_QUOTE(*(bp_ - 1)) && IS_QUOTE(*ep_)) 
+       if (bp_ - 1 > start && IS_QUOTE(*(bp_ - 1)) && IS_QUOTE(*ep_))
                return FALSE;
 
        /* see if this is <bracketed>; in this case we also scan for the informative part. */
@@ -964,7 +959,7 @@ static gboolean get_email_part(const gchar *start, const gchar *scanpos,
 
        *ep = ep_;
        *bp = bp_;
-
+       
        return result;
 }
 
@@ -1099,7 +1094,6 @@ static void textview_make_clickable_parts(TextView *textview,
                for (last = head.next; last != NULL;
                     normal_text = last->ep, last = last->next) {
                        RemoteURI *uri;
-
                        uri = g_new(RemoteURI, 1);
                        if (last->bp - normal_text > 0)
                                gtk_text_buffer_insert_with_tags_by_name
@@ -1147,23 +1141,11 @@ static void textview_write_line(TextView *textview, const gchar *str,
        buffer = gtk_text_view_get_buffer(text);
        gtk_text_buffer_get_end_iter(buffer, &iter);
 
-#warning FIXME_GTK2
-#if 0
        if (!conv) {
-               if (textview->text_is_mb)
-                       conv_localetodisp(buf, sizeof(buf), str);
-               else
-                       strncpy2(buf, str, sizeof(buf));
-       } else if (conv_convert(conv, buf, sizeof(buf), str) < 0)
-               conv_localetodisp(buf, sizeof(buf), str);
-       else if (textview->text_is_mb)
-               conv_unreadable_locale(buf);
-#else
-       if (!conv)
                strncpy2(buf, str, sizeof(buf));
-       else if (conv_convert(conv, buf, sizeof(buf), str) < 0)
+       } else if (conv_convert(conv, buf, sizeof(buf), str) < 0) {
                conv_localetodisp(buf, sizeof(buf), str);
-#endif
+       }
 
        strcrchomp(buf);
        if (prefs_common.conv_mb_alnum) conv_mb_alnum(buf);
@@ -1501,10 +1483,10 @@ gboolean textview_search_string(TextView *textview, const gchar *str,
                gchar *text = NULL;
                int i = 0;
                gtk_text_buffer_get_end_iter(buffer, &real_end);
-               text = strdup(gtk_text_buffer_get_text(buffer, &iter, 
-                                                      &real_end, FALSE));
+               text = gtk_text_buffer_get_text(buffer, &iter, 
+                                               &real_end, FALSE);
                
-               while (!found && i++ < strlen(text)) {
+               while (!found && i++ < strlen(text) - 1) {
                        found = (strncasecmp(text+i, str, strlen(str)) == 0);
                }
                
@@ -1567,10 +1549,10 @@ gboolean textview_search_string_backward(TextView *textview, const gchar *str,
                i = gtk_text_iter_get_offset(&iter) - strlen(str) - 1;
                gtk_text_buffer_get_start_iter(buffer, &real_start);
                
-               text = strdup(gtk_text_buffer_get_text(buffer, &real_start, 
-                                                      &iter, FALSE));
+               text = gtk_text_buffer_get_text(buffer, &real_start, 
+                                               &iter, FALSE);
 
-               while (!found && i-- >= 0) {
+               while (!found && i-- > 0) {
                        found = (strncasecmp(text+i, str, strlen(str)) == 0);
                }
                                
@@ -1799,14 +1781,18 @@ static gint textview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                if (summaryview)
                        summary_pass_key_press_event(summaryview, event);
                else
-                       textview_scroll_page(textview, FALSE);
+                       textview_scroll_page
+                               (textview,
+                                (event->state &
+                                 (GDK_SHIFT_MASK|GDK_MOD1_MASK)) != 0);
                break;
        case GDK_BackSpace:
                textview_scroll_page(textview, TRUE);
                break;
        case GDK_Return:
-               textview_scroll_one_line(textview,
-                                        (event->state & GDK_MOD1_MASK) != 0);
+               textview_scroll_one_line
+                       (textview, (event->state &
+                                   (GDK_SHIFT_MASK|GDK_MOD1_MASK)) != 0);
                break;
        case GDK_Delete:
                if (summaryview)
@@ -1838,168 +1824,261 @@ static gint textview_key_pressed(GtkWidget *widget, GdkEventKey *event,
        return TRUE;
 }
 
-static gint show_url_timeout_cb(gpointer data)
+static gboolean textview_motion_notify(GtkWidget *widget,
+                                      GdkEventMotion *event,
+                                      TextView *textview)
+{
+       textview_uri_update(textview, event->x, event->y);
+       gdk_window_get_pointer(widget->window, NULL, NULL, NULL);
+
+       return FALSE;
+}
+
+static gboolean textview_leave_notify(GtkWidget *widget,
+                                     GdkEventCrossing *event,
+                                     TextView *textview)
+{
+       textview_uri_update(textview, -1, -1);
+
+       return FALSE;
+}
+
+static gboolean textview_visibility_notify(GtkWidget *widget,
+                                          GdkEventVisibility *event,
+                                          TextView *textview)
 {
-       TextView *textview = (TextView *)data;
+       gint wx, wy;
+       GdkWindow *window;
+
+       window = gtk_text_view_get_window(GTK_TEXT_VIEW(widget),
+                                         GTK_TEXT_WINDOW_TEXT);
+
+       /* check if occurred for the text window part */
+       if (window != event->window)
+               return FALSE;
        
-       TEXTVIEW_STATUSBAR_POP(textview);
-       textview->show_url_timeout_tag = 0;
+       gdk_window_get_pointer(widget->window, &wx, &wy, NULL);
+       textview_uri_update(textview, wx, wy);
+
        return FALSE;
 }
 
-/*!
- *\brief    Check to see if a web URL has been disguised as a different
- *          URL (possible with HTML email).
- *
- *\param    uri The uri to check
- *
- *\param    textview The TextView the URL is contained in
- *
- *\return   gboolean TRUE if the URL is ok, or if the user chose to open
- *          it anyway, otherwise FALSE          
- */
-static gboolean uri_security_check(RemoteURI *uri, TextView *textview) 
+static void textview_uri_update(TextView *textview, gint x, gint y)
 {
-       gchar *clicked_str;
-       gboolean retval = TRUE;
+       GtkTextBuffer *buffer;
+       GtkTextIter start_iter, end_iter;
+       RemoteURI *uri = NULL;
+       
+       buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview->text));
+
+       if (x != -1 && y != -1) {
+               gint bx, by;
+               GtkTextIter iter;
+               GSList *tags;
+               GSList *cur;
+           
+               gtk_text_view_window_to_buffer_coords(GTK_TEXT_VIEW(textview->text), 
+                                                     GTK_TEXT_WINDOW_WIDGET,
+                                                     x, y, &bx, &by);
+               gtk_text_view_get_iter_at_location(GTK_TEXT_VIEW(textview->text),
+                                                  &iter, bx, by);
+
+               tags = gtk_text_iter_get_tags(&iter);
+               for (cur = tags; cur != NULL; cur = cur->next) {
+                       GtkTextTag *tag = cur->data;
+                       char *name;
+
+                       g_object_get(G_OBJECT(tag), "name", &name, NULL);
+                       if (!strcmp(name, "link")
+                           && textview_get_uri_range(textview, &iter, tag,
+                                                     &start_iter, &end_iter))
+                               uri = textview_get_uri_from_range(textview,
+                                                                 &iter, tag,
+                                                                 &start_iter,
+                                                                 &end_iter);
+                       g_free(name);
+
+                       if (uri)
+                               break;
+               }
+               g_slist_free(tags);
+       }
+       
+       if (uri != textview->uri_hover) {
+               GdkWindow *window;
+
+               if (textview->uri_hover)
+                       gtk_text_buffer_remove_tag_by_name(buffer,
+                                                          "link-hover",
+                                                          &textview->uri_hover_start_iter,
+                                                          &textview->uri_hover_end_iter);
+                   
+               textview->uri_hover = uri;
+               if (uri) {
+                       textview->uri_hover_start_iter = start_iter;
+                       textview->uri_hover_end_iter = end_iter;
+               }
+               
+               window = gtk_text_view_get_window(GTK_TEXT_VIEW(textview->text),
+                                                 GTK_TEXT_WINDOW_TEXT);
+               gdk_window_set_cursor(window, uri ? hand_cursor : text_cursor);
 
-       if (g_strncasecmp(uri->uri, "http:", 5) &&
-           g_strncasecmp(uri->uri, "https:", 6) &&
-           g_strncasecmp(uri->uri, "www.", 4)) 
-               return retval;
+               TEXTVIEW_STATUSBAR_POP(textview);
 
-       clicked_str = gtk_editable_get_chars(GTK_EDITABLE(textview->text),
-                                            uri->start,
-                                            uri->end);
-       if (clicked_str == NULL)
-               return TRUE;
+               if (uri) {
+                       char *trimmed_uri;
 
-       if (strcmp(clicked_str, uri->uri) &&
-           (!g_strncasecmp(clicked_str, "http:",  5) ||
-            !g_strncasecmp(clicked_str, "https:", 6) ||
-            !g_strncasecmp(clicked_str, "www.",   4))) {
-               gchar *str;
-               retval = FALSE;
+                       gtk_text_buffer_apply_tag_by_name(buffer,
+                                                         "link-hover",
+                                                         &start_iter,
+                                                         &end_iter);
 
-               /* allow uri->uri    == http://somewhere.com
-                  and   clicked_str ==        somewhere.com */
-               str = g_strconcat("http://", clicked_str, NULL);
+                       trimmed_uri = trim_string(uri->uri, 60);
+                       TEXTVIEW_STATUSBAR_PUSH(textview, trimmed_uri);
+                       g_free(trimmed_uri);
+               }
+       }
+}
 
-               if (!g_strcasecmp(str, uri->uri))
-                       retval = TRUE;
-               g_free(str);
+static gboolean textview_get_uri_range(TextView *textview,
+                                      GtkTextIter *iter,
+                                      GtkTextTag *tag,
+                                      GtkTextIter *start_iter,
+                                      GtkTextIter *end_iter)
+{
+       GtkTextIter _start_iter, _end_iter;
+
+       _end_iter = *iter;
+       if (!gtk_text_iter_forward_to_tag_toggle(&_end_iter, tag)) {
+               debug_print("Can't find end");
+               return FALSE;
        }
 
-       if (retval == FALSE) {
-               gchar *msg = NULL;
-               AlertValue resp;
+       _start_iter = _end_iter;
+       if (!gtk_text_iter_backward_to_tag_toggle(&_start_iter, tag)) {
+               debug_print("Can't find start.");
+               return FALSE;
+       }
 
-               msg = g_strdup_printf(_("The real URL (%s) is different from\n"
-                                       "the apparent URL (%s).  \n"
-                                       "Open it anyway?"),
-                                       uri->uri, clicked_str);
-               resp = alertpanel_with_type(_("Warning"), 
-                                 msg,
-                                 _("Yes"), 
-                                 _("No"),
-                                 NULL, NULL, ALERT_WARNING);
-               g_free(msg);
-               if (resp == G_ALERTDEFAULT)
-                       retval = TRUE;
-       } 
-       g_free(clicked_str);
-       return retval;
+       *start_iter = _start_iter;
+       *end_iter = _end_iter;
+
+       return TRUE;
+}
+
+static RemoteURI *textview_get_uri_from_range(TextView *textview,
+                                             GtkTextIter *iter,
+                                             GtkTextTag *tag,
+                                             GtkTextIter *start_iter,
+                                             GtkTextIter *end_iter)
+{
+       gint start_pos, end_pos, cur_pos;
+       RemoteURI *uri = NULL;
+       GSList *cur;
+
+       start_pos = gtk_text_iter_get_offset(start_iter);
+       end_pos = gtk_text_iter_get_offset(end_iter);
+       cur_pos = gtk_text_iter_get_offset(iter);
+
+       for (cur = textview->uri_list; cur != NULL; cur = cur->next) {
+               RemoteURI *uri_ = (RemoteURI *)cur->data;
+               if (start_pos == uri_->start &&
+                   end_pos ==  uri_->end) {
+                       uri = uri_;
+                       break;
+               } else if (start_pos == uri_->start ||
+                          end_pos == uri_->end) {
+                       /* in case of contiguous links, textview_get_uri_range
+                        * returns a broader range (start of 1st link to end
+                        * of last link).
+                        * In that case, correct link is the one covering
+                        * current iter.
+                        */
+                       if (uri_->start <= cur_pos && cur_pos <= uri_->end) {
+                               uri = uri_;
+                               break;
+                       }
+               } 
+       }
+
+       return uri;
+}
+
+static RemoteURI *textview_get_uri(TextView *textview,
+                                  GtkTextIter *iter,
+                                  GtkTextTag *tag)
+{
+       GtkTextIter start_iter, end_iter;
+       RemoteURI *uri = NULL;
+
+       if (textview_get_uri_range(textview, iter, tag, &start_iter,
+                                  &end_iter))
+               uri = textview_get_uri_from_range(textview, iter, tag,
+                                                 &start_iter, &end_iter);
+
+       return uri;
 }
 
 static gboolean textview_uri_button_pressed(GtkTextTag *tag, GObject *obj,
                                            GdkEvent *event, GtkTextIter *iter,
                                            TextView *textview)
 {
-       GtkTextIter start_iter, end_iter;
-       gint start_pos, end_pos;
        GdkEventButton *bevent;
+       RemoteURI *uri = NULL;
        GSList *cur;
        gchar *trimmed_uri;
-       if (event->type != GDK_BUTTON_PRESS && event->type != GDK_2BUTTON_PRESS
-               && event->type != GDK_MOTION_NOTIFY)
-               return FALSE;
-
-       bevent = (GdkEventButton *) event;
 
-       /* get start and end positions */
-        start_iter = *iter;
-        if(!gtk_text_iter_backward_to_tag_toggle(&start_iter, tag)) {
-               debug_print("Can't find start.");
+       if (!event)
                return FALSE;
-       }
-       start_pos = gtk_text_iter_get_offset(&start_iter);
 
-       end_iter = *iter;
-       if(!gtk_text_iter_forward_to_tag_toggle(&end_iter, tag)) {
-               debug_print("Can't find end");
+       if (event->type != GDK_BUTTON_PRESS && event->type != GDK_2BUTTON_PRESS
+               && event->type != GDK_MOTION_NOTIFY)
                return FALSE;
-       }
-       end_pos = gtk_text_iter_get_offset(&end_iter);
 
-       /* search current uri */
-       for (cur = textview->uri_list; cur != NULL; cur = cur->next) {
-               RemoteURI *uri = (RemoteURI *)cur->data;
-
-               if (start_pos != uri->start || end_pos !=  uri->end)
-                       continue;
-
-               trimmed_uri = trim_string(uri->uri, 60);
-               /* hover or single click: display url in statusbar */
+       uri = textview_get_uri(textview, iter, tag);
+       if (!uri)
+               return FALSE;
 
-               if (event->type == GDK_MOTION_NOTIFY
-                   || (event->type == GDK_BUTTON_PRESS && bevent->button == 1)) {
-                       if (textview->messageview->mainwin) {
-                               TEXTVIEW_STATUSBAR_PUSH(textview, trimmed_uri);
-                               textview->show_url_timeout_tag = gtk_timeout_add
-                                       (4000, show_url_timeout_cb, textview);
-                       }
-                       return FALSE;
-               }
-               /* doubleclick: open compose / add address / browser */
-               if ((event->type == GDK_2BUTTON_PRESS && bevent->button == 1) ||
-                       bevent->button == 2 || bevent->button == 3) {
-                       if (!g_strncasecmp(uri->uri, "mailto:", 7)) {
-                               if (bevent->button == 3) {
-                                       gchar *fromname, *fromaddress;
+       bevent = (GdkEventButton *) event;
+       
+       /* doubleclick: open compose / add address / browser */
+       if ((event->type == GDK_BUTTON_PRESS && bevent->button == 1) ||
+               bevent->button == 2 || bevent->button == 3) {
+               if (!g_ascii_strncasecmp(uri->uri, "mailto:", 7)) {
+                       if (bevent->button == 3) {
+                               gchar *fromname, *fromaddress;
                                                
-                                       /* 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 */
-                                       addressbook_add_contact( fromname, fromaddress, NULL );
+                               /* 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 */
+                               addressbook_add_contact( fromname, fromaddress, NULL );
                                                
-                                       g_free(fromaddress);
-                                       g_free(fromname);
-                               } else {
-                                       PrefsAccount *account = NULL;
-
-                                       if (textview->messageview && textview->messageview->msginfo &&
-                                           textview->messageview->msginfo->folder) {
-                                               FolderItem   *folder_item;
-
-                                               folder_item = textview->messageview->msginfo->folder;
-                                               if (folder_item->prefs && folder_item->prefs->enable_default_account)
-                                                       account = account_find_from_id(folder_item->prefs->default_account);
-                                       }
-                                       compose_new(account, uri->uri + 7, NULL);
-                               }
-                               return TRUE;
+                               g_free(fromaddress);
+                               g_free(fromname);
                        } else {
-                               if (textview_uri_security_check(textview, uri) == TRUE) 
-                                       open_uri(uri->uri,
-                                                prefs_common.uri_cmd);
-                               return TRUE;
+                               PrefsAccount *account = NULL;
+
+                               if (textview->messageview && textview->messageview->msginfo &&
+                                   textview->messageview->msginfo->folder) {
+                                       FolderItem   *folder_item;
+
+                                       folder_item = textview->messageview->msginfo->folder;
+                                       if (folder_item->prefs && folder_item->prefs->enable_default_account)
+                                               account = account_find_from_id(folder_item->prefs->default_account);
+                               }
+                               compose_new(account, uri->uri + 7, NULL);
                        }
+                       return TRUE;
+               } else {
+                       if (textview_uri_security_check(textview, uri) == TRUE) 
+                               open_uri(uri->uri,
+                                        prefs_common.uri_cmd);
+                       return TRUE;
                }
-               g_free(trimmed_uri);
        }
 
        return FALSE;
@@ -2020,12 +2099,19 @@ static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri)
 {
        gchar *visible_str;
        gboolean retval = TRUE;
+       GtkTextBuffer *buffer;
+       GtkTextIter start, end;
 
        if (is_uri_string(uri->uri) == FALSE)
                return TRUE;
 
-       visible_str = gtk_editable_get_chars(GTK_EDITABLE(textview->text),
-                                            uri->start, uri->end);
+       buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview->text));
+
+       gtk_text_buffer_get_iter_at_offset(buffer, &start, uri->start);
+       gtk_text_buffer_get_iter_at_offset(buffer, &end,   uri->end);
+
+       visible_str = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
+
        if (visible_str == NULL)
                return TRUE;