#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 "inputdialog.h"
#include "timing.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;
static GdkColor quote_colors[3] = {
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,
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_part(TextView *textview, MimeInfo *mimeinfo, FILE *fp)
{
- START_TIMING("textview_show_part");
+ START_TIMING("");
g_return_if_fail(mimeinfo != NULL);
g_return_if_fail(fp != NULL);
END_TIMING();
}
-#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); \
-}
-
static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
{
GtkTextView *text;
const gchar *name;
gchar *content_type;
gint charcount;
- START_TIMING("textview_add_part");
+ 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;
}
return;
}
+ previousquotelevel = -1;
+
if ((mimeinfo->type == MIMETYPE_MESSAGE) && !g_ascii_strcasecmp(mimeinfo->subtype, "rfc822")) {
FILE *fp;
|| (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 ) {
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);
{
GNode * iter;
MimeInfo *mimeinfo;
- START_TIMING("recursive_add_parts");
+ START_TIMING("");
mimeinfo = (MimeInfo *) node->data;
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;
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);
+ textview_write_line(textview, buf, conv, TRUE);
lines++;
if (lines % 500 == 0)
fclose(tmpfp);
waitpid(pid, pfd, 0);
unlink(fname);
+#endif
} else {
textview_default:
lines = 0;
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);
+ textview_write_line(textview, buf, conv, TRUE);
lines++;
if (lines % 500 == 0)
GTK_EVENTS_FLUSH();
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 (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();
return;
}
}
- textview_write_line(textview, "\n", NULL);
+ textview_write_line(textview, "\n", NULL, FALSE);
sc_html_parser_destroy(parser);
}
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();
} 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 (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 ( previousquotelevel != 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;
} else {
- GSList *last = g_slist_last(textview->uri_list);
+ GSList *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;
+ gint e_len = 0, n_len = 0;
+
+ if (lasturi->is_quote == FALSE) {
+ previousquotelevel = -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);
(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)
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;
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];
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
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;
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);
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)) {
projects / claws.git / blobdiff