#include "gtkshruler.h"
#include "folder.h"
#include "addr_compl.h"
-#include "template_select.h"
+#include "quote_fmt.h"
+#include "template.h"
+#include "undo.h"
#if USE_GPGME
# include "rfc2015.h"
#endif
-#include "quote_fmt.h"
-
typedef enum
{
COL_MIMETYPE = 0,
static GList *compose_list = NULL;
+static void compose_set_undo (UndoMain *undostruct,
+ gint undo_state,
+ gint redo_state,
+ GtkWidget *changewidget);
+Compose *compose_generic_new (PrefsAccount *account,
+ const gchar *to,
+ FolderItem *item);
+
static Compose *compose_create (PrefsAccount *account,
ComposeMode mode);
static void compose_toolbar_create (Compose *compose,
GtkWidget *container);
static GtkWidget *compose_account_option_menu_create
(Compose *compose);
+static void compose_set_template_menu (Compose *compose);
+static void compose_template_apply (Compose *compose,
+ Template *tmpl);
static void compose_destroy (Compose *compose);
+static void compose_entries_set (Compose *compose,
+ const gchar *mailto);
static gint compose_parse_header (Compose *compose,
MsgInfo *msginfo);
static gchar *compose_parse_references (const gchar *ref,
const gchar *msgid);
-static void compose_quote_file (Compose *compose,
- MsgInfo *msginfo,
- FILE *fp);
-static gchar *compose_quote_parse_fmt (Compose *compose,
+
+static gchar *compose_quote_fmt (Compose *compose,
MsgInfo *msginfo,
- const gchar *fmt);
+ const gchar *fmt,
+ const gchar *qmark);
+
static void compose_reply_set_entry (Compose *compose,
MsgInfo *msginfo,
gboolean to_all,
const gchar *file);
static gint compose_remove_reedit_target (Compose *compose);
static gint compose_queue (Compose *compose,
- const gchar *file);
+ gint *msgnum,
+ FolderItem **item);
static void compose_write_attach (Compose *compose,
FILE *fp);
static gint compose_write_headers (Compose *compose,
gpointer data);
static void toolbar_address_cb (GtkWidget *widget,
gpointer data);
-static void template_select_cb (gpointer daat,
- guint action,
- GtkWidget *widget);
+static void select_account (Compose *compose,
+ PrefsAccount *ac);
-static void select_account(Compose * compose, PrefsAccount * ac);
static void account_activated (GtkMenuItem *menuitem,
gpointer data);
static void compose_close_cb (gpointer data,
guint action,
GtkWidget *widget);
+
static void compose_address_cb (gpointer data,
guint action,
GtkWidget *widget);
+static void compose_template_activate_cb(GtkWidget *widget,
+ gpointer data);
static void compose_ext_editor_cb (gpointer data,
guint action,
static void compose_destroy_cb (GtkWidget *widget,
Compose *compose);
+static void compose_undo_cb (Compose *compose);
+static void compose_redo_cb (Compose *compose);
static void compose_cut_cb (Compose *compose);
static void compose_copy_cb (Compose *compose);
static void compose_paste_cb (Compose *compose);
Compose *compose);
#endif
+#if 0
static void compose_toggle_to_cb (gpointer data,
guint action,
GtkWidget *widget);
static void compose_toggle_attach_cb (gpointer data,
guint action,
GtkWidget *widget);
+#endif
static void compose_toggle_ruler_cb (gpointer data,
guint action,
GtkWidget *widget);
guint time,
gpointer user_data);
+#if 0
static void to_activated (GtkWidget *widget,
Compose *compose);
static void newsgroups_activated (GtkWidget *widget,
Compose *compose);
static void followupto_activated (GtkWidget *widget,
Compose *compose);
-static void compose_attach_parts(Compose * compose,
- MsgInfo * msginfo);
+#endif
-static gchar *compose_quote_fmt (Compose *compose,
- MsgInfo *msginfo,
- const gchar *fmt,
- const gchar * qmark);
+static void compose_attach_parts (Compose *compose,
+ MsgInfo *msginfo);
static void compose_generic_reply(MsgInfo *msginfo, gboolean quote,
gboolean to_all,
gboolean ignore_replyto,
gboolean followup_and_reply_to);
-void compose_headerentry_changed_cb (GtkWidget *entry,
- compose_headerentry *headerentry);
-void compose_headerentry_key_press_event_cb (GtkWidget *entry,
- GdkEventKey *event,
- compose_headerentry *headerentry);
-
-Compose * compose_generic_new (PrefsAccount *account,
- const gchar *to,
- FolderItem *item);
+void compose_headerentry_changed_cb (GtkWidget *entry,
+ ComposeHeaderEntry *headerentry);
+void compose_headerentry_key_press_event_cb(GtkWidget *entry,
+ GdkEventKey *event,
+ ComposeHeaderEntry *headerentry);
static GtkItemFactoryEntry compose_popup_entries[] =
{
{N_("/_File/_Close"), "<alt>W", compose_close_cb, 0, NULL},
{N_("/_Edit"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Edit/_Undo"), "<control>Z", NULL, 0, NULL},
- {N_("/_Edit/_Redo"), "<control>Y", NULL, 0, NULL},
+ {N_("/_Edit/_Undo"), "<control>Z", compose_undo_cb, 0, NULL},
+ {N_("/_Edit/_Redo"), "<control>Y", compose_redo_cb, 0, NULL},
{N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Edit/Cu_t"), "<control>X", compose_cut_cb, 0, NULL},
{N_("/_Edit/_Copy"), "<control>C", compose_copy_cb, 0, NULL},
"<alt>X", compose_ext_editor_cb, 0, NULL},
{N_("/_Message"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Message/_Send"), "<shift><control>S",
+ {N_("/_Message/_Send"), "<control>Return",
compose_send_cb, 0, NULL},
{N_("/_Message/Send _later"), "<shift><alt>S",
compose_send_later_cb, 0, NULL},
{N_("/_Tool"), NULL, NULL, 0, "<Branch>"},
{N_("/_Tool/Show _ruler"), NULL, compose_toggle_ruler_cb, 0, "<ToggleItem>"},
{N_("/_Tool/_Address book"), "<alt>A", compose_address_cb , 0, NULL},
- {N_("/_Tool/_Templates ..."), NULL, template_select_cb, 0, NULL},
+ {N_("/_Tool/_Template"), NULL, NULL, 0, "<Branch>"},
{N_("/_Help"), NULL, NULL, 0, "<LastBranch>"},
{N_("/_Help/_About"), NULL, about_show, 0, NULL}
};
{"text/uri-list", 0, 0}
};
-Compose * compose_new(PrefsAccount *account)
+Compose *compose_new(PrefsAccount *account)
{
return compose_generic_new(account, NULL, NULL);
}
-Compose * compose_new_with_recipient(PrefsAccount *account, const gchar *to)
+Compose *compose_bounce(PrefsAccount *account, MsgInfo *msginfo)
{
- return compose_generic_new(account, to, NULL);
+ Compose *c;
+ gchar *filename;
+ GtkItemFactory *ifactory;
+
+ c = compose_generic_new(account, NULL, NULL);
+
+ filename = procmsg_get_message_file(msginfo);
+ if (filename == NULL)
+ return NULL;
+
+ c->bounce_filename = filename;
+
+ if (msginfo->subject)
+ gtk_entry_set_text(GTK_ENTRY(c->subject_entry),
+ msginfo->subject);
+ gtk_editable_set_editable(GTK_EDITABLE(c->subject_entry), FALSE);
+
+ compose_quote_fmt(c, msginfo, "%M", NULL);
+ gtk_editable_set_editable(GTK_EDITABLE(c->text), FALSE);
+
+ ifactory = gtk_item_factory_from_widget(c->popupmenu);
+ menu_set_sensitive(ifactory, "/Add...", FALSE);
+ menu_set_sensitive(ifactory, "/Remove", FALSE);
+ menu_set_sensitive(ifactory, "/Property...", FALSE);
+
+ ifactory = gtk_item_factory_from_widget(c->menubar);
+ menu_set_sensitive(ifactory, "/File/Insert file", FALSE);
+ menu_set_sensitive(ifactory, "/File/Attach file", FALSE);
+ menu_set_sensitive(ifactory, "/File/Insert signature", FALSE);
+ menu_set_sensitive(ifactory, "/Edit/Paste", FALSE);
+ menu_set_sensitive(ifactory, "/Edit/Wrap current paragraph", FALSE);
+ menu_set_sensitive(ifactory, "/Edit/Wrap all long lines", FALSE);
+ menu_set_sensitive(ifactory, "/Edit/Edit with external editor", FALSE);
+ menu_set_sensitive(ifactory, "/Message/Attach", FALSE);
+#if USE_GPGME
+ menu_set_sensitive(ifactory, "/Message/Sign", FALSE);
+ menu_set_sensitive(ifactory, "/Message/Encrypt", FALSE);
+#endif
+ menu_set_sensitive(ifactory, "/Message/Request Return Receipt", FALSE);
+ menu_set_sensitive(ifactory, "/Tool/Template", FALSE);
+
+ gtk_widget_set_sensitive(c->insert_btn, FALSE);
+ gtk_widget_set_sensitive(c->attach_btn, FALSE);
+ gtk_widget_set_sensitive(c->sig_btn, FALSE);
+ gtk_widget_set_sensitive(c->exteditor_btn, FALSE);
+ gtk_widget_set_sensitive(c->linewrap_btn, FALSE);
+
+ return c;
}
-Compose * compose_new_with_folderitem(PrefsAccount *account, FolderItem *item)
+Compose *compose_new_with_recipient(PrefsAccount *account, const gchar *mailto)
+{
+ return compose_generic_new(account, mailto, NULL);
+}
+
+Compose *compose_new_with_folderitem(PrefsAccount *account, FolderItem *item)
{
return compose_generic_new(account, NULL, item);
}
-Compose * compose_generic_new(PrefsAccount *account, const gchar *to, FolderItem *item)
+Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderItem *item)
{
Compose *compose;
- if (!account) account = cur_account;
+ if (item && item->prefs && item->prefs->enable_default_account)
+ account = account_find_from_id(item->prefs->default_account);
+
+ if (!account) account = cur_account;
g_return_val_if_fail(account != NULL, NULL);
compose = compose_create(account, COMPOSE_NEW);
gtk_stext_set_point(GTK_STEXT(compose->text), 0);
if (account->protocol != A_NNTP) {
- if (to) {
- compose_entry_append(compose, to, COMPOSE_TO);
- gtk_widget_grab_focus(compose->subject_entry);
- } else {
- if(item && item->prefs->enable_default_to) {
- compose_entry_append(compose, item->prefs->default_to, COMPOSE_TO);
- } else {
- gtk_widget_grab_focus(compose->header_last->entry);
- }
+ if (mailto) {
+ compose_entries_set(compose, mailto);
+
+ } else if(item && item->prefs->enable_default_to) {
+ compose_entry_append(compose, item->prefs->default_to, COMPOSE_TO);
}
if (item && item->ret_rcpt) {
GtkItemFactory *ifactory;
menu_set_toggle(ifactory, "/Message/Request Return Receipt", TRUE);
}
} else {
- if (to) {
- compose_entry_append(compose, to, COMPOSE_NEWSGROUPS);
- gtk_widget_grab_focus(compose->subject_entry);
- } else
- gtk_widget_grab_focus(compose->header_last->entry);
+ if (mailto) {
+ compose_entry_append(compose, mailto, COMPOSE_NEWSGROUPS);
+ }
}
+ gtk_widget_grab_focus(compose->subject_entry);
if (prefs_common.auto_exteditor)
compose_exec_ext_editor(compose);
}
/*
-Compose * compose_new_followup_and_replyto(PrefsAccount *account,
+Compose *compose_new_followup_and_replyto(PrefsAccount *account,
const gchar *followupto, gchar * to)
{
Compose *compose;
g_return_if_fail(msginfo != NULL);
g_return_if_fail(msginfo->folder != NULL);
- account = msginfo->folder->folder->account;
- if (!account && msginfo->to && prefs_common.reply_account_autosel) {
- gchar *to;
- Xstrdup_a(to, msginfo->to, return);
- extract_address(to);
- account = account_find_from_address(to);
- }
- if(!account&& prefs_common.reply_account_autosel) {
- gchar cc[BUFFSIZE];
- if(!get_header_from_msginfo(msginfo,cc,sizeof(cc),"CC:")){ /* Found a CC header */
- extract_address(cc);
- account = account_find_from_address(cc);
- }
+ account = NULL;
+ /* select the account set in folderitem's property (if enabled) */
+ if (msginfo->folder->prefs && msginfo->folder->prefs->enable_default_account)
+ account = account_find_from_id(msginfo->folder->prefs->default_account);
+
+ /* select the account for the whole folder (IMAP / NNTP) */
+ if (!account)
+ account = msginfo->folder->folder->account;
+
+ /* select account by to: and cc: header if enabled */
+ if (prefs_common.reply_account_autosel) {
+ if (!account && msginfo->to) {
+ gchar *to;
+ Xstrdup_a(to, msginfo->to, return);
+ extract_address(to);
+ account = account_find_from_address(to);
+ }
+ if (!account) {
+ gchar cc[BUFFSIZE];
+ if(!get_header_from_msginfo(msginfo, cc, sizeof(cc), "CC:")) { /* Found a CC header */
+ extract_address(cc);
+ account = account_find_from_address(cc);
+ }
+ }
}
+ /* select current account */
if (!account) account = cur_account;
g_return_if_fail(account != NULL);
return;
} else
reply_account = account;
+
MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_FORWARDED);
MSG_SET_PERM_FLAGS(msginfo->flags, MSG_REPLIED);
CHANGE_FLAGS(msginfo);
compose = compose_create(account, COMPOSE_REPLY);
- compose->replyinfo = msginfo;
+ compose->replyinfo = procmsg_msginfo_copy(msginfo);
#if 0 /* NEW COMPOSE GUI */
if (followup_and_reply_to) {
gtk_stext_freeze(text);
if (quote) {
- FILE *fp;
+ gchar *qmark;
gchar *quote_str;
- if ((fp = procmime_get_first_text_content(msginfo)) == NULL)
- g_warning(_("Can't get text part\n"));
- else {
- gchar * qmark;
+ if (prefs_common.quotemark && *prefs_common.quotemark)
+ qmark = prefs_common.quotemark;
+ else
+ qmark = "> ";
- if (prefs_common.quotemark && *prefs_common.quotemark)
- qmark = prefs_common.quotemark;
- else
- qmark = "> ";
-
- quote_str = compose_quote_fmt(compose, msginfo,
- prefs_common.quotefmt,
- qmark);
-
- /*
- quote_str = compose_quote_parse_fmt
- (compose, msginfo, prefs_common.quotefmt);
- */
-
- if (quote_str != NULL)
- gtk_stext_insert(text, NULL, NULL, NULL,
- quote_str, -1);
- /* g_free(quote_str); */
- /* compose_quote_file(compose, msginfo, fp); */
- fclose(fp);
- }
+ quote_str = compose_quote_fmt(compose, msginfo,
+ prefs_common.quotefmt,
+ qmark);
}
if (prefs_common.auto_sig)
compose_insert_sig(compose);
- gtk_editable_set_position(GTK_EDITABLE(text), 0);
- gtk_stext_set_point(text, 0);
- if (quote && prefs_common.linewrap_quote) {
+ if (quote && prefs_common.linewrap_quote)
compose_wrap_line_all(compose);
- }
+
+ gtk_editable_set_position(GTK_EDITABLE(text), 0);
+ gtk_stext_set_point(text, 0);
gtk_stext_thaw(text);
gtk_widget_grab_focus(compose->text);
: mimeinfo->name ? mimeinfo->name : NULL;
if (MIME_TEXT_HTML == mimeinfo->mime_type && base == NULL){
- filename = g_strdup_printf("%s%smimetmp%i.html",
+ filename = g_strdup_printf("%s%smimetmp.%08x.html",
get_mime_tmp_dir(),
G_DIR_SEPARATOR_S,
- mimeinfo);
+ (gint)mimeinfo);
return filename;
}
else {
base = base ? base : "";
base = g_basename(base);
if (*base == '\0') {
- filename = g_strdup_printf("%s%smimetmp%i",
+ filename = g_strdup_printf("%s%smimetmp.%08x",
get_mime_tmp_dir(),
G_DIR_SEPARATOR_S,
- mimeinfo);
+ (gint)mimeinfo);
return filename;
}
}
return filename;
}
-static gchar * mime_extract_file(gchar * source, MimeInfo *partinfo)
+static gchar *mime_extract_file(gchar *source, MimeInfo *partinfo)
{
gchar *filename;
- if (!partinfo) return;
+ if (!partinfo) return NULL;
filename = procmime_get_file_name(partinfo);
return filename;
}
-static void compose_attach_parts(Compose * compose,
- MsgInfo * msginfo)
+static void compose_attach_parts(Compose *compose, MsgInfo *msginfo)
{
-
FILE *fp;
gchar *file;
MimeInfo *mimeinfo;
gchar buf[BUFFSIZE];
glong fpos, prev_fpos;
gint npart;
- gchar * source;
- gchar * filename;
+ gchar *source;
+ gchar *filename;
g_return_if_fail(msginfo != NULL);
gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1); \
}
-Compose *compose_forward(PrefsAccount * account, MsgInfo *msginfo,
+Compose *compose_forward(PrefsAccount *account, MsgInfo *msginfo,
gboolean as_attach)
{
Compose *compose;
/* PrefsAccount *account; */
GtkSText *text;
- FILE *fp;
- gchar buf[BUFFSIZE];
g_return_val_if_fail(msginfo != NULL, NULL);
g_return_val_if_fail(msginfo->folder != NULL, NULL);
account = msginfo->folder->folder->account;
if (!account && msginfo->to && prefs_common.forward_account_autosel) {
gchar *to;
- Xstrdup_a(to, msginfo->to, return);
+ Xstrdup_a(to, msginfo->to, return NULL);
extract_address(to);
account = account_find_from_address(to);
}
g_free(msgfile);
} else {
- FILE *fp;
+ gchar *qmark;
gchar *quote_str;
- if ((fp = procmime_get_first_text_content(msginfo)) == NULL)
- g_warning(_("Can't get text part\n"));
- else {
- gchar * qmark;
-
- if (prefs_common.fw_quotemark &&
- *prefs_common.fw_quotemark)
- qmark = prefs_common.fw_quotemark;
- else
- qmark = "> ";
- quote_str = compose_quote_fmt(compose, msginfo,
- prefs_common.fw_quotefmt,
- qmark);
-
- if (quote_str != NULL)
- gtk_stext_insert(text, NULL, NULL, NULL,
- quote_str, -1);
-
- fclose(fp);
- }
+ if (prefs_common.fw_quotemark && *prefs_common.fw_quotemark)
+ qmark = prefs_common.fw_quotemark;
+ else
+ qmark = "> ";
+ quote_str = compose_quote_fmt(compose, msginfo,
+ prefs_common.fw_quotefmt, qmark);
compose_attach_parts(compose, msginfo);
}
if (prefs_common.auto_sig)
compose_insert_sig(compose);
+
+ if (prefs_common.linewrap_quote)
+ compose_wrap_line_all(compose);
+
gtk_editable_set_position(GTK_EDITABLE(compose->text), 0);
gtk_stext_set_point(GTK_STEXT(compose->text), 0);
else
gtk_widget_grab_focus(compose->newsgroups_entry);
#endif
+ gtk_widget_grab_focus(compose->header_last->entry);
if (prefs_common.auto_exteditor)
compose_exec_ext_editor(compose);
#undef INSERT_FW_HEADER
-Compose * compose_forward_multiple(PrefsAccount * account,
- GSList *msginfo_list)
+Compose *compose_forward_multiple(PrefsAccount *account, GSList *msginfo_list)
{
Compose *compose;
GtkSText *text;
}
g_return_val_if_fail(account != NULL, NULL);
+ for (msginfo = msginfo_list; msginfo != NULL; msginfo = msginfo->next) {
+ MSG_UNSET_PERM_FLAGS(((MsgInfo *)msginfo->data)->flags, MSG_REPLIED);
+ MSG_SET_PERM_FLAGS(((MsgInfo *)msginfo->data)->flags, MSG_FORWARDED);
+ CHANGE_FLAGS(((MsgInfo *)msginfo->data));
+ }
+
compose = compose_create(account, COMPOSE_FORWARD);
text = GTK_STEXT(compose->text);
if (prefs_common.auto_sig)
compose_insert_sig(compose);
+
+ if (prefs_common.linewrap_quote)
+ compose_wrap_line_all(compose);
+
gtk_editable_set_position(GTK_EDITABLE(compose->text), 0);
gtk_stext_set_point(GTK_STEXT(compose->text), 0);
compose_add_header_entry(compose, header, (gchar *)address);
}
+static void compose_entries_set(Compose *compose, const gchar *mailto)
+{
+ gchar *subject = NULL;
+ gchar *to = NULL;
+ gchar *cc = NULL;
+ gchar *bcc = NULL;
+ gchar *body = NULL;
+ gchar *p;
+ gchar *tmp_mailto;
+
+ Xstrdup_a(tmp_mailto, mailto, return);
+
+ to = tmp_mailto;
+
+ p = strchr(tmp_mailto, '?');
+ if (p) {
+ *p = '\0';
+ p++;
+ }
+
+ while (p) {
+ gchar *field, *value;
+
+ field = p;
+
+ p = strchr(p, '=');
+ if (!p) break;
+ *p = '\0';
+ p++;
+
+ value = p;
+
+ p = strchr(p, '&');
+ if (p) {
+ *p = '\0';
+ p++;
+ }
+
+ if (*value == '\0') continue;
+
+ if (!g_strcasecmp(field, "subject")) {
+ Xalloca(subject, strlen(value) + 1, return);
+ decode_uri(subject, value);
+ } else if (!g_strcasecmp(field, "cc")) {
+ cc = value;
+ } else if (!g_strcasecmp(field, "bcc")) {
+ bcc = value;
+ } else if (!g_strcasecmp(field, "body")) {
+ Xalloca(body, strlen(value) + 1, return);
+ decode_uri(body, value);
+ }
+ }
+
+ if (to)
+ compose_entry_append(compose, to, COMPOSE_TO);
+ if (subject)
+ gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), subject);
+ if (cc)
+ compose_entry_append(compose, cc, COMPOSE_CC);
+ if (bcc)
+ compose_entry_append(compose, bcc, COMPOSE_BCC);
+ if (body) {
+ gtk_stext_insert(GTK_STEXT(compose->text),
+ NULL, NULL, NULL, body, -1);
+ gtk_stext_insert(GTK_STEXT(compose->text),
+ NULL, NULL, NULL, "\n", 1);
+ }
+}
+
static gint compose_parse_header(Compose *compose, MsgInfo *msginfo)
{
static HeaderEntry hentry[] = {{"Reply-To:", NULL, TRUE},
}
if (hentry[H_X_MAILING_LIST].body != NULL) {
/* this is good enough to parse debian-devel */
- char * buf = g_malloc(strlen(hentry[H_X_MAILING_LIST].body) + 1);
+ gchar *buf = g_malloc(strlen(hentry[H_X_MAILING_LIST].body) + 1);
g_return_val_if_fail(buf != NULL, -1 );
if (1 == sscanf(hentry[H_X_MAILING_LIST].body, "<%[^>]>", buf))
compose->mailinglist = g_strdup(buf);
}
if (hentry[H_X_BEENTHERE].body != NULL) {
/* this is good enough to parse the sylpheed-claws lists */
- char * buf = g_malloc(strlen(hentry[H_X_BEENTHERE].body) + 1);
+ gchar *buf = g_malloc(strlen(hentry[H_X_BEENTHERE].body) + 1);
g_return_val_if_fail(buf != NULL, -1 );
if (1 == sscanf(hentry[H_X_BEENTHERE].body, "%[^>]", buf))
compose->mailinglist = g_strdup(buf);
return new_ref_str;
}
-/*
-static void compose_quote_file(Compose *compose, MsgInfo *msginfo, FILE *fp)
+static gchar *compose_quote_fmt(Compose *compose, MsgInfo *msginfo,
+ const gchar *fmt, const gchar *qmark)
{
GtkSText *text = GTK_STEXT(compose->text);
- gchar *qmark;
- gchar *quote_str;
- GdkColor *qcolor = NULL;
- gchar buf[BUFFSIZE];
- gint qlen;
- gchar *linep, *cur, *leftp;
- gint line_len, cur_len;
- gint wrap_len;
- gint str_len;
- gint ch_len;
-
- // if (prefs_common.enable_color) qcolor = "e_color;
- if (prefs_common.quotemark && *prefs_common.quotemark)
- qmark = prefs_common.quotemark;
- else
- qmark = "> ";
- quote_str = compose_quote_parse_fmt(compose, msginfo, qmark);
- g_return_if_fail(quote_str != NULL);
- qlen = strlen(quote_str);
-
- if (!prefs_common.linewrap_quote ||
- prefs_common.linewrap_len <= qlen) {
- while (fgets(buf, sizeof(buf), fp) != NULL) {
- gtk_stext_insert(text, NULL, qcolor, NULL,
- quote_str, -1);
- gtk_stext_insert(text, NULL, qcolor, NULL, buf, -1);
- }
- g_free(quote_str);
- return;
- }
-
- wrap_len = prefs_common.linewrap_len - qlen;
-
- while (fgets(buf, sizeof(buf), fp) != NULL) {
- strretchomp(buf);
- str_len = strlen(buf);
-
- if (str_len <= wrap_len) {
- gtk_stext_insert(text, NULL, qcolor, NULL,
- quote_str, -1);
- gtk_stext_insert(text, NULL, qcolor, NULL, buf, -1);
- gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
- continue;
- }
-
- linep = cur = leftp = buf;
- line_len = cur_len = 0;
-
- while (*cur != '\0') {
- ch_len = mblen(cur, MB_CUR_MAX);
- if (ch_len < 0) ch_len = 1;
-
- if (ch_len == 1 && isspace(*cur)) {
- linep = cur + ch_len;
- line_len = cur_len + ch_len;
- }
-
- if (cur_len + ch_len > wrap_len && line_len > 0) {
- gtk_stext_insert(text, NULL, qcolor, NULL,
- quote_str, -1);
-
- if (isspace(*(linep - 1)))
- gtk_stext_insert(text, NULL,
- qcolor, NULL,
- leftp, line_len - 1);
- else
- gtk_stext_insert(text, NULL,
- qcolor, NULL,
- leftp, line_len);
- gtk_stext_insert(text, NULL, NULL, NULL,
- "\n", 1);
-
- leftp = linep;
- cur_len = cur_len - line_len + ch_len;
- line_len = 0;
- cur += ch_len;
- continue;
- }
+ gchar *quote_str = NULL;
+ gchar *buf;
+ gchar *p, *lastp;
+ gint len;
- if (ch_len > 1) {
- linep = cur + ch_len;
- line_len = cur_len + ch_len;
- }
- cur_len += ch_len;
- cur += ch_len;
- }
+ if (qmark != NULL) {
+ quote_fmt_init(msginfo, NULL);
+ quote_fmt_scan_string(qmark);
+ quote_fmt_parse();
- if (*leftp) {
- gtk_stext_insert(text, NULL, qcolor, NULL,
- quote_str, -1);
- gtk_stext_insert(text, NULL, qcolor, NULL, leftp, -1);
- gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
- }
+ buf = quote_fmt_get_buffer();
+ if (buf == NULL)
+ alertpanel_error(_("Quote mark format error."));
+ else
+ Xstrdup_a(quote_str, buf, return NULL)
}
- g_free(quote_str);
-}
-*/
-
-/*
-static gchar *compose_quote_parse_fmt(Compose *compose, MsgInfo *msginfo,
- const gchar *fmt)
-{
- gchar *ext_str;
- size_t buf_len = 1024;
- size_t ext_len = 0;
- gchar *str;
- gchar *mbs;
- wchar_t *wcsfmt;
- wchar_t *sp;
- gchar tmp[3];
-
- if (!fmt || *fmt == '\0') return 0;
-
- Xalloca(mbs, sizeof(wchar_t) + 1, return 0);
- Xalloca(wcsfmt, (strlen(fmt) + 1) * sizeof(wchar_t), return 0);
- mbstowcs(wcsfmt, fmt, strlen(fmt) + 1);
- sp = wcsfmt;
-
- ext_str = g_malloc(sizeof(gchar) * buf_len);
- g_return_val_if_fail(ext_str != NULL, NULL);
+ if (fmt && *fmt != '\0') {
+ quote_fmt_init(msginfo, quote_str);
+ quote_fmt_scan_string(fmt);
+ quote_fmt_parse();
- while (*sp) {
- gint len;
-
- len = wctomb(mbs, *sp);
- mbs[len] = '\0';
-
- if (*mbs == '%') {
- gchar *p;
-
- wctomb(mbs, *(++sp));
- str = NULL;
-
- switch (*mbs) {
- case 'd':
- str = msginfo->date;
- sp++;
- break;
- case 'f':
- str = msginfo->from;
- sp++;
- break;
- case 'I':
- if (!msginfo->fromname) {sp++; break;}
- p = msginfo->fromname;
- tmp[0] = tmp[1] = tmp[2] = '\0';
-
- if (*p && isalnum(*p))
- tmp[0] = toupper(*p);
- else {
- sp++;
- break;
- }
-
- while (*p) {
- while (*p && !isspace(*p)) p++;
- while (*p && isspace(*p)) p++;
- if (*p && isalnum(*p))
- tmp[1] = toupper(*p);
- }
-
- if (tmp[1]) str = tmp;
- sp++;
- break;
- case 'n':
- str = msginfo->fromname;
- sp++;
- break;
- case 'N':
- if (!msginfo->fromname) {sp++; break;}
- Xstrdup_a(str, msginfo->fromname,
- {sp++; break;});
- p = str;
- while (*p && !isspace(*p)) p++;
- *p = '\0';
- sp++;
- break;
- case 's':
- str = msginfo->subject;
- sp++;
- break;
- case 't':
- str = msginfo->to;
- sp++;
- break;
- case 'c':
- str = msginfo->cc;
- sp++;
- break;
- case 'i':
- if (!msginfo->msgid) {sp++; break;}
- Xalloca(str, strlen(msginfo->msgid) + 3,
- {sp++; break;});
- g_snprintf(str, strlen(msginfo->msgid) + 3,
- "<%s>", msginfo->msgid);
- sp++;
- break;
- case '%':
- str = "%";
- sp++;
- break;
- default:
- break;
- }
-
- if (str) {
- while (ext_len + strlen(str) + 1 > buf_len)
- buf_len += 1024;
- ext_str = g_realloc(ext_str,
- sizeof(gchar) * buf_len);
- g_return_val_if_fail(ext_str != NULL, NULL);
- strcpy(ext_str + ext_len, str);
- ext_len += strlen(str);
- }
- } else if (*mbs == '\\') {
- wctomb(mbs, *(++sp));
- str = NULL;
-
- switch (*mbs) {
- case 'n':
- str = "\n";
- break;
- case 't':
- str = "\t";
- break;
- case '\\':
- str = "\\";
- break;
- default:
- break;
- }
-
- if (str) {
- while (ext_len + strlen(str) + 1 > buf_len)
- buf_len += 1024;
- ext_str = g_realloc(ext_str,
- sizeof(gchar) * buf_len);
- g_return_val_if_fail(ext_str != NULL, NULL);
- strcpy(ext_str + ext_len, str);
- ext_len += strlen(str);
- sp++;
- }
- } else {
- while (ext_len + len + 1 > buf_len) buf_len += 1024;
- ext_str = g_realloc(ext_str, sizeof(gchar) * buf_len);
- g_return_val_if_fail(ext_str != NULL, NULL);
- strcpy(ext_str + ext_len, mbs);
- ext_len += len;
- sp++;
+ buf = quote_fmt_get_buffer();
+ if (buf == NULL) {
+ alertpanel_error(_("Message reply/forward format error."));
+ return NULL;
}
+ } else
+ buf = "";
+
+ gtk_stext_freeze(text);
+ gtk_stext_set_point(text, 0);
+ gtk_stext_forward_delete(text, gtk_stext_get_length(text));
+
+ for (p = buf; *p != '\0'; ) {
+ lastp = strchr(p, '\n');
+ len = lastp ? lastp - p + 1 : -1;
+ gtk_stext_insert(text, NULL, NULL, NULL, p, len);
+ if (lastp)
+ p = lastp + 1;
+ else
+ break;
}
- if (ext_str)
- ext_str = g_realloc(ext_str, strlen(ext_str) + 1);
+ gtk_stext_thaw(text);
- return ext_str;
+ return buf;
}
-*/
static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
gboolean to_all, gboolean ignore_replyto,
? compose->replyto
: msginfo->from ? msginfo->from : ""),
COMPOSE_TO);
- if (compose->account->protocol == A_NNTP)
- compose_entry_append(compose,
- compose->followup_to ? compose->followup_to
- : compose->newsgroups ? compose->newsgroups
- : "",
- COMPOSE_NEWSGROUPS);
+ if (compose->account->protocol == A_NNTP) {
+ if (ignore_replyto)
+ compose_entry_append
+ (compose, msginfo->from ? msginfo->from : "",
+ COMPOSE_TO);
+ else
+ compose_entry_append
+ (compose,
+ compose->followup_to ? compose->followup_to
+ : compose->newsgroups ? compose->newsgroups
+ : "",
+ COMPOSE_NEWSGROUPS);
+ }
if (msginfo->subject && *msginfo->subject) {
gchar *buf, *buf2, *p;
{
GtkSText *text = GTK_STEXT(compose->text);
gchar buf[BUFFSIZE];
+ gint len;
FILE *fp;
g_return_if_fail(file != NULL);
gtk_stext_freeze(text);
- while (fgets(buf, sizeof(buf), fp) != NULL)
- gtk_stext_insert(text, NULL, NULL, NULL, buf, -1);
+ while (fgets(buf, sizeof(buf), fp) != NULL) {
+ /* Strip <CR> if DOS/Windoze file, replace <CR> with <LF> if MAC file */
+ len = strlen(buf);
+ if (len > 1 && buf[len - 2] == '\r' && buf[len - 1] == '\n') {
+ buf[len - 2] = '\n';
+ buf[len - 1] = '\0';
+ } else {
+ while (--len > 0)
+ if (buf[len] == '\r')
+ buf[len] = '\n';
+ }
+
+ gtk_stext_insert(text, NULL, NULL, NULL, buf, -1);
+ }
gtk_stext_thaw(text);
compose_attach_info(compose, ainfo, cnttype);
}
+#define GET_CHAR(pos, buf, len) \
+{ \
+ if (text->use_wchar) \
+ len = wctomb(buf, (wchar_t)GTK_STEXT_INDEX(text, (pos))); \
+ else { \
+ buf[0] = GTK_STEXT_INDEX(text, (pos)); \
+ len = 1; \
+ } \
+}
+
static void compose_wrap_line(Compose *compose)
{
GtkSText *text = GTK_STEXT(compose->text);
gint line_pos, cur_pos;
gint line_len, cur_len;
-#define GET_STEXT(pos) \
- if (text->use_wchar) \
- ch_len = wctomb(cbuf, (wchar_t)GTK_STEXT_INDEX(text, (pos))); \
- else { \
- cbuf[0] = GTK_STEXT_INDEX(text, (pos)); \
- ch_len = 1; \
- }
gtk_stext_freeze(text);
/* check to see if the point is on the paragraph mark (empty line). */
cur_pos = gtk_stext_get_point(text);
- GET_STEXT(cur_pos);
+ GET_CHAR(cur_pos, cbuf, ch_len);
if ((ch_len == 1 && *cbuf == '\n') || cur_pos == text_len) {
if (cur_pos == 0)
goto compose_end; /* on the paragraph mark */
- GET_STEXT(cur_pos - 1);
+ GET_CHAR(cur_pos - 1, cbuf, ch_len);
if (ch_len == 1 && *cbuf == '\n')
goto compose_end; /* on the paragraph mark */
}
/* find paragraph start. */
line_end = quoted = 0;
for (p_start = cur_pos; p_start >= 0; --p_start) {
- GET_STEXT(p_start);
+ GET_CHAR(p_start, cbuf, ch_len);
if (ch_len == 1 && *cbuf == '\n') {
if (quoted)
goto compose_end; /* quoted part */
/* find paragraph end. */
line_end = 0;
for (p_end = cur_pos; p_end < text_len; p_end++) {
- GET_STEXT(p_end);
+ GET_CHAR(p_end, cbuf, ch_len);
if (ch_len == 1 && *cbuf == '\n') {
if (line_end) {
p_end -= 1;
for (cur_pos = p_start; cur_pos < p_end; cur_pos++) {
guint space = 0;
- GET_STEXT(cur_pos);
+ GET_CHAR(cur_pos, cbuf, ch_len);
if (ch_len < 0) {
cbuf[0] = '\0';
guint replace = 0;
if (last_ch_len == 1 && !isspace(last_ch)) {
if (cur_pos + 1 < p_end) {
- GET_STEXT(cur_pos + 1);
+ GET_CHAR(cur_pos + 1, cbuf, ch_len);
if (ch_len == 1 && !isspace(*cbuf))
replace = 1;
}
line_len > 0) {
gint tlen = ch_len;
- GET_STEXT(line_pos - 1);
+ GET_CHAR(line_pos - 1, cbuf, ch_len);
if (ch_len == 1 && isspace(*cbuf)) {
gtk_stext_set_point(text, line_pos);
gtk_stext_backward_delete(text, 1);
compose_end:
gtk_stext_thaw(text);
-
-#undef GET_STEXT
-}
-
-/* return str length if text at start_pos matches str else return zero */
-static guint gtkstext_str_strcmp(GtkSText *text, guint start_pos,
- guint text_len, gchar *str) {
- guint is_str, i, str_len;
- gchar str_ch;
-
- is_str = 0;
- if (str) {
- str_len = strlen(str);
- is_str = 1;
- for (i = 0; (i < str_len) && (start_pos + i < text_len); i++) {
- str_ch = GTK_STEXT_INDEX(text, start_pos + i);
- if (*(str + i) != str_ch) {
- break;
- }
- }
- if (i == 0 || i < str_len)
- is_str = 0;
- }
-
- return is_str ? str_len : 0;
}
/* return indent length */
-static guint get_indent_length(GtkSText *text, guint start_pos,
- guint text_len) {
+static guint get_indent_length(GtkSText *text, guint start_pos, guint text_len)
+{
gint indent_len = 0;
gint i, ch_len;
- gchar cbuf[MB_CUR_MAX];
+ gchar cbuf[MB_LEN_MAX];
for (i = start_pos; i < text_len; i++) {
- if (text->use_wchar)
- ch_len = wctomb
- (cbuf, (wchar_t)GTK_STEXT_INDEX(text, i));
- else {
- cbuf[0] = GTK_STEXT_INDEX(text, i);
- ch_len = 1;
- }
+ GET_CHAR(i, cbuf, ch_len);
if (ch_len > 1)
break;
/* allow space, tab, > or | */
return indent_len;
}
-/* insert quotation string when line was wrapped, we know these
- are single byte characters */
-static guint insert_quote(GtkSText *text, guint quote_len, guint indent_len,
- guint prev_line_pos, guint text_len,
- gchar *quote_fmt) {
+/* insert quotation string when line was wrapped */
+static guint ins_quote(GtkSText *text, guint quote_len, guint indent_len,
+ guint prev_line_pos, guint text_len,
+ gchar *quote_fmt)
+{
guint i, ins_len;
gchar ch;
gtk_stext_insert(text, NULL, NULL, NULL, &ch, 1);
}
ins_len = indent_len;
- }
- else {
+ } else {
gtk_stext_insert(text, NULL, NULL, NULL, quote_fmt, quote_len);
ins_len = quote_len;
}
return ins_len;
}
-/* compare gtkstext string at pos1 with string at pos2 for equality
- (max. len chars) - we treat characters as single byte */
-static gint gtkstext_strncmp(GtkSText *text, guint pos1, guint pos2, guint len,
- guint tlen)
+#undef WRAP_DEBUG
+#ifdef WRAP_DEBUG
+/* Darko: used when I debug wrapping */
+void dump_text(GtkSText *text, int pos, int tlen, int breakoncr)
{
- guint i = 0;
- gchar ch1, ch2;
+ gint i;
+ gchar ch;
- for (; (i < len) && (pos1 + i < tlen) && (pos2 + i < tlen); i++) {
- ch1 = GTK_STEXT_INDEX(text, pos1 + i);
- ch2 = GTK_STEXT_INDEX(text, pos2 + i);
- if (ch1 != ch2)
+ printf("%d [", pos);
+ for (i = pos; i < tlen; i++) {
+ ch = GTK_STEXT_INDEX(text, i);
+ if (breakoncr && ch == '\n')
break;
+ printf("%c", ch);
}
-
- return i;
+ printf("]\n");
}
+#endif
static void compose_wrap_line_all(Compose *compose)
{
GtkSText *text = GTK_STEXT(compose->text);
- guint text_len;
- guint line_pos = 0, cur_pos = 0, prev_line_pos = 0;
+ guint tlen;
+ guint line_pos = 0, cur_pos = 0, p_pos = 0;
gint line_len = 0, cur_len = 0;
gint ch_len;
- gint is_new_line = 1, do_delete = 0;
- guint quote_len = 0, indent_len = 0;
+ gboolean is_new_line = TRUE, do_delete = FALSE;
+ guint qlen = 0, i_len = 0;
guint linewrap_quote = prefs_common.linewrap_quote;
guint linewrap_len = prefs_common.linewrap_len;
- gchar *quote_fmt = prefs_common.quotemark;
+ gchar *qfmt = prefs_common.quotemark;
gchar cbuf[MB_LEN_MAX];
gtk_stext_freeze(text);
/* make text buffer contiguous */
- gtk_stext_compact_buffer(text);
+ /* gtk_stext_compact_buffer(text); */
- text_len = gtk_stext_get_length(text);
+ tlen = gtk_stext_get_length(text);
- for (; cur_pos < text_len; cur_pos++) {
+ for (; cur_pos < tlen; cur_pos++) {
+ /* mark position of new line - needed for quotation wrap */
if (linewrap_quote && is_new_line) {
- quote_len = gtkstext_str_strcmp(text, cur_pos,
- text_len, quote_fmt);
- is_new_line = 0;
- if (quote_len) {
- indent_len = get_indent_length(text, cur_pos,
- text_len);
- }
+ qlen = gtkut_text_str_compare
+ (text, cur_pos, tlen, qfmt);
+ is_new_line = FALSE;
+ if (qlen)
+ i_len = get_indent_length(text, cur_pos, tlen);
else
- indent_len = 0;
- prev_line_pos = cur_pos;
+ i_len = 0;
+ p_pos = cur_pos;
+#ifdef WRAP_DEBUG
+ printf("new line i_len=%d qlen=%d p_pos=", i_len, qlen);
+ dump_text(text, p_pos, tlen, 1);
+#endif
}
- if (text->use_wchar)
- ch_len = wctomb
- (cbuf, (wchar_t)GTK_STEXT_INDEX(text, cur_pos));
- else {
- cbuf[0] = GTK_STEXT_INDEX(text, cur_pos);
- ch_len = 1;
+
+ GET_CHAR(cur_pos, cbuf, ch_len);
+
+ /* fix line length for tabs */
+ if (ch_len == 1 && *cbuf == '\t') {
+ guint tab_width = text->default_tab_width;
+ guint tab_offset = line_len % tab_width;
+
+#ifdef WRAP_DEBUG
+ printf("found tab at pos=%d line_len=%d ", cur_pos,
+ line_len);
+#endif
+ if (tab_offset) {
+ line_len += tab_width - tab_offset - 1;
+ cur_len = line_len;
+ }
+#ifdef WRAP_DEBUG
+ printf("new_len=%d\n", line_len);
+#endif
}
+ /* we have encountered line break */
if (ch_len == 1 && *cbuf == '\n') {
gint clen;
guint ilen;
gchar cb[MB_CUR_MAX];
+#ifdef WRAP_DEBUG
+ printf("found CR at %d next line is ", cur_pos);
+ dump_text(text, cur_pos + 1, tlen, 1);
+#endif
/* if it's just quotation + newline skip it */
- if (indent_len && (cur_pos + 1 < text_len)) {
- ilen = gtkstext_strncmp(text,
- cur_pos + 1,
- prev_line_pos,
- indent_len,
- text_len);
- if (cur_pos + ilen < text_len) {
- if (text->use_wchar)
- clen = wctomb
- (cb, (wchar_t)GTK_STEXT_INDEX(text, cur_pos + ilen + 1));
- else {
- cb[0] = GTK_STEXT_INDEX(text,
- cur_pos + ilen + 1);
- clen = 1;
- }
- if ((clen == 1) && (cb[0] == '\n'))
- do_delete = 0;
+ if (i_len && (cur_pos + 1 < tlen)) {
+ /* check if text at new line matches indent */
+ ilen = gtkut_text_str_compare_n
+ (text, cur_pos + 1, p_pos, i_len, tlen);
+ if (cur_pos + ilen < tlen) {
+ GET_CHAR(cur_pos + ilen + 1, cb, clen);
+ /* no need to join the lines */
+ if (clen == 1 && cb[0] == '\n')
+ do_delete = FALSE;
}
+ /* if it's just newline skip it */
+ } else if (do_delete && (cur_pos + 1 < tlen)) {
+ GET_CHAR(cur_pos + 1, cb, clen);
+ /* no need to join the lines */
+ if (clen == 1 && cb[0] == '\n')
+ do_delete = FALSE;
}
+#ifdef WRAP_DEBUG
+ printf("qlen=%d l_len=%d wrap_len=%d do_del=%d\n",
+ qlen, line_len, linewrap_len, do_delete);
+#endif
/* should we delete to perform smart wrapping */
- if (quote_len && line_len < linewrap_len && do_delete) {
+ if (line_len < linewrap_len && do_delete) {
/* get rid of newline */
gtk_stext_set_point(text, cur_pos);
gtk_stext_forward_delete(text, 1);
+ tlen--;
- /* if text starts with quote_fmt or with
+ /* if text starts with quote fmt or with
indent string, delete them */
- if (indent_len) {
- ilen = gtkstext_strncmp(text, cur_pos,
- prev_line_pos,
- indent_len,
- text_len);
+ if (i_len) {
+ ilen = gtkut_text_str_compare_n
+ (text, cur_pos, p_pos, i_len,
+ tlen);
if (ilen) {
gtk_stext_forward_delete(text,
ilen);
- text_len -= ilen;
+ tlen -= ilen;
}
- }
- else if (quote_len) {
- if (gtkstext_str_strcmp(text, cur_pos,
- text_len,
- quote_fmt)) {
- gtk_stext_forward_delete(text,
- quote_len);
- text_len-=quote_len;
+ } else if (qlen) {
+ if (gtkut_text_str_compare
+ (text, cur_pos, tlen, qfmt)) {
+ gtk_stext_forward_delete
+ (text, qlen);
+ tlen -= qlen;
}
}
- if (text->use_wchar)
- clen = wctomb
- (cb, (wchar_t)GTK_STEXT_INDEX(text, cur_pos));
- else {
- cb[0] = GTK_STEXT_INDEX(text, cur_pos);
- clen = 1;
- }
+ GET_CHAR(cur_pos, cb, clen);
+
/* insert space if it's alphanumeric */
if ((cur_pos != line_pos) &&
((clen > 1) || isalnum(cb[0]))) {
gtk_stext_insert(text, NULL, NULL,
- NULL, " ", 1);
- gtk_stext_compact_buffer(text);
- text_len++;
+ NULL, " ", 1);
+ /* gtk_text_compact_buffer(text); */
+ tlen++;
}
/* and start over with current line */
- cur_pos = prev_line_pos - 1;
+ cur_pos = p_pos - 1;
line_pos = cur_pos;
line_len = cur_len = 0;
- quote_len = 0;
- do_delete = 0;
- is_new_line = 1;
+ qlen = 0;
+ do_delete = FALSE;
+ is_new_line = TRUE;
+#ifdef WRAP_DEBUG
+ printf("after delete l_pos=");
+ dump_text(text, line_pos, tlen, 1);
+#endif
continue;
}
+ /* mark new line beginning */
line_pos = cur_pos + 1;
line_len = cur_len = 0;
- quote_len = 0;
- do_delete = 0;
- is_new_line = 1;
+ qlen = 0;
+ do_delete = FALSE;
+ is_new_line = TRUE;
continue;
}
ch_len = 1;
}
+ /* possible line break */
if (ch_len == 1 && isspace(*cbuf)) {
line_pos = cur_pos + 1;
line_len = cur_len + ch_len;
}
- if (cur_len + ch_len > linewrap_len && line_len > 0) {
- gint tlen;
+ /* are we over wrapping length set in preferences ? */
+ if (cur_len + ch_len > linewrap_len) {
+ gint clen;
- if (text->use_wchar)
- tlen = wctomb(cbuf, (wchar_t)GTK_STEXT_INDEX(text, line_pos - 1));
- else {
- cbuf[0] = GTK_STEXT_INDEX(text, line_pos - 1);
- tlen = 1;
+#ifdef WRAP_DEBUG
+ printf("should wrap cur_pos=%d ", cur_pos);
+ dump_text(text, p_pos, tlen, 1);
+ dump_text(text, line_pos, tlen, 1);
+#endif
+ /* force wrapping if it is one long word but not URL */
+ if (p_pos + i_len == line_pos)
+ if (!gtkut_text_is_uri_string
+ (text, line_pos, tlen))
+ line_pos = cur_pos - 1;
+#ifdef WRAP_DEBUG
+ printf("new line_pos=%d\n", line_pos);
+#endif
+
+ GET_CHAR(line_pos - 1, cbuf, clen);
+
+ /* if next character is space delete it */
+ if (clen == 1 && isspace(*cbuf)) {
+ if (p_pos + i_len != line_pos ||
+ !gtkut_text_is_uri_string
+ (text, line_pos, tlen)) {
+ gtk_stext_set_point(text, line_pos);
+ gtk_stext_backward_delete(text, 1);
+ tlen--;
+ cur_pos--;
+ line_pos--;
+ cur_len--;
+ line_len--;
+ }
}
- if (tlen == 1 && isspace(*cbuf)) {
- gtk_stext_set_point(text, line_pos);
- gtk_stext_backward_delete(text, 1);
- text_len--;
- cur_pos--;
- line_pos--;
- cur_len--;
- line_len--;
+
+ /* if it is URL at beginning of line don't wrap */
+ if (p_pos + i_len == line_pos &&
+ gtkut_text_is_uri_string(text, line_pos, tlen)) {
+#ifdef WRAP_DEBUG
+ printf("found URL at ");
+ dump_text(text, line_pos, tlen, 1);
+#endif
+ continue;
}
+ /* insert CR */
gtk_stext_set_point(text, line_pos);
gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
- gtk_stext_compact_buffer(text);
- text_len++;
- cur_pos++;
+ /* gtk_stext_compact_buffer(text); */
+ tlen++;
line_pos++;
- cur_len = cur_len - line_len + ch_len;
+ /* for loop will increase it */
+ cur_pos = line_pos - 1;
+ /* start over with current line */
+ is_new_line = TRUE;
line_len = 0;
- if (linewrap_quote && quote_len) {
- /* only if line is not already quoted */
- if (!gtkstext_str_strcmp(text, line_pos,
- text_len, quote_fmt)) {
- guint i_len;
-
- i_len = insert_quote(text, quote_len,
- indent_len,
- prev_line_pos,
- text_len,
- quote_fmt);
-
- gtk_stext_compact_buffer(text);
- text_len += i_len;
- /* for loop above will increase it */
- cur_pos = line_pos - 1;
- cur_len = 0;
- line_len = 0;
- /* start over with current line */
- is_new_line = 1;
- do_delete = 1;
+ cur_len = 0;
+ do_delete = TRUE;
+#ifdef WRAP_DEBUG
+ printf("after CR insert ");
+ dump_text(text, line_pos, tlen, 1);
+ dump_text(text, cur_pos, tlen, 1);
+#endif
+
+ /* should we insert quotation ? */
+ if (linewrap_quote && qlen) {
+ /* only if line is not already quoted */
+ if (!gtkut_text_str_compare
+ (text, line_pos, tlen, qfmt)) {
+ guint ins_len;
+
+ if (line_pos - p_pos > i_len) {
+ ins_len = ins_quote
+ (text, qlen, i_len,
+ p_pos, tlen, qfmt);
+
+ /* gtk_stext_compact_buffer(text); */
+ tlen += ins_len;
+ }
+#ifdef WRAP_DEBUG
+ printf("after quote insert ");
+ dump_text(text, line_pos, tlen, 1);
+#endif
}
}
continue;
line_pos = cur_pos + 1;
line_len = cur_len + ch_len;
}
+ /* advance to next character in buffer */
cur_len += ch_len;
}
gtk_stext_thaw(text);
}
+#undef GET_CHAR
static void compose_set_title(Compose *compose)
{
}
gboolean compose_check_for_valid_recipient(Compose *compose) {
- gchar *recipient_headers[] = {"To:", "Newsgroups:", "Cc:", "Bcc:", NULL};
+ gchar *recipient_headers_mail[] = {"To:", "Cc:", "Bcc:", NULL};
+ gchar *recipient_headers_news[] = {"Newsgroups:", NULL};
gboolean recipient_found = FALSE;
GSList *list;
gchar **strptr;
+ /* free to and newsgroup list */
+ slist_free_strings(compose->to_list);
+ g_slist_free(compose->to_list);
+ compose->to_list = NULL;
+
+ slist_free_strings(compose->newsgroup_list);
+ g_slist_free(compose->newsgroup_list);
+ compose->newsgroup_list = NULL;
+
+ /* search header entries for to and newsgroup entries */
for(list = compose->header_list; list; list = list->next) {
gchar *header;
gchar *entry;
- header = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(((compose_headerentry *)list->data)->combo)->entry));
- entry = gtk_entry_get_text(GTK_ENTRY(((compose_headerentry *)list->data)->entry));
- if(strlen(entry)) {
- for(strptr = recipient_headers; *strptr != NULL; strptr++) {
+ header = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(((ComposeHeaderEntry *)list->data)->combo)->entry));
+ entry = gtk_editable_get_chars(GTK_EDITABLE(((ComposeHeaderEntry *)list->data)->entry), 0, -1);
+ g_strstrip(entry);
+ if(entry[0] != '\0') {
+ for(strptr = recipient_headers_mail; *strptr != NULL; strptr++) {
+ if(!strcmp(header, (prefs_common.trans_hdr ? gettext(*strptr) : *strptr))) {
+ compose->to_list = address_list_append(compose->to_list, entry);
+ recipient_found = TRUE;
+ }
+ }
+ for(strptr = recipient_headers_news; *strptr != NULL; strptr++) {
if(!strcmp(header, (prefs_common.trans_hdr ? gettext(*strptr) : *strptr))) {
+ compose->newsgroup_list = newsgroup_list_append(compose->newsgroup_list, entry);
recipient_found = TRUE;
}
}
}
+ g_free(entry);
}
return recipient_found;
}
+gint compose_send(Compose *compose)
+{
+ gint msgnum;
+ FolderItem *folder;
+ gint val;
+
+ val = compose_queue(compose, &msgnum, &folder);
+ if (val) {
+ alertpanel_error(_("Could not queue message for sending"));
+ return -1;
+ }
+
+ val = procmsg_send_message_queue(folder_item_fetch_msg(folder, msgnum));
+ if(!val) {
+ folder_item_remove_msg(folder, msgnum);
+ folderview_update_item(folder, TRUE);
+ }
+
+ return val;
+}
+
+#if 0 /* compose restructure */
gint compose_send(Compose *compose)
{
gchar tmp[MAXPATHLEN + 1];
}
}
- /* queue message if failed to send */
- if (ok < 0) {
- if (prefs_common.queue_msg) {
- AlertValue val;
+ /* queue message if failed to send */
+ if (ok < 0) {
+ if (prefs_common.queue_msg) {
+ AlertValue val;
+
+ val = alertpanel
+ (_("Queueing"),
+ _("Error occurred while sending the message.\n"
+ "Put this message into queue folder?"),
+ _("OK"), _("Cancel"), NULL);
+ if (G_ALERTDEFAULT == val) {
+ ok = compose_queue(compose, tmp);
+ if (ok < 0)
+ alertpanel_error(_("Can't queue the message."));
+ }
+ } else
+ alertpanel_error(_("Error occurred while sending the message."));
+ } else {
+ if (compose->mode == COMPOSE_REEDIT) {
+ compose_remove_reedit_target(compose);
+ if (compose->targetinfo)
+ folderview_update_item
+ (compose->targetinfo->folder, TRUE);
+ }
+ }
+
+ /* save message to outbox */
+ if (ok == 0 && prefs_common.savemsg) {
+ if (compose_save_to_outbox(compose, tmp) < 0)
+ alertpanel_error
+ (_("Can't save the message to outbox."));
+ }
+
+ unlink(tmp);
+ lock = FALSE;
+ return ok;
+}
+#endif
+
+static gboolean compose_use_attach(Compose *compose) {
+ return(gtk_clist_get_row_data(GTK_CLIST(compose->attach_clist), 0) != NULL);
+}
+
+static gint compose_bounce_write_headers_from_headerlist(Compose *compose,
+ FILE *fp)
+{
+ gchar buf[BUFFSIZE];
+ gchar *str;
+ gboolean first_address;
+ GSList *list;
+ ComposeHeaderEntry *headerentry;
+ gchar *headerentryname;
+ gchar *header_w_colon;
+ gchar *cc_hdr;
+ gchar *to_hdr;
+
+ debug_print(_("Writing bounce header\n"));
+
+ header_w_colon = g_strconcat("To:", NULL);
+ to_hdr = (prefs_common.trans_hdr ? gettext(header_w_colon) : header_w_colon);
+ header_w_colon = g_strconcat("Cc:", NULL);
+ cc_hdr = (prefs_common.trans_hdr ? gettext(header_w_colon) : header_w_colon);
+
+ first_address = TRUE;
+ for(list = compose->header_list; list; list = list->next) {
+ headerentry = ((ComposeHeaderEntry *)list->data);
+ headerentryname = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(headerentry->combo)->entry));
+
+ if(g_strcasecmp(headerentryname, cc_hdr) == 0
+ || g_strcasecmp(headerentryname, to_hdr) == 0) {
+ str = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
+ Xstrdup_a(str, str, return -1);
+ g_strstrip(str);
+ if(str[0] != '\0') {
+ compose_convert_header
+ (buf, sizeof(buf), str,
+ strlen("Resent-To") + 2);
+ if(first_address) {
+ fprintf(fp, "Resent-To: ");
+ first_address = FALSE;
+ } else {
+ fprintf(fp, ",");
+ }
+ fprintf(fp, "%s", buf);
+ }
+ }
+ }
+ /* if(!first_address) { */
+ fprintf(fp, "\n");
+ /* } */
+
+ return(0);
+}
+
+static gint compose_bounce_write_headers(Compose *compose, FILE *fp)
+{
+ gchar buf[BUFFSIZE];
+ gchar *str;
+ /* struct utsname utsbuf; */
+
+ g_return_val_if_fail(fp != NULL, -1);
+ g_return_val_if_fail(compose->account != NULL, -1);
+ g_return_val_if_fail(compose->account->address != NULL, -1);
+
+ /* Date */
+ get_rfc822_date(buf, sizeof(buf));
+ fprintf(fp, "Resent-Date: %s\n", buf);
+
+ /* From */
+ if (compose->account->name && *compose->account->name) {
+ compose_convert_header
+ (buf, sizeof(buf), compose->account->name,
+ strlen("From: "));
+ fprintf(fp, "Resent-From: %s <%s>\n",
+ buf, compose->account->address);
+ } else
+ fprintf(fp, "Resent-From: %s\n", compose->account->address);
+
+ /* To */
+ compose_bounce_write_headers_from_headerlist(compose, fp);
+
+ /* separator between header and body */
+ fputs("\n", fp);
+
+ return 0;
+}
+
+static gint compose_bounce_write_to_file(Compose *compose, const gchar *file)
+{
+ FILE *fp;
+ FILE *fdest;
+ size_t len;
+ gchar buf[BUFFSIZE];
+
+ if ((fp = fopen(compose->bounce_filename, "r")) == NULL) {
+ FILE_OP_ERROR(file, "fopen");
+ return -1;
+ }
+
+ if ((fdest = fopen(file, "w")) == NULL) {
+ FILE_OP_ERROR(file, "fopen");
+ fclose(fp);
+ return -1;
+ }
+
+ /* chmod for security */
+ if (change_file_mode_rw(fdest, file) < 0) {
+ FILE_OP_ERROR(file, "chmod");
+ g_warning(_("can't change file mode\n"));
+ }
+
+ while (procheader_get_unfolded_line(buf, sizeof(buf), fp)) {
+ /* should filter returnpath, delivered-to */
+ if ((g_strncasecmp(buf, "Return-Path:",
+ strlen("Return-Path:")) == 0)
+ || (g_strncasecmp(buf, "Delivered-To:",
+ strlen("Delivered-To:")) == 0))
+ continue;
- val = alertpanel
- (_("Queueing"),
- _("Error occurred while sending the message.\n"
- "Put this message into queue folder?"),
- _("OK"), _("Cancel"), NULL);
- if (G_ALERTDEFAULT == val) {
- ok = compose_queue(compose, tmp);
- if (ok < 0)
- alertpanel_error(_("Can't queue the message."));
- }
- } else
- alertpanel_error(_("Error occurred while sending the message."));
- } else {
- if (compose->mode == COMPOSE_REEDIT) {
- compose_remove_reedit_target(compose);
- if (compose->targetinfo)
- folderview_update_item
- (compose->targetinfo->folder, TRUE);
+ if (fputs(buf, fdest) == -1)
+ goto error;
+
+ if (g_strncasecmp(buf, "From:", strlen("From:")) == 0) {
+ fputs(" (by way of ", fdest);
+ if (compose->account->name
+ && *compose->account->name) {
+ compose_convert_header
+ (buf, sizeof(buf),
+ compose->account->name,
+ strlen("From: "));
+ fprintf(fdest, "%s <%s>",
+ buf, compose->account->address);
+ } else
+ fprintf(fdest, "%s",
+ compose->account->address);
+ fputs(")", fdest);
}
+
+ if (fputs("\n", fdest) == -1)
+ goto error;
}
- /* save message to outbox */
- if (ok == 0 && prefs_common.savemsg) {
- if (compose_save_to_outbox(compose, tmp) < 0)
- alertpanel_error
- (_("Can't save the message to outbox."));
+ compose_bounce_write_headers(compose, fdest);
+
+ while ((len = fread(buf, sizeof(gchar), BUFFSIZE, fp)) > 0) {
+ if (fwrite(buf, sizeof(gchar), len, fdest) == -1)
+ goto error;
}
- unlink(tmp);
- lock = FALSE;
- return ok;
-}
+ fclose(fdest);
+ fclose(fp);
-static gboolean compose_use_attach(Compose *compose) {
- return(gtk_clist_get_row_data(GTK_CLIST(compose->attach_clist), 0) != NULL);
+ return 0;
+ error:
+ fclose(fdest);
+ fclose(fp);
+
+ return -1;
}
static gint compose_write_to_file(Compose *compose, const gchar *file,
return 0;
}
-static gint compose_queue(Compose *compose, const gchar *file)
+
+static gint compose_queue(Compose *compose, gint *msgnum, FolderItem **item)
{
FolderItem *queue;
- gchar *tmp, *queue_path;
+ gchar *tmp, *tmp2, *queue_path;
FILE *fp, *src_fp;
GSList *cur;
gchar buf[BUFFSIZE];
gint num;
-
+ static gboolean lock = FALSE;
+ PrefsAccount *mailac = NULL, *newsac = NULL;
+
debug_print(_("queueing message...\n"));
- g_return_val_if_fail(compose->to_list != NULL, -1);
g_return_val_if_fail(compose->account != NULL, -1);
+ g_return_val_if_fail(compose->orig_account != NULL, -1);
+
+ lock = TRUE;
+
+ if(!compose_check_for_valid_recipient(compose)) {
+ alertpanel_error(_("Recipient is not specified."));
+ lock = FALSE;
+ return -1;
+ }
+
+ if (!compose->to_list && !compose->newsgroup_list) {
+ g_warning(_("can't get recipient list."));
+ lock = FALSE;
+ return -1;
+ }
+
+ if(compose->to_list) {
+ if (compose->account->protocol != A_NNTP)
+ mailac = compose->account;
+ else if (compose->orig_account->protocol != A_NNTP)
+ mailac = compose->orig_account;
+ else if (cur_account && cur_account->protocol != A_NNTP)
+ mailac = cur_account;
+ else if (!(mailac = compose_current_mail_account())) {
+ lock = FALSE;
+ alertpanel_error(_("No account for sending mails available!"));
+ return -1;
+ }
+ }
+
+ if(compose->newsgroup_list) {
+ if (compose->account->protocol == A_NNTP)
+ newsac = compose->account;
+ else if(!(newsac = compose->orig_account) || (newsac->protocol != A_NNTP)) {
+ lock = FALSE;
+ alertpanel_error(_("No account for posting news available!"));
+ return -1;
+ }
+ }
+
+ if (prefs_common.linewrap_at_send)
+ compose_wrap_line_all(compose);
+
+ /* write to temporary file */
+ tmp2 = g_strdup_printf("%s%ctmp%d", g_get_tmp_dir(),
+ G_DIR_SEPARATOR, (gint)compose);
+
+ if (compose->bounce_filename != NULL) {
+ if (compose_bounce_write_to_file(compose, tmp2) < 0) {
+ unlink(tmp2);
+ lock = FALSE;
+ return -1;
+ }
+ }
+ else {
+ if (compose_write_to_file(compose, tmp2, FALSE) < 0) {
+ unlink(tmp2);
+ lock = FALSE;
+ return -1;
+ }
+ }
+ /* add queue header */
tmp = g_strdup_printf("%s%cqueue.%d", g_get_tmp_dir(),
- G_DIR_SEPARATOR, (gint)compose);
+ G_DIR_SEPARATOR, (gint)compose);
if ((fp = fopen(tmp, "w")) == NULL) {
FILE_OP_ERROR(tmp, "fopen");
g_free(tmp);
return -1;
}
- if ((src_fp = fopen(file, "r")) == NULL) {
- FILE_OP_ERROR(file, "fopen");
+ if ((src_fp = fopen(tmp2, "r")) == NULL) {
+ FILE_OP_ERROR(tmp2, "fopen");
fclose(fp);
unlink(tmp);
g_free(tmp);
+ unlink(tmp2);
+ g_free(tmp2);
return -1;
}
if (change_file_mode_rw(fp, tmp) < 0) {
fprintf(fp, "PT:0\n");
fprintf(fp, "S:%s\n", compose->account->address);
fprintf(fp, "RQ:\n");
- if (compose->account->smtp_server)
- fprintf(fp, "SSV:%s\n", compose->account->smtp_server);
+ if (mailac)
+ fprintf(fp, "SSV:%s\n", mailac->smtp_server);
else
fprintf(fp, "SSV:\n");
- if (compose->account->nntp_server)
- fprintf(fp, "NSV:%s\n", compose->account->nntp_server);
+ if (newsac)
+ fprintf(fp, "NSV:%s\n", newsac->nntp_server);
else
fprintf(fp, "NSV:\n");
fprintf(fp, "SSH:\n");
- fprintf(fp, "R:<%s>", (gchar *)compose->to_list->data);
- for (cur = compose->to_list->next; cur != NULL; cur = cur->next)
- fprintf(fp, ",<%s>", (gchar *)cur->data);
+ /* write recepient list */
+ fprintf(fp, "R:");
+ if(compose->to_list) {
+ fprintf(fp, "<%s>", (gchar *)compose->to_list->data);
+ for (cur = compose->to_list->next; cur != NULL; cur = cur->next)
+ fprintf(fp, ",<%s>", (gchar *)cur->data);
+ }
fprintf(fp, "\n");
- /* Sylpheed account ID */
- fprintf(fp, "AID:%d\n", compose->account->account_id);
+ /* write newsgroup list */
+ fprintf(fp, "NG:");
+ if(compose->newsgroup_list) {
+ fprintf(fp, "%s", (gchar *)compose->newsgroup_list->data);
+ for (cur = compose->newsgroup_list->next; cur != NULL; cur = cur->next)
+ fprintf(fp, ",%s", (gchar *)cur->data);
+ }
+ fprintf(fp, "\n");
+ /* Sylpheed account IDs */
+ if(mailac) {
+ fprintf(fp, "MAID:%d\n", mailac->account_id);
+ }
+ if(newsac) {
+ fprintf(fp, "NAID:%d\n", newsac->account_id);
+ }
fprintf(fp, "\n");
while (fgets(buf, sizeof(buf), src_fp) != NULL) {
fclose(src_fp);
unlink(tmp);
g_free(tmp);
+ unlink(tmp2);
+ g_free(tmp2);
return -1;
}
}
-
fclose(src_fp);
if (fclose(fp) == EOF) {
FILE_OP_ERROR(tmp, "fclose");
unlink(tmp);
g_free(tmp);
+ unlink(tmp2);
+ g_free(tmp2);
return -1;
}
-
+
+ /* queue message */
queue = folder_get_default_queue();
folder_item_scan(queue);
g_free(queue_path);
return -1;
}
+ unlink(tmp);
g_free(tmp);
+ unlink(tmp2);
+ g_free(tmp2);
if (compose->mode == COMPOSE_REEDIT) {
compose_remove_reedit_target(compose);
folder_item_scan(queue);
folderview_update_item(queue, TRUE);
+ if((msgnum != NULL) && (item != NULL)) {
+ *msgnum = num;
+ *item = queue;
+ }
+
return 0;
}
gchar buf[BUFFSIZE];
while (fgets(buf, sizeof(buf), attach_fp) != NULL) {
- len = strlen(buf);
- if (len > 1 && buf[len - 1] == '\n' &&
- buf[len - 2] == '\r') {
- buf[len - 2] = '\n';
- buf[len - 1] = '\0';
- }
+ strcrchomp(buf);
fputs(buf, fp);
}
} else {
static gint compose_write_headers_from_headerlist(Compose *compose,
FILE *fp,
- gchar *header,
- GSList *(*list_append_func) (GSList *list, const gchar *str),
- GSList **dest_list)
+ gchar *header)
{
gchar buf[BUFFSIZE];
gchar *str, *header_w_colon, *trans_hdr;
gboolean first_address;
GSList *list;
- compose_headerentry *headerentry;
+ ComposeHeaderEntry *headerentry;
+ gchar * headerentryname;
if (IS_IN_CUSTOM_HEADER(header)) {
return 0;
first_address = TRUE;
for(list = compose->header_list; list; list = list->next) {
- headerentry = ((compose_headerentry *)list->data);
- if(!strcmp(trans_hdr, gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(headerentry->combo)->entry)))) {
+ headerentry = ((ComposeHeaderEntry *)list->data);
+ headerentryname = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(headerentry->combo)->entry));
+
+ if(!g_strcasecmp(trans_hdr, headerentryname)) {
str = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
Xstrdup_a(str, str, return -1);
g_strstrip(str);
- if(list_append_func)
- *dest_list = list_append_func(*dest_list, str);
- compose_convert_header
- (buf, sizeof(buf), str,
- strlen(header) + 2);
- if(first_address) {
- fprintf(fp, "%s: ", header);
- first_address = FALSE;
- } else {
- fprintf(fp, ", ");
+ if(str[0] != '\0') {
+ compose_convert_header
+ (buf, sizeof(buf), str,
+ strlen(header) + 2);
+ if(first_address) {
+ fprintf(fp, "%s: ", header);
+ first_address = FALSE;
+ } else {
+ fprintf(fp, ",");
+ }
+ fprintf(fp, "%s", buf);
}
- fprintf(fp, "%s", buf);
}
}
if(!first_address) {
fprintf(fp, "From: %s\n", compose->account->address);
}
- slist_free_strings(compose->to_list);
- g_slist_free(compose->to_list);
- compose->to_list = NULL;
-
/* To */
- compose_write_headers_from_headerlist(compose, fp, "To", address_list_append, &compose->to_list);
+ compose_write_headers_from_headerlist(compose, fp, "To");
#if 0 /* NEW COMPOSE GUI */
if (compose->use_to) {
str = gtk_entry_get_text(GTK_ENTRY(compose->to_entry));
}
}
#endif
- slist_free_strings(compose->newsgroup_list);
- g_slist_free(compose->newsgroup_list);
- compose->newsgroup_list = NULL;
/* Newsgroups */
- compose_write_headers_from_headerlist(compose, fp, "Newsgroups", newsgroup_list_append, &compose->newsgroup_list);
+ compose_write_headers_from_headerlist(compose, fp, "Newsgroups");
#if 0 /* NEW COMPOSE GUI */
str = gtk_entry_get_text(GTK_ENTRY(compose->newsgroups_entry));
if (*str != '\0') {
}
#endif
/* Cc */
- compose_write_headers_from_headerlist(compose, fp, "Cc", address_list_append, &compose->to_list);
+ compose_write_headers_from_headerlist(compose, fp, "Cc");
#if 0 /* NEW COMPOSE GUI */
if (compose->use_cc) {
str = gtk_entry_get_text(GTK_ENTRY(compose->cc_entry));
}
#endif
/* Bcc */
- compose_write_headers_from_headerlist(compose, fp, "Bcc", address_list_append, &compose->to_list);
+ compose_write_headers_from_headerlist(compose, fp, "Bcc");
#if 0 /* NEW COMPOSE GUI */
if (compose->use_bcc) {
str = gtk_entry_get_text(GTK_ENTRY(compose->bcc_entry));
}
}
#endif
- if (!is_draft && !compose->to_list && !compose->newsgroup_list)
- return -1;
/* Subject */
str = gtk_entry_get_text(GTK_ENTRY(compose->subject_entry));
fprintf(fp, "References: %s\n", compose->references);
/* Followup-To */
- compose_write_headers_from_headerlist(compose, fp, "Followup-To", NULL, NULL);
+ compose_write_headers_from_headerlist(compose, fp, "Followup-To");
#if 0 /* NEW COMPOSE GUI */
if (compose->use_followupto && !IS_IN_CUSTOM_HEADER("Followup-To")) {
str = gtk_entry_get_text(GTK_ENTRY(compose->followup_entry));
}
#endif
/* Reply-To */
- compose_write_headers_from_headerlist(compose, fp, "Reply-To", NULL, NULL);
+ compose_write_headers_from_headerlist(compose, fp, "Reply-To");
#if 0 /* NEW COMPOSE GUI */
if (compose->use_replyto && !IS_IN_CUSTOM_HEADER("Reply-To")) {
str = gtk_entry_get_text(GTK_ENTRY(compose->reply_entry));
cur = cur->next) {
CustomHeader *chdr = (CustomHeader *)cur->data;
- if (strcasecmp(chdr->name, "Date") != 0 &&
- strcasecmp(chdr->name, "From") != 0 &&
- strcasecmp(chdr->name, "To") != 0 &&
- strcasecmp(chdr->name, "Sender") != 0 &&
- strcasecmp(chdr->name, "Message-Id") != 0 &&
- strcasecmp(chdr->name, "In-Reply-To") != 0 &&
- strcasecmp(chdr->name, "References") != 0 &&
- strcasecmp(chdr->name, "Mime-Version") != 0 &&
- strcasecmp(chdr->name, "Content-Type") != 0 &&
- strcasecmp(chdr->name, "Content-Transfer-Encoding") != 0)
+ if (strcasecmp(chdr->name, "Date") != 0 &&
+ strcasecmp(chdr->name, "From") != 0 &&
+ strcasecmp(chdr->name, "To") != 0 &&
+ /* strcasecmp(chdr->name, "Sender") != 0 && */
+ strcasecmp(chdr->name, "Message-Id") != 0 &&
+ strcasecmp(chdr->name, "In-Reply-To") != 0 &&
+ strcasecmp(chdr->name, "References") != 0 &&
+ strcasecmp(chdr->name, "Mime-Version") != 0 &&
+ strcasecmp(chdr->name, "Content-Type") != 0 &&
+ strcasecmp(chdr->name, "Content-Transfer-Encoding")
+ != 0) {
compose_convert_header
(buf, sizeof(buf),
chdr->value ? chdr->value : "",
strlen(chdr->name) + 2);
- fprintf(fp, "%s: %s\n", chdr->name, buf);
+ fprintf(fp, "%s: %s\n", chdr->name, buf);
+ }
}
}
gtk_box_pack_end(GTK_BOX(*hbox), label, FALSE, FALSE, 0);
gtk_table_attach(GTK_TABLE(table), *hbox, 0, 1, *count, (*count) + 1,
GTK_FILL, 0, 2, 0);
- *entry = gtk_entry_new();
+ *entry = gtk_entry_new_with_max_length(MAX_ENTRY_LENGTH);
gtk_table_attach
(GTK_TABLE(table), *entry, 1, 2, *count, (*count) + 1, GTK_FILL | GTK_EXPAND, GTK_SHRINK, 0, 0);
#if 0 /* NEW COMPOSE GUI */
GtkWidget *entry;
GList *combo_list = NULL;
gchar **string, *header;
- compose_headerentry *headerentry = g_new0(compose_headerentry, 1);
+ ComposeHeaderEntry *headerentry;
+
+ headerentry = g_new0(ComposeHeaderEntry, 1);
/* Combo box */
combo = gtk_combo_new();
} else {
switch(compose->account->protocol) {
case A_NNTP:
- header = _("Newsgroups:");
+ header = prefs_common.trans_hdr ? _("Newsgroups:") : "Newsgroups:";
break;
default:
- header = _("To:");
+ header = prefs_common.trans_hdr ? _("To:") : "To:";
break;
}
}
}
static void compose_add_header_entry(Compose *compose, gchar *header, gchar *text) {
- compose_headerentry *last_header;
+ ComposeHeaderEntry *last_header;
last_header = compose->header_last;
GtkWidget *table;
GtkWidget *hbox;
+ UndoMain *undostruct;
+
gchar *titles[] = {_("MIME type"), _("Size"), _("Name")};
guint n_menu_entries;
GtkStyle *style, *new_style;
GtkWidget *menuitem;
GtkItemFactory *popupfactory;
GtkItemFactory *ifactory;
+ GtkWidget *tmpl_menu;
gint n_entries;
gint count = 0;
gint i;
menu_set_sensitive(ifactory, "/Edit/Undo", FALSE);
menu_set_sensitive(ifactory, "/Edit/Redo", FALSE);
+ tmpl_menu = gtk_item_factory_get_item(ifactory, "/Tool/Template");
#if 0 /* NEW COMPOSE GUI */
if (account->protocol == A_NNTP) {
gtk_widget_hide(to_hbox);
compose->vbox2 = vbox2;
compose->table_vbox = table_vbox;
- compose->table = table;
+ compose->table = NULL;
#if 0 /* NEW COMPOSE GUI */
+ compose->table = table;
compose->to_hbox = to_hbox;
compose->to_entry = to_entry;
compose->newsgroups_hbox = newsgroups_hbox;
compose->popupmenu = popupmenu;
compose->popupfactory = popupfactory;
+ compose->tmpl_menu = tmpl_menu;
+
compose->mode = mode;
+ compose->targetinfo = NULL;
+ compose->replyinfo = NULL;
+
compose->replyto = NULL;
compose->mailinglist = NULL;
compose->cc = NULL;
compose->exteditor_readdes = -1;
compose->exteditor_tag = -1;
+ compose->bounce_filename = NULL;
+
compose_set_title(compose);
#if 0 /* NEW COMPOSE GUI */
compose->gtkpspell = gtkpspell;
#endif
+ undostruct = undo_init(text);
+
+ compose->undostruct = undostruct;
+ undo_set_undo_change_funct(undostruct, &compose_set_undo, GTK_WIDGET(compose->menubar));
+
#if 0 /* NEW COMPOSE GUI */
if (account->protocol != A_NNTP) {
menuitem = gtk_item_factory_get_item(ifactory, "/Message/To");
account->auto_replyto);
#endif
}
+ if (account->protocol != A_NNTP) {
+ gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry), _("To:"));
+ } else {
+ gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry), _("Newsgroups:"));
+ }
+
menuitem = gtk_item_factory_get_item(ifactory, "/Tool/Show ruler");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
prefs_common.show_ruler);
#endif /* USE_GPGME */
addressbook_set_target_compose(compose);
+ compose_set_template_menu(compose);
compose_list = g_list_append(compose_list, compose);
return hbox;
}
+static void compose_set_template_menu(Compose *compose)
+{
+ GSList *tmpl_list, *cur;
+ GtkWidget *menu;
+ GtkWidget *item;
+
+ tmpl_list = template_get_config();
+
+ menu = gtk_menu_new();
+
+ for (cur = tmpl_list; cur != NULL; cur = cur->next) {
+ Template *tmpl = (Template *)cur->data;
+
+ item = gtk_menu_item_new_with_label(tmpl->name);
+ gtk_menu_append(GTK_MENU(menu), item);
+ gtk_signal_connect(GTK_OBJECT(item), "activate",
+ GTK_SIGNAL_FUNC(compose_template_activate_cb),
+ compose);
+ gtk_object_set_data(GTK_OBJECT(item), "template", tmpl);
+ gtk_widget_show(item);
+ }
+
+ gtk_widget_show(menu);
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(compose->tmpl_menu), menu);
+}
+
+void compose_reflect_prefs_all(void)
+{
+ GList *cur;
+ Compose *compose;
+
+ for (cur = compose_list; cur != NULL; cur = cur->next) {
+ compose = (Compose *)cur->data;
+ compose_set_template_menu(compose);
+ }
+}
+
+static void compose_template_apply(Compose *compose, Template *tmpl)
+{
+ gchar *qmark;
+ gchar *parsed_str;
+
+ if (!tmpl || !tmpl->value) return;
+
+ gtk_stext_freeze(GTK_STEXT(compose->text));
+
+ if (tmpl->subject)
+ gtk_entry_set_text(GTK_ENTRY(compose->subject_entry),
+ tmpl->subject);
+ if (tmpl->to)
+ compose_entry_append(compose, tmpl->to, COMPOSE_TO);
+
+ if (compose->replyinfo == NULL) {
+ MsgInfo dummyinfo;
+
+ memset(&dummyinfo, 0, sizeof(MsgInfo));
+ parsed_str = compose_quote_fmt(compose, &dummyinfo,
+ tmpl->value, NULL);
+ } else {
+ if (prefs_common.quotemark && *prefs_common.quotemark)
+ qmark = prefs_common.quotemark;
+ else
+ qmark = "> ";
+
+ parsed_str = compose_quote_fmt(compose, compose->replyinfo,
+ tmpl->value, qmark);
+ }
+
+ if (parsed_str && prefs_common.auto_sig)
+ compose_insert_sig(compose);
+
+ gtk_stext_thaw(GTK_STEXT(compose->text));
+}
+
static void compose_destroy(Compose *compose)
{
gint row;
g_slist_free(compose->header_list);
procmsg_msginfo_free(compose->targetinfo);
+ procmsg_msginfo_free(compose->replyinfo);
g_free(compose->replyto);
g_free(compose->cc);
g_free(compose->msgid);
g_free(compose->boundary);
+ if (compose->bounce_filename)
+ g_free(compose->bounce_filename);
+
g_free(compose->exteditor_file);
for (row = 0; (ainfo = gtk_clist_get_row_data(clist, row)) != NULL;
gint val;
val = compose_send(compose);
-
if (val == 0) gtk_widget_destroy(compose->window);
}
GtkWidget *widget)
{
Compose *compose = (Compose *)data;
- gchar tmp[22];
- gboolean recipient_found;
- GSList *list;
-
- if(!compose_check_for_valid_recipient(compose)) {
- alertpanel_error(_("Recipient is not specified."));
- return;
- }
-
- g_snprintf(tmp, 22, "%s%ctmpmsg%d",
- g_get_tmp_dir(), G_DIR_SEPARATOR, (gint)compose);
-
- if (prefs_common.linewrap_at_send)
- compose_wrap_line_all(compose);
-
- if (compose_write_to_file(compose, tmp, FALSE) < 0 ||
- compose_queue(compose, tmp) < 0) {
- alertpanel_error(_("Can't queue the message."));
- return;
- }
-
- if (prefs_common.savemsg) {
- if (compose_save_to_outbox(compose, tmp) < 0)
- alertpanel_error
- (_("Can't save the message to outbox."));
- }
-
- if (unlink(tmp) < 0)
- FILE_OP_ERROR(tmp, "unlink");
+ gint val;
- gtk_widget_destroy(compose->window);
+ val = compose_queue(compose, NULL, NULL);
+ if (!val) gtk_widget_destroy(compose->window);
}
static void compose_draft_cb(gpointer data, guint action, GtkWidget *widget)
Compose *compose = (Compose *)data;
GList *file_list;
+ if (compose->bounce_filename != NULL)
+ return;
+
file_list = filesel_select_multiple_files(_("Select file"), NULL);
if (file_list) {
addressbook_open(compose);
}
+static void compose_template_activate_cb(GtkWidget *widget, gpointer data)
+{
+ Compose *compose = (Compose *)data;
+ Template *tmpl;
+
+ tmpl = gtk_object_get_data(GTK_OBJECT(widget), "template");
+ g_return_if_fail(tmpl != NULL);
+
+ compose_template_apply(compose, tmpl);
+}
+
static void compose_ext_editor_cb(gpointer data, guint action,
GtkWidget *widget)
{
compose_destroy(compose);
}
+static void compose_undo_cb(Compose *compose)
+{
+ undo_undo(compose->undostruct);
+}
+
+static void compose_redo_cb(Compose *compose)
+{
+ undo_redo(compose->undostruct);
+}
+
static void compose_cut_cb(Compose *compose)
{
if (compose->focused_editable &&
compose->return_receipt = FALSE;
}
-static gchar *compose_quote_fmt (Compose *compose,
- MsgInfo *msginfo,
- const gchar *fmt,
- const gchar *qmark)
+void compose_headerentry_key_press_event_cb(GtkWidget *entry,
+ GdkEventKey *event,
+ ComposeHeaderEntry *headerentry)
{
- gchar * quote_str = NULL;
-
- if (qmark != NULL) {
- gchar * p;
-
- quote_fmt_init(msginfo, NULL);
- quote_fmt_scan_string(qmark);
- quote_fmtparse();
-
- p = quote_fmt_get_buffer();
- if (p == NULL) {
- alertpanel_error
- (_("Quote mark format error."));
- }
- else {
- quote_str = alloca(strlen(p) + 1);
- strcpy(quote_str, p);
- }
- }
-
- quote_fmt_init(msginfo, quote_str);
- quote_fmt_scan_string(fmt);
- quote_fmtparse();
-
- if (quote_fmt_get_buffer() == NULL)
- alertpanel_error
- (_("Message reply/forward format error."));
-
- return quote_fmt_get_buffer();
-}
-
-static void template_apply_cb(gchar *s, gpointer data)
-{
- Compose *compose = (Compose*)data;
- GtkSText *text = GTK_STEXT(compose->text);
- gchar *quote_str;
- gchar *qmark;
- gchar *parsed_text;
- gchar *tmpl;
- gchar *old_tmpl = s;
-
- if(!s) return;
-
- if(compose->replyinfo == NULL) {
- gtk_stext_freeze(text);
- gtk_stext_set_point(text, 0);
- gtk_stext_forward_delete(text, gtk_stext_get_length(text));
- gtk_stext_insert(text, NULL, NULL, NULL, s, -1);
- gtk_stext_thaw(text);
- g_free(old_tmpl);
- return;
- }
-
- parsed_text = g_new(gchar, strlen(s)*2 + 1);
- tmpl = parsed_text;
- while(*s) {
- if (*s == '\n') {
- *parsed_text++ = '\\';
- *parsed_text++ = 'n';
- s++;
- } else {
- *parsed_text++ = *s++;
- }
- }
- *parsed_text = '\0';
-
- if (prefs_common.quotemark && *prefs_common.quotemark)
- qmark = prefs_common.quotemark;
- else
- qmark = "> ";
-
- quote_str = compose_quote_fmt(compose, compose->replyinfo, tmpl, qmark);
- if (quote_str != NULL) {
- gtk_stext_freeze(text);
- gtk_stext_set_point(text, 0);
- gtk_stext_forward_delete(text, gtk_stext_get_length(text));
- gtk_stext_insert(text, NULL, NULL, NULL, quote_str, -1);
- gtk_stext_thaw(text);
- }
-
- g_free(old_tmpl);
- g_free(tmpl);
-}
-
-static void template_select_cb(gpointer data, guint action,
- GtkWidget *widget)
-{
- template_select(&template_apply_cb, data);
-}
-
-void compose_headerentry_key_press_event_cb(GtkWidget *entry, GdkEventKey *event, compose_headerentry *headerentry) {
- if((g_slist_length(headerentry->compose->header_list) > 0) &&
+ if ((g_slist_length(headerentry->compose->header_list) > 0) &&
((headerentry->headernum + 1) != headerentry->compose->header_nextrow) &&
!(event->state & GDK_MODIFIER_MASK) &&
(event->keyval == GDK_BackSpace) &&
(strlen(gtk_entry_get_text(GTK_ENTRY(entry))) == 0)) {
- gtk_container_remove(GTK_CONTAINER(headerentry->compose->header_table), headerentry->combo);
- gtk_container_remove(GTK_CONTAINER(headerentry->compose->header_table), headerentry->entry);
- headerentry->compose->header_list = g_slist_remove(headerentry->compose->header_list, headerentry);
+ gtk_container_remove
+ (GTK_CONTAINER(headerentry->compose->header_table),
+ headerentry->combo);
+ gtk_container_remove
+ (GTK_CONTAINER(headerentry->compose->header_table),
+ headerentry->entry);
+ headerentry->compose->header_list =
+ g_slist_remove(headerentry->compose->header_list,
+ headerentry);
g_free(headerentry);
}
}
-void compose_headerentry_changed_cb(GtkWidget *entry, compose_headerentry *headerentry) {
- if(strlen(gtk_entry_get_text(GTK_ENTRY(entry))) != 0) {
- headerentry->compose->header_list = g_slist_append(headerentry->compose->header_list, headerentry);
+void compose_headerentry_changed_cb(GtkWidget *entry,
+ ComposeHeaderEntry *headerentry)
+{
+ if (strlen(gtk_entry_get_text(GTK_ENTRY(entry))) != 0) {
+ headerentry->compose->header_list =
+ g_slist_append(headerentry->compose->header_list,
+ headerentry);
compose_create_header_entry(headerentry->compose);
- gtk_signal_disconnect_by_func(GTK_OBJECT(entry), GTK_SIGNAL_FUNC(compose_headerentry_changed_cb), headerentry);
+ gtk_signal_disconnect_by_func
+ (GTK_OBJECT(entry),
+ GTK_SIGNAL_FUNC(compose_headerentry_changed_cb),
+ headerentry);
}
}
+
+/**
+ * undo_set_undo:
+ *
+ * Change the sensivity of the menuentries undo and redo
+ **/
+static void compose_set_undo(UndoMain *undostruct, gint undo_state,
+ gint redo_state, GtkWidget *changewidget)
+{
+ GtkItemFactory *ifactory;
+ debug_print ("Set_undo. UNDO:%i REDO:%i\n",
+ undo_state,
+ redo_state);
+
+ g_return_if_fail (changewidget != NULL);
+
+ ifactory = gtk_item_factory_from_widget(changewidget);
+
+ /* Set undo */
+ switch (undo_state) {
+ case UNDO_STATE_TRUE:
+ if (!undostruct->undo_state) {
+ debug_print ("Set_undo - Testpoint\n");
+ undostruct->undo_state = TRUE;
+ menu_set_sensitive(ifactory, "/Edit/Undo", TRUE);
+ }
+ break;
+ case UNDO_STATE_FALSE:
+ if (undostruct->undo_state) {
+ undostruct->undo_state = FALSE;
+ menu_set_sensitive(ifactory, "/Edit/Undo", FALSE);
+ }
+ break;
+ case UNDO_STATE_UNCHANGED:
+ break;
+ case UNDO_STATE_REFRESH:
+ menu_set_sensitive(ifactory, "/Edit/Undo", undostruct->undo_state);
+ break;
+ default:
+ g_warning ("Undo state not recognized");
+ break;
+ }
+
+ /* Set redo*/
+ switch (redo_state) {
+ case UNDO_STATE_TRUE:
+ if (!undostruct->redo_state) {
+ undostruct->redo_state = TRUE;
+ menu_set_sensitive(ifactory, "/Edit/Redo", TRUE);
+ }
+ break;
+ case UNDO_STATE_FALSE:
+ if (undostruct->redo_state) {
+ undostruct->redo_state = FALSE;
+ menu_set_sensitive(ifactory, "/Edit/Redo", FALSE);
+ }
+ break;
+ case UNDO_STATE_UNCHANGED:
+ break;
+ case UNDO_STATE_REFRESH:
+ menu_set_sensitive(ifactory, "/Edit/Redo", undostruct->redo_state);
+ break;
+ default:
+ g_warning ("Redo state not recognized");
+ break;
+ }
+}
projects / claws.git / blobdiff