{(gulong)0, (gushort)0, (gushort)0, (gushort)0}
};
+static GdkColor signature_color = {
+ (gulong)0,
+ (gushort)0x7fff,
+ (gushort)0x7fff,
+ (gushort)0x7fff
+};
+
static GdkColor uri_color = {
(gulong)0,
(gushort)0,
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,
GtkWidget *text_sb;
GtkWidget *text_mb;
- debug_print(_("Creating text view...\n"));
+ debug_print("Creating text view...\n");
textview = g_new0(TextView, 1);
scrolledwin_sb = gtk_scrolled_window_new(NULL, NULL);
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;
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;
+ 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;
if (!boundary && (mimeinfo->mime_type == MIME_TEXT ||
mimeinfo->mime_type == MIME_TEXT_HTML ||
mimeinfo->mime_type == MIME_TEXT_ENRICHED)) {
-
+
if (fseek(fp, mimeinfo->fpos, SEEK_SET) < 0)
perror("fseek");
headers = textview_scan_header(textview, fp);
}
/* 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);
}
- textview_write_body(textview, mimeinfo, fp, charset);
+ 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);
}
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;
}
gtk_stext_freeze(text);
+#if USE_GPGME
+ if (mimeinfo->sigstatus)
+ g_snprintf(buf, sizeof(buf), "\n[%s (%s)]\n",
+ mimeinfo->content_type, mimeinfo->sigstatus);
+ else
+#endif
if (mimeinfo->filename || mimeinfo->name)
g_snprintf(buf, sizeof(buf), "\n[%s %s (%d bytes)]\n",
mimeinfo->filename ? mimeinfo->filename :
charset = mimeinfo->charset;
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)
textview_set_font(textview, NULL);
text = GTK_STEXT(textview->text);
textview_clear(textview);
-
+
gtk_stext_freeze(text);
TEXT_INSERT(_("To save this part, pop up the context menu with "));
} else {
TEXT_INSERT(partinfo->sigstatus_full);
}
-
+
gtk_stext_thaw(text);
}
#endif /* USE_GPGME */
conv = conv_code_converter_new(charset);
tmpfp = procmime_decode_content(NULL, fp, mimeinfo);
+
+ textview->is_in_signature = FALSE;
+
if (tmpfp) {
+
if (mimeinfo->mime_type == MIME_TEXT_HTML)
textview_show_html(textview, tmpfp, conv);
else if (mimeinfo->mime_type == MIME_TEXT_ENRICHED)
textview_write_line(textview, str, NULL);
}
}
+
html_parser_destroy(parser);
}
{
ERTFParser *parser;
gchar *str;
- gchar* url = NULL;
parser = ertf_parser_new(fp, conv);
g_return_if_fail(parser != NULL);
while ((str = ertf_parse(parser)) != NULL) {
textview_write_line(textview, str, NULL);
}
+
ertf_parser_destroy(parser);
}
}
#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);
}
else
fg_color = "e_colors[quotelevel];
+ if (prefs_common.enable_color && (strcmp(buf,"-- \n") == 0 || textview->is_in_signature)) {
+ fg_color = &signature_color;
+ textview->is_in_signature = TRUE;
+ }
+
if (prefs_common.head_space && spacingfont && buf[0] != '\n')
gtk_stext_insert(text, spacingfont, NULL, NULL, " ", 1);
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)
header = g_ptr_array_index(headers, i);
g_ptr_array_add(sorted_headers, header);
}
- }
+ g_ptr_array_free(headers, TRUE);
+ } else
+ procheader_header_array_destroy(headers);
- g_ptr_array_free(headers, FALSE);
return sorted_headers;
}
textview_scroll_one_line(textview,
(event->state & GDK_MOD1_MASK) != 0);
break;
+ case GDK_Delete:
+ if (summaryview)
+ summary_pass_key_press_event(summaryview, event);
+ break;
case GDK_n:
case GDK_N:
case GDK_p:
case GDK_y:
case GDK_t:
case GDK_l:
- if (messageview->type == MVIEW_MIME) {
+ if (messageview->type == MVIEW_MIME &&
+ textview == messageview->mimeview->textview) {
KEY_PRESS_EVENT_STOP();
mimeview_pass_key_press_event(messageview->mimeview,
event);
}
/* fall through */
default:
- if (summaryview)
- summary_pass_key_press_event(summaryview, event);
+ if (summaryview &&
+ event->window != messageview->mainwin->window->window) {
+ GdkEventKey tmpev = *event;
+
+ tmpev.window = messageview->mainwin->window->window;
+ KEY_PRESS_EVENT_STOP();
+ gtk_widget_event(messageview->mainwin->window,
+ (GdkEvent *)&tmpev);
+ }
break;
}
return TRUE;
}
+static gint show_url_timeout_cb(gpointer data)
+{
+ TextView *textview = (TextView *)data;
+
+ 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( 4000, 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;
- GdkEventButton tmpev;
/* extract url */
fromaddress = g_strdup(uri->uri + 7);
if (folder_item->prefs && folder_item->prefs->enable_default_account)
account = account_find_from_id(folder_item->prefs->default_account);
}
- compose_new_with_recipient
- (account, uri->uri + 7);
+ compose_new(account, uri->uri + 7, NULL);
}
} else {
open_uri(uri->uri,
projects / claws.git / blobdiff