#include <stdlib.h>
#include <string.h>
#include <ctype.h>
+#include <sys/types.h>
+#include <sys/stat.h>
#include <unistd.h>
#include <time.h>
/* #include <sys/utsname.h> */
# include <wctype.h>
#endif
-
-#include "gtkstext.h"
-
#include "intl.h"
#include "main.h"
#include "mainwindow.h"
#include "compose.h"
+#include "gtkstext.h"
#include "addressbook.h"
#include "folderview.h"
#include "procmsg.h"
#include "menu.h"
+#include "stock_pixmap.h"
#include "send.h"
+#include "imap.h"
#include "news.h"
#include "customheader.h"
#include "prefs_common.h"
#include "addr_compl.h"
#include "quote_fmt.h"
#include "template.h"
+#include "undo.h"
+#include "foldersel.h"
#if USE_GPGME
# include "rfc2015.h"
static GList *compose_list = NULL;
+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,
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,
static void compose_set_ext_editor_sensitive (Compose *compose,
gboolean sensitive);
+static void compose_undo_state_changed (UndoMain *undostruct,
+ gint undo_state,
+ gint redo_state,
+ gpointer data);
+
static gint calc_cursor_xpos (GtkSText *text,
gint extra,
gint char_width);
static void toolbar_address_cb (GtkWidget *widget,
gpointer data);
+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_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);
static void compose_allsel_cb (Compose *compose);
+typedef enum {
+ COMPOSE_CALL_GTK_STEXT_MOVE_BEGINNING_OF_LINE,
+ COMPOSE_CALL_GTK_STEXT_MOVE_FORWARD_CHARACTER,
+ COMPOSE_CALL_GTK_STEXT_MOVE_BACKWARD_CHARACTER,
+ COMPOSE_CALL_GTK_STEXT_MOVE_FORWARD_WORD,
+ COMPOSE_CALL_GTK_STEXT_MOVE_BACKWARD_WORD,
+ COMPOSE_CALL_GTK_STEXT_MOVE_END_OF_LINE,
+ COMPOSE_CALL_GTK_STEXT_MOVE_NEXT_LINE,
+ COMPOSE_CALL_GTK_STEXT_MOVE_PREVIOUS_LINE,
+ COMPOSE_CALL_GTK_STEXT_DELETE_FORWARD_CHARACTER,
+ COMPOSE_CALL_GTK_STEXT_DELETE_BACKWARD_CHARACTER,
+ COMPOSE_CALL_GTK_STEXT_DELETE_FORWARD_WORD,
+ COMPOSE_CALL_GTK_STEXT_DELETE_BACKWARD_WORD,
+ COMPOSE_CALL_GTK_STEXT_DELETE_LINE,
+ COMPOSE_CALL_GTK_STEXT_DELETE_TO_LINE_END
+} ComposeCallGtkStextAction;
+
+static void compose_gtk_stext_action_cb (Compose *compose, ComposeCallGtkStextAction action);
+
static void compose_grab_focus_cb (GtkWidget *widget,
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 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);
+void compose_headerentry_changed_cb (GtkWidget *entry,
+ ComposeHeaderEntry *headerentry);
+void compose_headerentry_key_press_event_cb(GtkWidget *entry,
+ GdkEventKey *event,
+ ComposeHeaderEntry *headerentry);
+
+static void compose_show_first_last_header (Compose *compose, gboolean show_first);
+
+static void compose_ctl_enter_send_shortcut_cb(GtkWidget *w, Compose *compose);
+
+static void compose_check_backwards(Compose *compose);
+
+static void compose_check_forwards_go(Compose *compose);
+
-Compose * compose_generic_new (PrefsAccount *account,
- const gchar *to,
- FolderItem *item);
static GtkItemFactoryEntry compose_popup_entries[] =
{
{N_("/_File/_Insert file"), "<control>I", compose_insert_file_cb, 0, NULL},
{N_("/_File/Insert si_gnature"), "<control>G", compose_insert_sig, 0, NULL},
{N_("/_File/---"), NULL, NULL, 0, "<Separator>"},
- {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/---"), 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},
- {N_("/_Edit/_Paste"), "<control>V", compose_paste_cb, 0, NULL},
- {N_("/_Edit/Select _all"), "<control>A", compose_allsel_cb, 0, NULL},
- {N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
- {N_("/_Edit/_Wrap current paragraph"), "<alt>L", compose_wrap_line, 0, NULL},
+ {N_("/_File/_Close"), "<control>Q", compose_close_cb, 0, NULL},
+
+ {N_("/_Edit"), NULL, NULL, 0, "<Branch>"},
+ {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},
+ {N_("/_Edit/_Paste"), "<control>V", compose_paste_cb, 0, NULL},
+ {N_("/_Edit/Select _all"), "<control>A", compose_allsel_cb, 0, NULL},
+ {N_("/_Edit/A_dvanced"), NULL, NULL, 0,
+ "<Branch>"},
+ {N_("/_Edit/A_dvanced/Move a character backward"), "<control>B", compose_gtk_stext_action_cb, COMPOSE_CALL_GTK_STEXT_MOVE_BACKWARD_CHARACTER, NULL},
+ {N_("/_Edit/A_dvanced/Move a character forward"), "<control>F", compose_gtk_stext_action_cb, COMPOSE_CALL_GTK_STEXT_MOVE_FORWARD_CHARACTER, NULL},
+ {N_("/_Edit/A_dvanced/Move a word backward"), "<alt>B", compose_gtk_stext_action_cb, COMPOSE_CALL_GTK_STEXT_MOVE_BACKWARD_WORD, NULL},
+ {N_("/_Edit/A_dvanced/Move a word forward"), "<alt>F", compose_gtk_stext_action_cb, COMPOSE_CALL_GTK_STEXT_MOVE_FORWARD_WORD, NULL},
+ {N_("/_Edit/A_dvanced/Move to beginning of line"), NULL, compose_gtk_stext_action_cb, COMPOSE_CALL_GTK_STEXT_MOVE_BEGINNING_OF_LINE, NULL},
+ {N_("/_Edit/A_dvanced/Move to end of line"), "<control>E", compose_gtk_stext_action_cb, COMPOSE_CALL_GTK_STEXT_MOVE_END_OF_LINE, NULL},
+ {N_("/_Edit/A_dvanced/Move to next line"), "<control>N", compose_gtk_stext_action_cb, COMPOSE_CALL_GTK_STEXT_MOVE_NEXT_LINE, NULL},
+ {N_("/_Edit/A_dvanced/Move to previous line"), "<control>P", compose_gtk_stext_action_cb, COMPOSE_CALL_GTK_STEXT_MOVE_PREVIOUS_LINE, NULL},
+ {N_("/_Edit/A_dvanced/Delete a character backward"), "<control>H", compose_gtk_stext_action_cb, COMPOSE_CALL_GTK_STEXT_DELETE_BACKWARD_CHARACTER, NULL},
+ {N_("/_Edit/A_dvanced/Delete a character forward"), "<control>D", compose_gtk_stext_action_cb, COMPOSE_CALL_GTK_STEXT_DELETE_FORWARD_CHARACTER, NULL},
+ {N_("/_Edit/A_dvanced/Delete a word backward"), "<control>w", compose_gtk_stext_action_cb, COMPOSE_CALL_GTK_STEXT_DELETE_BACKWARD_WORD, NULL},
+ {N_("/_Edit/A_dvanced/Delete a word forward"), "<alt>D", compose_gtk_stext_action_cb, COMPOSE_CALL_GTK_STEXT_DELETE_FORWARD_WORD, NULL},
+ {N_("/_Edit/A_dvanced/Delete line"), "<control>U", compose_gtk_stext_action_cb, COMPOSE_CALL_GTK_STEXT_DELETE_LINE, NULL},
+ {N_("/_Edit/A_dvanced/Delete to end of line"), "<control>K", compose_gtk_stext_action_cb, COMPOSE_CALL_GTK_STEXT_DELETE_TO_LINE_END, NULL},
+ {N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
+#if USE_PSPELL
+ {N_("/_Edit/Check backwards misspelled word"), "<control>;", compose_check_backwards , 0, NULL},
+ {N_("/_Edit/Forward to next misspelled word"), "<control>!", compose_check_forwards_go, 0, NULL},
+ {N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
+#endif
+ {N_("/_Edit/_Wrap current paragraph"),
+ "<control>L", compose_wrap_line, 0, NULL},
{N_("/_Edit/Wrap all long _lines"),
-
"<shift><alt>L", compose_wrap_line_all, 0, NULL},
+
"<control><alt>L", compose_wrap_line_all, 0, NULL},
{N_("/_Edit/Edit with e_xternal editor"),
- "<alt>X", compose_ext_editor_cb, 0, NULL},
-
+ "<control>X", compose_ext_editor_cb, 0, NULL},
+#if 0 /* NEW COMPOSE GUI */
+ {N_("/_View"), NULL, NULL, 0, "<Branch>"},
+ {N_("/_View/_To"), NULL, compose_toggle_to_cb , 0, "<ToggleItem>"},
+ {N_("/_View/_Cc"), NULL, compose_toggle_cc_cb , 0, "<ToggleItem>"},
+ {N_("/_View/_Bcc"), NULL, compose_toggle_bcc_cb , 0, "<ToggleItem>"},
+ {N_("/_View/_Reply to"), NULL, compose_toggle_replyto_cb, 0, "<ToggleItem>"},
+ {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_View/_Followup to"), NULL, compose_toggle_followupto_cb, 0, "<ToggleItem>"},
+ {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_View/R_uler"), NULL, compose_toggle_ruler_cb, 0, "<ToggleItem>"},
+ {N_("/_View/---"), NULL, NULL, 0, "<Separator>"},
+ {N_("/_View/_Attachment"), NULL, compose_toggle_attach_cb, 0, "<ToggleItem>"},
+#endif
{N_("/_Message"), NULL, NULL, 0, "<Branch>"},
{N_("/_Message/_Send"), "<control>Return",
compose_send_cb, 0, NULL},
compose_send_later_cb, 0, NULL},
{N_("/_Message/Save to _draft folder"),
"<alt>D", compose_draft_cb, 0, NULL},
+ {N_("/_Message/Save and _keep editing"),
+ "<control>S", compose_draft_cb, 1, NULL},
#if 0 /* NEW COMPOSE GUI */
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/_To"), NULL, compose_toggle_to_cb , 0, "<ToggleItem>"},
{N_("/_Message/_Request Return Receipt"), NULL, compose_toggle_return_receipt_cb, 0, "<ToggleItem>"},
{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/_Address book"), "<control><alt>A", compose_address_cb , 0, NULL},
{N_("/_Tool/_Template"), NULL, NULL, 0, "<Branch>"},
- {N_("/_Help"), NULL, NULL, 0, "<LastBranch>"},
+ {N_("/_Help"), NULL, NULL, 0, "<Branch>"},
{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_bounce(PrefsAccount *account, MsgInfo *msginfo)
+Compose *compose_bounce(PrefsAccount *account, MsgInfo *msginfo)
{
- Compose * c;
- gchar * filename;
+ Compose *c;
+ gchar *filename;
GtkItemFactory *ifactory;
c = compose_generic_new(account, NULL, NULL);
return c;
}
-Compose * compose_new_with_recipient(PrefsAccount *account, const gchar *to)
+Compose *compose_new_with_recipient(PrefsAccount *account, const gchar *mailto)
{
- return compose_generic_new(account, to, NULL);
+ return compose_generic_new(account, mailto, NULL);
}
-Compose * compose_new_with_folderitem(PrefsAccount *account, FolderItem *item)
+Compose *compose_new_with_folderitem(PrefsAccount *account, FolderItem *item)
{
return compose_generic_new(account, NULL, item);
}
-static void set_compose_entries(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;
- gchar * cur;
-
- Xstrdup_a(tmp_mailto, mailto, return);
-
- cur = tmp_mailto;
-
- p = strchr(cur, '?');
- if (p != NULL) {
- * p = 0;
- cur = p + 1;
- }
- to = tmp_mailto;
-
- while (p) {
- char *field, *value;
-
- field = cur;
-
- p = strchr(cur, '=');
- if (p == NULL)
- break;
- * p = 0;
- cur = p + 1;
-
- value = cur;
-
- p = strchr(cur, '&');
- if (p != NULL) {
- * p = 0;
- cur = p + 1;
- }
-
- if (value) {
- if (g_strcasecmp(field, "subject")==0) {
- Xstrdup_a(subject, value, );
- if (subject != NULL)
- decode_uri(subject, value);
- }
- else if (g_strcasecmp(field, "cc")==0)
- cc = value;
- else if (g_strcasecmp(field, "bcc")==0)
- bcc = value;
- else if (g_strcasecmp(field, "body")==0) {
- Xstrdup_a(body, value, );
- if (body != NULL)
- decode_uri(body, value);
- }
- }
- }
-
- if (to) {
- compose_entry_append(compose, to, COMPOSE_TO);
- /*
- gtk_widget_grab_focus(compose->text);
- */
- }
-
- 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);
- }
-}
-
-Compose * compose_generic_new(PrefsAccount *account, const gchar *to, FolderItem *item)
+Compose *compose_generic_new(PrefsAccount *account, const gchar *mailto, FolderItem *item)
{
Compose *compose;
gtk_stext_set_point(GTK_STEXT(compose->text), 0);
if (account->protocol != A_NNTP) {
- if (to) {
- set_compose_entries(compose, to);
+ 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);
menu_set_toggle(ifactory, "/Message/Request Return Receipt", TRUE);
}
} else {
- if (to) {
- compose_entry_append(compose, to, COMPOSE_NEWSGROUPS);
+ if (mailto) {
+ compose_entry_append(compose, mailto, COMPOSE_NEWSGROUPS);
}
}
- gtk_widget_grab_focus(compose->subject_entry);
+ compose_show_first_last_header(compose, TRUE);
+
+ /* Set save folder */
+ if(item && item->prefs && item->prefs->save_copy_to_folder) {
+ gchar *folderidentifier;
+
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), prefs_common.savemsg);
+ folderidentifier = folder_item_get_identifier(item);
+ gtk_entry_set_text(GTK_ENTRY(compose->savemsg_entry), folderidentifier);
+ g_free(folderidentifier);
+ }
+
+ gtk_widget_grab_focus(compose->header_last->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;
/* select the account for the whole folder (IMAP / NNTP) */
if (!account)
+ /* FIXME: this is not right, because folder may be nested. we should
+ * ascend the tree until we find a parent with proper account
+ * information */
account = msginfo->folder->folder->account;
/* select account by to: and cc: header if enabled */
MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_FORWARDED);
MSG_SET_PERM_FLAGS(msginfo->flags, MSG_REPLIED);
-
+ if (MSG_IS_IMAP(msginfo->flags))
+ imap_msg_set_perm_flags(msginfo, MSG_REPLIED);
CHANGE_FLAGS(msginfo);
compose = compose_create(account, COMPOSE_REPLY);
menu_set_toggle(ifactory, "/Message/Request Return Receipt", TRUE);
}
+ /* Set save folder */
+ if(msginfo->folder && msginfo->folder->prefs && msginfo->folder->prefs->save_copy_to_folder) {
+ gchar *folderidentifier;
+
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), TRUE);
+ folderidentifier = folder_item_get_identifier(msginfo->folder);
+ gtk_entry_set_text(GTK_ENTRY(compose->savemsg_entry), folderidentifier);
+ g_free(folderidentifier);
+ }
+
if (compose_parse_header(compose, msginfo) < 0) return;
compose_reply_set_entry(compose, msginfo, to_all, ignore_replyto,
followup_and_reply_to);
+ compose_show_first_last_header(compose, TRUE);
text = GTK_STEXT(compose->text);
gtk_stext_freeze(text);
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);
#if USE_GPGME
for (;;) {
if ((fp = procmsg_open_message(msginfo)) == NULL) return;
- mimeinfo = procmime_scan_mime_header(fp);
+ mimeinfo = procmime_scan_mime_header(fp, MIME_TEXT);
if (!mimeinfo) break;
if (!MSG_IS_ENCRYPTED(msginfo->flags) &&
}
#else /* !USE_GPGME */
if ((fp = procmsg_open_message(msginfo)) == NULL) return;
- mimeinfo = procmime_scan_mime_header(fp);
+ mimeinfo = procmime_scan_mime_header(fp, MIME_TEXT);
#endif /* USE_GPGME */
fclose(fp);
prev_fpos = fpos;
- partinfo = procmime_scan_mime_header(fp);
+ partinfo = procmime_scan_mime_header(fp, MIME_TEXT);
if (!partinfo) break;
if (npart != 0)
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;
g_return_val_if_fail(msginfo->folder != NULL, NULL);
account = msginfo->folder->folder->account;
- if (!account && msginfo->to && prefs_common.forward_account_autosel) {
+ 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);
}
- if(!account && prefs_common.forward_account_autosel) {
- gchar cc[BUFFSIZE];
+ if(!account && prefs_common.forward_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);
}
}
- if (account == NULL) {
+ if (account == NULL) {
account = cur_account;
/*
account = msginfo->folder->folder->account;
MSG_UNSET_PERM_FLAGS(msginfo->flags, MSG_REPLIED);
MSG_SET_PERM_FLAGS(msginfo->flags, MSG_FORWARDED);
+ if (MSG_IS_IMAP(msginfo->flags))
+ imap_msg_unset_perm_flags(msginfo, MSG_REPLIED);
CHANGE_FLAGS(msginfo);
compose = compose_create(account, COMPOSE_FORWARD);
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);
#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;
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);
void compose_reedit(MsgInfo *msginfo)
{
Compose *compose;
- PrefsAccount *account;
+ PrefsAccount *account = NULL;
GtkSText *text;
FILE *fp;
gchar buf[BUFFSIZE];
g_return_if_fail(msginfo != NULL);
g_return_if_fail(msginfo->folder != NULL);
- account = msginfo->folder->folder->account;
+ if (msginfo->folder->stype == F_QUEUE) {
+ gchar queueheader_buf[BUFFSIZE];
+ gint id;
+
+ /* Select Account from queue headers */
+ if (!get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "NAID:")) {
+ id = atoi(&queueheader_buf[5]);
+ account = account_find_from_id(id);
+ }
+ if (!account && !get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "MAID:")) {
+ id = atoi(&queueheader_buf[5]);
+ account = account_find_from_id(id);
+ }
+ if (!account && !get_header_from_msginfo(msginfo, queueheader_buf,
+ sizeof(queueheader_buf), "S:")) {
+ account = account_find_from_address(queueheader_buf);
+ }
+ } else
+ account = msginfo->folder->folder->account;
- if(!account&& prefs_common.reedit_account_autosel) {
+ if (!account && prefs_common.reedit_account_autosel) {
gchar from[BUFFSIZE];
- if(!get_header_from_msginfo(msginfo,from,sizeof(from),"FROM:")){ /* Found a FROM header */
+ if (!get_header_from_msginfo(msginfo, from, sizeof(from), "FROM:")){
extract_address(from);
account = account_find_from_address(from);
}
compose = compose_create(account, COMPOSE_REEDIT);
compose->targetinfo = procmsg_msginfo_copy(msginfo);
+ if (msginfo->folder->stype == F_QUEUE) {
+ gchar queueheader_buf[BUFFSIZE];
+
+ /* Set message save folder */
+ if (!get_header_from_msginfo(msginfo, queueheader_buf, sizeof(queueheader_buf), "SCF:")) {
+ gint startpos = 0;
+
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), TRUE);
+ gtk_editable_delete_text(GTK_EDITABLE(compose->savemsg_entry), 0, -1);
+ gtk_editable_insert_text(GTK_EDITABLE(compose->savemsg_entry), &queueheader_buf[4], strlen(&queueheader_buf[4]), &startpos);
+ }
+ }
+
if (compose_parse_header(compose, msginfo) < 0) return;
compose_reedit_set_entry(compose, msginfo);
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);
Xstrdup_a(quote_str, buf, return NULL)
}
- quote_fmt_init(msginfo, quote_str);
- quote_fmt_scan_string(fmt);
- quote_fmt_parse();
+ if (fmt && *fmt != '\0') {
+ quote_fmt_init(msginfo, quote_str);
+ quote_fmt_scan_string(fmt);
+ quote_fmt_parse();
- buf = quote_fmt_get_buffer();
- if (buf == NULL) {
- alertpanel_error(_("Message reply/forward format error."));
- return NULL;
- }
+ 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);
if ((compose->account->protocol != A_NNTP) || followup_and_reply_to)
compose_entry_append(compose,
- ((compose->mailinglist && !ignore_replyto)
- ? compose->mailinglist
- : (compose->replyto && !ignore_replyto)
+ ((compose->replyto && !ignore_replyto)
? compose->replyto
+ : (compose->mailinglist && !ignore_replyto)
+ ? compose->mailinglist
: msginfo->from ? msginfo->from : ""),
COMPOSE_TO);
- if (compose->account->protocol == A_NNTP)
+ if (compose->account->protocol == A_NNTP) {
if (ignore_replyto)
- compose_entry_append(compose,
- msginfo->from ? msginfo->from : "",
- COMPOSE_TO);
+ 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);
- /*
- compose_entry_append(compose,
- compose->followup_to ? compose->followup_to
- : compose->newsgroups ? compose->newsgroups
- : "",
- COMPOSE_NEWSGROUPS);
- */
+ 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;
SET_ADDRESS(COMPOSE_BCC, compose->bcc);
SET_ADDRESS(COMPOSE_REPLYTO, compose->replyto);
+ compose_show_first_last_header(compose, TRUE);
+
#if 0 /* NEW COMPOSE GUI */
if (compose->bcc) {
GtkItemFactory *ifactory;
GtkWidget *menuitem;
ifactory = gtk_item_factory_from_widget(compose->menubar);
- menuitem = gtk_item_factory_get_item(ifactory, "/Message/Bcc");
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/Bcc");
gtk_check_menu_item_set_active
(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
}
ifactory = gtk_item_factory_from_widget(compose->menubar);
menuitem = gtk_item_factory_get_item
- (ifactory, "/Message/Reply to");
+ (ifactory, "/View/Reply to");
gtk_check_menu_item_set_active
(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
}
gtk_stext_freeze(text);
while (fgets(buf, sizeof(buf), fp) != NULL) {
- /* Strip <CR> if DOS/Windoze file, replace <CR> with <LF> if MAC file */
+ /* strip <CR> if DOS/Windows file,
+ replace <CR> with <LF> if Macintosh file. */
+ strcrchomp(buf);
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';
+ if (len > 0 && buf[len - 1] != '\n') {
+ while (--len >= 0)
+ if (buf[len] == '\r') buf[len] = '\n';
}
-
- gtk_stext_insert(text, NULL, NULL, NULL, buf, -1);
+ gtk_stext_insert(text, NULL, NULL, NULL, buf, -1);
}
gtk_stext_thaw(text);
ifactory = gtk_item_factory_from_widget(compose->menubar);
menuitem = gtk_item_factory_get_item(ifactory,
- "/Message/Attach");
+ "/View/Attachment");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
TRUE);
}
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);
text_len = gtk_stext_get_length(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 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 */
+/* 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) {
+ 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;
}
/* Darko: used when I debug wrapping */
void dump_text(GtkSText *text, int pos, int tlen, int breakoncr)
{
- int i;
- char ch;
+ gint i;
+ gchar ch;
- printf("%d [", pos);
- for (i = pos; i < tlen; i++)
- {
- ch = GTK_STEXT_INDEX(text, i);
- if (breakoncr && ch == '\n')
- break;
- printf("%c", ch);
- }
- printf("]\n");
+ printf("%d [", pos);
+ for (i = pos; i < tlen; i++) {
+ ch = GTK_STEXT_INDEX(text, i);
+ if (breakoncr && ch == '\n')
+ break;
+ printf("%c", ch);
+ }
+ printf("]\n");
}
#endif
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;
+ 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;
gtk_stext_freeze(text);
/* make text buffer contiguous */
- gtk_stext_compact_buffer(text);
+ /* gtk_stext_compact_buffer(text); */
tlen = gtk_stext_get_length(text);
for (; cur_pos < tlen; cur_pos++) {
/* mark position of new line - needed for quotation wrap */
- if (linewrap_quote && is_new_line) {
- qlen = gtkstext_str_strcmp(text, cur_pos, tlen, qfmt);
- is_new_line = 0;
- if (qlen) {
- i_len = get_indent_length(text, cur_pos, tlen);
+ if (is_new_line) {
+ if (linewrap_quote) {
+ qlen = gtkut_stext_str_compare
+ (text, cur_pos, tlen, qfmt);
+ if (qlen)
+ i_len = get_indent_length
+ (text, cur_pos, tlen);
+ else
+ i_len = 0;
}
- else
- i_len = 0;
+ is_new_line = FALSE;
p_pos = cur_pos;
#ifdef WRAP_DEBUG
printf("new line i_len=%d qlen=%d p_pos=", i_len, qlen);
#endif
}
- /* get character(s) at current position */
- 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') {
gchar cb[MB_CUR_MAX];
#ifdef WRAP_DEBUG
- printf("found CR at %d\n", cur_pos);
+ 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 (i_len && (cur_pos + 1 < tlen)) {
/* check if text at new line matches indent */
- ilen = gtkstext_strncmp(text, cur_pos + 1,
- p_pos, i_len, tlen);
+ ilen = gtkut_stext_str_compare_n
+ (text, cur_pos + 1, p_pos, i_len, tlen);
if (cur_pos + ilen < tlen) {
- 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;
- }
+ GET_CHAR(cur_pos + ilen + 1, cb, clen);
/* no need to join the lines */
- if ((clen == 1) && (cb[0] == '\n'))
- do_delete = 0;
+ 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
qlen, line_len, linewrap_len, do_delete);
#endif
/* should we delete to perform smart wrapping */
- if (qlen && 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);
/* if text starts with quote fmt or with
indent string, delete them */
if (i_len) {
- ilen = gtkstext_strncmp(text, cur_pos,
- p_pos, i_len,
- tlen);
+ ilen = gtkut_stext_str_compare_n
+ (text, cur_pos, p_pos, i_len,
+ tlen);
if (ilen) {
- gtk_stext_forward_delete(text,
- ilen);
+ gtk_stext_forward_delete
+ (text, ilen);
tlen -= ilen;
}
- }
- else if (qlen) {
- if (gtkstext_str_strcmp(text, cur_pos,
- tlen, qfmt)) {
- gtk_stext_forward_delete(text,
- qlen);
+ } else if (qlen) {
+ if (gtkut_stext_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);
+ NULL, " ", 1);
+ /* gtk_stext_compact_buffer(text); */
tlen++;
}
line_pos = cur_pos;
line_len = cur_len = 0;
qlen = 0;
- do_delete = 0;
- is_new_line = 1;
+ do_delete = FALSE;
+ is_new_line = TRUE;
#ifdef WRAP_DEBUG
printf("after delete l_pos=");
dump_text(text, line_pos, tlen, 1);
line_pos = cur_pos + 1;
line_len = cur_len = 0;
qlen = 0;
- do_delete = 0;
- is_new_line = 1;
+ do_delete = FALSE;
+ is_new_line = TRUE;
continue;
}
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 (!is_url_string(text, line_pos, tlen))
+ if (line_pos - p_pos <= i_len)
+ if (!gtkut_stext_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 (text->use_wchar)
- clen = wctomb(cbuf, (wchar_t)GTK_STEXT_INDEX(text, line_pos - 1));
- else {
- cbuf[0] = GTK_STEXT_INDEX(text, line_pos - 1);
- clen = 1;
- }
if (clen == 1 && isspace(*cbuf)) {
if (p_pos + i_len != line_pos ||
- !is_url_string(text, line_pos, tlen)) {
+ !gtkut_stext_is_uri_string
+ (text, line_pos, tlen)) {
gtk_stext_set_point(text, line_pos);
gtk_stext_backward_delete(text, 1);
tlen--;
/* if it is URL at beginning of line don't wrap */
if (p_pos + i_len == line_pos &&
- is_url_string(text, line_pos, tlen)) {
+ gtkut_stext_is_uri_string(text, line_pos, tlen)) {
#ifdef WRAP_DEBUG
printf("found URL at ");
dump_text(text, line_pos, tlen, 1);
/* insert CR */
gtk_stext_set_point(text, line_pos);
gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
- gtk_stext_compact_buffer(text);
+ /* gtk_stext_compact_buffer(text); */
tlen++;
- cur_pos++;
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;
+ 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 (!gtkstext_str_strcmp(text, line_pos,
- tlen, qfmt)) {
+ if (!gtkut_stext_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);
+ ins_len = ins_quote
+ (text, qlen, i_len,
+ p_pos, tlen, qfmt);
+
+ /* gtk_stext_compact_buffer(text); */
tlen += ins_len;
}
-
- /* for loop 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;
#ifdef WRAP_DEBUG
printf("after quote insert ");
dump_text(text, line_pos, tlen, 1);
gtk_stext_thaw(text);
}
+#undef GET_CHAR
+
static void compose_set_title(Compose *compose)
{
gchar *str;
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_editable_get_chars(GTK_EDITABLE(((compose_headerentry *)list->data)->entry), 0, -1);
+ 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++) {
val = compose_queue(compose, &msgnum, &folder);
if (val) {
alertpanel_error(_("Could not queue message for sending"));
- return;
+ return -1;
}
val = procmsg_send_message_queue(folder_item_fetch_msg(folder, msgnum));
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 *str;
gboolean first_address;
GSList *list;
- compose_headerentry *headerentry;
- gchar * headerentryname;
- gchar * header_w_colon;
- gchar * cc_hdr;
- gchar * to_hdr;
+ ComposeHeaderEntry *headerentry;
+ gchar *headerentryname;
+ gchar *header_w_colon;
+ gchar *cc_hdr;
+ gchar *to_hdr;
debug_print(_("Writing bounce header\n"));
first_address = TRUE;
for(list = compose->header_list; list; list = list->next) {
- headerentry = ((compose_headerentry *)list->data);
+ headerentry = ((ComposeHeaderEntry *)list->data);
headerentryname = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(headerentry->combo)->entry));
if(g_strcasecmp(headerentryname, cc_hdr) == 0
}
}
}
- // if(!first_address) {
+ /* if(!first_address) { */
fprintf(fp, "\n");
- // }
+ /* } */
return(0);
}
-
static gint compose_bounce_write_headers(Compose *compose, FILE *fp)
{
gchar buf[BUFFSIZE];
return -1;
}
- if ((fdest = fopen(file, "a+")) == NULL) {
+ if ((fdest = fopen(file, "w")) == NULL) {
FILE_OP_ERROR(file, "fopen");
fclose(fp);
return -1;
|| (g_strncasecmp(buf, "Delivered-To:",
strlen("Delivered-To:")) == 0))
continue;
+
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;
}
return -1;
}
+
+#ifdef USE_GPGME
+/*
+ * interfaces to rfc2015 to keep out the prefs stuff there.
+ * returns 0 on success and -1 on error. */
+static int compose_create_signers_list (Compose *compose, GSList **pkey_list)
+{
+ const char *keyid = NULL;
+ GSList *key_list;
+
+ switch (compose->account->sign_key) {
+ case SIGN_KEY_DEFAULT:
+ *pkey_list = NULL;
+ return 0; /* nothing to do */
+
+ case SIGN_KEY_BY_FROM:
+ keyid = compose->account->address;
+ break;
+
+ case SIGN_KEY_CUSTOM:
+ keyid = compose->account->sign_key_id;
+ break;
+
+ default:
+ g_assert_not_reached ();
+ }
+
+ key_list = rfc2015_create_signers_list(keyid);
+
+ if (!key_list) {
+ alertpanel_error("Could not find any key associated with currently "
+ "selected keyid `%s'!", keyid);
+ return -1;
+ }
+
+ *pkey_list = key_list;
+ return 0;
+}
+#endif /* USE_GPGME */
+
static gint compose_write_to_file(Compose *compose, const gchar *file,
gboolean is_draft)
{
const gchar *out_codeset;
EncodingType encoding;
- if ((fp = fopen(file, "a+")) == NULL) {
+ if ((fp = fopen(file, "w")) == NULL) {
FILE_OP_ERROR(file, "fopen");
return -1;
}
#if USE_GPGME
if (compose->use_signing) {
- if (rfc2015_sign(file, compose->account) < 0) {
+ GSList *key_list;
+
+ if (compose_create_signers_list(compose, &key_list) == -1 ||
+ rfc2015_sign(file, key_list) < 0) {
+
unlink(file);
return -1;
}
}
if (compose->use_encryption) {
- if (rfc2015_encrypt(file, compose->to_list) < 0) {
+ if (rfc2015_encrypt(file, compose->to_list, compose->account->ascii_armored) < 0) {
unlink(file);
return -1;
}
static gint compose_queue(Compose *compose, gint *msgnum, FolderItem **item)
{
FolderItem *queue;
- gchar *tmpfilename, *queue_path;
+ gchar *tmp, *tmp2, *queue_path;
FILE *fp, *src_fp;
GSList *cur;
gchar buf[BUFFSIZE];
if (!compose->to_list && !compose->newsgroup_list) {
g_warning(_("can't get recipient list."));
- unlink(tmpfilename);
lock = FALSE;
return -1;
}
- if (prefs_common.linewrap_at_send)
- compose_wrap_line_all(compose);
-
- /* write to temporary file */
- tmpfilename = g_strdup_printf("%s%cqueue.%d", g_get_tmp_dir(),
- G_DIR_SEPARATOR, (gint)compose);
- if ((fp = fopen(tmpfilename, "w")) == NULL) {
- FILE_OP_ERROR(tmpfilename, "fopen");
- g_free(tmpfilename);
- return -1;
- }
- if (change_file_mode_rw(fp, tmpfilename) < 0) {
- FILE_OP_ERROR(tmpfilename, "chmod");
- g_warning(_("can't change file mode\n"));
- }
-
if(compose->to_list) {
if (compose->account->protocol != A_NNTP)
mailac = compose->account;
else if (cur_account && cur_account->protocol != A_NNTP)
mailac = cur_account;
else if (!(mailac = compose_current_mail_account())) {
- unlink(tmpfilename);
lock = FALSE;
alertpanel_error(_("No account for sending mails available!"));
return -1;
if (compose->account->protocol == A_NNTP)
newsac = compose->account;
else if(!(newsac = compose->orig_account) || (newsac->protocol != A_NNTP)) {
- unlink(tmpfilename);
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);
+ if ((fp = fopen(tmp, "w")) == NULL) {
+ FILE_OP_ERROR(tmp, "fopen");
+ g_free(tmp);
+ return -1;
+ }
+ 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) {
+ FILE_OP_ERROR(tmp, "chmod");
+ g_warning(_("can't change file mode\n"));
+ }
+
/* queueing variables */
fprintf(fp, "AF:\n");
fprintf(fp, "NF:0\n");
if(newsac) {
fprintf(fp, "NAID:%d\n", newsac->account_id);
}
+ /* Save copy folder */
+ if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn))) {
+ gchar *str;
+
+ str = gtk_editable_get_chars(GTK_EDITABLE(compose->savemsg_entry), 0, -1);
+ fprintf(fp, "SCF:%s\n", str);
+ g_free(str);
+ }
fprintf(fp, "\n");
- fclose(fp);
- if (compose->bounce_filename != NULL) {
- if (compose_bounce_write_to_file(compose, tmpfilename) < 0) {
- unlink(tmpfilename);
- lock = FALSE;
+ while (fgets(buf, sizeof(buf), src_fp) != NULL) {
+ if (fputs(buf, fp) == EOF) {
+ FILE_OP_ERROR(tmp, "fputs");
+ fclose(fp);
+ fclose(src_fp);
+ unlink(tmp);
+ g_free(tmp);
+ unlink(tmp2);
+ g_free(tmp2);
return -1;
}
}
- else {
- if (compose_write_to_file(compose, tmpfilename, FALSE) < 0) {
- unlink(tmpfilename);
- lock = FALSE;
- 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_path = folder_item_get_path(queue);
if (!is_dir_exist(queue_path))
make_dir_hier(queue_path);
- if ((num = folder_item_add_msg(queue, tmpfilename, TRUE)) < 0) {
+ if ((num = folder_item_add_msg(queue, tmp, TRUE)) < 0) {
g_warning(_("can't queue the message\n"));
- unlink(tmpfilename);
- g_free(tmpfilename);
+ unlink(tmp);
+ g_free(tmp);
g_free(queue_path);
return -1;
}
- g_free(tmpfilename);
+ unlink(tmp);
+ g_free(tmp);
+ unlink(tmp2);
+ g_free(tmp2);
if (compose->mode == COMPOSE_REEDIT) {
compose_remove_reedit_target(compose);
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)) {
first_address = TRUE;
for(list = compose->header_list; list; list = list->next) {
- headerentry = ((compose_headerentry *)list->data);
+ headerentry = ((ComposeHeaderEntry *)list->data);
headerentryname = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(headerentry->combo)->entry));
if(!g_strcasecmp(trans_hdr, headerentryname)) {
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);
+ }
}
}
g_free(addr);
}
-
static void compose_add_entry_field(GtkWidget *table, GtkWidget **hbox,
GtkWidget **entry, gint *count,
const gchar *label_str,
(*count)++;
}
-static void compose_create_header_entry(Compose *compose) {
+static void compose_create_header_entry(Compose *compose)
+{
gchar *headers[] = {"To:", "Cc:", "Bcc:", "Newsgroups:", "Reply-To:", "Followup-To:", NULL};
GtkWidget *combo;
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;
}
}
gtk_signal_connect(GTK_OBJECT(entry), "key-press-event", GTK_SIGNAL_FUNC(compose_headerentry_key_press_event_cb), headerentry);
gtk_signal_connect(GTK_OBJECT(entry), "changed", GTK_SIGNAL_FUNC(compose_headerentry_changed_cb), headerentry);
+ gtk_signal_connect(GTK_OBJECT(entry), "activate", GTK_SIGNAL_FUNC(compose_ctl_enter_send_shortcut_cb), compose);
address_completion_register_entry(GTK_ENTRY(entry));
compose->header_last = headerentry;
}
-static void compose_add_header_entry(Compose *compose, gchar *header, gchar *text) {
- compose_headerentry *last_header;
+static void compose_add_header_entry(Compose *compose, gchar *header, gchar *text)
+{
+ ComposeHeaderEntry *last_header;
last_header = compose->header_last;
gtk_entry_set_text(GTK_ENTRY(last_header->entry), text);
}
-static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
+static GtkWidget *compose_create_header(Compose *compose)
{
- Compose *compose;
- GtkWidget *window;
- GtkWidget *vbox;
- GtkWidget *menubar;
- GtkWidget *handlebox;
-
- GtkWidget *notebook;
-
- GtkWidget *vbox2;
-
- GtkWidget *table_vbox;
GtkWidget *label;
+ GtkWidget *hbox;
GtkWidget *from_optmenu_hbox;
#if 0 /* NEW COMPOSE GUI */
GtkWidget *to_entry;
#endif
GtkWidget *header_scrolledwin;
GtkWidget *header_table;
- GtkWidget *subject_entry;
#if 0 /* NEW COMPOSE GUI */
GtkWidget *cc_entry;
GtkWidget *cc_hbox;
GtkWidget *followup_entry;
GtkWidget *followup_hbox;
#endif
- GtkWidget *paned;
- GtkWidget *attach_scrwin;
- GtkWidget *attach_clist;
-
- GtkWidget *edit_vbox;
- GtkWidget *ruler_hbox;
- GtkWidget *ruler;
- GtkWidget *scrolledwin;
- GtkWidget *text;
-
- GtkWidget *table;
- GtkWidget *hbox;
-
- gchar *titles[] = {_("MIME type"), _("Size"), _("Name")};
- guint n_menu_entries;
- GtkStyle *style, *new_style;
- GdkColormap *cmap;
- GdkColor color[1];
- gboolean success[1];
- GdkFont *font;
- GtkWidget *popupmenu;
- GtkWidget *menuitem;
- GtkItemFactory *popupfactory;
- GtkItemFactory *ifactory;
- GtkWidget *tmpl_menu;
- gint n_entries;
gint count = 0;
- gint i;
-
-#if USE_PSPELL
- GtkPspell * gtkpspell = NULL;
-#endif
-
- g_return_val_if_fail(account != NULL, NULL);
-
- debug_print(_("Creating compose window...\n"));
- compose = g_new0(Compose, 1);
-
- compose->account = account;
- compose->orig_account = account;
-
- window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, FALSE);
- gtk_widget_set_usize(window, -1, prefs_common.compose_height);
- gtk_signal_connect(GTK_OBJECT(window), "delete_event",
- GTK_SIGNAL_FUNC(compose_delete_cb), compose);
- gtk_signal_connect(GTK_OBJECT(window), "destroy",
- GTK_SIGNAL_FUNC(compose_destroy_cb), compose);
- gtk_signal_connect(GTK_OBJECT(window), "focus_in_event",
- GTK_SIGNAL_FUNC(manage_window_focus_in), NULL);
- gtk_signal_connect(GTK_OBJECT(window), "focus_out_event",
- GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
- gtk_widget_realize(window);
-
- gtkut_widget_set_composer_icon(window);
-
- vbox = gtk_vbox_new(FALSE, 0);
- gtk_container_add(GTK_CONTAINER(window), vbox);
-
- n_menu_entries = sizeof(compose_entries) / sizeof(compose_entries[0]);
- menubar = menubar_create(window, compose_entries,
- n_menu_entries, "<Compose>", compose);
- gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
-
- handlebox = gtk_handle_box_new();
- gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
-
- compose_toolbar_create(compose, handlebox);
-
- vbox2 = gtk_vbox_new(FALSE, 2);
- gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
- gtk_container_set_border_width(GTK_CONTAINER(vbox2), BORDER_WIDTH);
-
- table_vbox = gtk_vbox_new(FALSE, 0);
- gtk_box_pack_start(GTK_BOX(vbox2), table_vbox, FALSE, TRUE, 0);
- gtk_container_set_border_width(GTK_CONTAINER(table_vbox),
- BORDER_WIDTH * 2);
-
- /* Notebook */
- notebook = gtk_notebook_new();
- gtk_widget_set_usize(notebook, -1, 180);
- gtk_widget_show(notebook);
/* header labels and entries */
header_scrolledwin = gtk_scrolled_window_new(NULL, NULL);
gtk_widget_show(header_scrolledwin);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(header_scrolledwin), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), header_scrolledwin, gtk_label_new(_("Header")));
header_table = gtk_table_new(2, 2, FALSE);
gtk_widget_show(header_table);
gtk_container_set_border_width(GTK_CONTAINER(header_table), 2);
gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(header_scrolledwin), header_table);
+ gtk_viewport_set_shadow_type(GTK_VIEWPORT(GTK_BIN(header_scrolledwin)->child), GTK_SHADOW_ETCHED_IN);
count = 0;
/* option menu for selecting accounts */
#endif
count++;
- /* Subject */
- compose_add_entry_field(header_table, &hbox, &subject_entry, &count,
- "Subject:", FALSE);
-
compose->header_table = header_table;
compose->header_list = NULL;
compose->header_nextrow = count;
GTK_SIGNAL_FUNC(compose_grab_focus_cb), compose);
#endif
+ 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->newsgroups_entry = newsgroups_entry;
+#endif
+#if 0 /* NEW COMPOSE GUI */
+ compose->cc_hbox = cc_hbox;
+ compose->cc_entry = cc_entry;
+ compose->bcc_hbox = bcc_hbox;
+ compose->bcc_entry = bcc_entry;
+ compose->reply_hbox = reply_hbox;
+ compose->reply_entry = reply_entry;
+ compose->followup_hbox = followup_hbox;
+ compose->followup_entry = followup_entry;
+#endif
+
+ return header_scrolledwin ;
+}
+
+GtkWidget *compose_create_attach(Compose *compose)
+{
+ gchar *titles[] = {_("MIME type"), _("Size"), _("Name")};
+ gint i;
+
+ GtkWidget *attach_scrwin;
+ GtkWidget *attach_clist;
+
/* attachment list */
attach_scrwin = gtk_scrolled_window_new(NULL, NULL);
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), attach_scrwin, gtk_label_new(_("Attachments")));
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(attach_scrwin),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_ALWAYS);
GTK_SIGNAL_FUNC(compose_attach_drag_received_cb),
compose);
+ compose->attach_scrwin = attach_scrwin;
+ compose->attach_clist = attach_clist;
+
+ return attach_scrwin;
+}
+
+static void compose_savemsg_checkbtn_cb(GtkWidget *widget, Compose *compose);
+static void compose_savemsg_select_cb(GtkWidget *widget, Compose *compose);
+
+static GtkWidget *compose_create_others(Compose *compose)
+{
+ GtkWidget *table;
+ GtkWidget *savemsg_checkbtn;
+ GtkWidget *savemsg_entry;
+ GtkWidget *savemsg_select;
+
+ guint rowcount = 0;
+ gchar *folderidentifier;
+
+ /* Table for settings */
+ table = gtk_table_new(3, 1, FALSE);
+ gtk_widget_show(table);
+ gtk_table_set_row_spacings(GTK_TABLE(table), VSPACING_NARROW);
+ rowcount = 0;
+
+ /* Save Message to folder */
+ savemsg_checkbtn = gtk_check_button_new_with_label(_("Save Message to "));
+ gtk_widget_show(savemsg_checkbtn);
+ gtk_table_attach(GTK_TABLE(table), savemsg_checkbtn, 0, 1, rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+ if(folder_get_default_outbox()) {
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(savemsg_checkbtn), prefs_common.savemsg);
+ }
+ gtk_signal_connect(GTK_OBJECT(savemsg_checkbtn), "toggled",
+ GTK_SIGNAL_FUNC(compose_savemsg_checkbtn_cb), compose);
+
+ savemsg_entry = gtk_entry_new();
+ gtk_widget_show(savemsg_entry);
+ gtk_table_attach_defaults(GTK_TABLE(table), savemsg_entry, 1, 2, rowcount, rowcount + 1);
+ gtk_editable_set_editable(GTK_EDITABLE(savemsg_entry), prefs_common.savemsg);
+ if(folder_get_default_outbox()) {
+ folderidentifier = folder_item_get_identifier(folder_get_default_outbox());
+ gtk_entry_set_text(GTK_ENTRY(savemsg_entry), folderidentifier);
+ g_free(folderidentifier);
+ }
+
+ savemsg_select = gtk_button_new_with_label (_("Select ..."));
+ gtk_widget_show (savemsg_select);
+ gtk_table_attach(GTK_TABLE(table), savemsg_select, 2, 3, rowcount, rowcount + 1, GTK_SHRINK | GTK_FILL, GTK_SHRINK, 0, 0);
+ gtk_signal_connect (GTK_OBJECT (savemsg_select), "clicked",
+ GTK_SIGNAL_FUNC (compose_savemsg_select_cb),
+ compose);
+
+ rowcount++;
+
+ compose->savemsg_checkbtn = savemsg_checkbtn;
+ compose->savemsg_entry = savemsg_entry;
+
+ return table;
+}
+
+static void compose_savemsg_checkbtn_cb(GtkWidget *widget, Compose *compose)
+{
+ gtk_editable_set_editable(GTK_EDITABLE(compose->savemsg_entry),
+ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn)));
+}
+
+static void compose_savemsg_select_cb(GtkWidget *widget, Compose *compose)
+{
+ FolderItem *dest;
+ gchar * path;
+
+ dest = foldersel_folder_sel(NULL, NULL);
+ if (!dest) return;
+
+ path = folder_item_get_identifier(dest);
+
+ gtk_entry_set_text(GTK_ENTRY(compose->savemsg_entry), path);
+ g_free(path);
+}
+static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
+{
+ Compose *compose;
+ GtkWidget *window;
+ GtkWidget *vbox;
+ GtkWidget *menubar;
+ GtkWidget *handlebox;
+
+ GtkWidget *notebook;
+
+ GtkWidget *vbox2;
+
+ GtkWidget *label;
+ GtkWidget *subject_hbox;
+ GtkWidget *subject_frame;
+ GtkWidget *subject_entry;
+ GtkWidget *subject;
+ GtkWidget *paned;
+
+ GtkWidget *edit_vbox;
+ GtkWidget *ruler_hbox;
+ GtkWidget *ruler;
+ GtkWidget *scrolledwin;
+ GtkWidget *text;
+
+ GtkWidget *table;
+
+ UndoMain *undostruct;
+
+ guint n_menu_entries;
+ GtkStyle *style, *new_style;
+ GdkColormap *cmap;
+ GdkColor color[1];
+ gboolean success[1];
+ GdkFont *font;
+ GtkWidget *popupmenu;
+ GtkWidget *menuitem;
+ GtkItemFactory *popupfactory;
+ GtkItemFactory *ifactory;
+ GtkWidget *tmpl_menu;
+ gint n_entries;
+
+#if USE_PSPELL
+ GtkPspell * gtkpspell = NULL;
+#endif
+
+ g_return_val_if_fail(account != NULL, NULL);
+
+ debug_print(_("Creating compose window...\n"));
+ compose = g_new0(Compose, 1);
+
+ compose->account = account;
+ compose->orig_account = account;
+
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, FALSE);
+ gtk_widget_set_usize(window, -1, prefs_common.compose_height);
+ gtk_window_set_wmclass(GTK_WINDOW(window), "compose window", "Sylpheed");
+ gtk_signal_connect(GTK_OBJECT(window), "delete_event",
+ GTK_SIGNAL_FUNC(compose_delete_cb), compose);
+ gtk_signal_connect(GTK_OBJECT(window), "destroy",
+ GTK_SIGNAL_FUNC(compose_destroy_cb), compose);
+ gtk_signal_connect(GTK_OBJECT(window), "focus_in_event",
+ GTK_SIGNAL_FUNC(manage_window_focus_in), NULL);
+ gtk_signal_connect(GTK_OBJECT(window), "focus_out_event",
+ GTK_SIGNAL_FUNC(manage_window_focus_out), NULL);
+ gtk_widget_realize(window);
+
+ gtkut_widget_set_composer_icon(window);
+
+ vbox = gtk_vbox_new(FALSE, 0);
+ gtk_container_add(GTK_CONTAINER(window), vbox);
+
+ n_menu_entries = sizeof(compose_entries) / sizeof(compose_entries[0]);
+ menubar = menubar_create(window, compose_entries,
+ n_menu_entries, "<Compose>", compose);
+ gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
+
+ handlebox = gtk_handle_box_new();
+ gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
+
+ compose_toolbar_create(compose, handlebox);
+
+ vbox2 = gtk_vbox_new(FALSE, 2);
+ gtk_box_pack_start(GTK_BOX(vbox), vbox2, TRUE, TRUE, 0);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox2), BORDER_WIDTH);
+
+ /* Notebook */
+ notebook = gtk_notebook_new();
+ gtk_widget_set_usize(notebook, -1, 130);
+ gtk_widget_show(notebook);
+
+ /* header labels and entries */
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), compose_create_header(compose), gtk_label_new(_("Header")));
+ /* attachment list */
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), compose_create_attach(compose), gtk_label_new(_("Attachments")));
+ /* Others Tab */
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), compose_create_others(compose), gtk_label_new(_("Others")));
+
+ /* Subject */
+ subject_hbox = gtk_hbox_new(FALSE, 0);
+ gtk_widget_show(subject_hbox);
+
+ subject_frame = gtk_frame_new(NULL);
+ gtk_frame_set_shadow_type(GTK_FRAME(subject_frame), GTK_SHADOW_OUT);
+ gtk_box_pack_start(GTK_BOX(subject_hbox), subject_frame, TRUE, TRUE, BORDER_WIDTH+1);
+ gtk_widget_show(subject_frame);
+
+ subject = gtk_hbox_new(FALSE, 0);
+ gtk_container_set_border_width(GTK_CONTAINER(subject), BORDER_WIDTH);
+ gtk_widget_show(subject);
+
+ label = gtk_label_new(_("Subject:"));
+ gtk_box_pack_start(GTK_BOX(subject), label, FALSE, FALSE, 4);
+ gtk_widget_show(label);
+
+ subject_entry = gtk_entry_new();
+ gtk_box_pack_start(GTK_BOX(subject), subject_entry, TRUE, TRUE, 2);
+ gtk_signal_connect(GTK_OBJECT(subject_entry), "activate", GTK_SIGNAL_FUNC(compose_ctl_enter_send_shortcut_cb), compose);
+ gtk_widget_show(subject_entry);
+ compose->subject_entry = subject_entry;
+ gtk_container_add(GTK_CONTAINER(subject_frame), subject);
+
edit_vbox = gtk_vbox_new(FALSE, 0);
#if 0 /* NEW COMPOSE GUI */
gtk_box_pack_start(GTK_BOX(vbox2), edit_vbox, TRUE, TRUE, 0);
#endif
+ gtk_box_pack_start(GTK_BOX(edit_vbox), subject_hbox, FALSE, FALSE, 0);
+
/* ruler */
ruler_hbox = gtk_hbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(edit_vbox), ruler_hbox, FALSE, FALSE, 0);
gtk_stext_set_editable(GTK_STEXT(text), TRUE);
if (prefs_common.block_cursor) {
- GTK_STEXT(text)->cursor_type = STEXT_CURSOR_BLOCK;
+ GTK_STEXT(text)->cursor_type = GTK_STEXT_CURSOR_BLOCK;
}
if (prefs_common.smart_wrapping) {
GTK_SIGNAL_FUNC(compose_changed_cb), compose);
gtk_signal_connect(GTK_OBJECT(text), "grab_focus",
GTK_SIGNAL_FUNC(compose_grab_focus_cb), compose);
+ gtk_signal_connect(GTK_OBJECT(text), "activate",
+ GTK_SIGNAL_FUNC(compose_ctl_enter_send_shortcut_cb), compose);
gtk_signal_connect_after(GTK_OBJECT(text), "button_press_event",
GTK_SIGNAL_FUNC(compose_button_press_cb),
- compose);
+ edit_vbox);
#if 0
gtk_signal_connect_after(GTK_OBJECT(text), "key_press_event",
GTK_SIGNAL_FUNC(compose_key_press_cb),
gtk_signal_connect(GTK_OBJECT(text), "drag_data_received",
GTK_SIGNAL_FUNC(compose_insert_drag_received_cb),
compose);
-#if USE_PSPELL
- if (prefs_common.enable_pspell) {
- gtkpspell = gtkpspell_new_with_config(gtkpspellconfig,
- prefs_common.pspell_path,
- prefs_common.dictionary,
- PSPELL_FASTMODE,
- conv_get_current_charset_str());
- if (gtkpspell == NULL)
- prefs_common.enable_pspell = FALSE;
- else
- gtkpspell_attach(gtkpspell, GTK_STEXT(text));
- }
-#endif
gtk_widget_show_all(vbox);
/* pane between attach clist and text */
paned = gtk_vpaned_new();
+ gtk_paned_set_gutter_size(GTK_PANED(paned), 12);
+ gtk_paned_set_handle_size(GTK_PANED(paned), 12);
gtk_container_add(GTK_CONTAINER(vbox2), paned);
gtk_paned_add1(GTK_PANED(paned), notebook);
gtk_paned_add2(GTK_PANED(paned), edit_vbox);
style = gtk_widget_get_style(text);
- /* workaround for the slow down of GtkText when using Pixmap theme */
+ /* workaround for the slow down of GtkSText when using Pixmap theme */
if (style->engine) {
GtkThemeEngine *engine;
tmpl_menu = gtk_item_factory_get_item(ifactory, "/Tool/Template");
#if 0 /* NEW COMPOSE GUI */
+ gtk_widget_hide(bcc_hbox);
+ gtk_widget_hide(bcc_entry);
+ gtk_widget_hide(reply_hbox);
+ gtk_widget_hide(reply_entry);
+ gtk_widget_hide(followup_hbox);
+ gtk_widget_hide(followup_entry);
+ gtk_widget_hide(ruler_hbox);
+ gtk_table_set_row_spacing(GTK_TABLE(table), 4, 0);
+ gtk_table_set_row_spacing(GTK_TABLE(table), 5, 0);
+ gtk_table_set_row_spacing(GTK_TABLE(table), 6, 0);
+
if (account->protocol == A_NNTP) {
gtk_widget_hide(to_hbox);
gtk_widget_hide(to_entry);
gtk_widget_hide(newsgroups_hbox);
gtk_widget_hide(newsgroups_entry);
gtk_table_set_row_spacing(GTK_TABLE(table), 2, 0);
-
- menu_set_sensitive(ifactory, "/Message/Followup to", FALSE);
+ menu_set_sensitive(ifactory, "/View/Followup to", FALSE);
}
#endif
break;
}
+ undostruct = undo_init(text);
+ undo_set_change_state_func(undostruct, &compose_undo_state_changed,
+ menubar);
+
gtk_widget_show(window);
address_completion_start(window);
compose->vbox2 = vbox2;
- compose->table_vbox = table_vbox;
- compose->table = table;
-#if 0 /* NEW COMPOSE GUI */
- compose->to_hbox = to_hbox;
- compose->to_entry = to_entry;
- compose->newsgroups_hbox = newsgroups_hbox;
- compose->newsgroups_entry = newsgroups_entry;
-#endif
- compose->subject_entry = subject_entry;
-#if 0 /* NEW COMPOSE GUI */
- compose->cc_hbox = cc_hbox;
- compose->cc_entry = cc_entry;
- compose->bcc_hbox = bcc_hbox;
- compose->bcc_entry = bcc_entry;
- compose->reply_hbox = reply_hbox;
- compose->reply_entry = reply_entry;
- compose->followup_hbox = followup_hbox;
- compose->followup_entry = followup_entry;
-#endif
compose->paned = paned;
- compose->attach_scrwin = attach_scrwin;
- compose->attach_clist = attach_clist;
-
compose->edit_vbox = edit_vbox;
compose->ruler_hbox = ruler_hbox;
compose->ruler = ruler;
compose->exteditor_tag = -1;
compose->bounce_filename = NULL;
+ compose->undostruct = undostruct;
+#if USE_PSPELL
+ menu_set_sensitive(ifactory, "/Edit/Check backwards misspelled word", FALSE);
+ menu_set_sensitive(ifactory, "/Edit/Forward to next misspelled word", FALSE);
+ if (prefs_common.enable_pspell) {
+ gtkpspell = gtkpspell_new((const gchar*)prefs_common.dictionary,
+ conv_get_current_charset_str(),
+ GTK_STEXT(text));
+ if (!gtkpspell) {
+ alertpanel_error(_("Spell checker could not be started.\n%s"), gtkpspellcheckers->error_message);
+ gtkpspell_checkers_reset();
+ } else {
+
+ gtkpspell_set_sug_mode(gtkpspell, prefs_common.pspell_sugmode);
+ menu_set_sensitive(ifactory, "/Edit/Check backwards misspelled word", TRUE);
+ menu_set_sensitive(ifactory, "/Edit/Forward to next misspelled word", TRUE);
+ }
+ }
+#endif
compose_set_title(compose);
#if 0 /* NEW COMPOSE GUI */
if (account->protocol != A_NNTP) {
- menuitem = gtk_item_factory_get_item(ifactory, "/Message/To");
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/To");
gtk_check_menu_item_set_active
(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
gtk_widget_set_sensitive(menuitem, FALSE);
- menuitem = gtk_item_factory_get_item(ifactory, "/Message/Cc");
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/Cc");
gtk_check_menu_item_set_active
(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
gtk_widget_set_sensitive(menuitem, FALSE);
#if 0 /* NEW COMPOSE GUI */
compose->use_cc = TRUE;
gtk_entry_set_text(GTK_ENTRY(cc_entry), account->auto_cc);
- menuitem = gtk_item_factory_get_item(ifactory, "/Message/Cc");
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/Cc");
gtk_check_menu_item_set_active
(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
#endif
if (account->set_autobcc) {
compose_entry_append(compose, account->auto_bcc, COMPOSE_BCC);
#if 0 /* NEW COMPOSE GUI */
- compose->use_bcc = TRUE;
- menuitem = gtk_item_factory_get_item(ifactory, "/Message/Bcc");
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/Bcc");
gtk_check_menu_item_set_active
(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
if (account->auto_bcc && mode != COMPOSE_REEDIT)
#if 0 /* NEW COMPOSE GUI */
compose->use_replyto = TRUE;
menuitem = gtk_item_factory_get_item(ifactory,
- "/Message/Reply to");
+ "/View/Reply to");
gtk_check_menu_item_set_active
(GTK_CHECK_MENU_ITEM(menuitem), TRUE);
gtk_entry_set_text(GTK_ENTRY(reply_entry),
account->auto_replyto);
#endif
}
+
if (account->protocol != A_NNTP) {
- gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry), _("To:"));
+ gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry), prefs_common.trans_hdr ? _("To:") : "To:");
} else {
- gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry), _("Newsgroups:"));
+ gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry), prefs_common.trans_hdr ? _("Newsgroups:") : "Newsgroups:");
}
- menuitem = gtk_item_factory_get_item(ifactory, "/Tool/Show ruler");
+#if 0 /* NEW COMPOSE GUI */
+ menuitem = gtk_item_factory_get_item(ifactory, "/View/Ruler");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
prefs_common.show_ruler);
+#endif
#if USE_GPGME
menuitem = gtk_item_factory_get_item(ifactory, "/Message/Sign");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
- prefs_common.default_sign);
+ account->default_sign);
menuitem = gtk_item_factory_get_item(ifactory, "/Message/Encrypt");
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
- prefs_common.default_encrypt);
+ account->default_encrypt);
#endif /* USE_GPGME */
addressbook_set_target_compose(compose);
return compose;
}
-#include "pixmaps/stock_mail_send.xpm"
-#include "pixmaps/stock_mail_send_queue.xpm"
-#include "pixmaps/stock_mail.xpm"
-#include "pixmaps/stock_paste.xpm"
-#include "pixmaps/stock_mail_attach.xpm"
-#include "pixmaps/stock_mail_compose.xpm"
-#include "pixmaps/linewrap.xpm"
-#include "pixmaps/tb_address_book.xpm"
-
-#define CREATE_TOOLBAR_ICON(xpm_d) \
-{ \
- icon = gdk_pixmap_create_from_xpm_d(container->window, &mask, \
- &container->style->white, \
- xpm_d); \
- icon_wid = gtk_pixmap_new(icon, mask); \
-}
-
static void compose_toolbar_create(Compose *compose, GtkWidget *container)
{
GtkWidget *toolbar;
- GdkPixmap *icon;
- GdkBitmap *mask;
GtkWidget *icon_wid;
GtkWidget *send_btn;
GtkWidget *sendl_btn;
gtk_toolbar_set_space_style(GTK_TOOLBAR(toolbar),
GTK_TOOLBAR_SPACE_LINE);
- CREATE_TOOLBAR_ICON(stock_mail_send_xpm);
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_SEND);
send_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Send"),
_("Send message"),
"Send",
icon_wid, toolbar_send_cb, compose);
- CREATE_TOOLBAR_ICON(stock_mail_send_queue_xpm);
- /* CREATE_TOOLBAR_ICON(tb_mail_queue_send_xpm); */
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_SEND_QUEUE);
sendl_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Send later"),
_("Put into queue folder and send later"),
icon_wid, toolbar_send_later_cb,
compose);
- CREATE_TOOLBAR_ICON(stock_mail_xpm);
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL);
draft_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Draft"),
_("Save to draft folder"),
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
- CREATE_TOOLBAR_ICON(stock_paste_xpm);
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_PASTE);
insert_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Insert"),
_("Insert file"),
icon_wid, toolbar_insert_cb,
compose);
- CREATE_TOOLBAR_ICON(stock_mail_attach_xpm);
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_ATTACH);
attach_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Attach"),
_("Attach file"),
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
- CREATE_TOOLBAR_ICON(stock_mail_xpm);
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL);
sig_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Signature"),
_("Insert signature"),
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
- CREATE_TOOLBAR_ICON(stock_mail_compose_xpm);
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_MAIL_COMPOSE);
exteditor_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Editor"),
_("Edit with external editor"),
toolbar_ext_editor_cb,
compose);
- CREATE_TOOLBAR_ICON(linewrap_xpm);
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_LINEWRAP);
linewrap_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Linewrap"),
- _("Wrap current paragraph"),
+ _("Wrap all long lines"),
"Linewrap",
icon_wid,
toolbar_linewrap_cb,
gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
- CREATE_TOOLBAR_ICON(tb_address_book_xpm);
+ icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_ADDRESS_BOOK);
addrbook_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
_("Address"),
_("Address book"),
gtk_widget_show_all(toolbar);
}
-#undef CREATE_TOOLBAR_ICON
-
static GtkWidget *compose_account_option_menu_create(Compose *compose)
{
GList *accounts;
}
}
-static void compose_template_apply(Compose *compose, const gchar *tmpl_str)
+static void compose_template_apply(Compose *compose, Template *tmpl)
{
gchar *qmark;
gchar *parsed_str;
- if (!tmpl_str) return;
+ if (!tmpl || !tmpl->value) return;
gtk_stext_freeze(GTK_STEXT(compose->text));
+ if (tmpl->subject && *tmpl->subject != '\0')
+ gtk_entry_set_text(GTK_ENTRY(compose->subject_entry),
+ tmpl->subject);
+ if (tmpl->to && *tmpl->to != '\0')
+ 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_str,
- NULL);
+ 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_str,
- qmark);
+ parsed_str = compose_quote_fmt(compose, compose->replyinfo,
+ tmpl->value, qmark);
}
if (parsed_str && prefs_common.auto_sig)
if (addressbook_get_target_compose() == compose)
addressbook_set_target_compose(NULL);
+#if USE_PSPELL
+ if (compose->gtkpspell) {
+ gtkpspell_delete(compose->gtkpspell);
+ }
+#endif
+
prefs_common.compose_width = compose->scrolledwin->allocation.width;
prefs_common.compose_height = compose->window->allocation.height;
GtkWidget *menuitem;
cancelled = FALSE;
- gtk_main();
+ gtk_main();
if (cancelled == TRUE) {
gtk_widget_hide(attach_prop.window);
gtk_widget_set_sensitive(compose->linewrap_btn, sensitive);
}
+/**
+ * compose_undo_state_changed:
+ *
+ * Change the sensivity of the menuentries undo and redo
+ **/
+static void compose_undo_state_changed(UndoMain *undostruct, gint undo_state,
+ gint redo_state, gpointer data)
+{
+ GtkWidget *widget = GTK_WIDGET(data);
+ GtkItemFactory *ifactory;
+
+ g_return_if_fail(widget != NULL);
+
+ debug_print("Set_undo. UNDO:%i REDO:%i\n", undo_state, redo_state);
+
+ ifactory = gtk_item_factory_from_widget(widget);
+
+ 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;
+ }
+
+ 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;
+ }
+}
+
static gint calc_cursor_xpos(GtkSText *text, gint extra, gint char_width)
{
gint cursor_pos;
gint val;
val = compose_send(compose);
+
if (val == 0) gtk_widget_destroy(compose->window);
}
Compose *compose = (Compose *)data;
FolderItem *draft;
gchar *tmp;
+ gint msgnum;
+ static gboolean lock = FALSE;
+
+ if (lock) return;
draft = folder_get_default_draft();
+ g_return_if_fail(draft != NULL);
- tmp = g_strdup_printf("%s%cdraft.%d", g_get_tmp_dir(),
+ lock = TRUE;
+
+ tmp = g_strdup_printf("%s%cdraft.%d", g_get_tmp_dir(),
G_DIR_SEPARATOR, (gint)compose);
if (compose_write_to_file(compose, tmp, TRUE) < 0) {
g_free(tmp);
+ lock = FALSE;
return;
}
folder_item_scan(draft);
- if (folder_item_add_msg(draft, tmp, TRUE) < 0) {
+ if ((msgnum = folder_item_add_msg(draft, tmp, TRUE)) <= 0) {
unlink(tmp);
g_free(tmp);
+ lock = FALSE;
return;
}
g_free(tmp);
+ draft->mtime = 0; /* force updating */
if (compose->mode == COMPOSE_REEDIT) {
compose_remove_reedit_target(compose);
folder_item_scan(draft);
folderview_update_item(draft, TRUE);
- gtk_widget_destroy(compose->window);
+ lock = FALSE;
+
+ /* 0: quit editing 1: keep editing */
+ if (action == 0)
+ gtk_widget_destroy(compose->window);
+ else {
+ struct stat s;
+ gchar *path;
+
+ path = folder_item_fetch_msg(draft, msgnum);
+ g_return_if_fail(path != NULL);
+ if (stat(path, &s) < 0) {
+ FILE_OP_ERROR(path, "stat");
+ g_free(path);
+ lock = FALSE;
+ return;
+ }
+ g_free(path);
+
+ procmsg_msginfo_free(compose->targetinfo);
+ compose->targetinfo = g_new0(MsgInfo, 1);
+ compose->targetinfo->msgnum = msgnum;
+ compose->targetinfo->size = s.st_size;
+ compose->targetinfo->mtime = s.st_mtime;
+ compose->targetinfo->folder = draft;
+ compose->mode = COMPOSE_REEDIT;
+ }
}
static void compose_attach_cb(gpointer data, guint action, GtkWidget *widget)
return;
}
}
-#if USE_PSPELL
- if (compose->gtkpspell) {
- gtkpspell_detach(compose->gtkpspell);
- compose->gtkpspell = gtkpspell_delete(compose->gtkpspell);
- }
-#endif
gtk_widget_destroy(compose->window);
}
tmpl = gtk_object_get_data(GTK_OBJECT(widget), "template");
g_return_if_fail(tmpl != NULL);
- compose_template_apply(compose, tmpl->value);
+ compose_template_apply(compose, tmpl);
}
static void compose_ext_editor_cb(gpointer data, guint action,
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 &&
(GTK_EDITABLE(compose->focused_editable), 0, -1);
}
+static void compose_move_beginning_of_line_cb(Compose *compose)
+{
+ if (compose->focused_editable &&
+ GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
+ gtk_stext_move_beginning_of_line(GTK_STEXT(compose->focused_editable));
+}
+
+static void compose_gtk_stext_action_cb (Compose *compose, ComposeCallGtkStextAction action)
+{
+ if (!(compose->focused_editable && GTK_WIDGET_HAS_FOCUS(compose->focused_editable))) return;
+
+ switch (action) {
+ case COMPOSE_CALL_GTK_STEXT_MOVE_BEGINNING_OF_LINE:
+ gtk_stext_move_beginning_of_line(GTK_STEXT(compose->focused_editable));
+ break;
+ case COMPOSE_CALL_GTK_STEXT_MOVE_FORWARD_CHARACTER:
+ gtk_stext_move_forward_character(GTK_STEXT(compose->focused_editable));
+ break;
+ case COMPOSE_CALL_GTK_STEXT_MOVE_BACKWARD_CHARACTER:
+ gtk_stext_move_backward_character(GTK_STEXT(compose->focused_editable));
+ break;
+ case COMPOSE_CALL_GTK_STEXT_MOVE_FORWARD_WORD:
+ gtk_stext_move_forward_word(GTK_STEXT(compose->focused_editable));
+ break;
+ case COMPOSE_CALL_GTK_STEXT_MOVE_BACKWARD_WORD:
+ gtk_stext_move_backward_word(GTK_STEXT(compose->focused_editable));
+ break;
+ case COMPOSE_CALL_GTK_STEXT_MOVE_END_OF_LINE:
+ gtk_stext_move_end_of_line(GTK_STEXT(compose->focused_editable));
+ break;
+ case COMPOSE_CALL_GTK_STEXT_MOVE_NEXT_LINE:
+ gtk_stext_move_next_line(GTK_STEXT(compose->focused_editable));
+ break;
+ case COMPOSE_CALL_GTK_STEXT_MOVE_PREVIOUS_LINE:
+ gtk_stext_move_previous_line(GTK_STEXT(compose->focused_editable));
+ break;
+ case COMPOSE_CALL_GTK_STEXT_DELETE_FORWARD_CHARACTER:
+ gtk_stext_delete_forward_character(GTK_STEXT(compose->focused_editable));
+ break;
+ case COMPOSE_CALL_GTK_STEXT_DELETE_BACKWARD_CHARACTER:
+ gtk_stext_delete_backward_character(GTK_STEXT(compose->focused_editable));
+ break;
+ case COMPOSE_CALL_GTK_STEXT_DELETE_FORWARD_WORD:
+ gtk_stext_delete_forward_word(GTK_STEXT(compose->focused_editable));
+ break;
+ case COMPOSE_CALL_GTK_STEXT_DELETE_BACKWARD_WORD:
+ gtk_stext_delete_backward_word(GTK_STEXT(compose->focused_editable));
+ break;
+ case COMPOSE_CALL_GTK_STEXT_DELETE_LINE:
+ gtk_stext_delete_line(GTK_STEXT(compose->focused_editable));
+ break;
+ case COMPOSE_CALL_GTK_STEXT_DELETE_TO_LINE_END:
+ gtk_stext_delete_to_line_end(GTK_STEXT(compose->focused_editable));
+ break;
+ default:
+ break;
+ }
+}
+
static void compose_grab_focus_cb(GtkWidget *widget, Compose *compose)
{
if (GTK_IS_EDITABLE(widget))
if (GTK_CHECK_MENU_ITEM(widget)->active) {
gtk_widget_ref(compose->edit_vbox);
- gtk_container_remove(GTK_CONTAINER(compose->vbox2),
- compose->edit_vbox);
+ gtkut_container_remove(GTK_CONTAINER(compose->vbox2),
+ compose->edit_vbox);
gtk_paned_add2(GTK_PANED(compose->paned), compose->edit_vbox);
gtk_box_pack_start(GTK_BOX(compose->vbox2), compose->paned,
TRUE, TRUE, 0);
gtk_widget_ref(compose->paned);
gtk_widget_ref(compose->edit_vbox);
- gtk_container_remove(GTK_CONTAINER(compose->vbox2),
- compose->paned);
- gtk_container_remove(GTK_CONTAINER(compose->paned),
- compose->edit_vbox);
+ gtkut_container_remove(GTK_CONTAINER(compose->vbox2),
+ compose->paned);
+ gtkut_container_remove(GTK_CONTAINER(compose->paned),
+ compose->edit_vbox);
gtk_box_pack_start(GTK_BOX(compose->vbox2),
compose->edit_vbox, TRUE, TRUE, 0);
compose->return_receipt = FALSE;
}
-void compose_headerentry_key_press_event_cb(GtkWidget *entry, GdkEventKey *event, compose_headerentry *headerentry) {
- if((g_slist_length(headerentry->compose->header_list) > 0) &&
+void compose_headerentry_key_press_event_cb(GtkWidget *entry,
+ GdkEventKey *event,
+ ComposeHeaderEntry *headerentry)
+{
+ 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);
+ } else if (event->keyval == GDK_Tab) {
+ if (headerentry->compose->header_last == headerentry) {
+ /* Override default next focus, and give it to subject_entry
+ * instead of notebook tabs
+ */
+ gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key-press-event");
+ gtk_widget_grab_focus(headerentry->compose->subject_entry);
+ }
}
+
}
-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);
+ /* Automatically scroll down */
+ compose_show_first_last_header(headerentry->compose, FALSE);
+
}
}
+
+static void compose_show_first_last_header(Compose *compose, gboolean show_first)
+{
+ GtkAdjustment *vadj;
+
+ g_return_if_fail(compose);
+ g_return_if_fail(GTK_IS_WIDGET(compose->header_table));
+ g_return_if_fail(GTK_IS_VIEWPORT(compose->header_table->parent));
+
+ vadj = gtk_viewport_get_vadjustment(GTK_VIEWPORT(compose->header_table->parent));
+ gtk_adjustment_set_value(vadj, (show_first ? vadj->lower : vadj->upper));
+}
+
+static void compose_ctl_enter_send_shortcut_cb(GtkWidget *w, Compose *compose)
+{
+ GtkItemFactory *ifactory;
+ GtkAccelEntry *accel;
+ GtkWidget *send_button;
+ GSList *list;
+ GdkEventKey *e= (GdkEventKey *) gtk_get_current_event();
+
+ if (e->type != GDK_KEY_PRESS ||
+ !( e->keyval == GDK_Return && e->state & GDK_CONTROL_MASK) )
+ return;
+
+ ifactory = gtk_item_factory_from_widget(compose->menubar);
+ send_button = gtk_item_factory_get_widget(ifactory, "/Message/Send");
+ list = gtk_accel_group_entries_from_object(GTK_OBJECT(send_button));
+ accel = (GtkAccelEntry *) list->data;
+ if (accel->accelerator_key == GDK_Return &&
+ accel->accelerator_mods == GDK_CONTROL_MASK)
+ compose_send_cb(compose, 0, NULL);
+}
+
+#if USE_PSPELL
+static void compose_check_backwards(Compose *compose)
+{
+ if (compose->gtkpspell)
+ gtkpspell_check_backwards(compose->gtkpspell);
+ else {
+ GtkItemFactory *ifactory;
+ ifactory = gtk_item_factory_from_widget(compose->popupmenu);
+ menu_set_sensitive(ifactory, "/Edit/Check backwards misspelled word", FALSE);
+ menu_set_sensitive(ifactory, "/Edit/Forward to next misspelled word", FALSE);
+ }
+}
+
+static void compose_check_forwards_go(Compose *compose)
+{
+ if (compose->gtkpspell)
+ gtkpspell_check_forwards_go(compose->gtkpspell);
+ else {
+ GtkItemFactory *ifactory;
+ ifactory = gtk_item_factory_from_widget(compose->popupmenu);
+ menu_set_sensitive(ifactory, "/Edit/Check backwards misspelled word", FALSE);
+ menu_set_sensitive(ifactory, "/Edit/Forward to next misspelled word", FALSE);
+ }
+}
+#endif
projects / claws.git / blobdiff