/*
* Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
+ * Copyright (C) 1999-2007 Hiroyuki Yamamoto and the Claws Mail team
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#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
#include "image_viewer.h"
#include "filesel.h"
#include "base64.h"
-
-struct _ClickableText
-{
- gchar *uri;
-
- gchar *filename;
-
- gpointer data;
-
- guint start;
- guint end;
-
- gboolean is_quote;
- gint quote_level;
- gboolean q_expanded;
- gchar *fg_color;
-};
-
-gint previousquotelevel = -1;
+#include "inputdialog.h"
+#include "timing.h"
static GdkColor quote_colors[3] = {
{(gulong)0, (gushort)0, (gushort)0, (gushort)0},
static void textview_write_line (TextView *textview,
const gchar *str,
- CodeConverter *conv);
+ CodeConverter *conv,
+ gboolean do_quote_folding);
static void textview_write_link (TextView *textview,
const gchar *str,
const gchar *uri,
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);
static void textview_toggle_quote (TextView *textview,
+ GSList *start_list,
ClickableText *uri,
gboolean expand_only);
static void open_image_cb (TextView *textview,
guint action,
void *data);
-static void textview_show_icon(TextView *textview, const gchar *stock_id);
static GtkItemFactoryEntry textview_link_popup_entries[] =
{
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", "e_colors[0],
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("");
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");
textview_add_parts(textview, mimeinfo);
else
textview_write_body(textview, mimeinfo);
-}
-#define TEXT_INSERT(str) \
- gtk_text_buffer_insert_with_tags_by_name \
- (buffer, &iter, str, -1,\
- "header", NULL)
-
-#define TEXT_INSERT_LINK(str, fname, udata) { \
- ClickableText *uri; \
- uri = g_new0(ClickableText, 1); \
- uri->uri = g_strdup(""); \
- uri->start = gtk_text_iter_get_offset(&iter); \
- gtk_text_buffer_insert_with_tags_by_name \
- (buffer, &iter, str, -1, \
- "link", "header_title", "header", \
- NULL); \
- uri->end = gtk_text_iter_get_offset(&iter); \
- uri->filename = fname?g_strdup(fname):NULL; \
- uri->data = udata; \
- textview->uri_list = \
- g_slist_append(textview->uri_list, uri); \
+ textview->loading = FALSE;
+ textview->stop_loading = FALSE;
+ END_TIMING();
}
static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
const gchar *name;
gchar *content_type;
gint charcount;
+ START_TIMING("");
g_return_if_fail(mimeinfo != NULL);
text = GTK_TEXT_VIEW(textview->text);
buffer = gtk_text_view_get_buffer(text);
charcount = gtk_text_buffer_get_char_count(buffer);
gtk_text_buffer_get_end_iter(buffer, &iter);
+
+ if (textview->stop_loading) {
+ return;
+ }
+ if (mimeinfo->type == MIMETYPE_MULTIPART) {
+ END_TIMING();
+ return;
+ }
- if (mimeinfo->type == MIMETYPE_MULTIPART) return;
+ textview->prev_quote_level = -1;
if ((mimeinfo->type == MIMETYPE_MESSAGE) && !g_ascii_strcasecmp(mimeinfo->subtype, "rfc822")) {
FILE *fp;
procheader_header_array_destroy(headers);
}
fclose(fp);
+ END_TIMING();
return;
}
|| (mimeinfo->disposition == DISPOSITIONTYPE_INLINE &&
mimeinfo->type != MIMETYPE_TEXT)) {
gtk_text_buffer_insert(buffer, &iter, "\n", 1);
- TEXT_INSERT_LINK(buf, "sc://select_attachment", mimeinfo);
+ TEXTVIEW_INSERT_LINK(buf, "sc://select_attachment", mimeinfo);
gtk_text_buffer_insert(buffer, &iter, " \n", -1);
if (mimeinfo->type == MIMETYPE_IMAGE &&
prefs_common.inline_img ) {
gchar *filename;
ClickableText *uri;
gchar *uri_str;
+ gint err;
+ 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.");
+
+ if ((err = procmime_get_part(filename, mimeinfo)) < 0) {
+ g_warning("Can't get the image file.(%s)", strerror(-err));
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 (textview->scrolledwin->allocation.width - 100 > 0 &&
+ 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);
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);
uri->end = uri->start + 1;
uri->filename = procmime_get_part_file_name(mimeinfo);
textview->uri_list =
- g_slist_append(textview->uri_list, uri);
+ g_slist_prepend(textview->uri_list, uri);
gtk_text_buffer_insert(buffer, &iter, " ", 1);
gtk_text_buffer_get_iter_at_offset(buffer, &start_iter, uri->start);
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))
textview_write_body(textview, mimeinfo);
}
+ END_TIMING();
}
static void recursive_add_parts(TextView *textview, GNode *node)
{
GNode * iter;
MimeInfo *mimeinfo;
-
+ START_TIMING("");
+
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;
recursive_add_parts(textview, iter);
}
}
+ END_TIMING();
}
static void textview_add_parts(TextView *textview, MimeInfo *mimeinfo)
buffer = gtk_text_view_get_buffer(text);
gtk_text_buffer_get_start_iter(buffer, &iter);
- TEXT_INSERT(_("\n"
+ TEXTVIEW_INSERT(_("\n"
" This message can't be displayed.\n"
" This is probably due to a network error.\n"
"\n"
" Use "));
- TEXT_INSERT_LINK(_("'View Log'"), "sc://view_log", NULL);
- TEXT_INSERT(_(" in the Tools menu for more information."));
+ TEXTVIEW_INSERT_LINK(_("'View Log'"), "sc://view_log", NULL);
+ TEXTVIEW_INSERT(_(" in the Tools menu for more information."));
textview_show_icon(textview, GTK_STOCK_DIALOG_ERROR);
}
buffer = gtk_text_view_get_buffer(text);
gtk_text_buffer_get_start_iter(buffer, &iter);
- TEXT_INSERT("\n");
- TEXT_INSERT(_(" The following can be performed on this part by\n"));
- TEXT_INSERT(_(" right-clicking the icon or list item:\n"));
-
- TEXT_INSERT(_(" - To save, select "));
- TEXT_INSERT_LINK(_("'Save as...'"), "sc://save_as", NULL);
- TEXT_INSERT(_(" (Shortcut key: 'y')\n"));
- TEXT_INSERT(_(" - To display as text, select "));
- TEXT_INSERT_LINK(_("'Display as text'"), "sc://display_as_text", NULL);
- TEXT_INSERT(_(" (Shortcut key: 't')\n"));
- TEXT_INSERT(_(" - To open with an external program, select "));
- TEXT_INSERT_LINK(_("'Open'"), "sc://open", NULL);
- TEXT_INSERT(_(" (Shortcut key: 'l')\n"));
- TEXT_INSERT(_(" (alternately double-click, or click the middle "));
- TEXT_INSERT(_("mouse button)\n"));
- TEXT_INSERT(_(" - Or use "));
- TEXT_INSERT_LINK(_("'Open with...'"), "sc://open_with", NULL);
- TEXT_INSERT(_(" (Shortcut key: 'o')\n"));
+ TEXTVIEW_INSERT("\n");
+ TEXTVIEW_INSERT(_(" The following can be performed on this part by\n"));
+ TEXTVIEW_INSERT(_(" right-clicking the icon or list item:\n"));
+
+ TEXTVIEW_INSERT(_(" - To save, select "));
+ TEXTVIEW_INSERT_LINK(_("'Save as...'"), "sc://save_as", NULL);
+ TEXTVIEW_INSERT(_(" (Shortcut key: 'y')\n"));
+ TEXTVIEW_INSERT(_(" - To display as text, select "));
+ TEXTVIEW_INSERT_LINK(_("'Display as text'"), "sc://display_as_text", NULL);
+ TEXTVIEW_INSERT(_(" (Shortcut key: 't')\n"));
+ TEXTVIEW_INSERT(_(" - To open with an external program, select "));
+ TEXTVIEW_INSERT_LINK(_("'Open'"), "sc://open", NULL);
+ TEXTVIEW_INSERT(_(" (Shortcut key: 'l')\n"));
+ TEXTVIEW_INSERT(_(" (alternately double-click, or click the middle "));
+ TEXTVIEW_INSERT(_("mouse button)\n"));
+ TEXTVIEW_INSERT(_(" - Or use "));
+ TEXTVIEW_INSERT_LINK(_("'Open with...'"), "sc://open_with", NULL);
+ TEXTVIEW_INSERT(_(" (Shortcut key: 'o')\n"));
textview_show_icon(textview, GTK_STOCK_DIALOG_INFO);
}
-#undef TEXT_INSERT
-#undef TEXT_INSERT_LINK
-
static void textview_write_body(TextView *textview, MimeInfo *mimeinfo)
{
FILE *tmpfp;
CodeConverter *conv;
const gchar *charset, *p, *cmd;
GSList *cur;
+ int lines = 0;
if (textview->messageview->forced_charset)
charset = textview->messageview->forced_charset;
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') {
if (pipe(pfd) < 0) {
g_snprintf(buf, sizeof(buf),
"pipe failed for textview\n\n%s\n", strerror(errno));
- textview_write_line(textview, buf, conv);
+ textview_write_line(textview, buf, conv, TRUE);
goto textview_default;
}
pid = fork();
if (pid < 0) {
g_snprintf(buf, sizeof(buf),
"fork failed for textview\n\n%s\n", strerror(errno));
- textview_write_line(textview, buf, conv);
+ textview_write_line(textview, buf, conv, TRUE);
close(pfd[0]);
close(pfd[1]);
goto textview_default;
}
close(pfd[1]);
tmpfp = fdopen(pfd[0], "rb");
- while (fgets(buf, sizeof(buf), tmpfp))
- textview_write_line(textview, buf, conv);
+ while (fgets(buf, sizeof(buf), tmpfp)) {
+ textview_write_line(textview, buf, conv, TRUE);
+
+ 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))
- textview_write_line(textview, buf, conv);
+ (fgets(buf, sizeof(buf), tmpfp) != NULL)) {
+ textview_write_line(textview, buf, conv, TRUE);
+ 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;
+ textview->uri_list = g_slist_reverse(textview->uri_list);
for (cur = textview->uri_list; cur; cur = cur->next) {
ClickableText *uri = (ClickableText *)cur->data;
if (!uri->is_quote)
continue;
if (!prefs_common.hide_quotes ||
uri->quote_level+1 < prefs_common.hide_quotes) {
- textview_toggle_quote(textview, uri, TRUE);
+ textview_toggle_quote(textview, cur, uri, TRUE);
+ lines++;
+ if (lines % 500 == 0)
+ GTK_EVENTS_FLUSH();
+ if (textview->stop_loading) {
+ return;
+ }
}
}
}
{
SC_HTMLParser *parser;
gchar *str;
+ gint lines = 0;
parser = sc_html_parser_new(fp, conv);
g_return_if_fail(parser != NULL);
if (parser->state == SC_HTML_HREF) {
/* first time : get and copy the URL */
if (parser->href == NULL) {
- /* ALF - the sylpheed html parser returns an empty string,
+ /* ALF - the claws html parser returns an empty string,
* if still inside an <a>, but already parsed past HREF */
str = strtok(str, " ");
if (str) {
if (str != NULL)
textview_write_link(textview, str, parser->href, NULL);
} else
- textview_write_line(textview, str, NULL);
+ textview_write_line(textview, str, NULL, FALSE);
+ lines++;
+ if (lines % 500 == 0)
+ GTK_EVENTS_FLUSH();
+ if (textview->stop_loading) {
+ return;
+ }
}
- textview_write_line(textview, "\n", NULL);
+ textview_write_line(textview, "\n", NULL, FALSE);
sc_html_parser_destroy(parser);
}
{
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);
+ textview_write_line(textview, str, NULL, FALSE);
+ lines++;
+ if (lines % 500 == 0)
+ GTK_EVENTS_FLUSH();
+ if (textview->stop_loading) {
+ return;
+ }
}
ertf_parser_destroy(parser);
} head = {NULL, NULL, 0, NULL}, *last = &head;
if (!g_utf8_validate(linebuf, -1, NULL)) {
+ g_free(mybuf);
mybuf = g_malloc(strlen(linebuf)*2 +1);
conv_localetodisp(mybuf, strlen(linebuf)*2 +1, linebuf);
}
uri->end = gtk_text_iter_get_offset(&iter);
uri->filename = NULL;
textview->uri_list =
- g_slist_append(textview->uri_list, uri);
+ g_slist_prepend(textview->uri_list, uri);
}
if (*normal_text)
uri->end = gtk_text_iter_get_offset(&end_iter);
uri->filename = NULL;
textview->uri_list =
- g_slist_append(textview->uri_list, uri);
+ g_slist_prepend(textview->uri_list, uri);
}
}
#undef ADD_TXT_POS
static void textview_write_line(TextView *textview, const gchar *str,
- CodeConverter *conv)
+ CodeConverter *conv, gboolean do_quote_folding)
{
GtkTextView *text;
GtkTextBuffer *buffer;
textview->is_in_signature = TRUE;
}
- if (real_quotelevel > -1) {
- if ( previousquotelevel != real_quotelevel ) {
+ if (real_quotelevel > -1 && do_quote_folding) {
+ if (!g_utf8_validate(buf, -1, NULL)) {
+ gchar *utf8buf = NULL;
+ utf8buf = g_malloc(BUFFSIZE);
+ conv_localetodisp(utf8buf, BUFFSIZE, buf);
+ strncpy2(buf, utf8buf, BUFFSIZE-1);
+ g_free(utf8buf);
+ }
+do_quote:
+ if ( textview->prev_quote_level != real_quotelevel ) {
ClickableText *uri;
uri = g_new0(ClickableText, 1);
uri->uri = g_strdup("");
uri->data = g_strdup(buf);
uri->start = gtk_text_iter_get_offset(&iter);
+ uri->is_quote = TRUE;
+ uri->quote_level = real_quotelevel;
+ uri->fg_color = g_strdup(fg_color);
+
gtk_text_buffer_insert_with_tags_by_name
- (buffer, &iter, " [...]", -1,
- "qlink", fg_color, NULL);
+ (buffer, &iter, " [...]", -1,
+ "qlink", fg_color, NULL);
uri->end = gtk_text_iter_get_offset(&iter);
+ gtk_text_buffer_insert(buffer, &iter, " \n", -1);
+
uri->filename = NULL;
- uri->fg_color = g_strdup(fg_color);
- uri->is_quote = TRUE;
- uri->quote_level = real_quotelevel;
textview->uri_list =
- g_slist_append(textview->uri_list, uri);
- gtk_text_buffer_insert(buffer, &iter, " \n", -1);
+ g_slist_prepend(textview->uri_list, uri);
- previousquotelevel = real_quotelevel;
+ textview->prev_quote_level = real_quotelevel;
} else {
- GSList *last = g_slist_last(textview->uri_list);
- ClickableText *lasturi = (ClickableText *)last->data;
- gchar *tmp = g_strdup_printf("%s%s", (gchar *)lasturi->data, buf);
- g_free(lasturi->data);
- lasturi->data = tmp;
+ GSList *last = textview->uri_list;
+ ClickableText *lasturi = NULL;
+ gint e_len = 0, n_len = 0;
+
+ if (textview->uri_list) {
+ lasturi = (ClickableText *)last->data;
+ } else {
+ printf("oops (%d %d)\n",
+ real_quotelevel, textview->prev_quote_level);
+ }
+ if (lasturi->is_quote == FALSE) {
+ textview->prev_quote_level = -1;
+ goto do_quote;
+ }
+ e_len = lasturi->data ? strlen(lasturi->data):0;
+ n_len = strlen(buf);
+ lasturi->data = g_realloc((gchar *)lasturi->data, e_len + n_len + 1);
+ strcpy((gchar *)lasturi->data + e_len, buf);
+ *((gchar *)lasturi->data + e_len + n_len) = '\0';
}
} else {
textview_make_clickable_parts(textview, fg_color, "link", buf, FALSE);
- previousquotelevel = -1;
+ textview->prev_quote_level = -1;
}
}
(buffer, &iter, bufp, -1, "link", NULL);
r_uri->end = gtk_text_iter_get_offset(&iter);
r_uri->filename = NULL;
- textview->uri_list = g_slist_append(textview->uri_list, r_uri);
+ textview->uri_list = g_slist_prepend(textview->uri_list, r_uri);
}
static void textview_set_cursor(GdkWindow *window, GdkCursor *cursor)
textview_uri_list_remove_all(textview->uri_list);
textview->uri_list = NULL;
textview->uri_hover = NULL;
+ textview->prev_quote_level = -1;
textview->body_pos = 0;
if (textview->image)
void textview_destroy(TextView *textview)
{
+ GtkTextBuffer *buffer;
+ GtkClipboard *clipboard;
+
+ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview->text));
+ clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
+ gtk_text_buffer_remove_selection_clipboard(buffer, clipboard);
+
textview_uri_list_remove_all(textview->uri_list);
textview->uri_list = NULL;
+ textview->prev_quote_level = -1;
g_free(textview);
}
if (font_desc) {
gtk_widget_modify_font(textview->text, font_desc);
CHANGE_TAG_FONT("header", font_desc);
+ CHANGE_TAG_FONT("hlink", font_desc);
pango_font_description_free(font_desc);
}
if (bold_font_desc) {
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-Claws-Account-Id:", "X-Claws-Sign:", "X-Claws-Encrypt:",
+ "X-Claws-Privacy-System:", "X-Claws-End-Special-Headers:",
+ "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];
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)
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
|| !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);
textview->image = NULL;
}
-static void textview_show_icon(TextView *textview, const gchar *stock_id)
+void textview_show_icon(TextView *textview, const gchar *stock_id)
{
GtkTextView *text = GTK_TEXT_VIEW(textview->text);
int x = 0;
MsgInfo *msginfo = textview->messageview->msginfo;
GtkTextView *text = GTK_TEXT_VIEW(textview->text);
int x = 0;
-
+ GdkWindow *window = NULL;
+
if (prefs_common.display_header_pane
|| !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,
+
+ window = mainwindow_get_mainwindow() ?
+ mainwindow_get_mainwindow()->window->window :
+ textview->text->window;
+ textview->image = xface_get_from_header(msginfo->extradata->xface,
&textview->text->style->white,
- textview->text->window);
+ window);
g_return_if_fail(textview->image != NULL);
gtk_widget_show(textview->image);
if ((procheader_headername_equal(header->name, "X-Mailer") ||
procheader_headername_equal(header->name,
"X-Newsreader")) &&
- strstr(header->body, "Sylpheed-Claws") != NULL) {
+ (strstr(header->body, "Claws Mail") != NULL ||
+ strstr(header->body, "Sylpheed-Claws") != NULL)) {
gtk_text_buffer_get_end_iter (buffer, &iter);
gtk_text_buffer_insert_with_tags_by_name
(buffer, &iter, header->body, -1,
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);
{
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() \
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:
case GDK_t:
case GDK_l:
case GDK_c:
+ case GDK_a:
if ((event->state & (GDK_MOD1_MASK|GDK_CONTROL_MASK)) == 0) {
KEY_PRESS_EVENT_STOP();
mimeview_pass_key_press_event(messageview->mimeview,
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);
GdkEventCrossing *event,
TextView *textview)
{
+ if (textview->loading)
+ return FALSE;
textview_uri_update(textview, -1, -1);
return FALSE;
gint wx, wy;
GdkWindow *window;
+ if (textview->loading)
+ return FALSE;
+
window = gtk_text_view_get_window(GTK_TEXT_VIEW(widget),
GTK_TEXT_WINDOW_TEXT);
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)) {
return uri;
}
-static void textview_shift_uris_after(TextView *textview, gint start, gint shift)
+static void textview_shift_uris_after(TextView *textview, GSList *start_list, gint start, gint shift)
{
GSList *cur;
- for (cur = textview->uri_list; cur; cur = cur->next) {
+ if (!start_list)
+ start_list = textview->uri_list;
+
+ for (cur = start_list; cur; cur = cur->next) {
ClickableText *uri = (ClickableText *)cur->data;
if (uri->start <= start)
continue;
}
}
-static void textview_toggle_quote(TextView *textview, ClickableText *uri, gboolean expand_only)
+static void textview_toggle_quote(TextView *textview, GSList *start_list, ClickableText *uri, gboolean expand_only)
{
GtkTextIter start, end;
GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview->text));
if (!uri->q_expanded) {
gtk_text_buffer_get_iter_at_offset(buffer, &start, uri->start);
gtk_text_buffer_get_iter_at_offset(buffer, &end, uri->end);
- textview_shift_uris_after(textview, uri->start,
+ textview_shift_uris_after(textview, start_list, uri->start,
g_utf8_strlen((gchar *)uri->data, -1)-strlen(" [...]\n"));
gtk_text_buffer_delete(buffer, &start, &end);
gtk_text_buffer_get_iter_at_offset(buffer, &start, uri->start);
gtk_text_buffer_get_iter_at_offset(buffer, &start, uri->start);
gtk_text_buffer_get_iter_at_offset(buffer, &end, uri->end);
textview_remove_uris_in(textview, uri->start, uri->end);
- textview_shift_uris_after(textview, uri->start,
+ textview_shift_uris_after(textview, start_list, uri->start,
strlen(" [...]\n")-g_utf8_strlen((gchar *)uri->data, -1));
gtk_text_buffer_delete(buffer, &start, &end);
gtk_text_buffer_get_iter_at_offset(buffer, &start, uri->start);
}
return TRUE;
} else if (qlink && bevent->button == 1) {
- textview_toggle_quote(textview, uri, FALSE);
+ textview_toggle_quote(textview, NULL, uri, FALSE);
return TRUE;
} else if (!g_ascii_strncasecmp(uri->uri, "mailto:", 7)) {
if (bevent->button == 3) {
bevent->button, bevent->time);
} else {
PrefsAccount *account = NULL;
-
+ FolderItem *folder_item = 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);
+ compose_new_with_folderitem(account, folder_item, uri->uri + 7);
}
return TRUE;
} else if (g_ascii_strncasecmp(uri->uri, "file:", 5)) {
return FALSE;
}
+gchar *textview_get_visible_uri (TextView *textview,
+ ClickableText *uri)
+{
+ GtkTextBuffer *buffer;
+ GtkTextIter start, 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);
+
+ return gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
+}
+
/*!
*\brief Check to see if a web URL has been disguised as a different
* URL (possible with HTML email).
*\return gboolean TRUE if the URL is ok, or if the user chose to open
* it anyway, otherwise FALSE
*/
-static gboolean textview_uri_security_check(TextView *textview, ClickableText *uri)
+gboolean textview_uri_security_check(TextView *textview, ClickableText *uri)
{
gchar *visible_str;
gboolean retval = TRUE;
- GtkTextBuffer *buffer;
- GtkTextIter start, end;
if (is_uri_string(uri->uri) == FALSE)
return TRUE;
- 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);
-
+ visible_str = textview_get_visible_uri(textview, uri);
if (visible_str == NULL)
return TRUE;
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;
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);
filedir = g_path_get_dirname(filename);
if (filedir && strcmp(filedir, ".")) {
g_free(prefs_common.attach_save_dir);
- prefs_common.attach_save_dir = g_strdup(filedir);
+ prefs_common.attach_save_dir = g_filename_to_utf8(filedir, -1, NULL, NULL, NULL);
}
g_free(filedir);
/* 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 );
NULL);
}
+void textview_get_selection_offsets(TextView *textview, gint *sel_start, gint *sel_end)
+{
+ GtkTextView *text = GTK_TEXT_VIEW(textview->text);
+ GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
+ GtkTextIter start, end;
+ if (gtk_text_buffer_get_selection_bounds(buffer, &start, &end)) {
+ if (sel_start)
+ *sel_start = gtk_text_iter_get_offset(&start);
+ if (sel_end)
+ *sel_end = gtk_text_iter_get_offset(&end);
+ } else {
+ if (sel_start)
+ *sel_start = -1;
+ if (sel_end)
+ *sel_end = -1;
+ }
+}
projects / claws.git / blobdiff