static void textview_add_part (TextView *textview,
MimeInfo *mimeinfo,
FILE *fp);
+static void textview_add_parts (TextView *textview,
+ MimeInfo *mimeinfo,
+ FILE *fp);
static void textview_write_body (TextView *textview,
MimeInfo *mimeinfo,
FILE *fp,
- CodeConverter *conv);
+ const gchar *charset);
static void textview_show_html (TextView *textview,
FILE *fp,
CodeConverter *conv);
textview->cur_pos = 0;
textview->show_all_headers = FALSE;
textview->last_buttonpress = GDK_NOTHING;
+ textview->show_url_msgid = 0;
return textview;
}
void textview_show_message(TextView *textview, MimeInfo *mimeinfo,
const gchar *file)
{
- GtkSText *text = GTK_STEXT(textview->text);
+ GtkSText *text;
FILE *fp;
const gchar *charset = NULL;
GPtrArray *headers = NULL;
- if ((fp = fopen(file, "r")) == NULL) {
+ if ((fp = fopen(file, "rb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
return;
}
charset = mimeinfo->charset;
textview_set_font(textview, charset);
textview_clear(textview);
- textview->body_pos = 0;
- textview->cur_pos = 0;
+
+ text = GTK_STEXT(textview->text);
gtk_stext_freeze(text);
textview->body_pos = gtk_stext_get_length(text);
}
- while (mimeinfo != NULL) {
- textview_add_part(textview, mimeinfo, fp);
- if (mimeinfo->parent && mimeinfo->parent->content_type &&
- !strcasecmp(mimeinfo->parent->content_type,
- "multipart/alternative"))
- mimeinfo = mimeinfo->parent->next;
- else
- mimeinfo = procmime_mimeinfo_next(mimeinfo);
- }
+ textview_add_parts(textview, mimeinfo, fp);
gtk_stext_thaw(text);
void textview_show_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
{
- GtkSText *text = GTK_STEXT(textview->text);
+ GtkSText *text;
gchar buf[BUFFSIZE];
const gchar *boundary = NULL;
gint boundary_len = 0;
const gchar *charset = NULL;
GPtrArray *headers = NULL;
- CodeConverter *conv;
+ gboolean is_rfc822_part = FALSE;
g_return_if_fail(mimeinfo != NULL);
g_return_if_fail(fp != NULL);
- if (mimeinfo->mime_type == MIME_MULTIPART) return;
+ if (mimeinfo->mime_type == MIME_MULTIPART) {
+ textview_clear(textview);
+ textview_add_parts(textview, mimeinfo, fp);
+ return;
+ }
if (mimeinfo->parent && mimeinfo->parent->boundary) {
boundary = mimeinfo->parent->boundary;
}
/* display attached RFC822 single text message */
- if (mimeinfo->parent && mimeinfo->mime_type == MIME_MESSAGE_RFC822) {
- if (headers) procheader_header_array_destroy(headers);
- if (!mimeinfo->sub || mimeinfo->sub->children) return;
- headers = textview_scan_header(textview, fp);
- mimeinfo = mimeinfo->sub;
- } else if (!mimeinfo->parent &&
- mimeinfo->mime_type == MIME_MESSAGE_RFC822) {
+ if (mimeinfo->mime_type == MIME_MESSAGE_RFC822) {
if (headers) procheader_header_array_destroy(headers);
- if (!mimeinfo->sub) return;
+ if (!mimeinfo->sub) {
+ textview_clear(textview);
+ return;
+ }
headers = textview_scan_header(textview, fp);
mimeinfo = mimeinfo->sub;
+ is_rfc822_part = TRUE;
}
if (prefs_common.force_charset)
charset = mimeinfo->charset;
textview_set_font(textview, charset);
- textview_clear(textview);
- gtk_stext_freeze(text);
+ text = GTK_STEXT(textview->text);
- textview->body_pos = 0;
- textview->cur_pos = 0;
+ gtk_stext_freeze(text);
+ textview_clear(textview);
if (headers) {
textview_show_header(textview, headers);
- gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
procheader_header_array_destroy(headers);
textview->body_pos = gtk_stext_get_length(text);
+ if (!mimeinfo->main)
+ gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
}
- conv = conv_code_converter_new(charset);
- textview_write_body(textview, mimeinfo, fp, conv);
- conv_code_converter_destroy(conv);
+ if (mimeinfo->mime_type == MIME_MULTIPART || is_rfc822_part)
+ textview_add_parts(textview, mimeinfo, fp);
+ else
+ textview_write_body(textview, mimeinfo, fp, charset);
gtk_stext_thaw(text);
}
gint boundary_len = 0;
const gchar *charset = NULL;
GPtrArray *headers = NULL;
- CodeConverter *conv;
g_return_if_fail(mimeinfo != NULL);
g_return_if_fail(fp != NULL);
if (mimeinfo->mime_type == MIME_MULTIPART) return;
+ if (!mimeinfo->parent &&
+ mimeinfo->mime_type != MIME_TEXT &&
+ mimeinfo->mime_type != MIME_TEXT_HTML &&
+ mimeinfo->mime_type != MIME_TEXT_ENRICHED)
+ return;
+
if (fseek(fp, mimeinfo->fpos, SEEK_SET) < 0) {
perror("fseek");
return;
if (mimeinfo->mime_type == MIME_MESSAGE_RFC822) {
headers = textview_scan_header(textview, fp);
if (headers) {
+ gtk_stext_freeze(text);
gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
textview_show_header(textview, headers);
procheader_header_array_destroy(headers);
+ gtk_stext_thaw(text);
}
return;
}
charset = prefs_common.force_charset;
else if (mimeinfo->charset)
charset = mimeinfo->charset;
- conv = conv_code_converter_new(charset);
- textview_write_body(textview, mimeinfo, fp, conv);
- conv_code_converter_destroy(conv);
+ textview_write_body(textview, mimeinfo, fp, charset);
}
gtk_stext_thaw(text);
}
+static void textview_add_parts(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
+{
+ gint level;
+
+ g_return_if_fail(mimeinfo != NULL);
+ g_return_if_fail(fp != NULL);
+
+ level = mimeinfo->level;
+
+ for (;;) {
+ textview_add_part(textview, mimeinfo, fp);
+ if (mimeinfo->parent && mimeinfo->parent->content_type &&
+ !strcasecmp(mimeinfo->parent->content_type,
+ "multipart/alternative"))
+ mimeinfo = mimeinfo->parent->next;
+ else
+ mimeinfo = procmime_mimeinfo_next(mimeinfo);
+ if (!mimeinfo || mimeinfo->level <= level)
+ break;
+ }
+}
+
#define TEXT_INSERT(str) \
gtk_stext_insert(text, textview->msgfont, NULL, NULL, str, -1)
TEXT_INSERT(_("To display this part as a text message, select "));
TEXT_INSERT(_("`Display as text', or press `t' key.\n\n"));
+ TEXT_INSERT(_("To display this part as an image, select "));
+ TEXT_INSERT(_("`Display image', or press `i' key.\n\n"));
+
TEXT_INSERT(_("To open this part with external program, select "));
TEXT_INSERT(_("`Open' or `Open with...', "));
TEXT_INSERT(_("or double-click, or click the center button, "));
#undef TEXT_INSERT
static void textview_write_body(TextView *textview, MimeInfo *mimeinfo,
- FILE *fp, CodeConverter *conv)
+ FILE *fp, const gchar *charset)
{
FILE *tmpfp;
gchar buf[BUFFSIZE];
+ CodeConverter *conv;
+
+ conv = conv_code_converter_new(charset);
tmpfp = procmime_decode_content(NULL, fp, mimeinfo);
if (tmpfp) {
textview_write_line(textview, buf, conv);
fclose(tmpfp);
}
+
+ conv_code_converter_destroy(conv);
}
static void textview_show_html(TextView *textview, FILE *fp,
(ch) > 32 && \
(ch) != 127 && \
!isspace(ch) && \
- !strchr("()<>\"", (ch)))
+ !strchr("(),;<>\"", (ch)))
/* alphabet and number within 7bit ASCII */
#define IS_ASCII_ALNUM(ch) (isascii(ch) && isalnum(ch))
}
#endif
+ if (!conv || conv_convert(conv, buf, sizeof(buf), str) < 0)
+ strncpy2(buf, str, sizeof(buf));
+
+ strcrchomp(buf);
+ gtk_stext_insert(text, textview->msgfont, NULL, NULL, " ", 1);
+
/* this part is based on the code in make_clickable_parts */
if (prefs_common.enable_color) {
link_color = &uri_color;
uri = g_new(RemoteURI, 1);
uri->uri = g_strdup(url);
uri->start = gtk_stext_get_point(text);
- gtk_stext_insert(text, textview->msgfont, link_color, NULL, buf,
- strlen(buf));
+ gtk_stext_insert(text, textview->msgfont, link_color, NULL, str,
+ strlen(str));
uri->end = gtk_stext_get_point(text);
textview->uri_list = g_slist_append(textview->uri_list, uri);
}
>, foo>, _> ... ok, <foo>, foo bar>, foo-> ... ng
Up to 3 levels of quotations are detected, and each
level is colored using a different color. */
- if (prefs_common.enable_color && strchr(buf, '>')) {
- quotelevel = get_quote_level(buf);
+ if (prefs_common.enable_color
+ && line_has_quote_char(buf, prefs_common.quote_chars)) {
+ quotelevel = get_quote_level(buf, prefs_common.quote_chars);
/* set up the correct foreground color */
if (quotelevel > 2) {
textview_uri_list_remove_all(textview->uri_list);
textview->uri_list = NULL;
+
+ textview->body_pos = 0;
+ textview->cur_pos = 0;
}
void textview_destroy(TextView *textview)
if (text_len - pos < len) break;
if (gtkut_stext_match_string(text, pos, wcs, len, case_sens)
== TRUE) {
+ gtk_widget_hide(GTK_WIDGET(textview->scrolledwin));
gtk_editable_set_position(GTK_EDITABLE(text),
pos + len);
gtk_editable_select_region(GTK_EDITABLE(text),
pos, pos + len);
+ gtk_widget_show(GTK_WIDGET(textview->scrolledwin));
textview_set_position(textview, pos + len);
found = TRUE;
break;
}
if (text_len - pos == len) break;
}
-
g_free(wcs);
return found;
}
return TRUE;
}
+static gint show_url_timeout_cb(TextView *textview ){
+ if (textview->messageview->mainwin)
+ if (textview->show_url_msgid)
+ gtk_statusbar_remove(GTK_STATUSBAR(
+ textview->messageview->mainwin->statusbar),
+ textview->messageview->mainwin->folderview_cid,
+ textview->show_url_msgid);
+ return FALSE;
+}
+
static gint textview_button_pressed(GtkWidget *widget, GdkEventButton *event,
TextView *textview)
{
gtk_editable_get_position(GTK_EDITABLE(textview->text));
if (event &&
- ((event->button == 1 && textview->last_buttonpress == GDK_2BUTTON_PRESS)
+ ((event->button == 1)
|| event->button == 2 || event->button == 3)) {
GSList *cur;
if (textview->cur_pos >= uri->start &&
textview->cur_pos < uri->end) {
+ /* single click: display url in statusbar */
+ if (event->button == 1 && textview->last_buttonpress != GDK_2BUTTON_PRESS) {
+ if (textview->messageview->mainwin) {
+ if (textview->show_url_msgid) {
+ gtk_timeout_remove(textview->show_url_timeout_tag);
+ gtk_statusbar_remove(GTK_STATUSBAR(
+ textview->messageview->mainwin->statusbar),
+ textview->messageview->mainwin->folderview_cid,
+ textview->show_url_msgid);
+ textview->show_url_msgid = 0;
+ }
+ textview->show_url_msgid = gtk_statusbar_push(
+ GTK_STATUSBAR(textview->messageview->mainwin->statusbar),
+ textview->messageview->mainwin->folderview_cid,
+ uri->uri);
+ textview->show_url_timeout_tag = gtk_timeout_add( 2000, show_url_timeout_cb, textview );
+ gtkut_widget_wait_for_draw(textview->messageview->mainwin->hbox_stat);
+ }
+ } else
if (!g_strncasecmp(uri->uri, "mailto:", 7)) {
if (event->button == 3) {
gchar *fromname, *fromaddress;
projects / claws.git / blobdiff