#include "gtkutils.h"
#include "procmime.h"
#include "html.h"
+#include "enriched.h"
#include "compose.h"
#include "addressbook.h"
#include "displayheader.h"
static GdkFont *spacingfont;
+static void textview_show_ertf (TextView *textview,
+ FILE *fp,
+ CodeConverter *conv);
static void textview_show_html (TextView *textview,
FILE *fp,
CodeConverter *conv);
static void textview_write_line (TextView *textview,
const gchar *str,
CodeConverter *conv);
+static void textview_write_link (TextView *textview,
+ const gchar *url,
+ const gchar *str,
+ CodeConverter *conv);
static GPtrArray *textview_scan_header (TextView *textview,
FILE *fp);
static void textview_show_header (TextView *textview,
static void textview_key_pressed (GtkWidget *widget,
GdkEventKey *event,
TextView *textview);
-static void textview_button_pressed (GtkWidget *widget,
+static gint textview_button_pressed (GtkWidget *widget,
+ GdkEventButton *event,
+ TextView *textview);
+static gint textview_button_released (GtkWidget *widget,
GdkEventButton *event,
TextView *textview);
gtk_signal_connect(GTK_OBJECT(text_sb), "key_press_event",
GTK_SIGNAL_FUNC(textview_key_pressed),
textview);
- gtk_signal_connect(GTK_OBJECT(text_sb), "button_press_event",
- GTK_SIGNAL_FUNC(textview_button_pressed),
- textview);
+ gtk_signal_connect_after(GTK_OBJECT(text_sb), "button_press_event",
+ GTK_SIGNAL_FUNC(textview_button_pressed),
+ textview);
+ gtk_signal_connect_after(GTK_OBJECT(text_sb), "button_release_event",
+ GTK_SIGNAL_FUNC(textview_button_released),
+ textview);
gtk_signal_connect(GTK_OBJECT(text_mb), "key_press_event",
GTK_SIGNAL_FUNC(textview_key_pressed),
textview);
- gtk_signal_connect(GTK_OBJECT(text_mb), "button_press_event",
- GTK_SIGNAL_FUNC(textview_button_pressed),
- textview);
+ gtk_signal_connect_after(GTK_OBJECT(text_mb), "button_press_event",
+ GTK_SIGNAL_FUNC(textview_button_pressed),
+ textview);
+ gtk_signal_connect_after(GTK_OBJECT(text_mb), "button_release_event",
+ GTK_SIGNAL_FUNC(textview_button_released),
+ textview);
gtk_widget_show(scrolledwin_sb);
gtk_widget_show(scrolledwin_mb);
textview->text_mb = text_mb;
textview->text_is_mb = FALSE;
textview->uri_list = NULL;
+ textview->body_pos = 0;
+ textview->cur_pos = 0;
+ textview->last_buttonpress = GDK_NOTHING;
return textview;
}
boundary_len = strlen(boundary);
}
- if (!boundary && mimeinfo->mime_type == MIME_TEXT) {
+ 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);
} else {
if (mimeinfo->mime_type == MIME_TEXT && mimeinfo->parent) {
glong fpos;
+ MimeInfo *parent = mimeinfo->parent;
+
+ while (parent->parent) {
+ if (parent->main &&
+ parent->main->mime_type ==
+ MIME_MESSAGE_RFC822)
+ break;
+ parent = parent->parent;
+ }
if ((fpos = ftell(fp)) < 0)
perror("ftell");
- else if (fseek(fp, mimeinfo->parent->fpos, SEEK_SET)
- < 0)
+ else if (fseek(fp, parent->fpos, SEEK_SET) < 0)
perror("fseek");
else {
headers = textview_scan_header(textview, fp);
perror("fseek");
}
}
+ /* skip MIME part headers */
while (fgets(buf, sizeof(buf), fp) != NULL)
if (buf[0] == '\r' || buf[0] == '\n') break;
}
text = GTK_TEXT(textview->text);
gtk_text_freeze(text);
+ textview->body_pos = 0;
+ textview->cur_pos = 0;
+
if (headers) {
textview_show_header(textview, headers);
procheader_header_array_destroy(headers);
if (tmpfp) {
if (mimeinfo->mime_type == MIME_TEXT_HTML)
textview_show_html(textview, tmpfp, conv);
+ else if (mimeinfo->mime_type == MIME_TEXT_ENRICHED)
+ textview_show_ertf(textview, tmpfp, conv);
else
while (fgets(buf, sizeof(buf), tmpfp) != NULL)
textview_write_line(textview, buf, conv);
{
HTMLParser *parser;
gchar *str;
+ gchar* url = NULL;
parser = html_parser_new(fp, conv);
g_return_if_fail(parser != NULL);
while ((str = html_parse(parser)) != NULL) {
- textview_write_line(textview, str, NULL);
+ if (parser->state == HTML_HREF) {
+ /* first time : get and copy the URL */
+ if (url == NULL) {
+ /* ALF - the sylpheed html parser returns an empty string,
+ * if still inside an <a>, but already parsed past HREF */
+ str = strtok(str, " ");
+ if (str) {
+ url = strdup(str);
+ /* the URL may (or not) be followed by the
+ * referenced text */
+ str = strtok(NULL, "");
+ }
+ }
+ if (str != NULL) {
+ textview_write_link(textview, url, str, NULL);
+ }
+ } else {
+ if (url != NULL) {
+ free(url);
+ url = NULL;
+ }
+ textview_write_line(textview, str, NULL);
+ }
}
html_parser_destroy(parser);
}
+static void textview_show_ertf(TextView *textview, FILE *fp,
+ CodeConverter *conv)
+{
+ 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);
+}
+
/* get_uri_part() - retrieves a URI starting from scanpos.
Returns TRUE if succesful */
static gboolean get_uri_part(const gchar *start, const gchar *scanpos,
* should pass some URI type to this function and decide on that whether
* to perform punctuation stripping */
-#define IS_REAL_PUNCT(ch) \
- (ispunct(ch) && ((ch) != '/'))
+#define IS_REAL_PUNCT(ch) (ispunct(ch) && ((ch) != '/'))
for (; ep_ - 1 > scanpos + 1 && IS_REAL_PUNCT(*(ep_ - 1)); ep_--)
;
!isspace(ch) && \
!strchr("()<>\"", (ch)))
+/* alphabet and number within 7bit ASCII */
+#define IS_ASCII_ALNUM(ch) (isascii(ch) && isalnum(ch))
#define IS_QUOTE(ch) ((ch) == '\'' || (ch) == '"')
/* get_email_part() - retrieves an email address. Returns TRUE if succesful */
/* TODO: should start with an alnum? */
bp_++;
- for (; bp_ < scanpos && !isalnum(*bp_); bp_++)
+ for (; bp_ < scanpos && !IS_ASCII_ALNUM(*bp_); bp_++)
;
if (bp_ != scanpos) {
;
/* TODO: really should terminate with an alnum? */
- for (; ep_ > scanpos && !isalnum(*ep_); --ep_)
+ for (; ep_ > scanpos && !IS_ASCII_ALNUM(*ep_); --ep_)
;
ep_++;
#undef ADD_TXT_POS
+/* This function writes str as a double-clickable link with the given url. */
+static void textview_write_link(TextView *textview, const gchar *url,
+ const gchar *str, CodeConverter *conv)
+{
+ GdkColor *link_color = NULL;
+ RemoteURI* uri;
+ GtkText *text = GTK_TEXT(textview->text);
+ gchar buf[BUFFSIZE];
+
+ /* this part is taken from textview_write_line. Right now the only place
+ * that calls this function passes NULL for conv, but you never know. */
+ if (!conv)
+ strncpy2(buf, str, sizeof(buf));
+ else if (conv_convert(conv, buf, sizeof(buf), str) < 0) {
+ gtk_text_insert(text, textview->msgfont,
+ prefs_common.enable_color
+ ? &error_color : NULL, NULL,
+ "*** Warning: code conversion failed ***\n",
+ -1);
+ return;
+ }
+
+ /* 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_text_get_point(text);
+ gtk_text_insert(text, textview->msgfont, link_color, NULL, buf,
+ strlen(buf));
+ uri->end = gtk_text_get_point(text);
+ textview->uri_list = g_slist_append(textview->uri_list, uri);
+}
+
static void textview_write_line(TextView *textview, const gchar *str,
CodeConverter *conv)
{
GtkText *text = GTK_TEXT(textview->text);
gchar buf[BUFFSIZE];
- size_t len;
GdkColor *fg_color;
gint quotelevel = -1;
return;
}
- len = strlen(buf);
- if (len > 1 && buf[len - 1] == '\n' && buf[len - 2] == '\r') {
- buf[len - 2] = '\n';
- buf[len - 1] = '\0';
- }
+ strcrchomp(buf);
if (prefs_common.conv_mb_alnum) conv_mb_alnum(buf);
fg_color = NULL;
GtkText *text = GTK_TEXT(textview->text);
gtk_text_freeze(text);
- gtk_text_backward_delete(text, gtk_text_get_length(text));
+ gtk_text_set_point(text, 0);
+ gtk_text_forward_delete(text, gtk_text_get_length(text));
gtk_text_thaw(text);
textview_uri_list_remove_all(textview->uri_list);
if (MB_CUR_MAX > 1) {
if (codeset) {
if (!g_strncasecmp(codeset, "ISO-8859-", 9) ||
- !g_strncasecmp(codeset, "KOI8-", 5) ||
- !g_strncasecmp(codeset, "CP", 2) ||
- !g_strncasecmp(codeset, "WINDOWS-", 8) ||
!g_strcasecmp(codeset, "BALTIC"))
use_fontset = FALSE;
+ else if (conv_get_current_charset() != C_EUC_JP &&
+ (!g_strncasecmp(codeset, "KOI8-", 5) ||
+ !g_strncasecmp(codeset, "CP", 2) ||
+ !g_strncasecmp(codeset, "WINDOWS-", 8)))
+ use_fontset = FALSE;
}
} else
use_fontset = FALSE;
GtkWidget *parent;
parent = textview->scrolledwin_mb->parent;
- gtk_editable_select_region
- (GTK_EDITABLE(textview->text_mb), 0, 0);
+ gtk_editable_claim_selection(GTK_EDITABLE(textview->text_mb),
+ FALSE, GDK_CURRENT_TIME);
gtk_container_remove(GTK_CONTAINER(parent),
textview->scrolledwin_mb);
gtk_container_add(GTK_CONTAINER(parent),
GtkWidget *parent;
parent = textview->scrolledwin_sb->parent;
- gtk_editable_select_region
- (GTK_EDITABLE(textview->text_sb), 0, 0);
+ gtk_editable_claim_selection(GTK_EDITABLE(textview->text_sb),
+ FALSE, GDK_CURRENT_TIME);
gtk_container_remove(GTK_CONTAINER(parent),
textview->scrolledwin_sb);
gtk_container_add(GTK_CONTAINER(parent),
H_ORGANIZATION = 11,
};
+void textview_set_position(TextView *textview, gint pos)
+{
+ if (pos < 0) {
+ textview->cur_pos =
+ gtk_text_get_length(GTK_TEXT(textview->text));
+ } else {
+ textview->cur_pos = pos;
+ }
+}
+
static GPtrArray *textview_scan_header(TextView *textview, FILE *fp)
{
gchar buf[BUFFSIZE];
gtk_text_insert(text, textview->msgfont, NULL, NULL, "\n", 1);
gtk_text_thaw(text);
+ textview->body_pos = gtk_text_get_length(text);
+}
+
+gboolean textview_search_string(TextView *textview, const gchar *str,
+ gboolean case_sens)
+{
+ GtkText *text = GTK_TEXT(textview->text);
+ gint pos;
+ wchar_t *wcs;
+ gint len;
+ gint text_len;
+ gboolean found = FALSE;
+
+ g_return_val_if_fail(str != NULL, FALSE);
+
+ wcs = strdup_mbstowcs(str);
+ g_return_val_if_fail(wcs != NULL, FALSE);
+ len = wcslen(wcs);
+ pos = textview->cur_pos;
+ if (pos < textview->body_pos)
+ pos = textview->body_pos;
+ text_len = gtk_text_get_length(text);
+ if (text_len - pos < len) {
+ g_free(wcs);
+ return FALSE;
+ }
+
+ for (; pos < text_len; pos++) {
+ if (text_len - pos < len) break;
+ if (gtkut_text_match_string(text, pos, wcs, len, case_sens)
+ == TRUE) {
+ gtk_editable_set_position(GTK_EDITABLE(text),
+ pos + len);
+ gtk_editable_select_region(GTK_EDITABLE(text),
+ pos, pos + len);
+ textview_set_position(textview, pos + len);
+ found = TRUE;
+ break;
+ }
+ if (text_len - pos == len) break;
+ }
+
+ g_free(wcs);
+ return found;
+}
+
+gboolean textview_search_string_backward(TextView *textview, const gchar *str,
+ gboolean case_sens)
+{
+ GtkText *text = GTK_TEXT(textview->text);
+ gint pos;
+ wchar_t *wcs;
+ gint len;
+ gint text_len;
+ gboolean found = FALSE;
+
+ g_return_val_if_fail(str != NULL, FALSE);
+
+ wcs = strdup_mbstowcs(str);
+ g_return_val_if_fail(wcs != NULL, FALSE);
+ len = wcslen(wcs);
+ pos = textview->cur_pos;
+ text_len = gtk_text_get_length(text);
+ if (text_len - textview->body_pos < len) {
+ g_free(wcs);
+ return FALSE;
+ }
+ if (pos <= textview->body_pos || text_len - pos < len)
+ pos = text_len - len;
+
+ for (; pos >= textview->body_pos; pos--) {
+ if (gtkut_text_match_string(text, pos, wcs, len, case_sens)
+ == TRUE) {
+ gtk_editable_set_position(GTK_EDITABLE(text), pos);
+ gtk_editable_select_region(GTK_EDITABLE(text),
+ pos, pos + len);
+ textview_set_position(textview, pos - 1);
+ found = TRUE;
+ break;
+ }
+ if (pos == textview->body_pos) break;
+ }
+
+ g_free(wcs);
+ return found;
}
void textview_scroll_one_line(TextView *textview, gboolean up)
textview_scroll_page(textview, FALSE);
break;
case GDK_BackSpace:
- case GDK_Delete:
textview_scroll_page(textview, TRUE);
break;
case GDK_Return:
}
}
-static void textview_button_pressed(GtkWidget *widget, GdkEventButton *event,
+static gint textview_button_pressed(GtkWidget *widget, GdkEventButton *event,
TextView *textview)
{
- if (event &&
- ((event->button == 1 && event->type == GDK_2BUTTON_PRESS)
+ if (event)
+ textview->last_buttonpress = event->type;
+ return FALSE;
+}
+
+static gint textview_button_released(GtkWidget *widget, GdkEventButton *event,
+ TextView *textview)
+{
+ textview->cur_pos =
+ gtk_editable_get_position(GTK_EDITABLE(textview->text));
+
+ if (event &&
+ ((event->button == 1 && textview->last_buttonpress == GDK_2BUTTON_PRESS)
|| event->button == 2 || event->button == 3)) {
GSList *cur;
- guint current_pos;
- current_pos = GTK_EDITABLE(textview->text)->current_pos;
+ /* double click seems to set the cursor after the current
+ * word. The cursor position needs fixing, otherwise the
+ * last word of a clickable zone will not work */
+ if (event->button == 1 && textview->last_buttonpress == GDK_2BUTTON_PRESS) {
+ textview->cur_pos--;
+ }
for (cur = textview->uri_list; cur != NULL; cur = cur->next) {
RemoteURI *uri = (RemoteURI *)cur->data;
- if (current_pos >= uri->start &&
- current_pos < uri->end) {
+ if (textview->cur_pos >= uri->start &&
+ textview->cur_pos < uri->end) {
if (!g_strncasecmp(uri->uri, "mailto:", 7)) {
if (event->button == 3) {
gchar *fromname, *fromaddress;
+ GdkEventButton tmpev;
+
/* extract url */
fromaddress = g_strdup(uri->uri + 7);
/* 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);
- addressbook_add_submenu(NULL, fromname, fromaddress, NULL);
+ /* Add to address book - Match */
+ addressbook_add_contact( fromname, fromaddress, NULL );
+
g_free(fromaddress);
g_free(fromname);
} else {
}
}
}
+ if (event)
+ textview->last_buttonpress = event->type;
+ return FALSE;
}
static void textview_uri_list_remove_all(GSList *uri_list)