#include "addressbook.h"
#include "displayheader.h"
#include "account.h"
-
-#define FONT_LOAD(font, s) \
-{ \
- gchar *fontstr, *p; \
- \
- Xstrdup_a(fontstr, s, ); \
- if ((p = strchr(fontstr, ',')) != NULL) *p = '\0'; \
- font = gdk_font_load(fontstr); \
- if (!font) \
- g_warning("Couldn't load the font '%s'\n", fontstr); \
-}
+#include "mimeview.h"
typedef struct _RemoteURI RemoteURI;
{(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,
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);
GtkStyle *style;
GdkFont *font;
- FONT_LOAD(font, prefs_common.normalfont);
+ font = gtkut_font_load_from_fontset(prefs_common.normalfont);
if (font) {
style = gtk_style_copy(text_sb->style);
gdk_font_unref(style->font);
"e_colors[2]);
gtkut_convert_int_to_gdk_color(prefs_common.uri_col,
&uri_color);
+ gtkut_convert_int_to_gdk_color(prefs_common.signature_col,
+ &signature_color);
} else {
quote_colors[0] = quote_colors[1] = quote_colors[2] =
- uri_color = emphasis_color = black;
+ uri_color = emphasis_color = signature_color = black;
}
}
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;
textview_set_font(textview, charset);
textview_clear(textview);
+ text = GTK_STEXT(textview->text);
+
gtk_stext_freeze(text);
if (fseek(fp, mimeinfo->fpos, SEEK_SET) < 0) perror("fseek");
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 (!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);
}
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);
+ text = GTK_STEXT(textview->text);
+
gtk_stext_freeze(text);
+ textview_clear(textview);
if (headers) {
textview_show_header(textview, headers);
gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
}
- if (mimeinfo->mime_type == MIME_MULTIPART || mimeinfo->main)
+ if (mimeinfo->mime_type == MIME_MULTIPART || is_rfc822_part)
textview_add_parts(textview, mimeinfo, fp);
else
textview_write_body(textview, mimeinfo, fp, charset);
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 :
g_snprintf(buf, sizeof(buf), "\n[%s (%d bytes)]\n",
mimeinfo->content_type, mimeinfo->size);
+#if USE_GPGME
+ if (mimeinfo->sigstatus && !mimeinfo->sigstatus_full) {
+ gchar *tmp;
+ /* use standard font */
+ gpointer oldfont = textview->msgfont;
+ textview->msgfont = NULL;
+
+ tmp = g_strconcat("pgp: ", _("Check signature"), NULL);
+ textview_write_link(textview, tmp, buf, NULL);
+
+ /* put things back */
+ textview->msgfont = (GdkFont *)oldfont;
+ oldfont = NULL;
+ g_free(tmp);
+ } else
+#endif
if (mimeinfo->mime_type != MIME_TEXT &&
mimeinfo->mime_type != MIME_TEXT_HTML &&
mimeinfo->mime_type != MIME_TEXT_ENRICHED) {
mimeinfo->parent &&
mimeinfo->parent->children != mimeinfo)
gtk_stext_insert(text, NULL, NULL, NULL, buf, -1);
- else
+ else if (prefs_common.display_header)
gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
if (prefs_common.force_charset)
charset = prefs_common.force_charset;
charset = mimeinfo->charset;
textview_write_body(textview, mimeinfo, fp, charset);
}
-
+
gtk_stext_thaw(text);
}
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);
}
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);
text_sb_font->ascent = text_sb_font_orig_ascent;
text_sb_font->descent = text_sb_font_orig_descent;
}
- if (MB_CUR_MAX > 1) {
- FONT_LOAD(font, "-*-courier-medium-r-normal--14-*-*-*-*-*-iso8859-1");
- } else {
- FONT_LOAD(font, prefs_common.textfont);
- }
+ if (MB_CUR_MAX > 1)
+ font = gdk_font_load("-*-courier-medium-r-normal--14-*-*-*-*-*-iso8859-1");
+ else
+ font = gtkut_font_load_from_fontset
+ (prefs_common.textfont);
if (font && text_sb_font != font) {
if (text_sb_font)
gdk_font_unref(text_sb_font);
}
if (!textview->boldfont && prefs_common.boldfont)
- FONT_LOAD(textview->boldfont, prefs_common.boldfont);
+ textview->boldfont = gtkut_font_load(prefs_common.boldfont);
if (!spacingfont)
spacingfont = gdk_font_load("-*-*-medium-r-normal--6-*");
}
header = g_ptr_array_index(headers, i);
g_ptr_array_add(sorted_headers, header);
}
- }
-
- g_ptr_array_free(headers, FALSE);
+ g_ptr_array_free(headers, TRUE);
+ } else
+ procheader_header_array_destroy(headers);
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(TextView *textview ){
+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(
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 );
+ 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 {
+ } else
+#if USE_GPGME
+ if (!g_strncasecmp(uri->uri, "pgp:", 4)) {
+ GtkAdjustment *pos = gtk_scrolled_window_get_vadjustment(
+ GTK_SCROLLED_WINDOW(textview->scrolledwin));
+ gfloat vpos = pos->value;
+ mimeview_check_signature(textview->messageview->mimeview);
+ /* scroll back where we were */
+ gtk_adjustment_set_value(pos, vpos);
+ } else
+#endif
+ {
open_uri(uri->uri,
prefs_common.uri_cmd);
}
projects / claws.git / blobdiff