2006-09-13 [colin] 2.4.0cvs185
[claws.git] / src / textview.c
index db6a40e79f1715e637ba5e654e1a350fcb46172e..63842336a7a1638c2a369be4022de25498686bc7 100644 (file)
@@ -35,7 +35,9 @@
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
+#if HAVE_SYS_WAIT_H
 #include <sys/wait.h>
+#endif
 #if HAVE_LIBCOMPFACE
 #  include <compface.h>
 #endif
@@ -64,6 +66,8 @@
 #include "image_viewer.h"
 #include "filesel.h"
 #include "base64.h"
+#include "inputdialog.h"
+#include "timing.h"
 
 struct _ClickableText
 {
@@ -192,15 +196,6 @@ static gboolean textview_uri_button_pressed        (GtkTextTag     *tag,
                                                 GtkTextIter    *iter,
                                                 TextView       *textview);
 
-static void textview_smooth_scroll_do          (TextView       *textview,
-                                                gfloat          old_value,
-                                                gfloat          last_value,
-                                                gint            step);
-static void textview_smooth_scroll_one_line    (TextView       *textview,
-                                                gboolean        up);
-static gboolean textview_smooth_scroll_page    (TextView       *textview,
-                                                gboolean        up);
-
 static gboolean textview_uri_security_check    (TextView       *textview,
                                                 ClickableText  *uri);
 static void textview_uri_list_remove_all       (GSList         *uri_list);
@@ -410,6 +405,18 @@ static void textview_create_tags(GtkTextView *text, TextView *textview)
        gtk_text_buffer_create_tag(buffer, "header_title",
                                   "font-desc", bold_font_desc,
                                   NULL);
+       tag = gtk_text_buffer_create_tag(buffer, "hlink",
+                                  "pixels-above-lines", 0,
+                                  "pixels-above-lines-set", TRUE,
+                                  "pixels-below-lines", 0,
+                                  "pixels-below-lines-set", TRUE,
+                                  "font-desc", font_desc,
+                                  "left-margin", 3,
+                                  "left-margin-set", TRUE,
+                                  "foreground-gdk", &uri_color,
+                                  NULL);
+       g_signal_connect(G_OBJECT(tag), "event",
+                         G_CALLBACK(textview_uri_button_pressed), textview);
        if (prefs_common.enable_bgcolor) {
                gtk_text_buffer_create_tag(buffer, "quote0",
                                "foreground-gdk", &quote_colors[0],
@@ -544,24 +551,40 @@ void textview_reflect_prefs(TextView *textview)
 void textview_show_message(TextView *textview, MimeInfo *mimeinfo,
                           const gchar *file)
 {
+       textview->loading = TRUE;
+       textview->stop_loading = FALSE;
+
        textview_clear(textview);
 
        textview_add_parts(textview, mimeinfo);
 
        textview_set_position(textview, 0);
+
+       textview->loading = FALSE;
+       textview->stop_loading = FALSE;
 }
 
 void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
 {
+       START_TIMING("textview_show_part");
        g_return_if_fail(mimeinfo != NULL);
        g_return_if_fail(fp != NULL);
 
        if ((mimeinfo->type == MIMETYPE_MULTIPART) ||
            ((mimeinfo->type == MIMETYPE_MESSAGE) && !g_ascii_strcasecmp(mimeinfo->subtype, "rfc822"))) {
+               textview->loading = TRUE;
+               textview->stop_loading = FALSE;
+               
                textview_clear(textview);
                textview_add_parts(textview, mimeinfo);
+
+               textview->loading = FALSE;
+               textview->stop_loading = FALSE;
+               END_TIMING();
                return;
        }
+       textview->loading = TRUE;
+       textview->stop_loading = FALSE;
 
        if (fseek(fp, mimeinfo->offset, SEEK_SET) < 0)
                perror("fseek");
@@ -572,6 +595,10 @@ void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
                textview_add_parts(textview, mimeinfo);
        else
                textview_write_body(textview, mimeinfo);
+
+       textview->loading = FALSE;
+       textview->stop_loading = FALSE;
+       END_TIMING();
 }
 
 #define TEXT_INSERT(str) \
@@ -605,6 +632,7 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
        const gchar *name;
        gchar *content_type;
        gint charcount;
+       START_TIMING("textview_add_part");
 
        g_return_if_fail(mimeinfo != NULL);
        text = GTK_TEXT_VIEW(textview->text);
@@ -612,7 +640,13 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
        charcount = gtk_text_buffer_get_char_count(buffer);
        gtk_text_buffer_get_end_iter(buffer, &iter);
 
-       if (mimeinfo->type == MIMETYPE_MULTIPART) return;
+       if (textview->stop_loading) {
+               return;
+       }
+       if (mimeinfo->type == MIMETYPE_MULTIPART) {
+               END_TIMING();
+               return;
+       }
 
        if ((mimeinfo->type == MIMETYPE_MESSAGE) && !g_ascii_strcasecmp(mimeinfo->subtype, "rfc822")) {
                FILE *fp;
@@ -627,6 +661,7 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
                        procheader_header_array_destroy(headers);
                }
                fclose(fp);
+               END_TIMING();
                return;
        }
 
@@ -657,15 +692,29 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
                        gchar *filename;
                        ClickableText *uri;
                        gchar *uri_str;
+                       START_TIMING("inserting image");
 
                        filename = procmime_get_tmp_file_name(mimeinfo);
+
                        if (procmime_get_part(filename, mimeinfo) < 0) {
                                g_warning("Can't get the image file.");
                                g_free(filename);
+                               END_TIMING();
                                return;
                        }
 
-                       pixbuf = gdk_pixbuf_new_from_file(filename, &error);
+                       if (!prefs_common.resize_img) {
+                               pixbuf = gdk_pixbuf_new_from_file(filename, &error);
+                       } else {
+                               gint w, h;
+                               gdk_pixbuf_get_file_info(filename, &w, &h);
+                               if (w > textview->scrolledwin->allocation.width - 100)
+                                       pixbuf = gdk_pixbuf_new_from_file_at_scale(filename, 
+                                               textview->scrolledwin->allocation.width - 100, 
+                                               -1, TRUE, &error);
+                               else
+                                       pixbuf = gdk_pixbuf_new_from_file(filename, &error);
+                       }
                        if (error != NULL) {
                                g_warning("%s\n", error->message);
                                g_error_free(error);
@@ -673,24 +722,10 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
                        if (!pixbuf) {
                                g_warning("Can't load the image.");
                                g_free(filename);
+                               END_TIMING();
                                return;
                        }
 
-                       if (prefs_common.resize_img) {
-                               int new_width, new_height;
-                               GdkPixbuf *scaled;
-                               image_viewer_get_resized_size(gdk_pixbuf_get_width(pixbuf),
-                                                gdk_pixbuf_get_height(pixbuf),
-                                                textview->scrolledwin->allocation.width - 100, 
-                                                gdk_pixbuf_get_height(pixbuf),
-                                                &new_width, &new_height);
-                               scaled = gdk_pixbuf_scale_simple
-                                       (pixbuf, new_width, new_height, GDK_INTERP_BILINEAR);
-
-                               g_object_unref(pixbuf);
-                               pixbuf = scaled;
-                       }
-
                        uri_str = g_filename_to_uri(filename, NULL, NULL);
                        if (uri_str) {
                                uri = g_new0(ClickableText, 1);
@@ -715,6 +750,8 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
 
                        g_object_unref(pixbuf);
                        g_free(filename);
+                       END_TIMING();
+                       GTK_EVENTS_FLUSH();
                }
        } else if (mimeinfo->type == MIMETYPE_TEXT) {
                if (prefs_common.display_header && (charcount > 0))
@@ -722,21 +759,24 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
 
                textview_write_body(textview, mimeinfo);
        }
+       END_TIMING();
 }
 
 static void recursive_add_parts(TextView *textview, GNode *node)
 {
         GNode * iter;
        MimeInfo *mimeinfo;
-        
+        START_TIMING("recursive_add_parts");
+
         mimeinfo = (MimeInfo *) node->data;
         
         textview_add_part(textview, mimeinfo);
         
         if ((mimeinfo->type != MIMETYPE_MULTIPART) &&
-            (mimeinfo->type != MIMETYPE_MESSAGE))
+            (mimeinfo->type != MIMETYPE_MESSAGE)) {
+               END_TIMING();
                 return;
-        
+        }
         if (g_ascii_strcasecmp(mimeinfo->subtype, "alternative") == 0) {
                 GNode * prefered_body;
                 int prefered_score;
@@ -780,6 +820,7 @@ static void recursive_add_parts(TextView *textview, GNode *node)
                         recursive_add_parts(textview, iter);
                 }
         }
