#include <sys/stat.h>
#include <unistd.h>
#include <time.h>
-/* #include <sys/utsname.h> */
#include <stdlib.h>
-#include <sys/wait.h>
+#if HAVE_SYS_WAIT_H
+# include <sys/wait.h>
+#endif
#include <signal.h>
#include <errno.h>
#include <libgen.h>
#define MAX_REFERENCES_LEN 999
-static GdkColor quote_color = {0, 0, 0, 0xbfff};
-
static GList *compose_list = NULL;
Compose *compose_generic_new (PrefsAccount *account,
static void compose_attach_parts (Compose *compose,
MsgInfo *msginfo);
-static void compose_wrap_paragraph (Compose *compose,
- GtkTextIter *par_iter);
+static void compose_beautify_paragraph (Compose *compose,
+ GtkTextIter *par_iter,
+ gboolean force);
static void compose_wrap_all (Compose *compose);
static void compose_wrap_all_full (Compose *compose,
gboolean autowrap);
MimeInfo *parent);
static gchar *compose_get_header (Compose *compose);
-static void compose_convert_header (gchar *dest,
+static void compose_convert_header (Compose *compose,
+ gchar *dest,
gint len,
gchar *src,
gint header_len,
GdkEventKey *event,
gboolean *cancelled);
-static void compose_exec_ext_editor (Compose *compose);
-static gint compose_exec_ext_editor_real (const gchar *file);
-static gboolean compose_ext_editor_kill (Compose *compose);
-static void compose_input_cb (gpointer data,
- gint source,
- GdkInputCondition condition);
-static void compose_set_ext_editor_sensitive (Compose *compose,
- gboolean sensitive);
+static void compose_exec_ext_editor (Compose *compose);
+#ifdef G_OS_UNIX
+static gint compose_exec_ext_editor_real (const gchar *file);
+static gboolean compose_ext_editor_kill (Compose *compose);
+static gboolean compose_input_cb (GIOChannel *source,
+ GIOCondition condition,
+ gpointer data);
+static void compose_set_ext_editor_sensitive (Compose *compose,
+ gboolean sensitive);
+#endif /* G_OS_UNIX */
static void compose_undo_state_changed (UndoMain *undostruct,
gint undo_state,
static void compose_copy_cb (Compose *compose);
static void compose_paste_cb (Compose *compose);
static void compose_paste_as_quote_cb (Compose *compose);
+static void compose_paste_no_wrap_cb (Compose *compose);
+static void compose_paste_wrap_cb (Compose *compose);
static void compose_allsel_cb (Compose *compose);
static void compose_advanced_action_cb (Compose *compose,
guint action,
GtkWidget *widget);
-#if 0
-static void compose_toggle_to_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void compose_toggle_cc_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void compose_toggle_bcc_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void compose_toggle_replyto_cb (gpointer data,
- guint action,
- GtkWidget *widget);
-static void compose_toggle_followupto_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);
GdkDragContext *drag_context,
gint x, gint y,
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 cc_activated (GtkWidget *widget,
- Compose *compose);
-static void bcc_activated (GtkWidget *widget,
- Compose *compose);
-static void replyto_activated (GtkWidget *widget,
- Compose *compose);
-static void followupto_activated (GtkWidget *widget,
- Compose *compose);
-static void subject_activated (GtkWidget *widget,
- Compose *compose);
-#endif
static void text_inserted (GtkTextBuffer *buffer,
GtkTextIter *iter,
{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/Paste as _quotation"),
+ {N_("/_Edit/Special paste/as _quotation"),
NULL, compose_paste_as_quote_cb, 0, NULL},
+ {N_("/_Edit/Special paste/_wrapped"),
+ NULL, compose_paste_wrap_cb, 0, NULL},
+ {N_("/_Edit/Special paste/_unwrapped"),
+ NULL, compose_paste_no_wrap_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"),
return FALSE;
}
+static GdkColor quote_color =
+ {(gulong)0, (gushort)0, (gushort)0, (gushort)0};
+
+static GdkColor signature_color = {
+ (gulong)0,
+ (gushort)0x7fff,
+ (gushort)0x7fff,
+ (gushort)0x7fff
+};
+
+static GdkColor uri_color = {
+ (gulong)0,
+ (gushort)0,
+ (gushort)0,
+ (gushort)0
+};
+
+static GtkTextTag *no_wrap_tag = NULL;
+
+static void compose_create_tags(GtkTextView *text, Compose *compose)
+{
+ GtkTextBuffer *buffer;
+ GdkColor black = {(gulong)0, (gushort)0, (gushort)0, (gushort)0};
+
+ buffer = gtk_text_view_get_buffer(text);
+
+ if (prefs_common.enable_color) {
+ /* grab the quote colors, converting from an int to a GdkColor */
+ gtkut_convert_int_to_gdk_color(prefs_common.quote_level1_col,
+ "e_color);
+ gtkut_convert_int_to_gdk_color(prefs_common.signature_col,
+ &signature_color);
+ gtkut_convert_int_to_gdk_color(prefs_common.uri_col,
+ &uri_color);
+ } else {
+ signature_color = quote_color = uri_color = black;
+ }
+
+ gtk_text_buffer_create_tag(buffer, "quote",
+ "foreground-gdk", "e_color,
+ NULL);
+ gtk_text_buffer_create_tag(buffer, "signature",
+ "foreground-gdk", &signature_color,
+ NULL);
+ gtk_text_buffer_create_tag(buffer, "link",
+ "foreground-gdk", &uri_color,
+ NULL);
+ no_wrap_tag = gtk_text_buffer_create_tag(buffer, "no_wrap", NULL);
+}
+
Compose *compose_new(PrefsAccount *account, const gchar *mailto,
GPtrArray *attach_files)
{
textview = GTK_TEXT_VIEW(compose->text);
textbuf = gtk_text_view_get_buffer(textview);
+ compose_create_tags(textview, compose);
undo_block(compose->undostruct);
#ifdef USE_ASPELL
return compose;
}
+static void compose_force_encryption(Compose *compose, PrefsAccount *account,
+ gboolean override_pref)
+{
+ gchar *privacy = NULL;
+
+ if (override_pref == FALSE && account->default_encrypt_reply == FALSE)
+ return;
+
+ if (account->default_privacy_system
+ && strlen(account->default_privacy_system)) {
+ privacy = account->default_privacy_system;
+ } else {
+ GSList *privacy_avail = privacy_get_system_ids();
+ if (privacy_avail && g_slist_length(privacy_avail)) {
+ privacy = (gchar *)(privacy_avail->data);
+ }
+ }
+ if (privacy != NULL) {
+ compose->privacy_system = g_strdup(privacy);
+ compose_update_privacy_system_menu_item(compose);
+ compose_use_encryption(compose, TRUE);
+ }
+}
+
+static void compose_force_signing(Compose *compose, PrefsAccount *account)
+{
+ gchar *privacy = NULL;
+
+ if (account->default_privacy_system
+ && strlen(account->default_privacy_system)) {
+ privacy = account->default_privacy_system;
+ } else {
+ GSList *privacy_avail = privacy_get_system_ids();
+ if (privacy_avail && g_slist_length(privacy_avail)) {
+ privacy = (gchar *)(privacy_avail->data);
+ }
+ }
+ if (privacy != NULL) {
+ compose->privacy_system = g_strdup(privacy);
+ compose_update_privacy_system_menu_item(compose);
+ compose_use_signing(compose, TRUE);
+ }
+}
+
void compose_reply_mode(ComposeMode mode, GSList *msginfo_list, gchar *body)
{
MsgInfo *msginfo;
textview = (GTK_TEXT_VIEW(compose->text));
textbuf = gtk_text_view_get_buffer(textview);
-
+ compose_create_tags(textview, compose);
+
undo_block(compose->undostruct);
#ifdef USE_ASPELL
if (msginfo->folder && msginfo->folder->prefs &&
prefs_common.quotefmt,
qmark, body);
}
+ if (procmime_msginfo_is_encrypted(compose->replyinfo)) {
+ compose_force_encryption(compose, account, FALSE);
+ }
if (account->auto_sig)
compose_insert_sig(compose, FALSE);
gtk_text_buffer_get_iter_at_offset(textbuf, &iter, cursor_pos);
gtk_text_buffer_place_cursor(textbuf, &iter);
- if (quote && prefs_common.linewrap_quote)
- compose_wrap_all(compose);
+ compose_wrap_all(compose);
gtk_widget_grab_focus(compose->text);
textview = GTK_TEXT_VIEW(compose->text);
textbuf = gtk_text_view_get_buffer(textview);
+ compose_create_tags(textview, compose);
if (as_attach) {
gchar *msgfile;
if (account->auto_sig)
compose_insert_sig(compose, FALSE);
- if (prefs_common.linewrap_quote)
- compose_wrap_all(compose);
+ compose_wrap_all(compose);
gtk_text_buffer_get_start_iter(textbuf, &iter);
gtk_text_buffer_place_cursor(textbuf, &iter);
-#if 0 /* NEW COMPOSE GUI */
- if (account->protocol != A_NNTP)
- gtk_widget_grab_focus(compose->to_entry);
- else
- gtk_widget_grab_focus(compose->newsgroups_entry);
-#endif
gtk_widget_grab_focus(compose->header_last->entry);
if (!no_extedit && prefs_common.auto_exteditor)
textview = GTK_TEXT_VIEW(compose->text);
textbuf = gtk_text_view_get_buffer(textview);
+ compose_create_tags(textview, compose);
for (msginfo = msginfo_list; msginfo != NULL; msginfo = msginfo->next) {
msgfile = procmsg_get_message_file_path((MsgInfo *)msginfo->data);
if (account->auto_sig)
compose_insert_sig(compose, FALSE);
- if (prefs_common.linewrap_quote)
- compose_wrap_all(compose);
+ compose_wrap_all(compose);
gtk_text_buffer_get_start_iter(textbuf, &iter);
gtk_text_buffer_place_cursor(textbuf, &iter);
gtk_widget_grab_focus(compose->header_last->entry);
-#if 0 /* NEW COMPOSE GUI */
- if (account->protocol != A_NNTP)
- gtk_widget_grab_focus(compose->to_entry);
- else
- gtk_widget_grab_focus(compose->newsgroups_entry);
-#endif
-
return compose;
}
+static gboolean compose_is_sig_separator(Compose *compose, GtkTextBuffer *textbuf, GtkTextIter *iter)
+{
+ GtkTextIter start = *iter;
+ GtkTextIter end_iter;
+ int start_pos = gtk_text_iter_get_offset(&start);
+
+ if (!compose->account->sig_sep)
+ return FALSE;
+
+ gtk_text_buffer_get_iter_at_offset(textbuf, &end_iter,
+ start_pos+strlen(compose->account->sig_sep));
+
+ /* check sig separator */
+ if (!strcmp(gtk_text_iter_get_text(&start, &end_iter),
+ compose->account->sig_sep)) {
+ /* check end of line (\n) */
+ gtk_text_buffer_get_iter_at_offset(textbuf, &start,
+ start_pos+strlen(compose->account->sig_sep));
+ gtk_text_buffer_get_iter_at_offset(textbuf, &end_iter,
+ start_pos+strlen(compose->account->sig_sep)+1);
+
+ if (!strcmp(gtk_text_iter_get_text(&start, &end_iter),"\n"));
+ return TRUE;
+
+
+ }
+
+ return FALSE;
+}
+
+static void compose_colorize_signature(Compose *compose)
+{
+ GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(compose->text));
+ GtkTextIter iter;
+ GtkTextIter end_iter;
+ gtk_text_buffer_get_start_iter(buffer, &iter);
+ while (gtk_text_iter_forward_line(&iter))
+ if (compose_is_sig_separator(compose, buffer, &iter)) {
+ gtk_text_buffer_get_end_iter(buffer, &end_iter);
+ gtk_text_buffer_apply_tag_by_name(buffer,"signature",&iter, &end_iter);
+ }
+}
+
void compose_reedit(MsgInfo *msginfo)
{
Compose *compose = NULL;
if (compose_put_existing_to_front(msginfo))
return;
- if (msginfo->folder->stype == F_QUEUE || msginfo->folder->stype == F_DRAFT) {
+ if (folder_has_parent_of_type(msginfo->folder, F_QUEUE) ||
+ folder_has_parent_of_type(msginfo->folder, F_DRAFT)) {
gchar queueheader_buf[BUFFSIZE];
gint id, param;
g_return_if_fail(account != NULL);
compose = compose_create(account, COMPOSE_REEDIT);
- compose->privacy_system = privacy_system;
- compose_use_signing(compose, use_signing);
- compose_use_encryption(compose, use_encryption);
+ if (privacy_system != NULL) {
+ compose->privacy_system = privacy_system;
+ compose_use_signing(compose, use_signing);
+ compose_use_encryption(compose, use_encryption);
+ compose_update_privacy_system_menu_item(compose);
+ } else {
+ activate_privacy_system(compose, account);
+ }
compose->targetinfo = procmsg_msginfo_copy(msginfo);
- if (msginfo->folder->stype == F_QUEUE
- || msginfo->folder->stype == F_DRAFT) {
+ if (folder_has_parent_of_type(msginfo->folder, F_QUEUE) ||
+ folder_has_parent_of_type(msginfo->folder, F_DRAFT)) {
gchar queueheader_buf[BUFFSIZE];
/* Set message save folder */
textview = GTK_TEXT_VIEW(compose->text);
textbuf = gtk_text_view_get_buffer(textview);
+ compose_create_tags(textview, compose);
+
mark = gtk_text_buffer_get_insert(textbuf);
gtk_text_buffer_get_iter_at_mark(textbuf, &iter, mark);
g_signal_handlers_block_by_func(G_OBJECT(textbuf),
G_CALLBACK(compose_changed_cb),
compose);
-
- if ((fp = procmime_get_first_text_content(msginfo)) == NULL)
+
+ if (procmime_msginfo_is_encrypted(msginfo)) {
+ fp = procmime_get_first_encrypted_text_content(msginfo);
+ if (fp)
+ compose_force_encryption(compose, account, TRUE);
+ } else
+ fp = procmime_get_first_text_content(msginfo);
+ if (fp == NULL)
g_warning("Can't get text part\n");
- else {
+
+ if (fp != NULL) {
gboolean prev_autowrap = compose->autowrap;
compose->autowrap = FALSE;
compose_attach_parts(compose, msginfo);
+ compose_colorize_signature(compose);
+
g_signal_handlers_unblock_by_func(G_OBJECT(textbuf),
G_CALLBACK(compose_changed_cb),
compose);
compose = compose_create(account, COMPOSE_REDIRECT);
ifactory = gtk_item_factory_from_widget(compose->menubar);
-
+ compose_create_tags(GTK_TEXT_VIEW(compose->text), compose);
compose->replyinfo = NULL;
compose->fwdinfo = NULL;
compose_quote_fmt(compose, msginfo, "%M", NULL, NULL);
gtk_text_view_set_editable(GTK_TEXT_VIEW(compose->text), FALSE);
+ compose_colorize_signature(compose);
+
ifactory = gtk_item_factory_from_widget(compose->popupmenu);
menu_set_sensitive(ifactory, "/Add...", FALSE);
menu_set_sensitive(ifactory, "/Remove", FALSE);
(prefs_common.color_new, &bold_color);
bold_style = gtk_style_copy(gtk_widget_get_style
(GTK_WIDGET(entry)));
- if (BOLD_FONT)
- font_desc = pango_font_description_from_string
- (BOLD_FONT);
- if (font_desc) {
- if (bold_style->font_desc)
- pango_font_description_free
- (bold_style->font_desc);
- bold_style->font_desc = font_desc;
- }
+ pango_font_description_set_weight
+ (bold_style->font_desc, PANGO_WEIGHT_BOLD);
bold_style->fg[GTK_STATE_NORMAL] = bold_color;
}
gtk_widget_set_style(GTK_WIDGET(entry), bold_style);
compose_ext_editor_cb(compose, 0, NULL);
break;
case A_LINEWRAP_CURRENT:
- compose_wrap_paragraph(compose, NULL);
+ compose_beautify_paragraph(compose, NULL, TRUE);
break;
case A_LINEWRAP_ALL:
- compose_wrap_all(compose);
+ compose_wrap_all_full(compose, TRUE);
break;
case A_ADDRBOOK:
compose_address_cb(compose, 0, NULL);
gint len;
gboolean prev_autowrap;
const gchar *trimmed_body = body;
+ GtkTextView *text = GTK_TEXT_VIEW(compose->text);
+ GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
if (!msginfo)
msginfo = &dummyinfo;
prev_autowrap = compose->autowrap;
compose->autowrap = FALSE;
+ g_signal_handlers_block_by_func(G_OBJECT(buffer),
+ G_CALLBACK(compose_changed_cb),
+ compose);
+ g_signal_handlers_block_by_func(G_OBJECT(buffer),
+ G_CALLBACK(text_inserted),
+ compose);
for (p = buf; *p != '\0'; ) {
- GtkTextView *text = GTK_TEXT_VIEW(compose->text);
- GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
GtkTextMark *mark;
GtkTextIter iter;
- g_signal_handlers_block_by_func(G_OBJECT(buffer),
- G_CALLBACK(compose_changed_cb),
- compose);
- g_signal_handlers_block_by_func(G_OBJECT(buffer),
- G_CALLBACK(text_inserted),
- compose);
mark = gtk_text_buffer_get_insert(buffer);
gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
gtk_text_buffer_insert(buffer, &iter, p, len);
- g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
- G_CALLBACK(compose_changed_cb),
- compose);
- g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
- G_CALLBACK(text_inserted),
- compose);
-
if (lastp)
p = lastp + 1;
else
if (compose->autowrap)
compose_wrap_all(compose);
+ g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
+ G_CALLBACK(compose_changed_cb),
+ compose);
+ g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
+ G_CALLBACK(text_inserted),
+ compose);
+
+
return buf;
}
GtkTextView *text = GTK_TEXT_VIEW(compose->text);
GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
GtkTextMark *mark;
- GtkTextIter iter;
+ GtkTextIter iter, iter_end;
gint cur_pos;
gboolean prev_autowrap;
if (!compose->sig_str || (replace && !compose->account->auto_sig))
compose->sig_str = g_strdup("");
+ cur_pos = gtk_text_iter_get_offset(&iter);
gtk_text_buffer_insert(buffer, &iter, compose->sig_str, -1);
+ /* skip \n\n */
+ gtk_text_buffer_get_iter_at_offset(buffer, &iter, cur_pos);
+ gtk_text_iter_forward_char(&iter);
+ gtk_text_iter_forward_char(&iter);
+ gtk_text_buffer_get_end_iter(buffer, &iter_end);
+ gtk_text_buffer_apply_tag_by_name(buffer,"signature",&iter, &iter_end);
if (cur_pos > gtk_text_buffer_get_char_count (buffer))
cur_pos = gtk_text_buffer_get_char_count (buffer);
sig_str = g_strconcat("\n\n", sig_body, NULL);
if (sig_str) {
- if (!g_utf8_validate(sig_str,1, NULL)) {
+ if (g_utf8_validate(sig_str, -1, NULL) == TRUE)
+ utf8_sig_str = sig_str;
+ else {
utf8_sig_str = conv_codeset_strdup
- (sig_str, conv_get_locale_charset_str(), CS_INTERNAL);
+ (sig_str, conv_get_locale_charset_str(),
+ CS_INTERNAL);
g_free(sig_str);
- } else
- utf8_sig_str = sig_str;
+ }
}
return utf8_sig_str;
g_return_val_if_fail(file != NULL, COMPOSE_INSERT_NO_FILE);
- if ((fp = fopen(file, "rb")) == NULL) {
+ if ((fp = g_fopen(file, "rb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
return COMPOSE_INSERT_READ_ERROR;
}
while (fgets(buf, sizeof(buf), fp) != NULL) {
gchar *str;
- str = conv_codeset_strdup(buf, cur_encoding, CS_INTERNAL);
+ if (g_utf8_validate(buf, -1, NULL) == TRUE)
+ str = g_strdup(buf);
+ else
+ str = conv_codeset_strdup
+ (buf, cur_encoding, CS_INTERNAL);
if (!str) continue;
/* strip <CR> if DOS/Windows file,
alertpanel_notice(_("File %s is empty."), filename);
return;
}
- if ((fp = fopen(file, "rb")) == NULL) {
+ if ((fp = g_fopen(file, "rb")) == NULL) {
alertpanel_error(_("Can't read %s."), filename);
return;
}
fclose(fp);
-#if 0 /* NEW COMPOSE GUI */
- if (!compose->use_attach) {
- GtkItemFactory *ifactory;
-
- ifactory = gtk_item_factory_from_widget(compose->menubar);
- menu_set_active(ifactory, "/View/Attachment", TRUE);
- }
-#endif
ainfo = g_new0(AttachInfo, 1);
auto_ainfo = g_auto_pointer_new_with_free
(ainfo, (GFreeFunc) compose_attach_info_free);
} else if (compose->mode == COMPOSE_REEDIT &&
child->type == MIMETYPE_APPLICATION &&
!g_ascii_strcasecmp(child->subtype, "pgp-encrypted")) {
- AlertValue val;
- val = alertpanel(_("Encrypted message"),
- _("Cannot re-edit an encrypted message. \n"
- "Discard encrypted part?"),
- _("Yes"), _("No"), NULL);
- if (val == G_ALERTDEFAULT)
- encrypted = (MimeInfo *)child->node->parent->data;
+ encrypted = (MimeInfo *)child->node->parent->data;
}
child = (MimeInfo *) mimeinfo->node->children->data;
gchar *content_type;
content_type = procmime_get_content_type_str(child->type, child->subtype);
- partname = procmime_mimeinfo_get_parameter(child, "name");
- if (partname == NULL)
- partname = "";
- compose_attach_append(compose, outfile,
- partname, content_type);
+
+ /* if we meet a pgp signature, we don't attach it, but
+ * we force signing. */
+ if (strcmp(content_type, "application/pgp-signature")) {
+ partname = procmime_mimeinfo_get_parameter(child, "filename");
+ if (partname == NULL)
+ partname = procmime_mimeinfo_get_parameter(child, "name");
+ if (partname == NULL)
+ partname = "";
+ compose_attach_append(compose, outfile,
+ partname, content_type);
+ } else {
+ compose_force_signing(compose, compose->account);
+ }
g_free(content_type);
}
g_free(outfile);
gint pos = 0;
gboolean can_break = FALSE;
gboolean do_break = FALSE;
+ gboolean was_white = FALSE;
+ gboolean prev_dont_break = FALSE;
gtk_text_iter_forward_to_line_end(&line_end);
str = gtk_text_buffer_get_text(buffer, &iter, &line_end, FALSE);
gunichar wc;
gint uri_len;
- if (attr->is_line_break && can_break)
+ if (attr->is_line_break && can_break && was_white && !prev_dont_break)
pos = i;
+
+ was_white = attr->is_white;
/* don't wrap URI */
if ((uri_len = get_uri_len(p)) > 0) {
}
wc = g_utf8_get_char(p);
- if (g_unichar_iswide(wc))
+ if (g_unichar_iswide(wc)) {
col += 2;
- else if (*p == '\t')
+ if (prev_dont_break && can_break && attr->is_line_break)
+ pos = i;
+ } else if (*p == '\t')
col += 8;
else
col++;
break;
}
+ if (*p == '-' || *p == '/')
+ prev_dont_break = TRUE;
+ else
+ prev_dont_break = FALSE;
+
p = g_utf8_next_char(p);
can_break = TRUE;
}
return do_break;
}
-static gboolean compose_is_sig_separator(Compose *compose, GtkTextBuffer *textbuf, GtkTextIter *iter)
-{
- GtkTextIter start = *iter;
- GtkTextIter end_iter;
- int start_pos = gtk_text_iter_get_offset(&start);
-
- if (!compose->account->sig_sep)
- return FALSE;
-
- gtk_text_buffer_get_iter_at_offset(textbuf, &end_iter,
- start_pos+strlen(compose->account->sig_sep));
-
- /* check sig separator */
- if (!strcmp(gtk_text_iter_get_text(&start, &end_iter),
- compose->account->sig_sep)) {
- /* check end of line (\n) */
- gtk_text_buffer_get_iter_at_offset(textbuf, &start,
- start_pos+strlen(compose->account->sig_sep));
- gtk_text_buffer_get_iter_at_offset(textbuf, &end_iter,
- start_pos+strlen(compose->account->sig_sep)+1);
-
- if (!strcmp(gtk_text_iter_get_text(&start, &end_iter),"\n"));
- return TRUE;
-
-
- }
-
- return FALSE;
-}
-
static gboolean compose_join_next_line(Compose *compose,
GtkTextBuffer *buffer,
GtkTextIter *iter,
return TRUE;
}
-static void compose_wrap_paragraph(Compose *compose, GtkTextIter *par_iter)
+#define ADD_TXT_POS(bp_, ep_, pti_) \
+ if ((last->next = alloca(sizeof(struct txtpos))) != NULL) { \
+ last = last->next; \
+ last->bp = (bp_); last->ep = (ep_); last->pti = (pti_); \
+ last->next = NULL; \
+ } else { \
+ g_warning("alloc error scanning URIs\n"); \
+ }
+
+static void compose_beautify_paragraph(Compose *compose, GtkTextIter *par_iter, gboolean force)
{
GtkTextView *text = GTK_TEXT_VIEW(compose->text);
GtkTextBuffer *buffer;
- GtkTextIter iter, break_pos;
+ GtkTextIter iter, break_pos, end_of_line;
gchar *quote_str = NULL;
gint quote_len;
gboolean wrap_quote = prefs_common.linewrap_quote;
gboolean prev_autowrap = compose->autowrap;
+ gint startq_offset = -1, noq_offset = -1;
+ gint uri_start = -1, uri_stop = -1;
+ gint nouri_start = -1, nouri_stop = -1;
compose->autowrap = FALSE;
/* go until paragraph end (empty line) */
while (!gtk_text_iter_ends_line(&iter)) {
+ gchar *scanpos = NULL;
+ /* parse table - in order of priority */
+ struct table {
+ const gchar *needle; /* token */
+
+ /* token search function */
+ gchar *(*search) (const gchar *haystack,
+ const gchar *needle);
+ /* part parsing function */
+ gboolean (*parse) (const gchar *start,
+ const gchar *scanpos,
+ const gchar **bp_,
+ const gchar **ep_);
+ /* part to URI function */
+ gchar *(*build_uri) (const gchar *bp,
+ const gchar *ep);
+ };
+
+ static struct table parser[] = {
+ {"http://", strcasestr, get_uri_part, make_uri_string},
+ {"https://", strcasestr, get_uri_part, make_uri_string},
+ {"ftp://", strcasestr, get_uri_part, make_uri_string},
+ {"www.", strcasestr, get_uri_part, make_http_string},
+ {"mailto:", strcasestr, get_uri_part, make_uri_string},
+ {"@", strcasestr, get_email_part, make_email_string}
+ };
+ const gint PARSE_ELEMS = sizeof parser / sizeof parser[0];
+ gint last_index = PARSE_ELEMS;
+ gint n;
+ gchar *o_walk = NULL, *walk = NULL, *bp = NULL, *ep = NULL;
+ gint walk_pos;
+
+ if (gtk_text_iter_has_tag(&iter, no_wrap_tag) && !force)
+ goto colorize;
+
+ uri_start = uri_stop = -1;
quote_str = compose_get_quote_str(buffer, &iter, "e_len);
+
if (quote_str) {
if (!wrap_quote) {
- gtk_text_iter_forward_line(&iter);
- g_free(quote_str);
- continue;
+ if (startq_offset == -1) {
+ startq_offset = gtk_text_iter_get_offset(&iter);
+ }
+ goto colorize;
}
- debug_print("compose_wrap_paragraph(): quote_str = '%s'\n", quote_str);
+ debug_print("compose_beautify_paragraph(): quote_str = '%s'\n", quote_str);
+ startq_offset = gtk_text_iter_get_offset(&iter);
+ } else {
+ if (startq_offset == -1)
+ noq_offset = gtk_text_iter_get_offset(&iter);
}
+ if (prev_autowrap == FALSE && !force) {
+ goto colorize;
+ }
if (compose_get_line_break_pos(buffer, &iter, &break_pos,
prefs_common.linewrap_len,
quote_len)) {
GtkTextIter prev, next, cur;
gtk_text_buffer_insert(buffer, &break_pos, "\n", 1);
-
+
/* remove trailing spaces */
cur = break_pos;
gtk_text_iter_backward_char(&cur);
/* move iter to current line start */
gtk_text_iter_set_line_offset(&iter, 0);
+ continue;
} else {
/* move iter to next line start */
iter = break_pos;
- gtk_text_iter_forward_line(&iter);
}
+colorize:
+ end_of_line = iter;
+ while (!gtk_text_iter_ends_line(&end_of_line)) {
+ gtk_text_iter_forward_char(&end_of_line);
+ }
+ o_walk = walk = gtk_text_buffer_get_text(buffer, &iter, &end_of_line, FALSE);
+
+ nouri_start = gtk_text_iter_get_offset(&iter);
+ nouri_stop = gtk_text_iter_get_offset(&end_of_line);
+
+ walk_pos = gtk_text_iter_get_offset(&iter);
+ /* FIXME: this looks phony. scanning for anything in the parse table */
+ for (n = 0; n < PARSE_ELEMS; n++) {
+ gchar *tmp;
+
+ tmp = parser[n].search(walk, parser[n].needle);
+ if (tmp) {
+ if (scanpos == NULL || tmp < scanpos) {
+ scanpos = tmp;
+ last_index = n;
+ }
+ }
+ }
+
+ bp = ep = 0;
+ if (scanpos) {
+ /* check if URI can be parsed */
+ if (parser[last_index].parse(walk, scanpos, (const gchar **)&bp,(const gchar **)&ep)
+ && (size_t) (ep - bp - 1) > strlen(parser[last_index].needle)) {
+ walk = ep;
+ } else
+ walk = scanpos +
+ strlen(parser[last_index].needle);
+ }
+ if (bp && ep) {
+ uri_start = walk_pos + (bp - o_walk);
+ uri_stop = walk_pos + (ep - o_walk);
+ }
+ g_free(o_walk);
+ o_walk = NULL;
+ gtk_text_iter_forward_line(&iter);
g_free(quote_str);
+ quote_str = NULL;
+ if (startq_offset != -1) {
+ GtkTextIter startquote, endquote;
+ gtk_text_buffer_get_iter_at_offset(
+ buffer, &startquote, startq_offset);
+ endquote = iter;
+ gtk_text_buffer_apply_tag_by_name(
+ buffer, "quote", &startquote, &endquote);
+ startq_offset = -1;
+ } else if (noq_offset != -1) {
+ GtkTextIter startnoquote, endnoquote;
+ gtk_text_buffer_get_iter_at_offset(
+ buffer, &startnoquote, noq_offset);
+ endnoquote = iter;
+ gtk_text_buffer_remove_tag_by_name(
+ buffer, "quote", &startnoquote, &endnoquote);
+ noq_offset = -1;
+ }
+
+ /* always */ {
+ GtkTextIter nouri_start_iter, nouri_end_iter;
+ gtk_text_buffer_get_iter_at_offset(
+ buffer, &nouri_start_iter, nouri_start);
+ gtk_text_buffer_get_iter_at_offset(
+ buffer, &nouri_end_iter, nouri_stop);
+ gtk_text_buffer_remove_tag_by_name(
+ buffer, "link", &nouri_start_iter, &nouri_end_iter);
+ }
+ if (uri_start > 0 && uri_stop > 0) {
+ GtkTextIter uri_start_iter, uri_end_iter;
+ gtk_text_buffer_get_iter_at_offset(
+ buffer, &uri_start_iter, uri_start);
+ gtk_text_buffer_get_iter_at_offset(
+ buffer, &uri_end_iter, uri_stop);
+ gtk_text_buffer_apply_tag_by_name(
+ buffer, "link", &uri_start_iter, &uri_end_iter);
+ }
}
if (par_iter)
compose_wrap_all_full(compose, FALSE);
}
-static void compose_wrap_all_full(Compose *compose, gboolean autowrap)
+static void compose_wrap_all_full(Compose *compose, gboolean force)
{
GtkTextView *text = GTK_TEXT_VIEW(compose->text);
GtkTextBuffer *buffer;
gtk_text_buffer_get_start_iter(buffer, &iter);
while (!gtk_text_iter_is_end(&iter))
- compose_wrap_paragraph(compose, &iter);
+ compose_beautify_paragraph(compose, &iter, force);
undo_unblock(compose->undostruct);
}
compose_set_title(compose);
ifactory = gtk_item_factory_from_widget(compose->menubar);
-#if 0
- if (account->protocol == A_NNTP) {
- gtk_widget_show(compose->newsgroups_hbox);
- gtk_widget_show(compose->newsgroups_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table), 2, 4);
- compose->use_newsgroups = TRUE;
-
- menu_set_active(ifactory, "/View/To", FALSE);
- menu_set_sensitive(ifactory, "/View/To", TRUE);
- menu_set_active(ifactory, "/View/Cc", FALSE);
- menu_set_sensitive(ifactory, "/View/Cc", TRUE);
- menu_set_sensitive(ifactory, "/View/Followup to", TRUE);
- } else {
- gtk_widget_hide(compose->newsgroups_hbox);
- gtk_widget_hide(compose->newsgroups_entry);
- gtk_table_set_row_spacing(GTK_TABLE(compose->table), 2, 0);
- gtk_widget_queue_resize(compose->table_vbox);
- compose->use_newsgroups = FALSE;
-
- menu_set_active(ifactory, "/View/To", TRUE);
- menu_set_sensitive(ifactory, "/View/To", FALSE);
- menu_set_active(ifactory, "/View/Cc", TRUE);
- menu_set_sensitive(ifactory, "/View/Cc", FALSE);
- menu_set_active(ifactory, "/View/Followup to", FALSE);
- menu_set_sensitive(ifactory, "/View/Followup to", FALSE);
- }
-
- if (account->set_autocc) {
- compose_entry_show(compose, COMPOSE_ENTRY_CC);
- if (account->auto_cc && compose->mode != COMPOSE_REEDIT)
- compose_entry_set(compose, account->auto_cc,
- COMPOSE_ENTRY_CC);
- }
- if (account->set_autobcc) {
- compose_entry_show(compose, COMPOSE_ENTRY_BCC);
- if (account->auto_bcc && compose->mode != COMPOSE_REEDIT)
- compose_entry_set(compose, account->auto_bcc,
- COMPOSE_ENTRY_BCC);
- }
- if (account->set_autoreplyto) {
- compose_entry_show(compose, COMPOSE_ENTRY_REPLY_TO);
- if (account->auto_replyto && compose->mode != COMPOSE_REEDIT)
- compose_entry_set(compose, account->auto_replyto,
- COMPOSE_ENTRY_REPLY_TO);
- }
-
-#endif
if (account->default_sign && compose->mode != COMPOSE_REDIRECT)
menu_set_active(ifactory, "/Options/Sign", TRUE);
val = compose_queue(compose, &msgnum, &folder);
if (val) {
- alertpanel_error(_("Could not queue message for sending."));
+ if (val == -3) {
+ alertpanel_error(_("Could not queue message for sending:\n\n"
+ "Signature failed."));
+ } else if (val == -2) {
+ alertpanel_error(_("Could not queue message for sending:\n\n%s."), strerror(errno));
+ } else {
+ alertpanel_error(_("Could not queue message for sending."));
+ }
goto bail;
}
g_strstrip(str);
if (str[0] != '\0') {
compose_convert_header
- (buf, sizeof(buf), str,
+ (compose, buf, sizeof(buf), str,
strlen("Resent-To") + 2, TRUE);
if (first_to_address) {
g_strstrip(str);
if (str[0] != '\0') {
compose_convert_header
- (buf, sizeof(buf), str,
+ (compose, buf, sizeof(buf), str,
strlen("Resent-Cc") + 2, TRUE);
if (first_cc_address) {
/* Resent-From */
if (compose->account->name && *compose->account->name) {
compose_convert_header
- (buf, sizeof(buf), compose->account->name,
+ (compose, buf, sizeof(buf), compose->account->name,
strlen("From: "), TRUE);
fprintf(fp, "Resent-From: %s <%s>\n",
buf, compose->account->address);
Xstrdup_a(str, entstr, return -1);
g_strstrip(str);
if (*str != '\0') {
- compose_convert_header(buf, sizeof(buf), str,
+ compose_convert_header(compose, buf, sizeof(buf), str,
strlen("Subject: "), FALSE);
fprintf(fp, "Subject: %s\n", buf);
}
size_t len;
gchar buf[BUFFSIZE];
- if ((fp = fopen(compose->redirect_filename, "rb")) == NULL) {
+ if ((fp = g_fopen(compose->redirect_filename, "rb")) == NULL) {
FILE_OP_ERROR(compose->redirect_filename, "fopen");
return -1;
}
if (compose->account->name
&& *compose->account->name) {
compose_convert_header
- (buf, sizeof(buf),
+ (compose, buf, sizeof(buf),
compose->account->name,
strlen("From: "),
FALSE);
const gchar *out_codeset;
EncodingType encoding;
MimeInfo *mimemsg, *mimetext;
+ gint line;
/* create message MimeInfo */
mimemsg = procmime_mimeinfo_new();
msg = g_strdup_printf(_("Can't convert the character encoding of the message from\n"
"%s to %s.\n"
"Send it anyway?"), src_codeset, out_codeset);
- aval = alertpanel_with_type
- (_("Error"), msg, _("Yes"), _("+No"), NULL, NULL, ALERT_ERROR);
- g_free(msg);
+ aval = alertpanel_full(_("Error"), msg, GTK_STOCK_YES, GTK_STOCK_NO, NULL, FALSE,
+ NULL, ALERT_ERROR, G_ALERTALTERNATE);
+ g_free(msg);
if (aval != G_ALERTDEFAULT) {
g_free(chars);
else if (encoding == ENC_8BIT)
encoding = ENC_BASE64;
}
+
+ /* check for line length limit */
+ if (action == COMPOSE_WRITE_FOR_SEND &&
+ encoding != ENC_QUOTED_PRINTABLE && encoding != ENC_BASE64 &&
+ check_line_length(buf, 1000, &line) < 0) {
+ AlertValue aval;
+ gchar *msg;
+
+ msg = g_strdup_printf
+ (_("Line %d exceeds the line length limit (998 bytes).\n"
+ "The contents of the message might be broken on the way to the delivery.\n"
+ "\n"
+ "Send it anyway?"), line + 1);
+ aval = alertpanel(_("Warning"), msg, GTK_STOCK_OK, GTK_STOCK_CANCEL, NULL);
+ g_free(msg);
+ if (aval != G_ALERTDEFAULT) {
+ return -1;
+ }
+ }
+
if (encoding != ENC_UNKNOWN)
procmime_encode_content(mimetext, encoding);
if (action == COMPOSE_WRITE_FOR_SEND && compose->use_signing &&
privacy_system_can_sign(compose->privacy_system))
if (!privacy_sign(compose->privacy_system, mimemsg, compose->account))
- return -1;
+ return -2;
procmime_write_mimeinfo(mimemsg, fp);
size_t len;
gchar *chars, *tmp;
- if ((fp = fopen(file, "wb")) == NULL) {
+ if ((fp = g_fopen(file, "wb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
return -1;
}
FILE_OP_ERROR(file, "fwrite");
g_free(chars);
fclose(fp);
- unlink(file);
+ g_unlink(file);
return -1;
}
if (fclose(fp) == EOF) {
FILE_OP_ERROR(file, "fclose");
- unlink(file);
+ g_unlink(file);
return -1;
}
return 0;
g_return_val_if_fail(item != NULL, -1);
if (procmsg_msg_exist(msginfo) &&
- (item->stype == F_DRAFT || item->stype == F_QUEUE
+ (folder_has_parent_of_type(item, F_QUEUE) ||
+ folder_has_parent_of_type(item, F_DRAFT)
|| msginfo == compose->autosaved_draft)) {
if (folder_item_remove_msg(item, msginfo->msgnum) < 0) {
g_warning("can't remove the old message\n");
/* write queue header */
tmp = g_strdup_printf("%s%cqueue.%p", get_tmp_dir(),
G_DIR_SEPARATOR, compose);
- if ((fp = fopen(tmp, "wb")) == NULL) {
+ if ((fp = g_fopen(tmp, "wb")) == NULL) {
FILE_OP_ERROR(tmp, "fopen");
g_free(tmp);
- return -1;
+ return -2;
}
if (change_file_mode_rw(fp, tmp) < 0) {
if (compose_redirect_write_to_file(compose, fp) < 0) {
lock = FALSE;
fclose(fp);
- unlink(tmp);
+ g_unlink(tmp);
g_free(tmp);
- return -1;
+ return -2;
}
} else {
- if (compose_write_to_file(compose, fp, COMPOSE_WRITE_FOR_SEND) < 0) {
+ gint result = 0;
+ if ((result = compose_write_to_file(compose, fp, COMPOSE_WRITE_FOR_SEND)) < 0) {
lock = FALSE;
fclose(fp);
- unlink(tmp);
+ g_unlink(tmp);
g_free(tmp);
- return -1;
+ return result - 1; /* -2 for a generic error, -3 for signing error */
}
}
if (fclose(fp) == EOF) {
FILE_OP_ERROR(tmp, "fclose");
- unlink(tmp);
+ g_unlink(tmp);
g_free(tmp);
- return -1;
+ return -2;
}
queue = account_get_special_folder(compose->account, F_QUEUE);
if (!queue) {
g_warning("can't find queue folder\n");
- unlink(tmp);
+ g_unlink(tmp);
g_free(tmp);
return -1;
}
folder_item_scan(queue);
if ((num = folder_item_add_msg(queue, tmp, NULL, TRUE)) < 0) {
g_warning("can't queue the message\n");
- unlink(tmp);
+ g_unlink(tmp);
g_free(tmp);
return -1;
}
- unlink(tmp);
+ g_unlink(tmp);
g_free(tmp);
if (compose->mode == COMPOSE_REEDIT) {
buf = g_new0(gchar, fieldstr->len * 4 + 256);
compose_convert_header
- (buf, fieldstr->len * 4 + 256, fieldstr->str,
+ (compose, buf, fieldstr->len * 4 + 256, fieldstr->str,
strlen(fieldname) + 2, TRUE);
g_string_append_printf(header, "%s: %s\n", fieldname, buf);
g_free(buf);
gchar *std_headers[] = {"To:", "Cc:", "Bcc:", "Newsgroups:", "Reply-To:", "Followup-To:", NULL};
GString *header;
- /* struct utsname utsbuf; */
-
g_return_val_if_fail(compose->account != NULL, NULL);
g_return_val_if_fail(compose->account->address != NULL, NULL);
/* From */
if (compose->account->name && *compose->account->name) {
compose_convert_header
- (buf, sizeof(buf), compose->account->name,
+ (compose, buf, sizeof(buf), compose->account->name,
strlen("From: "), TRUE);
QUOTE_IF_REQUIRED(name, buf);
g_string_append_printf(header, "From: %s <%s>\n",
if (*str != '\0' && !IS_IN_CUSTOM_HEADER("Subject")) {
g_strstrip(str);
if (*str != '\0') {
- compose_convert_header(buf, sizeof(buf), str,
+ compose_convert_header(compose, buf, sizeof(buf), str,
strlen("Subject: "), FALSE);
g_string_append_printf(header, "Subject: %s\n", buf);
}
if (compose->account->organization &&
strlen(compose->account->organization) &&
!IS_IN_CUSTOM_HEADER("Organization")) {
- compose_convert_header(buf, sizeof(buf),
+ compose_convert_header(compose, buf, sizeof(buf),
compose->account->organization,
strlen("Organization: "), FALSE);
g_string_append_printf(header, "Organization: %s\n", buf);
}
/* Program version and system info */
- /* uname(&utsbuf); */
if (g_slist_length(compose->to_list) && !IS_IN_CUSTOM_HEADER("X-Mailer") &&
!compose->newsgroup_list) {
g_string_append_printf(header, "X-Mailer: %s (GTK+ %d.%d.%d; %s)\n",
prog_version,
gtk_major_version, gtk_minor_version, gtk_micro_version,
TARGET_ALIAS);
- /* utsbuf.sysname, utsbuf.release, utsbuf.machine); */
}
if (g_slist_length(compose->newsgroup_list) && !IS_IN_CUSTOM_HEADER("X-Newsreader")) {
g_string_append_printf(header, "X-Newsreader: %s (GTK+ %d.%d.%d; %s)\n",
prog_version,
gtk_major_version, gtk_minor_version, gtk_micro_version,
TARGET_ALIAS);
- /* utsbuf.sysname, utsbuf.release, utsbuf.machine); */
}
/* custom headers */
if (custom_header_is_allowed(chdr->name)) {
compose_convert_header
- (buf, sizeof(buf),
+ (compose, buf, sizeof(buf),
chdr->value ? chdr->value : "",
strlen(chdr->name) + 2, FALSE);
g_string_append_printf(header, "%s: %s\n", chdr->name, buf);
if (compose->return_receipt) {
if (compose->account->name
&& *compose->account->name) {
- compose_convert_header(buf, sizeof(buf),
+ compose_convert_header(compose, buf, sizeof(buf),
compose->account->name,
strlen("Disposition-Notification-To: "),
TRUE);
#undef IS_IN_CUSTOM_HEADER
-static void compose_convert_header(gchar *dest, gint len, gchar *src,
+static void compose_convert_header(Compose *compose, gchar *dest, gint len, gchar *src,
gint header_len, gboolean addr_field)
{
gchar *tmpstr = NULL;
subst_char(tmpstr, '\r', ' ');
g_strchomp(tmpstr);
- conv_encode_header(dest, len, tmpstr, header_len, addr_field);
+ conv_encode_header_full(dest, len, tmpstr, header_len, addr_field,
+ conv_get_charset_str(compose->out_encoding));
g_free(tmpstr);
}
GtkWidget *label;
GtkWidget *hbox;
GtkWidget *from_optmenu_hbox;
-#if 0 /* NEW COMPOSE GUI */
- GtkWidget *to_entry;
- GtkWidget *to_hbox;
- GtkWidget *newsgroups_entry;
- GtkWidget *newsgroups_hbox;
-#endif
GtkWidget *header_scrolledwin;
GtkWidget *header_table;
-#if 0 /* NEW COMPOSE GUI */
- GtkWidget *cc_entry;
- GtkWidget *cc_hbox;
- GtkWidget *bcc_entry;
- GtkWidget *bcc_hbox;
- GtkWidget *reply_entry;
- GtkWidget *reply_hbox;
- GtkWidget *followup_entry;
- GtkWidget *followup_hbox;
-#endif
gint count = 0;
from_optmenu_hbox = compose_account_option_menu_create(compose);
gtk_table_attach(GTK_TABLE(header_table), from_optmenu_hbox,
1, 2, count, count + 1, GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0);
-#if 0 /* NEW COMPOSE GUI */
- gtk_table_set_row_spacing(GTK_TABLE(table), 0, 4);
-#endif
count++;
compose->header_table = header_table;
compose_create_header_entry(compose);
-#if 0 /* NEW COMPOSE GUI */
- compose_add_entry_field(table, &to_hbox, &to_entry, &count,
- "To:", TRUE);
- gtk_table_set_row_spacing(GTK_TABLE(table), 0, 4);
- compose_add_entry_field(table, &newsgroups_hbox, &newsgroups_entry,
- &count, "Newsgroups:", FALSE);
- gtk_table_set_row_spacing(GTK_TABLE(table), 1, 4);
-
- gtk_table_set_row_spacing(GTK_TABLE(table), 2, 4);
-
- compose_add_entry_field(table, &cc_hbox, &cc_entry, &count,
- "Cc:", TRUE);
- gtk_table_set_row_spacing(GTK_TABLE(table), 3, 4);
- compose_add_entry_field(table, &bcc_hbox, &bcc_entry, &count,
- "Bcc:", TRUE);
- gtk_table_set_row_spacing(GTK_TABLE(table), 4, 4);
- compose_add_entry_field(table, &reply_hbox, &reply_entry, &count,
- "Reply-To:", TRUE);
- gtk_table_set_row_spacing(GTK_TABLE(table), 5, 4);
- compose_add_entry_field(table, &followup_hbox, &followup_entry, &count,
- "Followup-To:", FALSE);
- gtk_table_set_row_spacing(GTK_TABLE(table), 6, 4);
-
- gtk_table_set_col_spacings(GTK_TABLE(table), 4);
-
- g_signal_connect(G_OBJECT(to_entry), "activate",
- G_CALLBACK(to_activated), compose);
- g_signal_connect(G_OBJECT(newsgroups_entry), "activate",
- G_CALLBACK(newsgroups_activated), compose);
- g_signal_connect(G_OBJECT(subject_entry), "activate",
- G_CALLBACK(subject_activated), compose);
- g_signal_connect(G_OBJECT(cc_entry), "activate",
- G_CALLBACK(cc_activated), compose);
- g_signal_connect(G_OBJECT(bcc_entry), "activate",
- G_CALLBACK(bcc_activated), compose);
- g_signal_connect(G_OBJECT(reply_entry), "activate",
- G_CALLBACK(replyto_activated), compose);
- g_signal_connect(G_OBJECT(followup_entry), "activate",
- G_CALLBACK(followupto_activated), compose);
-
- g_signal_connect(G_OBJECT(subject_entry), "grab_focus",
- G_CALLBACK(compose_grab_focus_cb), compose);
- g_signal_connect(G_OBJECT(to_entry), "grab_focus",
- G_CALLBACK(compose_grab_focus_cb), compose);
- g_signal_connect(G_OBJECT(newsgroups_entry), "grab_focus",
- G_CALLBACK(compose_grab_focus_cb), compose);
- g_signal_connect(G_OBJECT(cc_entry), "grab_focus",
- G_CALLBACK(compose_grab_focus_cb), compose);
- g_signal_connect(G_OBJECT(bcc_entry), "grab_focus",
- G_CALLBACK(compose_grab_focus_cb), compose);
- g_signal_connect(G_OBJECT(reply_entry), "grab_focus",
- G_CALLBACK(compose_grab_focus_cb), compose);
- g_signal_connect(G_OBJECT(followup_entry), "grab_focus",
- G_CALLBACK(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 ;
}
n_menu_entries, "<Compose>", compose);
gtk_box_pack_start(GTK_BOX(vbox), menubar, FALSE, TRUE, 0);
- handlebox = gtk_handle_box_new();
+ if (prefs_common.toolbar_detachable) {
+ handlebox = gtk_handle_box_new();
+ } else {
+ handlebox = gtk_hbox_new(FALSE, 0);
+ }
gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
+ gtk_widget_realize(handlebox);
compose->toolbar = toolbar_create(TOOLBAR_COMPOSE, handlebox,
(gpointer)compose);
}
color[0] = quote_color;
- cmap = gdk_window_get_colormap(window->window);
+ cmap = gdk_drawable_get_colormap(window->window);
gdk_colormap_alloc_colors(cmap, color, 1, FALSE, TRUE, success);
if (success[0] == FALSE) {
GtkStyle *style;
compose->exteditor_file = NULL;
compose->exteditor_pid = -1;
- compose->exteditor_readdes = -1;
compose->exteditor_tag = -1;
compose->draft_timeout_tag = -1;
optmenu_menu = gtk_menu_new();
MENUITEM_ADD(optmenu_menu, menuitem, "7bit", ENC_7BIT);
gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), optmenu_menu);
-#if 0
- gtk_widget_set_sensitive(menuitem, FALSE);
-#endif
MENUITEM_ADD(optmenu_menu, menuitem, "8bit", ENC_8BIT);
gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), optmenu_menu);
-#if 0
- gtk_widget_set_sensitive(menuitem, FALSE);
-#endif
MENUITEM_ADD(optmenu_menu, menuitem, "quoted-printable",
ENC_QUOTED_PRINTABLE);
gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), optmenu_menu);
static void compose_exec_ext_editor(Compose *compose)
{
+#ifdef G_OS_UNIX
gchar *tmp;
pid_t pid;
gint pipe_fds[2];
compose->exteditor_file = g_strdup(tmp);
compose->exteditor_pid = pid;
- compose->exteditor_readdes = pipe_fds[0];
compose_set_ext_editor_sensitive(compose, FALSE);
- compose->exteditor_tag =
- gdk_input_add(pipe_fds[0], GDK_INPUT_READ,
- compose_input_cb, compose);
+ compose->exteditor_ch = g_io_channel_unix_new(pipe_fds[0]);
+ compose->exteditor_tag = g_io_add_watch(compose->exteditor_ch,
+ G_IO_IN,
+ compose_input_cb,
+ compose);
} else { /* process-monitoring process */
pid_t pid_ed;
}
g_free(tmp);
+#endif /* G_OS_UNIX */
}
+#ifdef G_OS_UNIX
static gint compose_exec_ext_editor_real(const gchar *file)
{
static gchar *def_cmd = "emacs %s";
g_snprintf(buf, sizeof(buf), prefs_common.ext_editor_cmd, file);
} else {
if (prefs_common.ext_editor_cmd)
- g_warning("External editor command line is invalid: `%s'\n",
+ g_warning("External editor command line is invalid: '%s'\n",
prefs_common.ext_editor_cmd);
g_snprintf(buf, sizeof(buf), def_cmd, file);
}
(_("The external editor is still working.\n"
"Force terminating the process?\n"
"process group id: %d"), -pgid);
- val = alertpanel(_("Notice"), msg, _("Yes"), _("+No"), NULL);
+ val = alertpanel_full(_("Notice"), msg, GTK_STOCK_YES, GTK_STOCK_NO,
+ NULL, FALSE, NULL, ALERT_WARNING, G_ALERTALTERNATE);
+
g_free(msg);
if (val == G_ALERTDEFAULT) {
- gdk_input_remove(compose->exteditor_tag);
- close(compose->exteditor_readdes);
+ g_source_remove(compose->exteditor_tag);
+ g_io_channel_shutdown(compose->exteditor_ch,
+ FALSE, NULL);
+ g_io_channel_unref(compose->exteditor_ch);
if (kill(pgid, SIGTERM) < 0) perror("kill");
waitpid(compose->exteditor_pid, NULL, 0);
g_free(compose->exteditor_file);
compose->exteditor_file = NULL;
compose->exteditor_pid = -1;
- compose->exteditor_readdes = -1;
+ compose->exteditor_ch = NULL;
compose->exteditor_tag = -1;
} else
return FALSE;
return TRUE;
}
-static void compose_input_cb(gpointer data, gint source,
- GdkInputCondition condition)
+static gboolean compose_input_cb(GIOChannel *source, GIOCondition condition,
+ gpointer data)
{
- gchar buf[3];
+ gchar buf[3] = "3";
Compose *compose = (Compose *)data;
- gint i = 0;
+ gsize bytes_read;
- debug_print("Compose: input from monitoring process\n");
+ debug_print(_("Compose: input from monitoring process\n"));
- gdk_input_remove(compose->exteditor_tag);
+ g_io_channel_read_chars(source, buf, sizeof(buf), &bytes_read, NULL);
- for (;;) {
- if (read(source, &buf[i], 1) < 1) {
- buf[0] = '3';
- break;
- }
- if (buf[i] == '\n') {
- buf[i] = '\0';
- break;
- }
- i++;
- if (i == sizeof(buf) - 1)
- break;
- }
+ g_io_channel_shutdown(source, FALSE, NULL);
+ g_io_channel_unref(source);
waitpid(compose->exteditor_pid, NULL, 0);
compose_insert_file(compose, compose->exteditor_file);
compose_changed_cb(NULL, compose);
- if (unlink(compose->exteditor_file) < 0)
+ if (g_unlink(compose->exteditor_file) < 0)
FILE_OP_ERROR(compose->exteditor_file, "unlink");
} else if (buf[0] == '1') { /* failed */
g_warning("Couldn't exec external editor\n");
- if (unlink(compose->exteditor_file) < 0)
+ if (g_unlink(compose->exteditor_file) < 0)
FILE_OP_ERROR(compose->exteditor_file, "unlink");
} else if (buf[0] == '2') {
g_warning("Couldn't write to file\n");
g_warning("Pipe read failed\n");
}
- close(source);
-
compose_set_ext_editor_sensitive(compose, TRUE);
g_free(compose->exteditor_file);
compose->exteditor_file = NULL;
compose->exteditor_pid = -1;
- compose->exteditor_readdes = -1;
+ compose->exteditor_ch = NULL;
compose->exteditor_tag = -1;
+
+ return FALSE;
}
static void compose_set_ext_editor_sensitive(Compose *compose,
gtk_widget_set_sensitive(compose->toolbar->linewrap_current_btn, sensitive);
gtk_widget_set_sensitive(compose->toolbar->linewrap_all_btn, sensitive);
}
+#endif /* G_OS_UNIX */
/**
* compose_undo_state_changed:
if (prefs_common.work_offline)
if (alertpanel(_("Offline warning"),
_("You're working offline. Override?"),
- _("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
+ GTK_STOCK_YES, GTK_STOCK_NO, NULL) != G_ALERTDEFAULT)
return;
if (compose->draft_timeout_tag != -1) { /* CLAWS: disable draft timeout */
val = compose_queue_sub(compose, NULL, NULL, TRUE);
if (!val)
compose_close(compose);
+ else if (val == -2) {
+ alertpanel_error(_("Could not queue message:\n\n%s."), strerror(errno));
+ }
}
void compose_draft (gpointer data)
tmp = g_strdup_printf("%s%cdraft.%p", get_tmp_dir(),
G_DIR_SEPARATOR, compose);
- if ((fp = fopen(tmp, "wb")) == NULL) {
+ if ((fp = g_fopen(tmp, "wb")) == NULL) {
FILE_OP_ERROR(tmp, "fopen");
return;
}
if (compose_write_to_file(compose, fp, COMPOSE_WRITE_FOR_STORE) < 0) {
fclose(fp);
- unlink(tmp);
+ g_unlink(tmp);
g_free(tmp);
lock = FALSE;
return;
folder_item_scan(draft);
if ((msgnum = folder_item_add_msg(draft, tmp, &flag, TRUE)) < 0) {
- unlink(tmp);
+ g_unlink(tmp);
g_free(tmp);
lock = FALSE;
return;
path = folder_item_fetch_msg(draft, msgnum);
g_return_if_fail(path != NULL);
- if (stat(path, &s) < 0) {
+ if (g_stat(path, &s) < 0) {
FILE_OP_ERROR(path, "stat");
g_free(path);
lock = FALSE;
Compose *compose = (Compose *)data;
AlertValue val;
+#ifdef G_OS_UNIX
if (compose->exteditor_tag != -1) {
if (!compose_ext_editor_kill(compose))
return;
}
+#endif
if (compose->modified) {
val = alertpanel(_("Discard message"),
tmpl = g_object_get_data(G_OBJECT(widget), "template");
g_return_if_fail(tmpl != NULL);
- msg = g_strdup_printf(_("Do you want to apply the template `%s' ?"),
+ msg = g_strdup_printf(_("Do you want to apply the template '%s' ?"),
tmpl->name);
val = alertpanel(_("Apply template"), msg,
- _("Replace"), _("Insert"), GTK_STOCK_CANCEL);
+ _("_Replace"), _("_Insert"), GTK_STOCK_CANCEL);
g_free(msg);
if (val == G_ALERTDEFAULT)
gtk_clipboard_get(GDK_SELECTION_CLIPBOARD));
}
-static void entry_paste_clipboard(GtkWidget *entry)
+static void entry_paste_clipboard(GtkWidget *entry, gboolean wrap)
{
if (GTK_IS_EDITABLE(entry))
gtk_editable_paste_clipboard (GTK_EDITABLE(entry));
- else if (GTK_IS_TEXT_VIEW(entry))
- gtk_text_buffer_paste_clipboard(
- gtk_text_view_get_buffer(GTK_TEXT_VIEW(entry)),
- gtk_clipboard_get(GDK_SELECTION_CLIPBOARD),
- NULL, TRUE);
+ else if (GTK_IS_TEXT_VIEW(entry)) {
+ GtkTextBuffer *buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(entry));
+ GtkTextMark *mark_start = gtk_text_buffer_get_insert(buffer);
+ GtkTextIter start_iter, end_iter;
+ gint start, end;
+
+ gchar *contents = gtk_clipboard_wait_for_text(gtk_clipboard_get(GDK_SELECTION_CLIPBOARD));
+
+ if (contents == NULL)
+ return;
+
+ gtk_text_buffer_delete_selection(buffer, FALSE, TRUE);
+ gtk_text_buffer_get_iter_at_mark(buffer, &start_iter, mark_start);
+
+ start = gtk_text_iter_get_offset(&start_iter);
+
+ gtk_text_buffer_insert(buffer, &start_iter, contents, strlen(contents));
+
+ if (!wrap) {
+ end = start + strlen(contents);
+ gtk_text_buffer_get_iter_at_offset(buffer, &start_iter, start);
+ gtk_text_buffer_get_iter_at_offset(buffer, &end_iter, end);
+ gtk_text_buffer_apply_tag_by_name(buffer, "no_wrap", &start_iter, &end_iter);
+ }
+
+ }
}
static void entry_allsel(GtkWidget *entry)
entry_copy_clipboard(compose->focused_editable);
}
+#define BLOCK_WRAP() { \
+ prev_autowrap = compose->autowrap; \
+ buffer = gtk_text_view_get_buffer( \
+ GTK_TEXT_VIEW(compose->text)); \
+ compose->autowrap = FALSE; \
+ \
+ g_signal_handlers_block_by_func(G_OBJECT(buffer), \
+ G_CALLBACK(compose_changed_cb), \
+ compose); \
+ g_signal_handlers_block_by_func(G_OBJECT(buffer), \
+ G_CALLBACK(text_inserted), \
+ compose); \
+}
+#define UNBLOCK_WRAP() { \
+ compose->autowrap = prev_autowrap; \
+ if (compose->autowrap) \
+ compose_wrap_all(compose); \
+ \
+ g_signal_handlers_unblock_by_func(G_OBJECT(buffer), \
+ G_CALLBACK(compose_changed_cb), \
+ compose); \
+ g_signal_handlers_unblock_by_func(G_OBJECT(buffer), \
+ G_CALLBACK(text_inserted), \
+ compose); \
+}
+
static void compose_paste_cb(Compose *compose)
{
+ gint prev_autowrap;
+ GtkTextBuffer *buffer;
+ BLOCK_WRAP();
if (compose->focused_editable &&
GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
- entry_paste_clipboard(compose->focused_editable);
+ entry_paste_clipboard(compose->focused_editable, prefs_common.linewrap_pastes);
+ UNBLOCK_WRAP();
}
static void compose_paste_as_quote_cb(Compose *compose)
{
+ gint wrap_quote = prefs_common.linewrap_quote;
if (compose->focused_editable &&
GTK_WIDGET_HAS_FOCUS(compose->focused_editable)) {
/* let text_insert() (called directly or at a later time
g_object_set_data(G_OBJECT(compose->focused_editable),
"paste_as_quotation",
GINT_TO_POINTER(paste_as_quotation + 1));
- entry_paste_clipboard(compose->focused_editable);
+ prefs_common.linewrap_quote = prefs_common.linewrap_pastes;
+ entry_paste_clipboard(compose->focused_editable, prefs_common.linewrap_pastes);
+ prefs_common.linewrap_quote = wrap_quote;
}
}
+static void compose_paste_no_wrap_cb(Compose *compose)
+{
+ gint prev_autowrap;
+ GtkTextBuffer *buffer;
+ BLOCK_WRAP();
+ if (compose->focused_editable &&
+ GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
+ entry_paste_clipboard(compose->focused_editable, FALSE);
+ UNBLOCK_WRAP();
+}
+
+static void compose_paste_wrap_cb(Compose *compose)
+{
+ gint prev_autowrap;
+ GtkTextBuffer *buffer;
+ BLOCK_WRAP();
+ if (compose->focused_editable &&
+ GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
+ entry_paste_clipboard(compose->focused_editable, TRUE);
+ UNBLOCK_WRAP();
+}
+
static void compose_allsel_cb(Compose *compose)
{
if (compose->focused_editable &&
Compose *compose = (Compose *)data;
if (action == 1)
- compose_wrap_all(compose);
+ compose_wrap_all_full(compose, TRUE);
else
- compose_wrap_paragraph(compose, NULL);
+ compose_beautify_paragraph(compose, NULL, TRUE);
}
static void compose_toggle_autowrap_cb(gpointer data, guint action,
gchar *tmpfile = get_tmp_file();
str_write_to_file((const gchar *)data->data, tmpfile);
compose_insert_file(compose, tmpfile);
- unlink(tmpfile);
+ g_unlink(tmpfile);
g_free(tmpfile);
gtk_drag_finish(drag_context, TRUE, FALSE, time);
return;
gtk_drag_finish(drag_context, TRUE, FALSE, time);
}
-#if 0 /* NEW COMPOSE GUI */
-static void to_activated(GtkWidget *widget, Compose *compose)
-{
- if (GTK_WIDGET_VISIBLE(compose->newsgroups_entry))
- gtk_widget_grab_focus(compose->newsgroups_entry);
- else
- gtk_widget_grab_focus(compose->subject_entry);
-}
-
-static void newsgroups_activated(GtkWidget *widget, Compose *compose)
-{
- gtk_widget_grab_focus(compose->subject_entry);
-}
-
-static void subject_activated(GtkWidget *widget, Compose *compose)
-{
- if (GTK_WIDGET_VISIBLE(compose->cc_entry))
- gtk_widget_grab_focus(compose->cc_entry);
- else if (GTK_WIDGET_VISIBLE(compose->bcc_entry))
- gtk_widget_grab_focus(compose->bcc_entry);
- else if (GTK_WIDGET_VISIBLE(compose->reply_entry))
- gtk_widget_grab_focus(compose->reply_entry);
- else if (GTK_WIDGET_VISIBLE(compose->followup_entry))
- gtk_widget_grab_focus(compose->followup_entry);
- else
- gtk_widget_grab_focus(compose->text);
-}
-
-static void cc_activated(GtkWidget *widget, Compose *compose)
-{
- if (GTK_WIDGET_VISIBLE(compose->bcc_entry))
- gtk_widget_grab_focus(compose->bcc_entry);
- else if (GTK_WIDGET_VISIBLE(compose->reply_entry))
- gtk_widget_grab_focus(compose->reply_entry);
- else if (GTK_WIDGET_VISIBLE(compose->followup_entry))
- gtk_widget_grab_focus(compose->followup_entry);
- else
- gtk_widget_grab_focus(compose->text);
-}
-
-static void bcc_activated(GtkWidget *widget, Compose *compose)
-{
- if (GTK_WIDGET_VISIBLE(compose->reply_entry))
- gtk_widget_grab_focus(compose->reply_entry);
- else if (GTK_WIDGET_VISIBLE(compose->followup_entry))
- gtk_widget_grab_focus(compose->followup_entry);
- else
- gtk_widget_grab_focus(compose->text);
-}
-
-static void replyto_activated(GtkWidget *widget, Compose *compose)
-{
- if (GTK_WIDGET_VISIBLE(compose->followup_entry))
- gtk_widget_grab_focus(compose->followup_entry);
- else
- gtk_widget_grab_focus(compose->text);
-}
-
-static void followupto_activated(GtkWidget *widget, Compose *compose)
-{
- gtk_widget_grab_focus(compose->text);
-}
-#endif
-
static void compose_toggle_return_receipt_cb(gpointer data, guint action,
GtkWidget *widget)
{
(G_OBJECT(compose->text), "paste_as_quotation"));
GtkTextMark *mark;
- /* CLAWS: pass to default handler only if not pasting as quotation, and
- * no autowrap */
- if (!paste_as_quotation && !compose->autowrap)
- return;
-
g_return_if_fail(text != NULL);
g_signal_handlers_block_by_func(G_OBJECT(buffer),
qmark = prefs_common.quotemark;
else
qmark = "> ";
+
+ mark = gtk_text_buffer_create_mark(buffer, NULL, iter, FALSE);
gtk_text_buffer_place_cursor(buffer, iter);
+
compose_quote_fmt(compose, NULL, "%Q", qmark, new_text);
g_free(new_text);
g_object_set_data(G_OBJECT(compose->text), "paste_as_quotation",
GINT_TO_POINTER(paste_as_quotation - 1));
+
+ gtk_text_buffer_get_iter_at_mark(buffer, iter, mark);
} else
gtk_text_buffer_insert(buffer, iter, text, len);
mark = gtk_text_buffer_create_mark(buffer, NULL, iter, FALSE);
- compose_wrap_all_full(compose, TRUE);
+
+ compose_beautify_paragraph(compose, iter, FALSE);
+
gtk_text_buffer_get_iter_at_mark(buffer, iter, mark);
gtk_text_buffer_delete_mark(buffer, mark);
projects / claws.git / blobdiff