+       END_TIMING();
 }
 
 static void textview_add_parts(TextView *textview, MimeInfo *mimeinfo)
@@ -859,6 +900,7 @@ static void textview_write_body(TextView *textview, MimeInfo *mimeinfo)
        CodeConverter *conv;
        const gchar *charset, *p, *cmd;
        GSList *cur;
+       int lines = 0;
        
        if (textview->messageview->forced_charset)
                charset = textview->messageview->forced_charset;
@@ -898,6 +940,7 @@ static void textview_write_body(TextView *textview, MimeInfo *mimeinfo)
                        g_unlink(filename);
                }
                g_free(filename);
+#ifndef G_OS_WIN32
        } else if ( g_ascii_strcasecmp(mimeinfo->subtype, "plain") &&
                   (cmd = prefs_common.mime_textviewer) && *cmd &&
                   (p = strchr(cmd, '%')) && *(p + 1) == 's') {
@@ -943,25 +986,48 @@ static void textview_write_body(TextView *textview, MimeInfo *mimeinfo)
                }
                close(pfd[1]);
                tmpfp = fdopen(pfd[0], "rb");
-               while (fgets(buf, sizeof(buf), tmpfp))
+               while (fgets(buf, sizeof(buf), tmpfp)) {
                        textview_write_line(textview, buf, conv);
+                       
+                       lines++;
+                       if (lines % 500 == 0)
+                               GTK_EVENTS_FLUSH();
+                       if (textview->stop_loading) {
+                               fclose(tmpfp);
+                               waitpid(pid, pfd, 0);
+                               unlink(fname);
+                               return;
+                       }
+               }
+
                fclose(tmpfp);
                waitpid(pid, pfd, 0);
                unlink(fname);
+#endif
        } else {
 textview_default:
+               lines = 0;
                tmpfp = g_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 ((ftell(tmpfp) < mimeinfo->offset + mimeinfo->length) &&
-                      (fgets(buf, sizeof(buf), tmpfp) != NULL))
+                      (fgets(buf, sizeof(buf), tmpfp) != NULL)) {
                        textview_write_line(textview, buf, conv);
+                       lines++;
+                       if (lines % 500 == 0)
+                               GTK_EVENTS_FLUSH();
+                       if (textview->stop_loading) {
+                               fclose(tmpfp);
+                               return;
+                       }
+               }
                fclose(tmpfp);
        }
 
        conv_code_converter_destroy(conv);
        procmime_force_encoding(0);
 
+       lines = 0;
        for (cur = textview->uri_list; cur; cur = cur->next) {
                ClickableText *uri = (ClickableText *)cur->data;
                if (!uri->is_quote)
@@ -969,6 +1035,12 @@ textview_default:
                if (!prefs_common.hide_quotes ||
                    uri->quote_level+1 < prefs_common.hide_quotes) {
                        textview_toggle_quote(textview, uri, TRUE);
+                       lines++;
+                       if (lines % 500 == 0)
+                               GTK_EVENTS_FLUSH();
+                       if (textview->stop_loading) {
+                               return;
+                       }
                }
        }
 }
@@ -978,6 +1050,7 @@ static void textview_show_html(TextView *textview, FILE *fp,
 {
        SC_HTMLParser *parser;
        gchar *str;
+       gint lines = 0;
 
        parser = sc_html_parser_new(fp, conv);
        g_return_if_fail(parser != NULL);
@@ -1002,6 +1075,12 @@ static void textview_show_html(TextView *textview, FILE *fp,
                                textview_write_link(textview, str, parser->href, NULL);
                } else
                        textview_write_line(textview, str, NULL);
+               lines++;
+               if (lines % 500 == 0)
+                       GTK_EVENTS_FLUSH();
+               if (textview->stop_loading) {
+                       return;
+               }
        }
        textview_write_line(textview, "\n", NULL);
        sc_html_parser_destroy(parser);
@@ -1012,12 +1091,19 @@ static void textview_show_ertf(TextView *textview, FILE *fp,
 {
        ERTFParser *parser;
        gchar *str;
+       gint lines = 0;
 
        parser = ertf_parser_new(fp, conv);
        g_return_if_fail(parser != NULL);
 
        while ((str = ertf_parse(parser)) != NULL) {
                textview_write_line(textview, str, NULL);
+               lines++;
+               if (lines % 500 == 0)
+                       GTK_EVENTS_FLUSH();
+               if (textview->stop_loading) {
+                       return;
+               }
        }
        
        ertf_parser_destroy(parser);
@@ -1569,6 +1655,24 @@ void textview_set_position(TextView *textview, gint pos)
        gtkut_text_view_set_position(text, pos);
 }
 
+static gboolean header_is_internal(Header *header)
+{
+       const gchar *internal_hdrs[] = 
+               {"AF:", "NF:", "PS:", "SRH:", "SFN:", "DSR:", "MID:", 
+                "CFG:", "PT:", "S:", "RQ:", "SSV:", "NSV:", "SSH:", 
+                "R:", "MAID:", "SCF:", "RMID:", "FMID:", "NAID:", 
+                "X-Sylpheed-Account-Id:", "X-Sylpheed-Sign:", "X-Sylpheed-Encrypt:", 
+                "X-Sylpheed-Privacy-System:", "X-Sylpheed-End-Special-Headers:",
+                NULL};
+       int i;
+       
+       for (i = 0; internal_hdrs[i]; i++) {
+               if (!strcmp(header->name, internal_hdrs[i]))
+                       return TRUE;
+       }
+       return FALSE;
+}
+
 static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
 {
        gchar buf[BUFFSIZE];
@@ -1579,8 +1683,19 @@ static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
 
        g_return_val_if_fail(fp != NULL, NULL);
 
-       if (textview->show_all_headers)
-               return procheader_get_header_array_asis(fp);
+       if (textview->show_all_headers) {
+               headers = procheader_get_header_array_asis(fp);
+               sorted_headers = g_ptr_array_new();
+               for (i = 0; i < headers->len; i++) {
+                       header = g_ptr_array_index(headers, i);
+                       if (!header_is_internal(header))
+                               g_ptr_array_add(sorted_headers, header);
+                       else
+                               procheader_header_free(header);
+               }
+               g_ptr_array_free(headers, TRUE);
+               return sorted_headers;
+       }
 
        if (!prefs_common.display_header) {
                while (fgets(buf, sizeof(buf), fp) != NULL)
@@ -1616,7 +1731,11 @@ static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
        if (prefs_common.show_other_header) {
                for (i = 0; i < headers->len; i++) {
                        header = g_ptr_array_index(headers, i);
-                       g_ptr_array_add(sorted_headers, header);
+                       if (!header_is_internal(header)) {
+                               g_ptr_array_add(sorted_headers, header);
+                       } else {
+                               procheader_header_free(header);
+                       }
                }
                g_ptr_array_free(headers, TRUE);
        } else
@@ -1636,14 +1755,14 @@ static void textview_show_face(TextView *textview)
        ||  !prefs_common.display_xface)
                goto bail;
        
-       if (!msginfo->face) {
+       if (!msginfo->extradata || !msginfo->extradata->face) {
                goto bail;
        }
 
        if (textview->image) 
                gtk_widget_destroy(textview->image);
        
-       textview->image = face_get_from_header(msginfo->face);
+       textview->image = face_get_from_header(msginfo->extradata->face);
        g_return_if_fail(textview->image != NULL);
 
        gtk_widget_show(textview->image);
@@ -1698,20 +1817,20 @@ static void textview_show_xface(TextView *textview)
        ||  !prefs_common.display_xface)
                goto bail;
        
-       if (!msginfo)
+       if (!msginfo || !msginfo->extradata)
                goto bail;
 
-       if (msginfo->face)
+       if (msginfo->extradata->face)
                return;
        
-       if (!msginfo->xface || strlen(msginfo->xface) < 5) {
+       if (!msginfo->extradata->xface || strlen(msginfo->extradata->xface) < 5) {
                goto bail;
        }
 
        if (textview->image) 
                gtk_widget_destroy(textview->image);
        
-       textview->image = xface_get_from_header(msginfo->xface,
+       textview->image = xface_get_from_header(msginfo->extradata->xface,
                                &textview->text->style->white,
                                textview->text->window);
        g_return_if_fail(textview->image != NULL);
@@ -1791,7 +1910,7 @@ static void textview_show_header(TextView *textview, GPtrArray *headers)
                          procheader_headername_equal(header->name, "Reply-To") ||
                          procheader_headername_equal(header->name, "Sender");
                        textview_make_clickable_parts(textview, "header", 
-                                                     "link", header->body, 
+                                                     "hlink", header->body, 
                                                      hdr);
                }
                gtk_text_buffer_get_end_iter (buffer, &iter);
@@ -1825,170 +1944,16 @@ void textview_scroll_one_line(TextView *textview, gboolean up)
 {
        GtkTextView *text = GTK_TEXT_VIEW(textview->text);
        GtkAdjustment *vadj = text->vadjustment;
-       gfloat upper;
 
-       if (prefs_common.enable_smooth_scroll) {
-               textview_smooth_scroll_one_line(textview, up);
-               return;
-       }
-
-       if (!up) {
-               upper = vadj->upper - vadj->page_size;
-               if (vadj->value < upper) {
-                       vadj->value += vadj->step_increment;
-                       vadj->value = MIN(vadj->value, upper);
-                       g_signal_emit_by_name(G_OBJECT(vadj),
-                                             "value_changed", 0);
-               }
-       } else {
-               if (vadj->value > 0.0) {
-                       vadj->value -= vadj->step_increment;
-                       vadj->value = MAX(vadj->value, 0.0);
-                       g_signal_emit_by_name(G_OBJECT(vadj),
-                                             "value_changed", 0);
-               }
-       }
+       gtkutils_scroll_one_line(GTK_WIDGET(text), vadj, up);
 }
 
 gboolean textview_scroll_page(TextView *textview, gboolean up)
 {
        GtkTextView *text = GTK_TEXT_VIEW(textview->text);
        GtkAdjustment *vadj = text->vadjustment;
-       gfloat upper;
-       gfloat page_incr;
-
-       if (prefs_common.enable_smooth_scroll)
-               return textview_smooth_scroll_page(textview, up);
-
-       if (prefs_common.scroll_halfpage)
-               page_incr = vadj->page_increment / 2;
-       else
-               page_incr = vadj->page_increment;
-
-       if (!up) {
-               upper = vadj->upper - vadj->page_size;
-               if (vadj->value < upper) {
-                       vadj->value += page_incr;
-                       vadj->value = MIN(vadj->value, upper);
-                       g_signal_emit_by_name(G_OBJECT(vadj),
-                                             "value_changed", 0);
-               } else
-                       return FALSE;
-       } else {
-               if (vadj->value > 0.0) {
-                       vadj->value -= page_incr;
-                       vadj->value = MAX(vadj->value, 0.0);
-                       g_signal_emit_by_name(G_OBJECT(vadj),
-                                             "value_changed", 0);
-               } else
-                       return FALSE;
-       }
-
-       return TRUE;
-}
-
-static void textview_smooth_scroll_do(TextView *textview,
-                                     gfloat old_value, gfloat last_value,
-                                     gint step)
-{
-       GtkTextView *text = GTK_TEXT_VIEW(textview->text);
-       GtkAdjustment *vadj = text->vadjustment;
-       gint change_value;
-       gboolean up;
-       gint i;
-
-       if (old_value < last_value) {
-               change_value = last_value - old_value;
-               up = FALSE;
-       } else {
-               change_value = old_value - last_value;
-               up = TRUE;
-       }
-
-       for (i = step; i <= change_value; i += step) {
-               vadj->value = old_value + (up ? -i : i);
-               g_signal_emit_by_name(G_OBJECT(vadj),
-                                     "value_changed", 0);
-       }
-
-       vadj->value = last_value;
-       g_signal_emit_by_name(G_OBJECT(vadj), "value_changed", 0);
-
-       gtk_widget_queue_draw(GTK_WIDGET(text));
-}
-
-static void textview_smooth_scroll_one_line(TextView *textview, gboolean up)
-{
-       GtkTextView *text = GTK_TEXT_VIEW(textview->text);
-       GtkAdjustment *vadj = text->vadjustment;
-       gfloat upper;
-       gfloat old_value;
-       gfloat last_value;
-
-       if (!up) {
-               upper = vadj->upper - vadj->page_size;
-               if (vadj->value < upper) {
-                       old_value = vadj->value;
-                       last_value = vadj->value + vadj->step_increment;
-                       last_value = MIN(last_value, upper);
-
-                       textview_smooth_scroll_do(textview, old_value,
-                                                 last_value,
-                                                 prefs_common.scroll_step);
-               }
-       } else {
-               if (vadj->value > 0.0) {
-                       old_value = vadj->value;
-                       last_value = vadj->value - vadj->step_increment;
-                       last_value = MAX(last_value, 0.0);
-
-                       textview_smooth_scroll_do(textview, old_value,
-                                                 last_value,
-                                                 prefs_common.scroll_step);
-               }
-       }
-}
-
-static gboolean textview_smooth_scroll_page(TextView *textview, gboolean up)
-{
-       GtkTextView *text = GTK_TEXT_VIEW(textview->text);
-       GtkAdjustment *vadj = text->vadjustment;
-       gfloat upper;
-       gfloat page_incr;
-       gfloat old_value;
-       gfloat last_value;
-
-       if (prefs_common.scroll_halfpage)
-               page_incr = vadj->page_increment / 2;
-       else
-               page_incr = vadj->page_increment;
-
-       if (!up) {
-               upper = vadj->upper - vadj->page_size;
-               if (vadj->value < upper) {
-                       old_value = vadj->value;
-                       last_value = vadj->value + page_incr;
-                       last_value = MIN(last_value, upper);
-
-                       textview_smooth_scroll_do(textview, old_value,
-                                                 last_value,
-                                                 prefs_common.scroll_step);
-               } else
-                       return FALSE;
-       } else {
-               if (vadj->value > 0.0) {
-                       old_value = vadj->value;
-                       last_value = vadj->value - page_incr;
-                       last_value = MAX(last_value, 0.0);
-
-                       textview_smooth_scroll_do(textview, old_value,
-                                                 last_value,
-                                                 prefs_common.scroll_step);
-               } else
-                       return FALSE;
-       }
 
-       return TRUE;
+       return gtkutils_scroll_page(GTK_WIDGET(text), vadj, up);
 }
 
 #define KEY_PRESS_EVENT_STOP() \
@@ -2022,17 +1987,17 @@ static gint textview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                if (summaryview)
                        summary_pass_key_press_event(summaryview, event);
                else
-                       textview_scroll_page
-                               (textview,
+                       mimeview_scroll_page
+                               (messageview->mimeview,
                                 (event->state &
                                  (GDK_SHIFT_MASK|GDK_MOD1_MASK)) != 0);
                break;
        case GDK_BackSpace:
-               textview_scroll_page(textview, TRUE);
+               mimeview_scroll_page(messageview->mimeview, TRUE);
                break;
        case GDK_Return:
-               textview_scroll_one_line
-                       (textview, (event->state &
+               mimeview_scroll_one_line
+                       (messageview->mimeview, (event->state &
                                    (GDK_SHIFT_MASK|GDK_MOD1_MASK)) != 0);
                break;
        case GDK_Delete:
@@ -2070,6 +2035,8 @@ static gboolean textview_motion_notify(GtkWidget *widget,
                                       GdkEventMotion *event,
                                       TextView *textview)
 {
+       if (textview->loading)
+               return FALSE;
        textview_uri_update(textview, event->x, event->y);
        gdk_window_get_pointer(widget->window, NULL, NULL, NULL);
 
@@ -2080,6 +2047,8 @@ static gboolean textview_leave_notify(GtkWidget *widget,
                                      GdkEventCrossing *event,
                                      TextView *textview)
 {
+       if (textview->loading)
+               return FALSE;
        textview_uri_update(textview, -1, -1);
 
        return FALSE;
@@ -2092,6 +2061,9 @@ static gboolean textview_visibility_notify(GtkWidget *widget,
        gint wx, wy;
        GdkWindow *window;
 
+       if (textview->loading)
+               return FALSE;
+
        window = gtk_text_view_get_window(GTK_TEXT_VIEW(widget),
                                          GTK_TEXT_WINDOW_TEXT);
 
@@ -2148,7 +2120,7 @@ static void textview_uri_update(TextView *textview, gint x, gint y)
 
                        g_object_get(G_OBJECT(tag), "name", &name, NULL);
 
-                       if ((!strcmp(name, "link"))
+                       if ((!strcmp(name, "link") || !strcmp(name, "hlink"))
                            && textview_get_uri_range(textview, &iter, tag,
                                                      &start_iter, &end_iter)) {
 
@@ -2578,10 +2550,8 @@ static void open_image_cb (TextView *textview, guint action, void *data)
        ClickableText *uri = g_object_get_data(G_OBJECT(textview->file_popup_menu),
                                           "menu_button");
 
-       static gchar *default_cmdline = DEFAULT_IMAGE_VIEWER_CMD;
+       gchar *cmd = NULL;
        gchar buf[1024];
-       const gchar *cmd;
-       const gchar *def_cmd;
        const gchar *p;
        gchar *filename = NULL;
        gchar *tmp_filename = NULL;
@@ -2606,24 +2576,32 @@ static void open_image_cb (TextView *textview, guint action, void *data)
        copy_file(tmp_filename, filename, FALSE);
        g_free(tmp_filename);
 
-       cmd = prefs_common.mime_image_viewer;
-       def_cmd = default_cmdline;
-       
+       cmd = mailcap_get_command_for_type("image/jpeg", filename);
+       if (cmd == NULL) {
+               gboolean remember = FALSE;
+               cmd = input_dialog_combo_remember
+                       (_("Open with"),
+                        _("Enter the command line to open file:\n"
+                          "('%s' will be replaced with file name)"),
+                        prefs_common.mime_open_cmd,
+                        prefs_common.mime_open_cmd_history,
+                        TRUE, &remember);
+               if (cmd && remember) {
+                       mailcap_update_default("image/jpeg", cmd);
+               }
+       }
        if (cmd && (p = strchr(cmd, '%')) && *(p + 1) == 's' &&
            !strchr(p + 2, '%'))
                g_snprintf(buf, sizeof(buf), cmd, filename);
        else {
-               if (cmd)
-                       g_warning("Image viewer command line is invalid: '%s'", cmd);
-               if (def_cmd)
-                       g_snprintf(buf, sizeof(buf), def_cmd, filename);
-               else
-                       return;
+               g_warning("Image viewer command line is invalid: '%s'", cmd);
+               return;
        }
 
        execute_command_line(buf, TRUE);
 
        g_free(filename);
+       g_free(cmd);
 
        g_object_set_data(G_OBJECT(textview->file_popup_menu), "menu_button",
                          NULL);