#include <gtk/gtkhbox.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkthemes.h>
+#include <gtk/gtktreeview.h>
+#warning FIXME_GTK2
+/* #include <gtk/gtkthemes.h> */
#include <gtk/gtkdnd.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/wait.h>
#include <signal.h>
#include <errno.h>
+#include <libgen.h>
#if (HAVE_WCTYPE_H && HAVE_WCHAR_H)
# include <wchar.h>
#include "main.h"
#include "mainwindow.h"
#include "compose.h"
-#include "gtkstext.h"
#include "addressbook.h"
#include "folderview.h"
#include "procmsg.h"
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_LINE_N,
- COMPOSE_CALL_GTK_STEXT_DELETE_TO_LINE_END
-} ComposeCallGtkSTextAction;
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_BEGINNING_OF_LINE,
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_FORWARD_CHARACTER,
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_BACKWARD_CHARACTER,
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_FORWARD_WORD,
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_BACKWARD_WORD,
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_END_OF_LINE,
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_NEXT_LINE,
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_PREVIOUS_LINE,
+ COMPOSE_CALL_ADVANCED_ACTION_DELETE_FORWARD_CHARACTER,
+ COMPOSE_CALL_ADVANCED_ACTION_DELETE_BACKWARD_CHARACTER,
+ COMPOSE_CALL_ADVANCED_ACTION_DELETE_FORWARD_WORD,
+ COMPOSE_CALL_ADVANCED_ACTION_DELETE_BACKWARD_WORD,
+ COMPOSE_CALL_ADVANCED_ACTION_DELETE_LINE,
+ COMPOSE_CALL_ADVANCED_ACTION_DELETE_LINE_N,
+ COMPOSE_CALL_ADVANCED_ACTION_DELETE_TO_LINE_END
+} ComposeCallAdvancedAction;
typedef enum
{
PRIORITY_LOWEST
} PriorityLevel;
+typedef enum
+{
+ COMPOSE_INSERT_SUCCESS,
+ COMPOSE_INSERT_READ_ERROR,
+ COMPOSE_INSERT_INVALID_CHARACTER,
+ COMPOSE_INSERT_NO_FILE
+} ComposeInsertResult;
+
#define B64_LINE_SIZE 57
#define B64_BUFFSIZE 77
static void compose_insert_sig (Compose *compose,
gboolean replace);
static gchar *compose_get_signature_str (Compose *compose);
-static void compose_insert_file (Compose *compose,
+static ComposeInsertResult compose_insert_file (Compose *compose,
const gchar *file);
static void compose_attach_append (Compose *compose,
const gchar *file,
gchar *src,
gint header_len,
gboolean addr_field);
-static void compose_generate_msgid (Compose *compose,
- gchar *buf,
+static void compose_generate_msgid (gchar *buf,
gint len);
static void compose_attach_info_free (AttachInfo *ainfo);
static gint attach_property_delete_event (GtkWidget *widget,
GdkEventAny *event,
gboolean *cancelled);
-static void attach_property_key_pressed (GtkWidget *widget,
+static gboolean attach_property_key_pressed (GtkWidget *widget,
GdkEventKey *event,
gboolean *cancelled);
gint redo_state,
gpointer data);
-static gint calc_cursor_xpos (GtkSText *text,
+static gint calc_cursor_xpos (GtkTextView *text,
gint extra,
gint char_width);
gint column,
GdkEvent *event,
gpointer data);
-static void attach_button_pressed (GtkWidget *widget,
+static gboolean attach_button_pressed (GtkWidget *widget,
GdkEventButton *event,
gpointer data);
-static void attach_key_pressed (GtkWidget *widget,
+static gboolean attach_key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
static void compose_paste_as_quote_cb (Compose *compose);
static void compose_allsel_cb (Compose *compose);
-static void compose_gtk_stext_action_cb (Compose *compose,
- ComposeCallGtkSTextAction action);
+static void compose_advanced_action_cb (Compose *compose,
+ ComposeCallAdvancedAction action);
static void compose_grab_focus_cb (GtkWidget *widget,
Compose *compose);
-static void compose_changed_cb (GtkEditable *editable,
- Compose *compose);
-static void compose_button_press_cb (GtkWidget *widget,
- GdkEventButton *event,
- Compose *compose);
-#if 0
-static void compose_key_press_cb (GtkWidget *widget,
- GdkEventKey *event,
+static void compose_changed_cb (GtkTextBuffer *textbuf,
Compose *compose);
-#endif
#if 0
static void compose_toggle_to_cb (gpointer data,
#endif
static void compose_toggle_return_receipt_cb(gpointer data, guint action,
GtkWidget *widget);
+static void compose_toggle_remove_refs_cb(gpointer data, guint action,
+ GtkWidget *widget);
static void compose_set_priority_cb (gpointer data,
guint action,
GtkWidget *widget);
static void text_activated (GtkWidget *widget,
Compose *compose);
-static void text_inserted (GtkWidget *widget,
+static void text_inserted (GtkTextBuffer *buffer,
+ GtkTextIter *iter,
const gchar *text,
- gint length,
- gint *position,
+ gint len,
Compose *compose);
static void compose_generic_reply(MsgInfo *msginfo, gboolean quote,
gboolean to_all, gboolean to_ml,
gboolean followup_and_reply_to,
const gchar *body);
-void compose_headerentry_changed_cb (GtkWidget *entry,
+gboolean compose_headerentry_changed_cb (GtkWidget *entry,
ComposeHeaderEntry *headerentry);
-void compose_headerentry_key_press_event_cb(GtkWidget *entry,
+gboolean compose_headerentry_key_press_event_cb(GtkWidget *entry,
GdkEventKey *event,
ComposeHeaderEntry *headerentry);
#endif
static gboolean compose_send_control_enter (Compose *compose);
+static gint compose_defer_auto_save_draft (Compose *compose);
static GtkItemFactoryEntry compose_popup_entries[] =
{
{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,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_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,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_FORWARD_CHARACTER,
NULL},
{N_("/_Edit/A_dvanced/Move a word backward"),
NULL, /* "<alt>B" */
- compose_gtk_stext_action_cb,
- COMPOSE_CALL_GTK_STEXT_MOVE_BACKWARD_WORD,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_BACKWARD_WORD,
NULL},
{N_("/_Edit/A_dvanced/Move a word forward"),
NULL, /* "<alt>F" */
- compose_gtk_stext_action_cb,
- COMPOSE_CALL_GTK_STEXT_MOVE_FORWARD_WORD,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_FORWARD_WORD,
NULL},
{N_("/_Edit/A_dvanced/Move to beginning of line"),
NULL, /* "<control>A" */
- compose_gtk_stext_action_cb,
- COMPOSE_CALL_GTK_STEXT_MOVE_BEGINNING_OF_LINE,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_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,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_END_OF_LINE,
NULL},
{N_("/_Edit/A_dvanced/Move to previous line"),
"<control>P",
- compose_gtk_stext_action_cb,
- COMPOSE_CALL_GTK_STEXT_MOVE_PREVIOUS_LINE,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_PREVIOUS_LINE,
NULL},
{N_("/_Edit/A_dvanced/Move to next line"),
"<control>N",
- compose_gtk_stext_action_cb,
- COMPOSE_CALL_GTK_STEXT_MOVE_NEXT_LINE,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_MOVE_NEXT_LINE,
NULL},
{N_("/_Edit/A_dvanced/Delete a character backward"),
"<control>H",
- compose_gtk_stext_action_cb,
- COMPOSE_CALL_GTK_STEXT_DELETE_BACKWARD_CHARACTER,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_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,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_DELETE_FORWARD_CHARACTER,
NULL},
{N_("/_Edit/A_dvanced/Delete a word backward"),
NULL, /* "<control>W" */
- compose_gtk_stext_action_cb,
- COMPOSE_CALL_GTK_STEXT_DELETE_BACKWARD_WORD,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_DELETE_BACKWARD_WORD,
NULL},
{N_("/_Edit/A_dvanced/Delete a word forward"),
NULL, /* "<alt>D", */
- compose_gtk_stext_action_cb,
- COMPOSE_CALL_GTK_STEXT_DELETE_FORWARD_WORD,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_DELETE_FORWARD_WORD,
NULL},
{N_("/_Edit/A_dvanced/Delete line"),
"<control>U",
- compose_gtk_stext_action_cb,
- COMPOSE_CALL_GTK_STEXT_DELETE_LINE,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_DELETE_LINE,
NULL},
{N_("/_Edit/A_dvanced/Delete entire line"),
NULL,
- compose_gtk_stext_action_cb,
- COMPOSE_CALL_GTK_STEXT_DELETE_LINE_N,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_DELETE_LINE_N,
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,
+ compose_advanced_action_cb,
+ COMPOSE_CALL_ADVANCED_ACTION_DELETE_TO_LINE_END,
NULL},
{N_("/_Edit/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Edit/_Wrap current paragraph"),
{N_("/_Message/Priority/_Lowest"), NULL, compose_set_priority_cb, PRIORITY_LOWEST, "/Message/Priority/Highest"},
{N_("/_Message/---"), NULL, NULL, 0, "<Separator>"},
{N_("/_Message/_Request Return Receipt"), NULL, compose_toggle_return_receipt_cb, 0, "<ToggleItem>"},
+ {N_("/_Message/Remo_ve references"), NULL, compose_toggle_remove_refs_cb, 0, "<ToggleItem>"},
{N_("/_Tools"), NULL, NULL, 0, "<Branch>"},
{N_("/_Tools/Show _ruler"), NULL, compose_toggle_ruler_cb, 0, "<ToggleItem>"},
{N_("/_Tools/_Address book"), "<shift><control>A", compose_address_cb , 0, NULL},
GPtrArray *attach_files)
{
Compose *compose;
- GtkSText *text;
+ GtkTextView *textview;
+ GtkTextBuffer *textbuf;
+ GtkTextIter iter;
GtkItemFactory *ifactory;
gboolean grab_focus_on_last = TRUE;
compose->replyinfo = NULL;
compose->fwdinfo = NULL;
- text = GTK_STEXT(compose->text);
- gtk_stext_freeze(text);
+ textview = GTK_TEXT_VIEW(compose->text);
+ textbuf = gtk_text_view_get_buffer(textview);
+
+#ifdef USE_ASPELL
+ if (item && item->prefs && item->prefs->enable_default_dictionary &&
+ compose->gtkaspell)
+ gtkaspell_change_dict(compose->gtkaspell,
+ item->prefs->default_dictionary);
+#endif
if (account->auto_sig)
compose_insert_sig(compose, FALSE);
- gtk_editable_set_position(GTK_EDITABLE(text), 0);
- gtk_stext_set_point(text, 0);
-
- gtk_stext_thaw(text);
+ gtk_text_buffer_get_start_iter(textbuf, &iter);
+ gtk_text_buffer_place_cursor(textbuf, &iter);
if (account->protocol != A_NNTP) {
if (mailto && *mailto != '\0') {
if (grab_focus_on_last)
gtk_widget_grab_focus(compose->header_last->entry);
+ undo_unblock(compose->undostruct);
+
if (prefs_common.auto_exteditor)
compose_exec_ext_editor(compose);
case COMPOSE_FORWARD_INLINE:
/* check if we reply to more than one Message */
if (list_len == 1) {
- compose_forward(NULL, msginfo, FALSE, body);
+ compose_forward(NULL, msginfo, FALSE, body, FALSE);
break;
}
/* more messages FALL THROUGH */
gboolean followup_and_reply_to,
const gchar *body)
{
+ GtkItemFactory *ifactory;
Compose *compose;
PrefsAccount *account = NULL;
PrefsAccount *reply_account;
- GtkSText *text;
+ GtkTextBuffer *buffer;
+ GtkTextIter iter;
g_return_if_fail(msginfo != NULL);
g_return_if_fail(msginfo->folder != NULL);
reply_account = account;
compose = compose_create(account, COMPOSE_REPLY);
+ ifactory = gtk_item_factory_from_widget(compose->menubar);
+
+ menu_set_toggle(ifactory, "/Message/Remove references", FALSE);
+ menu_set_sensitive(ifactory, "/Message/Remove references", TRUE);
compose->replyinfo = procmsg_msginfo_get_full_info(msginfo);
if (!compose->replyinfo)
compose->replyinfo = procmsg_msginfo_copy(msginfo);
- if (msginfo->folder && msginfo->folder->ret_rcpt) {
- GtkItemFactory *ifactory;
-
- ifactory = gtk_item_factory_from_widget(compose->menubar);
+ if (msginfo->folder && msginfo->folder->ret_rcpt)
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) {
to_sender, followup_and_reply_to);
compose_show_first_last_header(compose, TRUE);
- text = GTK_STEXT(compose->text);
- gtk_stext_freeze(text);
+#ifdef USE_ASPELL
+ if (msginfo->folder && msginfo->folder->prefs &&
+ msginfo->folder->prefs &&
+ msginfo->folder->prefs->enable_default_dictionary &&
+ compose->gtkaspell)
+ gtkaspell_change_dict(compose->gtkaspell,
+ msginfo->folder->prefs->default_dictionary);
+#endif
if (quote) {
gchar *qmark;
- gchar *quote_str;
if (prefs_common.quotemark && *prefs_common.quotemark)
qmark = prefs_common.quotemark;
else
qmark = "> ";
- quote_str = compose_quote_fmt(compose, compose->replyinfo,
- prefs_common.quotefmt,
- qmark, body);
+ compose_quote_fmt(compose, compose->replyinfo,
+ prefs_common.quotefmt,
+ qmark, body);
}
if (account->auto_sig)
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);
+ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(compose->text));
+ gtk_text_buffer_get_start_iter(buffer, &iter);
+ gtk_text_buffer_place_cursor(buffer, &iter);
- gtk_stext_thaw(text);
gtk_widget_grab_focus(compose->text);
+ undo_unblock(compose->undostruct);
+
if (prefs_common.auto_exteditor)
compose_exec_ext_editor(compose);
}
}
Compose *compose_forward(PrefsAccount *account, MsgInfo *msginfo,
- gboolean as_attach, const gchar *body)
+ gboolean as_attach, const gchar *body,
+ gboolean no_extedit)
{
Compose *compose;
- GtkSText *text;
+ GtkTextView *textview;
+ GtkTextBuffer *textbuf;
+ GtkTextIter iter;
g_return_val_if_fail(msginfo != NULL, NULL);
g_return_val_if_fail(msginfo->folder != NULL, NULL);
if (!account && prefs_common.forward_account_autosel) {
gchar cc[BUFFSIZE];
- if (!get_header_from_msginfo(msginfo,cc,sizeof(cc),"CC:")){ /* Found a CC header */
+ if (!procheader_get_header_from_msginfo(msginfo,cc,sizeof(cc),"CC:")){ /* Found a CC header */
extract_address(cc);
account = account_find_from_address(cc);
}
compose->fwdinfo = procmsg_msginfo_copy(msginfo);
if (msginfo->subject && *msginfo->subject) {
- gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), "Fw: ");
- gtk_entry_append_text(GTK_ENTRY(compose->subject_entry),
- msginfo->subject);
- }
+ gchar *buf, *buf2, *p;
- text = GTK_STEXT(compose->text);
- gtk_stext_freeze(text);
+ buf = p = g_strdup(msginfo->subject);
+ p += subject_get_prefix_length(p);
+ memmove(buf, p, strlen(p) + 1);
+ buf2 = g_strdup_printf("Fw: %s", buf);
+ gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), buf2);
+
+ g_free(buf);
+ g_free(buf2);
+ }
- if (as_attach) {
- gchar *msgfile;
+ textview = GTK_TEXT_VIEW(compose->text);
+ textbuf = gtk_text_view_get_buffer(textview);
- msgfile = procmsg_get_message_file_path(msginfo);
- if (!is_file_exist(msgfile))
- g_warning("%s: file not exist\n", msgfile);
- else
- compose_attach_append(compose, msgfile, msgfile,
- "message/rfc822");
+ if (as_attach) {
+ gchar *msgfile;
- g_free(msgfile);
- } else {
- gchar *qmark;
- gchar *quote_str;
- MsgInfo *full_msginfo;
+ msgfile = procmsg_get_message_file_path(msginfo);
+ if (!is_file_exist(msgfile))
+ g_warning("%s: file not exist\n", msgfile);
+ else
+ compose_attach_append(compose, msgfile, msgfile,
+ "message/rfc822");
- full_msginfo = procmsg_msginfo_get_full_info(msginfo);
- if (!full_msginfo)
- full_msginfo = procmsg_msginfo_copy(msginfo);
+ g_free(msgfile);
+ } else {
+ gchar *qmark;
+ MsgInfo *full_msginfo;
- if (prefs_common.fw_quotemark &&
- *prefs_common.fw_quotemark)
- qmark = prefs_common.fw_quotemark;
- else
- qmark = "> ";
+ full_msginfo = procmsg_msginfo_get_full_info(msginfo);
+ if (!full_msginfo)
+ full_msginfo = procmsg_msginfo_copy(msginfo);
- quote_str = compose_quote_fmt(compose, full_msginfo,
- prefs_common.fw_quotefmt,
- qmark, body);
- compose_attach_parts(compose, msginfo);
+ if (prefs_common.fw_quotemark &&
+ *prefs_common.fw_quotemark)
+ qmark = prefs_common.fw_quotemark;
+ else
+ qmark = "> ";
- procmsg_msginfo_free(full_msginfo);
- }
+ compose_quote_fmt(compose, full_msginfo,
+ prefs_common.fw_quotefmt,
+ qmark, body);
+ compose_attach_parts(compose, msginfo);
+
+ procmsg_msginfo_free(full_msginfo);
+ }
if (account->auto_sig)
compose_insert_sig(compose, FALSE);
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);
+ gtk_text_buffer_get_start_iter(textbuf, &iter);
+ gtk_text_buffer_place_cursor(textbuf, &iter);
- gtk_stext_thaw(text);
#if 0 /* NEW COMPOSE GUI */
if (account->protocol != A_NNTP)
gtk_widget_grab_focus(compose->to_entry);
#endif
gtk_widget_grab_focus(compose->header_last->entry);
- if (prefs_common.auto_exteditor)
+ if (!no_extedit && prefs_common.auto_exteditor)
compose_exec_ext_editor(compose);
/*save folder*/
Compose *compose_forward_multiple(PrefsAccount *account, GSList *msginfo_list)
{
Compose *compose;
- GtkSText *text;
+ GtkTextView *textview;
+ GtkTextBuffer *textbuf;
+ GtkTextIter iter;
GSList *msginfo;
gchar *msgfile;
compose = compose_create(account, COMPOSE_FORWARD);
- text = GTK_STEXT(compose->text);
- gtk_stext_freeze(text);
+ textview = GTK_TEXT_VIEW(compose->text);
+ textbuf = gtk_text_view_get_buffer(textview);
for (msginfo = msginfo_list; msginfo != NULL; msginfo = msginfo->next) {
msgfile = procmsg_get_message_file_path((MsgInfo *)msginfo->data);
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);
+ gtk_text_buffer_get_start_iter(textbuf, &iter);
+ gtk_text_buffer_place_cursor(textbuf, &iter);
- gtk_stext_thaw(text);
gtk_widget_grab_focus(compose->header_last->entry);
#if 0 /* NEW COMPOSE GUI */
{
Compose *compose;
PrefsAccount *account = NULL;
- GtkSText *text;
+ GtkTextView *textview;
+ GtkTextBuffer *textbuf;
+ GtkTextMark *mark;
+ GtkTextIter iter;
FILE *fp;
gchar buf[BUFFSIZE];
gint id;
/* Select Account from queue headers */
- if (!get_header_from_msginfo(msginfo, queueheader_buf,
+ if (!procheader_get_header_from_msginfo(msginfo, queueheader_buf,
sizeof(queueheader_buf), "X-Sylpheed-Account-Id:")) {
id = atoi(&queueheader_buf[22]);
account = account_find_from_id(id);
}
- if (!account && !get_header_from_msginfo(msginfo, queueheader_buf,
+ if (!account && !procheader_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,
+ if (!account && !procheader_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,
+ if (!account && !procheader_get_header_from_msginfo(msginfo, queueheader_buf,
sizeof(queueheader_buf), "S:")) {
account = account_find_from_address(queueheader_buf);
}
if (!account && prefs_common.reedit_account_autosel) {
gchar from[BUFFSIZE];
- if (!get_header_from_msginfo(msginfo, from, sizeof(from), "FROM:")){
+ if (!procheader_get_header_from_msginfo(msginfo, from, sizeof(from), "FROM:")){
extract_address(from);
account = account_find_from_address(from);
}
gchar queueheader_buf[BUFFSIZE];
/* Set message save folder */
- if (!get_header_from_msginfo(msginfo, queueheader_buf, sizeof(queueheader_buf), "SCF:")) {
+ if (!procheader_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);
if (compose_parse_header(compose, msginfo) < 0) return;
compose_reedit_set_entry(compose, msginfo);
- text = GTK_STEXT(compose->text);
- gtk_stext_freeze(text);
+ textview = GTK_TEXT_VIEW(compose->text);
+ textbuf = gtk_text_view_get_buffer(textview);
+ mark = gtk_text_buffer_get_insert(textbuf);
+ gtk_text_buffer_get_iter_at_mark(textbuf, &iter, mark);
if ((fp = procmime_get_first_text_content(msginfo)) == NULL)
g_warning("Can't get text part\n");
else {
while (fgets(buf, sizeof(buf), fp) != NULL) {
strcrchomp(buf);
- gtk_stext_insert(text, NULL, NULL, NULL, buf, -1);
+ gtk_text_buffer_insert(textbuf, &iter, buf, -1);
}
fclose(fp);
}
compose_attach_parts(compose, msginfo);
- gtk_stext_thaw(text);
gtk_widget_grab_focus(compose->text);
if (prefs_common.auto_exteditor)
Compose *compose;
gchar *filename;
GtkItemFactory *ifactory;
+ FolderItem *item;
g_return_val_if_fail(msginfo != NULL, NULL);
if (!account)
- account = cur_account;
+ account = account_get_reply_account(msginfo,
+ prefs_common.reply_account_autosel);
g_return_val_if_fail(account != NULL, NULL);
compose = compose_create(account, COMPOSE_REDIRECT);
compose->redirect_filename = filename;
+ /* Set save folder */
+ item = msginfo->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);
+ }
+
compose_attach_parts(compose, msginfo);
if (msginfo->subject)
msginfo->subject);
gtk_editable_set_editable(GTK_EDITABLE(compose->subject_entry), FALSE);
- gtk_stext_freeze(GTK_STEXT(compose->text));
compose_quote_fmt(compose, msginfo, "%M", NULL, NULL);
- gtk_editable_set_editable(GTK_EDITABLE(compose->text), FALSE);
- gtk_stext_thaw(GTK_STEXT(compose->text));
+ gtk_text_view_set_editable(GTK_TEXT_VIEW(compose->text), TRUE);
ifactory = gtk_item_factory_from_widget(compose->popupmenu);
menu_set_sensitive(ifactory, "/Add...", FALSE);
case A_ADDRBOOK:
compose_address_cb(compose, 0, NULL);
break;
+#ifdef USE_ASPELL
+ case A_CHECK_SPELLING:
+ compose_check_all(compose);
+ break;
+#endif
default:
break;
}
if (subject)
gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), subject);
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);
+ GtkTextView *text = GTK_TEXT_VIEW(compose->text);
+ GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
+ GtkTextMark *mark;
+ GtkTextIter iter;
+
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
+
+ gtk_text_buffer_insert(buffer, &iter, body, -1);
+ gtk_text_buffer_insert(buffer, &iter, "\n", 1);
}
g_free(to);
const gchar *fmt, const gchar *qmark,
const gchar *body)
{
- GtkSText *text = GTK_STEXT(compose->text);
static MsgInfo dummyinfo;
gchar *quote_str = NULL;
gchar *buf;
} else
buf = "";
- gtk_stext_freeze(text);
-
for (p = buf; *p != '\0'; ) {
+ GtkTextView *text = GTK_TEXT_VIEW(compose->text);
+ GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
+ GtkTextMark *mark;
+ GtkTextIter iter;
+
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
+
lastp = strchr(p, '\n');
len = lastp ? lastp - p + 1 : -1;
- gtk_stext_insert(text, NULL, NULL, NULL, p, len);
+ gtk_text_buffer_insert(buffer, &iter, p, len);
if (lastp)
p = lastp + 1;
else
break;
}
- gtk_stext_thaw(text);
-
return buf;
}
gchar *buf, *buf2, *p;
buf = p = g_strdup(msginfo->subject);
- p += subject_get_reply_prefix_length(p);
+ p += subject_get_prefix_length(p);
memmove(buf, p, strlen(p) + 1);
buf2 = g_strdup_printf("Re: %s", buf);
gtk_entry_set_text(GTK_ENTRY(compose->subject_entry), buf2);
+
g_free(buf2);
g_free(buf);
} else
if (replyto && from)
cc_list = address_list_append_with_comments(cc_list, from);
+ if (to_all && msginfo->folder &&
+ msginfo->folder->prefs->enable_default_reply_to)
+ cc_list = address_list_append_with_comments(cc_list,
+ msginfo->folder->prefs->default_reply_to);
cc_list = address_list_append_with_comments(cc_list, msginfo->to);
cc_list = address_list_append_with_comments(cc_list, compose->cc);
slist_free_strings(cc_list);
g_slist_free(cc_list);
}
+
}
#define SET_ENTRY(entry, str) \
static void compose_insert_sig(Compose *compose, gboolean replace)
{
- GtkSText *text = GTK_STEXT(compose->text);
+ GtkTextView *text = GTK_TEXT_VIEW(compose->text);
+ GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
+ GtkTextMark *mark;
+ GtkTextIter iter;
gint cur_pos;
g_return_if_fail(compose->account != NULL);
- cur_pos = gtk_editable_get_position(GTK_EDITABLE(text));
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
+ cur_pos = gtk_text_iter_get_offset (&iter);
- gtk_stext_freeze(text);
+ gtk_text_buffer_get_end_iter(buffer, &iter);
if (replace && compose->sig_str) {
- gint pos;
- gint len;
+ gboolean found;
+ GtkTextIter first_iter, start_iter, end_iter;
+
+ gtk_text_buffer_get_start_iter(buffer, &first_iter);
if (compose->sig_str[0] == '\0')
- pos = -1;
+ found = FALSE;
else
- pos = gtkut_stext_find(text, 0, compose->sig_str, TRUE);
-
- if (pos != -1) {
- len = get_mbs_len(compose->sig_str);
- if (len >= 0) {
- gtk_stext_set_point(text, pos);
- gtk_stext_forward_delete(text, len);
- } else {
- len = gtk_stext_get_length(text);
- gtk_stext_set_point(text, len);
- }
- } else {
- len = gtk_stext_get_length(text);
- gtk_stext_set_point(text, len);
+ found = gtk_text_iter_forward_search(&first_iter,
+ compose->sig_str,
+ GTK_TEXT_SEARCH_TEXT_ONLY,
+ &start_iter, &end_iter,
+ NULL);
+
+ if (found) {
+ gtk_text_buffer_delete(buffer, &start_iter, &end_iter);
+ iter = start_iter;
}
- } else
- gtk_stext_insert(text, NULL, NULL, NULL, "\n\n", 2);
+ }
g_free(compose->sig_str);
compose->sig_str = compose_get_signature_str(compose);
if (!compose->sig_str || (replace && !compose->account->auto_sig))
compose->sig_str = g_strdup("");
- gtk_stext_insert(text, NULL, NULL, NULL, compose->sig_str, -1);
-
- gtk_stext_thaw(text);
+ gtk_text_buffer_insert(buffer, &iter, compose->sig_str, -1);
- if (cur_pos > gtk_stext_get_length(text))
- cur_pos = gtk_stext_get_length(text);
+ if (cur_pos > gtk_text_buffer_get_char_count (buffer))
+ cur_pos = gtk_text_buffer_get_char_count (buffer);
- gtk_editable_set_position(GTK_EDITABLE(text), cur_pos);
- gtk_stext_set_point(text, cur_pos);
+ gtk_text_buffer_get_iter_at_offset (buffer, &iter, cur_pos);
+ gtk_text_buffer_place_cursor (buffer, &iter);
}
static gchar *compose_get_signature_str(Compose *compose)
g_free(tmp);
}
- if (compose->account->sig_sep) {
- sig_str = g_strconcat(compose->account->sig_sep, "\n", sig_body,
+ if (compose->account->sig_sep)
+ sig_str = g_strconcat("\n\n", compose->account->sig_sep, "\n", sig_body,
NULL);
- g_free(sig_body);
- } else
- sig_str = sig_body;
+ else
+ sig_str = g_strconcat("\n\n", sig_body, NULL);
+ g_free(sig_body);
+
return sig_str;
}
-static void compose_insert_file(Compose *compose, const gchar *file)
+static ComposeInsertResult compose_insert_file(Compose *compose, const gchar *file)
{
- GtkSText *text = GTK_STEXT(compose->text);
+ GtkTextView *text;
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter iter;
gchar buf[BUFFSIZE];
gint len;
FILE *fp;
+ gboolean badtxt = FALSE;
- g_return_if_fail(file != NULL);
+ g_return_val_if_fail(file != NULL, COMPOSE_INSERT_NO_FILE);
if ((fp = fopen(file, "rb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
- return;
+ return COMPOSE_INSERT_READ_ERROR;
}
- gtk_stext_freeze(text);
+ text = GTK_TEXT_VIEW(compose->text);
+ buffer = gtk_text_view_get_buffer(text);
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
while (fgets(buf, sizeof(buf), fp) != NULL) {
+#warning FIXME_GTK2
+#if 1 /* FIXME_GTK2 */
+ const gchar *cur_encoding = conv_get_current_charset_str();
+ gchar *str = conv_codeset_strdup(buf, cur_encoding, CS_UTF_8);
+
+ if (!str) continue;
+
/* strip <CR> if DOS/Windows file,
replace <CR> with <LF> if Macintosh file. */
- strcrchomp(buf);
- len = strlen(buf);
- if (len > 0 && buf[len - 1] != '\n') {
+ strcrchomp(str);
+ len = strlen(str);
+ if (len > 0 && str[len - 1] != '\n') {
while (--len >= 0)
- if (buf[len] == '\r') buf[len] = '\n';
+ if (str[len] == '\r') str[len] = '\n';
}
- gtk_stext_insert(text, NULL, NULL, NULL, buf, -1);
- }
+ gtk_text_buffer_insert(buffer, &iter, str, -1);
- gtk_stext_thaw(text);
+ g_free (str);
+#endif /* FIXME_GTK2 */
+ }
fclose(fp);
+
+ if (badtxt)
+ return COMPOSE_INSERT_INVALID_CHARACTER;
+ else
+ return COMPOSE_INSERT_SUCCESS;
}
static void compose_attach_append(Compose *compose, const gchar *file,
if (content_type) {
ainfo->content_type = g_strdup(content_type);
if (!strcasecmp(content_type, "message/rfc822")) {
+ MsgInfo *msginfo;
+ MsgFlags flags = {0, 0};
+ const gchar *name;
+
if (procmime_get_encoding_for_file(file) == ENC_7BIT)
ainfo->encoding = ENC_7BIT;
else
ainfo->encoding = ENC_8BIT;
- ainfo->name = g_strdup_printf
- (_("Message: %s"),
- g_basename(filename ? filename : file));
+
+ msginfo = procheader_parse_file(file, flags, FALSE, FALSE);
+ if (msginfo && msginfo->subject)
+ name = msginfo->subject;
+ else
+ name = g_basename(filename ? filename : file);
+
+ ainfo->name = g_strdup_printf(_("Message: %s"), name);
+
+ procmsg_msginfo_free(msginfo);
} else {
if (!g_strncasecmp(content_type, "text", 4))
ainfo->encoding =
gtk_clist_set_row_data(GTK_CLIST(compose->attach_clist), row, ainfo);
}
-#define IS_FIRST_PART_TEXT(info) \
- ((info->mime_type == MIME_TEXT || info->mime_type == MIME_TEXT_HTML || \
- info->mime_type == MIME_TEXT_ENRICHED) || \
- (info->mime_type == MIME_MULTIPART && info->content_type && \
- !strcasecmp(info->content_type, "multipart/alternative") && \
- (info->children && \
- (info->children->mime_type == MIME_TEXT || \
- info->children->mime_type == MIME_TEXT_HTML || \
- info->children->mime_type == MIME_TEXT_ENRICHED))))
+#ifdef USE_GPGME
+static void compose_use_signing(Compose *compose, gboolean use_signing)
+{
+ GtkItemFactory *ifactory;
+ GtkWidget *menuitem = NULL;
+
+ compose->use_signing = use_signing;
+ ifactory = gtk_item_factory_from_widget(compose->menubar);
+ menuitem = gtk_item_factory_get_item
+ (ifactory, "/Message/Sign");
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem),
+ use_signing);
+ compose_update_gnupg_mode_menu_item(compose);
+}
+#endif /* USE_GPGME */
+
+#define NEXT_PART_NOT_CHILD(info) \
+{ \
+ node = info->node; \
+ while (node->children) \
+ node = g_node_last_child(node); \
+ info = procmime_mimeinfo_next((MimeInfo *)node->data); \
+}
static void compose_attach_parts(Compose *compose, MsgInfo *msginfo)
{
MimeInfo *mimeinfo;
MimeInfo *child;
- gchar *infile;
+ MimeInfo *firsttext = NULL;
+ MimeInfo *encrypted = NULL;
+ GNode *node;
gchar *outfile;
+ const gchar *partname = NULL;
mimeinfo = procmime_scan_message(msginfo);
if (!mimeinfo) return;
- /* skip first text (presumably message body) */
- child = mimeinfo->children;
- if (!child || IS_FIRST_PART_TEXT(mimeinfo)) {
+ if (mimeinfo->node->children == NULL) {
procmime_mimeinfo_free_all(mimeinfo);
return;
}
- if (IS_FIRST_PART_TEXT(child))
- child = child->next;
-
- infile = procmsg_get_message_file_path(msginfo);
+ /* find first content part */
+ child = (MimeInfo *) mimeinfo->node->children->data;
+ while (child && child->node->children && (child->type == MIMETYPE_MULTIPART))
+ child = (MimeInfo *)child->node->children->data;
+ if (child->type == MIMETYPE_TEXT) {
+ firsttext = child;
+ debug_print("First text part found\n");
+ } else if (compose->mode == COMPOSE_REEDIT &&
+ child->type == MIMETYPE_APPLICATION &&
+ !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;
+ }
+
+ child = (MimeInfo *) mimeinfo->node->children->data;
while (child != NULL) {
- if (child->children || child->mime_type == MIME_MULTIPART) {
+ if (child == encrypted) {
+ /* skip this part of tree */
+ NEXT_PART_NOT_CHILD(child);
+ continue;
+ }
+
+ if (child->type == MIMETYPE_MULTIPART) {
+ /* get the actual content */
child = procmime_mimeinfo_next(child);
continue;
}
- if(child->parent && child->parent->parent
- && !strcasecmp(child->parent->parent->content_type, "multipart/signed")
- && child->mime_type == MIME_TEXT) {
- /* this is the main text part of a signed message */
+
+ if (child == firsttext) {
+ child = procmime_mimeinfo_next(child);
+ continue;
+ }
+
+ if ((compose->mode == COMPOSE_REEDIT ||
+ compose->mode == COMPOSE_FORWARD_INLINE ||
+ compose->mode == COMPOSE_FORWARD ) &&
+ (child->type == MIMETYPE_APPLICATION) &&
+ !strcmp(child->subtype, "pgp-signature")) {
+#ifdef USE_GPGME
+ if (compose->mode == COMPOSE_REEDIT) {
+ compose->gnupg_mode = GNUPG_MODE_DETACH;
+ compose_use_signing(compose, TRUE);
+ }
+#endif
child = procmime_mimeinfo_next(child);
continue;
}
outfile = procmime_get_tmp_file_name(child);
- if (procmime_get_part(outfile, infile, child) < 0)
+ if (procmime_get_part(outfile, child) < 0)
g_warning("Can't get the part of multipart message.");
- else if (compose->mode != COMPOSE_REEDIT || strcmp(child->content_type, "application/pgp-signature"))
- compose_attach_append
- (compose, outfile,
- child->filename ? child->filename : child->name,
- child->content_type);
-
- child = child->next;
+ else {
+ gchar *content_type;
+
+ content_type = g_strdup_printf("%s/%s", procmime_get_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);
+ g_free(content_type);
+ }
+ g_free(outfile);
+ NEXT_PART_NOT_CHILD(child);
}
-
- g_free(infile);
procmime_mimeinfo_free_all(mimeinfo);
}
-#undef IS_FIRST_PART_TEXT
+
+#define CHAR_BUF_SIZE 8
+#undef NEXT_PART_NOT_CHILD
-#define GET_CHAR(pos, buf, len) \
+#define GET_CHAR(iter_p, buf, len) \
{ \
- if (text->use_wchar) \
- len = wctomb(buf, (wchar_t)GTK_STEXT_INDEX(text, (pos))); \
- else { \
- buf[0] = GTK_STEXT_INDEX(text, (pos)); \
+ GtkTextIter end_iter; \
+ gchar *tmp; \
+ end_iter = *iter_p; \
+ gtk_text_iter_forward_char(&end_iter); \
+ tmp = gtk_text_buffer_get_text(textbuf, iter_p, &end_iter, FALSE); \
+ if (tmp) { \
+ glong items_read, items_witten; \
+ GError *error = NULL; \
+ gunichar *wide_char; \
+ strncpy2(buf, tmp, CHAR_BUF_SIZE); \
+ wide_char = g_utf8_to_ucs4(tmp, -1, \
+ &items_read, &items_witten, \
+ &error); \
+ if (error != NULL) { \
+ g_warning("%s\n", error->message); \
+ g_error_free(error); \
+ } \
+ len = wide_char && g_unichar_iswide(*wide_char) ? 2 : 1; \
+ g_free(wide_char); \
+ } else { \
+ buf[0] = '\0'; \
len = 1; \
} \
+ g_free(tmp); \
}
-#define DISP_WIDTH(len) \
- ((len > 2 && conv_get_current_charset() == C_UTF_8) ? 2 : \
- (len == 2 && conv_get_current_charset() == C_UTF_8) ? 1 : len)
-
#define INDENT_CHARS ">|#"
#define SPACE_CHARS " \t"
+#warning FIXME_GTK2
static void compose_wrap_line(Compose *compose)
{
- GtkSText *text = GTK_STEXT(compose->text);
+ GtkTextView *text = GTK_TEXT_VIEW(compose->text);
+ GtkTextBuffer *textbuf = gtk_text_view_get_buffer(text);
+ GtkTextMark *mark;
+ GtkTextIter insert_iter, iter;
gint ch_len, last_ch_len;
- gchar cbuf[MB_LEN_MAX], last_ch;
+ gchar cbuf[CHAR_BUF_SIZE], last_ch;
guint text_len;
- guint line_end;
- guint quoted;
gint p_start, p_end;
gint line_pos, cur_pos;
gint line_len, cur_len;
+ gboolean line_end, quoted;
- 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_CHAR(cur_pos, cbuf, ch_len);
+ text_len = gtk_text_buffer_get_char_count(textbuf);
+ mark = gtk_text_buffer_get_insert(textbuf);
+ gtk_text_buffer_get_iter_at_mark(textbuf, &insert_iter, mark);
+ cur_pos = gtk_text_iter_get_offset(&insert_iter);
+ GET_CHAR(&insert_iter, cbuf, ch_len);
if ((ch_len == 1 && *cbuf == '\n') || cur_pos == text_len) {
+ GtkTextIter prev_iter;
if (cur_pos == 0)
- goto compose_end; /* on the paragraph mark */
- GET_CHAR(cur_pos - 1, cbuf, ch_len);
+ return; /* on the paragraph mark */
+ prev_iter = insert_iter;
+ gtk_text_iter_backward_char(&prev_iter);
+ GET_CHAR(&prev_iter, cbuf, ch_len);
if (ch_len == 1 && *cbuf == '\n')
- goto compose_end; /* on the paragraph mark */
+ return; /* on the paragraph mark */
}
/* find paragraph start. */
- line_end = quoted = 0;
- for (p_start = cur_pos; p_start >= 0; --p_start) {
- GET_CHAR(p_start, cbuf, ch_len);
+ line_end = quoted = FALSE;
+ for (iter = insert_iter; gtk_text_iter_backward_char(&iter);) {
+ GET_CHAR(&iter, cbuf, ch_len);
if (ch_len == 1 && *cbuf == '\n') {
if (quoted)
- goto compose_end; /* quoted part */
+ return; /* quoted part */
if (line_end) {
- p_start += 2;
+ gtk_text_iter_forward_chars(&iter, 2);
break;
}
- line_end = 1;
+ line_end = TRUE;
} else {
if (ch_len == 1
&& strchr(prefs_common.quote_chars, *cbuf))
- quoted = 1;
+ quoted = TRUE;
else if (ch_len != 1 || !isspace(*cbuf))
- quoted = 0;
+ quoted = FALSE;
- line_end = 0;
+ line_end = FALSE;
}
}
- if (p_start < 0)
- p_start = 0;
+ p_start = gtk_text_iter_get_offset(&iter);
/* find paragraph end. */
- line_end = 0;
- for (p_end = cur_pos; p_end < text_len; p_end++) {
- GET_CHAR(p_end, cbuf, ch_len);
+ line_end = FALSE;
+ for (iter = insert_iter; gtk_text_iter_forward_char(&iter);) {
+ GET_CHAR(&iter, cbuf, ch_len);
if (ch_len == 1 && *cbuf == '\n') {
if (line_end) {
p_end -= 1;
+ gtk_text_iter_backward_char(&iter);
break;
}
- line_end = 1;
+ line_end = TRUE;
} else {
if (line_end && ch_len == 1 &&
strchr(prefs_common.quote_chars, *cbuf))
- goto compose_end; /* quoted part */
+ return; /* quoted part */
- line_end = 0;
+ line_end = FALSE;
}
}
+ p_end = gtk_text_iter_get_offset(&iter);
+
if (p_end >= text_len)
p_end = text_len;
if (p_start >= p_end)
- goto compose_end;
+ return;
line_len = cur_len = 0;
last_ch_len = 0;
last_ch = '\0';
line_pos = p_start;
for (cur_pos = p_start; cur_pos < p_end; cur_pos++) {
- guint space = 0;
+ gboolean space = FALSE;
+
+ gtk_text_buffer_get_iter_at_offset(textbuf, &iter, cur_pos);
- GET_CHAR(cur_pos, cbuf, ch_len);
+ GET_CHAR(&iter, cbuf, ch_len);
if (ch_len < 0) {
cbuf[0] = '\0';
}
if (ch_len == 1 && isspace(*cbuf))
- space = 1;
+ space = TRUE;
if (ch_len == 1 && *cbuf == '\n') {
- guint replace = 0;
+ gboolean replace = FALSE;
+ GtkTextIter next_iter = iter;
+
+ gtk_text_iter_forward_char(&next_iter);
+
if (last_ch_len == 1 && !isspace(last_ch)) {
if (cur_pos + 1 < p_end) {
- GET_CHAR(cur_pos + 1, cbuf, ch_len);
+ GET_CHAR(&next_iter, cbuf, ch_len);
if (ch_len == 1 && !isspace(*cbuf))
- replace = 1;
+ replace = TRUE;
}
}
- gtk_stext_set_point(text, cur_pos + 1);
- gtk_stext_backward_delete(text, 1);
+ gtk_text_buffer_delete(textbuf, &iter, &next_iter);
if (replace) {
- gtk_stext_set_point(text, cur_pos);
- gtk_stext_insert(text, NULL, NULL, NULL, " ", 1);
- space = 1;
+ gtk_text_buffer_insert(textbuf, &iter, " ", 1);
+ space = TRUE;
}
else {
p_end--;
cur_pos--;
+ gtk_text_buffer_get_iter_at_offset
+ (textbuf, &iter, cur_pos);
continue;
}
}
line_len = cur_len + ch_len;
}
- if (cur_len + DISP_WIDTH(ch_len) > prefs_common.linewrap_len &&
+ gtk_text_buffer_get_iter_at_offset(textbuf, &iter, line_pos);
+
+ if (cur_len + ch_len > prefs_common.linewrap_len &&
line_len > 0) {
gint tlen = ch_len;
+ GtkTextIter prev_iter = iter;
- GET_CHAR(line_pos - 1, cbuf, ch_len);
+ gtk_text_iter_backward_char(&prev_iter);
+
+ GET_CHAR(&prev_iter, cbuf, ch_len);
if (ch_len == 1 && isspace(*cbuf)) {
- gtk_stext_set_point(text, line_pos);
- gtk_stext_backward_delete(text, 1);
+ gtk_text_buffer_delete(textbuf, &prev_iter, &iter);
+ iter = prev_iter;
p_end--;
cur_pos--;
line_pos--;
}
ch_len = tlen;
- gtk_stext_set_point(text, line_pos);
- gtk_stext_insert(text, NULL, NULL, NULL, "\n", 1);
+ gtk_text_buffer_insert(textbuf, &iter, "\n", 1);
p_end++;
cur_pos++;
line_pos++;
- cur_len = cur_len - line_len + DISP_WIDTH(ch_len);
+ cur_len = cur_len - line_len + ch_len;
line_len = 0;
continue;
}
if (ch_len > 1) {
line_pos = cur_pos + 1;
- line_len = cur_len + DISP_WIDTH(ch_len);
+ line_len = cur_len + ch_len;
}
- cur_len += DISP_WIDTH(ch_len);
+ cur_len += ch_len;
}
-
-compose_end:
- gtk_stext_thaw(text);
}
#undef WRAP_DEBUG
#ifdef WRAP_DEBUG
/* Darko: used when I debug wrapping */
-void dump_text(GtkSText *text, int pos, int tlen, int breakoncr)
+void dump_text(GtkTextBuffer textbuf, int pos, int tlen, int breakoncr)
{
gint i, clen;
- gchar cbuf[MB_LEN_MAX];
+ gchar cbuf[CHAR_BUF_SIZE];
printf("%d [", pos);
- for (i = pos; i < tlen; i++) {
- GET_CHAR(i, cbuf, clen);
+ gtk_text_buffer_get_iter_at_offset(textbuf, &iter, pos);
+ gtk_text_buffer_get_iter_at_offset(textbuf, &end_iter, pos + tlen);
+ for (; gtk_text_iter_forward_char(&iter) &&
+ gtk_text_iter_compare(&iter, &end_iter) < 0;)
+ GET_CHAR(&iter, cbuf, clen);
if (clen < 0) break;
if (breakoncr && clen == 1 && cbuf[0] == '\n')
break;
uppercase characters immediately followed by >,
and the repeating sequences of the above */
/* return indent length */
-static guint get_indent_length(GtkSText *text, guint start_pos, guint text_len)
+static guint get_indent_length(GtkTextBuffer *textbuf, guint start_pos, guint text_len)
{
guint i_len = 0;
guint i, ch_len, alnum_cnt = 0;
IndentState state = WAIT_FOR_INDENT_CHAR;
- gchar cbuf[MB_LEN_MAX];
+ gchar cbuf[CHAR_BUF_SIZE];
gboolean is_space;
gboolean is_indent;
+ if (prefs_common.quote_chars == NULL) {
+ return 0 ;
+ }
+
for (i = start_pos; i < text_len; i++) {
- GET_CHAR(i, cbuf, ch_len);
+ GtkTextIter iter;
+
+ gtk_text_buffer_get_iter_at_offset(textbuf, &iter, i);
+ GET_CHAR(&iter, cbuf, ch_len);
if (ch_len > 1)
break;
}
/* insert quotation string when line was wrapped */
-static guint ins_quote(GtkSText *text, guint indent_len,
+static guint ins_quote(GtkTextBuffer *textbuf, GtkTextIter *iter,
+ guint indent_len,
guint prev_line_pos, guint text_len,
gchar *quote_fmt)
{
- guint i, ins_len = 0;
- gchar ch;
+ guint ins_len = 0;
if (indent_len) {
- for (i = 0; i < indent_len; i++) {
- ch = GTK_STEXT_INDEX(text, prev_line_pos + i);
- gtk_stext_insert(text, NULL, NULL, NULL, &ch, 1);
- }
- ins_len = indent_len;
+ GtkTextIter iter1, iter2;
+ gchar *text;
+
+ gtk_text_buffer_get_iter_at_offset(textbuf, &iter1,
+ prev_line_pos);
+ gtk_text_buffer_get_iter_at_offset(textbuf, &iter2,
+ prev_line_pos + indent_len);
+ text = gtk_text_buffer_get_text(textbuf, &iter1, &iter2, FALSE);
+ if (!text) return 0;
+
+ gtk_text_buffer_insert(textbuf, iter, text, -1);
+ ins_len = g_utf8_strlen(text, -1);
+
+ g_free(text);
}
return ins_len;
}
/* check if we should join the next line */
-static gboolean join_next_line(GtkSText *text, guint start_pos, guint tlen,
- guint prev_ilen, gboolean autowrap)
+static gboolean join_next_line_is_needed(GtkTextBuffer *textbuf,
+ guint start_pos, guint tlen,
+ guint prev_ilen, gboolean autowrap)
{
guint indent_len, ch_len;
gboolean do_join = FALSE;
- gchar cbuf[MB_LEN_MAX];
+ gchar cbuf[CHAR_BUF_SIZE];
- indent_len = get_indent_length(text, start_pos, tlen);
+ indent_len = get_indent_length(textbuf, start_pos, tlen);
if ((autowrap || indent_len > 0) && indent_len == prev_ilen) {
- GET_CHAR(start_pos + indent_len, cbuf, ch_len);
+ GtkTextIter iter;
+ gtk_text_buffer_get_iter_at_offset(textbuf, &iter,
+ start_pos + indent_len);
+ GET_CHAR(&iter, cbuf, ch_len);
if (ch_len > 0 && (cbuf[0] != '\n'))
do_join = TRUE;
}
compose_wrap_line_all_full(compose, FALSE);
}
-#define STEXT_FREEZE() \
- if (!frozen) { gtk_stext_freeze(text); frozen = TRUE; }
-
static void compose_wrap_line_all_full(Compose *compose, gboolean autowrap)
{
- GtkSText *text = GTK_STEXT(compose->text);
+#if 0
+ GtkTextView *text = GTK_TEXT_VIEW(compose->text);
+ GtkTextBuffer *textbuf = gtk_text_view_get_buffer(text);
+ GtkTextIter iter, end_iter;
guint tlen;
guint line_pos = 0, cur_pos = 0, p_pos = 0;
gint line_len = 0, cur_len = 0;
gboolean linewrap_quote = TRUE;
gboolean set_editable_pos = FALSE;
gint editable_pos = 0;
- gboolean frozen = FALSE;
guint linewrap_len = prefs_common.linewrap_len;
gchar *qfmt = prefs_common.quotemark;
- gchar cbuf[MB_LEN_MAX];
+ gchar cbuf[CHAR_BUF_SIZE];
- tlen = gtk_stext_get_length(text);
+ tlen = gtk_text_buffer_get_char_count(textbuf);
for (; cur_pos < tlen; cur_pos++) {
/* mark position of new line - needed for quotation wrap */
if (is_new_line) {
if (linewrap_quote)
- i_len = get_indent_length(text, cur_pos, tlen);
+ i_len = get_indent_length(textbuf, cur_pos, tlen);
is_new_line = FALSE;
p_pos = cur_pos;
-#ifdef WRAP_DEBUG
- g_print("new line i_len=%d p_pos=", i_len);
- dump_text(text, p_pos, tlen, 1);
-#endif
}
- GET_CHAR(cur_pos, cbuf, ch_len);
+ gtk_text_buffer_get_iter_at_offset(textbuf, &iter, cur_pos);
+ GET_CHAR(&iter, cbuf, ch_len);
/* fix line length for tabs */
if (ch_len == 1 && *cbuf == '\t') {
- guint tab_width = text->default_tab_width;
+#warning FIXME_GTK2
+ /* guint tab_width = text->default_tab_width; */
+ guint tab_width = 8;
guint tab_offset = line_len % tab_width;
-#ifdef WRAP_DEBUG
- g_print("found tab at pos=%d line_len=%d ", cur_pos,
- line_len);
-#endif
if (tab_offset) {
line_len += tab_width - tab_offset - 1;
cur_len = line_len;
}
-#ifdef WRAP_DEBUG
- printf("new_len=%d\n", line_len);
-#endif
}
/* we have encountered line break */
if (ch_len == 1 && *cbuf == '\n') {
gint clen;
- gchar cb[MB_LEN_MAX];
+ gchar cb[CHAR_BUF_SIZE];
/* should we join the next line */
if ((autowrap || i_len != cur_len) && do_delete &&
- join_next_line
- (text, cur_pos + 1, tlen, i_len, autowrap))
+ join_next_line_is_needed
+ (textbuf, cur_pos + 1, tlen, i_len, autowrap))
do_delete = TRUE;
else
do_delete = FALSE;
-#ifdef WRAP_DEBUG
- g_print("found CR at %d do_del is %d next line is ",
- cur_pos, do_delete);
- dump_text(text, cur_pos + 1, tlen, 1);
-#endif
-
/* skip delete if it is continuous URL */
if (do_delete && (line_pos - p_pos <= i_len) &&
- gtk_stext_is_uri_string(text, line_pos, tlen))
+ gtkut_text_buffer_is_uri_string(textbuf, line_pos,
+ tlen))
do_delete = FALSE;
-#ifdef WRAP_DEBUG
- g_print("l_len=%d wrap_len=%d do_del=%d\n",
- line_len, linewrap_len, do_delete);
-#endif
/* should we delete to perform smart wrapping */
if (line_len < linewrap_len && do_delete) {
- STEXT_FREEZE();
/* get rid of newline */
- gtk_stext_set_point(text, cur_pos);
- gtk_stext_forward_delete(text, 1);
+ gtk_text_buffer_get_iter_at_offset(textbuf,
+ &iter,
+ cur_pos);
+ end_iter = iter;
+ gtk_text_iter_forward_char(&end_iter);
+ gtk_text_buffer_delete(textbuf, &iter, &end_iter);
tlen--;
/* if text starts with quote fmt or with
indent string, delete them */
if (i_len) {
guint ilen;
- ilen = gtk_stext_str_compare_n
- (text, cur_pos, p_pos, i_len,
+ ilen = gtkut_text_buffer_str_compare_n
+ (textbuf, cur_pos, p_pos, i_len,
tlen);
if (ilen) {
- gtk_stext_forward_delete
- (text, ilen);
+ end_iter = iter;
+ gtk_text_iter_forward_chars
+ (&end_iter, ilen);
+ gtk_text_buffer_delete(textbuf,
+ &iter,
+ &end_iter);
tlen -= ilen;
}
}
- GET_CHAR(cur_pos, cb, clen);
+ gtk_text_buffer_get_iter_at_offset(textbuf,
+ &iter,
+ cur_pos);
+ GET_CHAR(&iter, 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_text_buffer_insert(textbuf, &iter,
+ " ", 1);
tlen++;
}
if (ch_len > 1) {
line_pos = cur_pos + 1;
- line_len = cur_len + DISP_WIDTH(ch_len);
+ line_len = cur_len + ch_len;
}
/* advance to next character in buffer */
- cur_len += DISP_WIDTH(ch_len);
+ cur_len += ch_len;
}
- if (frozen)
- gtk_stext_thaw(text);
-
- if (set_editable_pos && editable_pos <= tlen)
- gtk_editable_set_position(GTK_EDITABLE(text), editable_pos);
+ if (set_editable_pos && editable_pos <= tlen) {
+ gtk_text_buffer_get_iter_at_offset(textbuf, &iter, editable_pos);
+ gtk_text_buffer_place_cursor(textbuf, &iter);
+ }
+#endif
}
-#undef STEXT_FREEZE
#undef GET_CHAR
+#undef CHAR_BUF_SIZE
static void compose_set_title(Compose *compose)
{
activate_gnupg_mode(compose, account);
#endif /* USE_GPGME */
- if (!init)
+ if (!init && compose->mode != COMPOSE_REDIRECT)
compose_insert_sig(compose, TRUE);
}
static gboolean compose_check_entries(Compose *compose, gboolean check_subject)
{
- gchar *str;
+ const gchar *str;
if (compose_check_for_valid_recipient(compose) == FALSE) {
alertpanel_error(_("Recipient is not specified."));
g_free(msgpath);
folder_item_remove_msg(folder, msgnum);
+
+ folder_item_scan(folder);
return val;
}
}
#endif
-static gboolean compose_use_attach(Compose *compose) {
- return(gtk_clist_get_row_data(GTK_CLIST(compose->attach_clist), 0) != NULL);
+static gboolean compose_use_attach(Compose *compose)
+{
+ return gtk_clist_get_row_data(GTK_CLIST(compose->attach_clist), 0) != NULL;
}
static gint compose_redirect_write_headers_from_headerlist(Compose *compose,
{
gchar buf[BUFFSIZE];
gchar *str;
- gboolean first_address;
+ gboolean first_to_address;
+ gboolean first_cc_address;
GSList *list;
ComposeHeaderEntry *headerentry;
- gchar *headerentryname;
+ const gchar *headerentryname;
gchar *cc_hdr;
gchar *to_hdr;
cc_hdr = prefs_common.trans_hdr ? _("Cc:") : "Cc:";
to_hdr = prefs_common.trans_hdr ? _("To:") : "To:";
- first_address = TRUE;
+ first_to_address = TRUE;
+ first_cc_address = TRUE;
for (list = compose->header_list; list; list = list->next) {
headerentry = ((ComposeHeaderEntry *)list->data);
headerentryname = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(headerentry->combo)->entry));
if (g_strcasecmp(headerentryname, cc_hdr) == 0
|| g_strcasecmp(headerentryname, to_hdr) == 0) {
- str = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
- Xstrdup_a(str, str, return -1);
+ const gchar *entstr = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
+ Xstrdup_a(str, entstr, return -1);
g_strstrip(str);
if (str[0] != '\0') {
compose_convert_header
(buf, sizeof(buf), str,
strlen("Resent-To") + 2, TRUE);
- if (first_address) {
- fprintf(fp, "Resent-To: ");
- first_address = FALSE;
- } else {
- fprintf(fp, ",");
+ if (g_strcasecmp(headerentryname, to_hdr) == 0) {
+ if (first_to_address) {
+ fprintf(fp, "Resent-To: ");
+ first_to_address = FALSE;
+ } else {
+ fprintf(fp, ",");
+ }
+ }
+ if (g_strcasecmp(headerentryname, cc_hdr) == 0) {
+ if (first_cc_address) {
+ fprintf(fp, "\n");
+ fprintf(fp, "Resent-Cc: ");
+ first_cc_address = FALSE;
+ } else {
+ fprintf(fp, ",");
+ }
}
+
fprintf(fp, "%s", buf);
}
}
{
gchar buf[BUFFSIZE];
gchar *str;
+ const gchar *entstr;
/* struct utsname utsbuf; */
g_return_val_if_fail(fp != NULL, -1);
fprintf(fp, "Resent-From: %s\n", compose->account->address);
/* Subject */
- str = gtk_entry_get_text(GTK_ENTRY(compose->subject_entry));
- if (*str != '\0') {
- Xstrdup_a(str, str, return -1);
+ entstr = gtk_entry_get_text(GTK_ENTRY(compose->subject_entry));
+ if (*entstr != '\0') {
+ Xstrdup_a(str, entstr, return -1);
g_strstrip(str);
if (*str != '\0') {
compose_convert_header(buf, sizeof(buf), str,
/* Resent-Message-ID */
if (compose->account->gen_msgid) {
- compose_generate_msgid(compose, buf, sizeof(buf));
+ compose_generate_msgid(buf, sizeof(buf));
fprintf(fp, "Resent-Message-Id: <%s>\n", buf);
compose->msgid = g_strdup(buf);
}
g_warning("can't change file mode\n");
}
- while (procheader_get_unfolded_line(buf, sizeof(buf), fp)) {
+ while (procheader_get_one_field(buf, sizeof(buf), fp, NULL) != -1) {
/* should filter returnpath, delivered-to */
if (g_strncasecmp(buf, "Return-Path:",
strlen("Return-Path:")) == 0 ||
static gint compose_write_to_file(Compose *compose, const gchar *file,
gboolean is_draft)
{
+ GtkTextBuffer *buffer;
+ GtkTextIter start, end;
FILE *fp;
size_t len;
gchar *chars;
}
/* get all composed text */
- chars = gtk_editable_get_chars(GTK_EDITABLE(compose->text), 0, -1);
+ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(compose->text));
+ gtk_text_buffer_get_start_iter(buffer, &start);
+ gtk_text_buffer_get_end_iter(buffer, &end);
+ chars = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
len = strlen(chars);
if (is_ascii_str(chars)) {
buf = chars;
encoding = ENC_BASE64;
#endif
+#warning FIXME_GTK2
+#if 0 /* FIXME_GTK2 */
src_codeset = conv_get_current_charset_str();
/* if current encoding is US-ASCII, set it the same as
outgoing one to prevent code conversion failure */
if (!strcasecmp(src_codeset, CS_US_ASCII))
src_codeset = out_codeset;
+#else /* FIXME_GTK2 */
+ src_codeset = CS_UTF_8;
+#endif /* FIXME_GTK2 */
debug_print("src encoding = %s, out encoding = %s, transfer encoding = %s\n",
src_codeset, out_codeset, procmime_get_encoding_str(encoding));
fprintf(fp, "\n--%s\n", compose->boundary);
fprintf(fp, "Content-Type: text/plain; charset=%s\n",
out_codeset);
+#if USE_GPGME
+ if (compose->use_signing && !compose->gnupg_mode)
+ fprintf(fp, "Content-Disposition: inline\n");
+#endif
fprintf(fp, "Content-Transfer-Encoding: %s\n",
procmime_get_encoding_str(encoding));
fputc('\n', fp);
static gint compose_write_body_to_file(Compose *compose, const gchar *file)
{
+ GtkTextBuffer *buffer;
+ GtkTextIter start, end;
FILE *fp;
size_t len;
- gchar *chars;
+ gchar *chars, *tmp;
+ const gchar *src_codeset, *dest_codeset;
if ((fp = fopen(file, "wb")) == NULL) {
FILE_OP_ERROR(file, "fopen");
g_warning("can't change file mode\n");
}
- chars = gtk_editable_get_chars(GTK_EDITABLE(compose->text), 0, -1);
+ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(compose->text));
+ gtk_text_buffer_get_start_iter(buffer, &start);
+ gtk_text_buffer_get_end_iter(buffer, &end);
+ tmp = gtk_text_buffer_get_text(buffer, &start, &end, FALSE);
+
+#warning FIXME_GTK2
+#if 1 /* FIXME_GTK2 */
+ src_codeset = CS_UTF_8;
+ dest_codeset = conv_get_current_charset_str();
+ chars = conv_codeset_strdup(tmp, src_codeset, dest_codeset);
+ g_free(tmp);
+ if (!chars) return -1;
+#endif /* FIXME_GTK2 */
/* write body */
len = strlen(chars);
return -1;
}
folder_item_scan(queue);
- if ((num = folder_item_add_msg(queue, tmp, TRUE)) < 0) {
+ if ((num = folder_item_add_msg(queue, tmp, NULL, TRUE)) < 0) {
g_warning("can't queue the message\n");
unlink(tmp);
g_free(tmp);
Xstrdup_a(out, str, return -1); \
} \
}
-
-#define PUT_RECIPIENT_HEADER(header, str) \
-{ \
- if (*str != '\0') { \
- Xstrdup_a(str, str, return -1); \
- g_strstrip(str); \
- if (*str != '\0') { \
- compose->to_list = address_list_append \
- (compose->to_list, str); \
- compose_convert_header \
- (buf, sizeof(buf), str, strlen(header) + 2, \
- TRUE); \
- fprintf(fp, "%s: %s\n", header, buf); \
- } \
- } \
+
+#define PUT_RECIPIENT_HEADER(header, str) \
+{ \
+ if (*str != '\0') { \
+ gchar *dest; \
+ Xstrdup_a(dest, str, return -1); \
+ g_strstrip(dest); \
+ if (*dest != '\0') { \
+ compose->to_list = address_list_append \
+ (compose->to_list, dest); \
+ compose_convert_header \
+ (buf, sizeof(buf), dest, strlen(header) + 2, \
+ TRUE); \
+ fprintf(fp, "%s: %s\n", header, buf); \
+ } \
+ } \
}
#define IS_IN_CUSTOM_HEADER(header) \
static gint compose_write_headers_from_headerlist(Compose *compose,
FILE *fp,
- gchar *header)
+ const gchar *header,
+ const gchar *seperator)
{
- gchar buf[BUFFSIZE];
gchar *str, *header_w_colon, *trans_hdr;
- gboolean first_address;
+ gboolean write_header = FALSE;
GSList *list;
ComposeHeaderEntry *headerentry;
- gchar * headerentryname;
+ const gchar * headerentryname;
+ GString *headerstr;
if (IS_IN_CUSTOM_HEADER(header)) {
return 0;
debug_print("Writing %s-header\n", header);
+ headerstr = g_string_sized_new(64);
+
header_w_colon = g_strconcat(header, ":", NULL);
trans_hdr = (prefs_common.trans_hdr ? gettext(header_w_colon) : header_w_colon);
- first_address = TRUE;
for (list = compose->header_list; list; list = list->next) {
headerentry = ((ComposeHeaderEntry *)list->data);
headerentryname = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(headerentry->combo)->entry));
if (!g_strcasecmp(trans_hdr, headerentryname)) {
- str = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
- Xstrdup_a(str, str, return -1);
+ const gchar *entstr = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
+ Xstrdup_a(str, entstr, return -1);
g_strstrip(str);
if (str[0] != '\0') {
- compose_convert_header
- (buf, sizeof(buf), str,
- strlen(header) + 2, TRUE);
- if (first_address) {
- fprintf(fp, "%s: ", header);
- first_address = FALSE;
- } else {
- fprintf(fp, ",");
- }
- fprintf(fp, "%s", buf);
+ if (write_header)
+ g_string_append(headerstr, seperator);
+ g_string_append(headerstr, str);
+ write_header = TRUE;
}
}
}
- if (!first_address) {
- fprintf(fp, "\n");
+ if (write_header) {
+ gchar *buf;
+
+ buf = g_new0(gchar, headerstr->len * 4 + 256);
+ compose_convert_header
+ (buf, headerstr->len * 4 + 256, headerstr->str,
+ strlen(header) + 2, TRUE);
+ fprintf(fp, "%s: %s\n", header, buf);
+ g_free(buf);
}
g_free(header_w_colon);
+ g_string_free(headerstr, TRUE);
return(0);
}
gboolean is_draft)
{
gchar buf[BUFFSIZE];
+ const gchar *entry_str;
gchar *str;
gchar *name;
GSList *list;
}
/* To */
- compose_write_headers_from_headerlist(compose, fp, "To");
+ compose_write_headers_from_headerlist(compose, fp, "To", ", ");
#if 0 /* NEW COMPOSE GUI */
if (compose->use_to) {
- str = gtk_entry_get_text(GTK_ENTRY(compose->to_entry));
- PUT_RECIPIENT_HEADER("To", str);
+ entry_str = gtk_entry_get_text(GTK_ENTRY(compose->to_entry));
+ PUT_RECIPIENT_HEADER("To", entry_str);
}
#endif
/* Newsgroups */
- compose_write_headers_from_headerlist(compose, fp, "Newsgroups");
+ compose_write_headers_from_headerlist(compose, fp, "Newsgroups", ",");
#if 0 /* NEW COMPOSE GUI */
if (compose->use_newsgroups) {
- str = gtk_entry_get_text(GTK_ENTRY(compose->newsgroups_entry));
- if (*str != '\0') {
- Xstrdup_a(str, str, return -1);
+ entry_str = gtk_entry_get_text(GTK_ENTRY(compose->newsgroups_entry));
+ if (*entry_str != '\0') {
+ Xstrdup_a(str, entry_str, return -1);
g_strstrip(str);
remove_space(str);
if (*str != '\0') {
}
#endif
/* Cc */
- compose_write_headers_from_headerlist(compose, fp, "Cc");
+ compose_write_headers_from_headerlist(compose, fp, "Cc", ", ");
#if 0 /* NEW COMPOSE GUI */
if (compose->use_cc) {
str = gtk_entry_get_text(GTK_ENTRY(compose->cc_entry));
}
#endif
/* Bcc */
- compose_write_headers_from_headerlist(compose, fp, "Bcc");
+ compose_write_headers_from_headerlist(compose, fp, "Bcc", ", ");
#if 0 /* NEW COMPOSE GUI */
if (compose->use_bcc) {
str = gtk_entry_get_text(GTK_ENTRY(compose->bcc_entry));
#endif
/* Subject */
- str = gtk_entry_get_text(GTK_ENTRY(compose->subject_entry));
- if (*str != '\0' && !IS_IN_CUSTOM_HEADER("Subject")) {
- Xstrdup_a(str, str, return -1);
+ entry_str = gtk_entry_get_text(GTK_ENTRY(compose->subject_entry));
+ if (*entry_str != '\0' && !IS_IN_CUSTOM_HEADER("Subject")) {
+ Xstrdup_a(str, entry_str, return -1);
g_strstrip(str);
if (*str != '\0') {
compose_convert_header(buf, sizeof(buf), str,
/* Message-ID */
if (compose->account->gen_msgid) {
- compose_generate_msgid(compose, buf, sizeof(buf));
+ compose_generate_msgid(buf, sizeof(buf));
fprintf(fp, "Message-Id: <%s>\n", buf);
compose->msgid = g_strdup(buf);
}
- /* In-Reply-To */
- if (compose->inreplyto && compose->to_list)
- fprintf(fp, "In-Reply-To: <%s>\n", compose->inreplyto);
-
- /* References */
- if (compose->references)
- fprintf(fp, "References: %s\n", compose->references);
+ if (compose->remove_references == FALSE) {
+ /* In-Reply-To */
+ if (compose->inreplyto && compose->to_list)
+ fprintf(fp, "In-Reply-To: <%s>\n", compose->inreplyto);
+
+ /* References */
+ if (compose->references)
+ fprintf(fp, "References: %s\n", compose->references);
+ }
/* Followup-To */
- compose_write_headers_from_headerlist(compose, fp, "Followup-To");
+ compose_write_headers_from_headerlist(compose, fp, "Followup-To", ",");
#if 0 /* NEW COMPOSE GUI */
if (compose->use_followupto && !IS_IN_CUSTOM_HEADER("Followup-To")) {
- str = gtk_entry_get_text(GTK_ENTRY(compose->followup_entry));
- if (*str != '\0') {
- Xstrdup_a(str, str, return -1);
+ entry_str = gtk_entry_get_text(GTK_ENTRY(compose->followup_entry));
+ if (*entry_str != '\0') {
+ Xstrdup_a(str, entry_str, return -1);
g_strstrip(str);
remove_space(str);
if (*str != '\0') {
}
#endif
/* Reply-To */
- compose_write_headers_from_headerlist(compose, fp, "Reply-To");
+ compose_write_headers_from_headerlist(compose, fp, "Reply-To", ", ");
#if 0 /* NEW COMPOSE GUI */
if (compose->use_replyto && !IS_IN_CUSTOM_HEADER("Reply-To")) {
- str = gtk_entry_get_text(GTK_ENTRY(compose->reply_entry));
- if (*str != '\0') {
- Xstrdup_a(str, str, return -1);
+ entry_str = gtk_entry_get_text(GTK_ENTRY(compose->reply_entry));
+ if (*entry_str != '\0') {
+ Xstrdup_a(str, entry_str, return -1);
g_strstrip(str);
if (*str != '\0') {
compose_convert_header(buf, sizeof(buf), str,
/* MIME */
fprintf(fp, "Mime-Version: 1.0\n");
if (compose_use_attach(compose)) {
- get_rfc822_date(buf, sizeof(buf));
- subst_char(buf, ' ', '_');
- subst_char(buf, ',', '_');
- compose->boundary = g_strdup_printf("Multipart_%s_%08x",
- buf, (guint)compose);
+ compose->boundary = generate_mime_boundary(NULL);
fprintf(fp,
"Content-Type: multipart/mixed;\n"
" boundary=\"%s\"\n", compose->boundary);
} else {
fprintf(fp, "Content-Type: text/plain; charset=%s\n", charset);
+#if USE_GPGME
+ if (compose->use_signing && !compose->gnupg_mode)
+ fprintf(fp, "Content-Disposition: inline\n");
+#endif
fprintf(fp, "Content-Transfer-Encoding: %s\n",
procmime_get_encoding_str(encoding));
}
headerentry = ((ComposeHeaderEntry *)list->data);
tmp = g_strdup(gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(headerentry->combo)->entry)));
+ if (strchr(tmp, ' ') != NULL || strchr(tmp, '\r') != NULL || strchr(tmp, '\n') != NULL) {
+ g_free(tmp);
+ continue;
+ }
+
if (!strstr(tmp, ":")) {
headername_wcolon = g_strconcat(tmp, ":", NULL);
headername = g_strdup(tmp);
}
g_free(tmp);
- headervalue = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
+ entry_str = gtk_entry_get_text(GTK_ENTRY(headerentry->entry));
+ Xstrdup_a(headervalue, entry_str, return -1);
+ subst_char(headervalue, '\r', ' ');
+ subst_char(headervalue, '\n', ' ');
string = std_headers;
while (*string != NULL) {
headername_trans = prefs_common.trans_hdr ? gettext(*string) : *string;
fprintf(fp, "%s %s\n", headername_wcolon, headervalue);
g_free(headername);
- g_free(headername_wcolon);
-
+ g_free(headername_wcolon);
}
/* separator between header and body */
if (len < 1) return;
+ subst_char(src, '\n', ' ');
+ subst_char(src, '\r', ' ');
g_strchomp(src);
conv_encode_header(dest, len, src, header_len, addr_field);
}
-static void compose_generate_msgid(Compose *compose, gchar *buf, gint len)
+static void compose_generate_msgid(gchar *buf, gint len)
{
struct tm *lt;
time_t t;
t = time(NULL);
lt = localtime(&t);
- if (compose->account && compose->account->address &&
- *compose->account->address) {
- if (strchr(compose->account->address, '@'))
- addr = g_strdup(compose->account->address);
- else
- addr = g_strconcat(compose->account->address, "@",
- get_domain_name(), NULL);
- } else
- addr = g_strconcat(g_get_user_name(), "@", get_domain_name(),
- NULL);
+ addr = g_strconcat("@", get_domain_name(), NULL);
- g_snprintf(buf, len, "%04d%02d%02d%02d%02d%02d.%08x.%s",
+ g_snprintf(buf, len, "%04d%02d%02d%02d%02d%02d.%08x%s",
lt->tm_year + 1900, lt->tm_mon + 1,
lt->tm_mday, lt->tm_hour,
lt->tm_min, lt->tm_sec,
GtkWidget *combo;
GtkWidget *entry;
GList *combo_list = NULL;
- gchar **string, *header = NULL;
+ gchar **string;
+ const gchar *header = NULL;
ComposeHeaderEntry *headerentry;
gboolean standard_header = FALSE;
gtk_combo_set_popdown_strings(GTK_COMBO(combo), combo_list);
g_list_free(combo_list);
gtk_editable_set_editable(GTK_EDITABLE(GTK_COMBO(combo)->entry), TRUE);
+ g_signal_connect(G_OBJECT(GTK_COMBO(combo)->entry), "grab_focus",
+ G_CALLBACK(compose_grab_focus_cb), compose);
gtk_widget_show(combo);
gtk_table_attach(GTK_TABLE(compose->header_table), combo, 0, 1, compose->header_nextrow, compose->header_nextrow+1, GTK_SHRINK, GTK_FILL, 0, 0);
if (compose->header_last) {
- gchar *last_header_entry = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry));
+ const gchar *last_header_entry = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry));
string = headers;
while (*string != NULL) {
if (!strcmp(*string, last_header_entry))
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(text_activated), compose);
+ g_signal_connect(G_OBJECT(entry), "grab_focus",
+ G_CALLBACK(compose_grab_focus_cb), compose);
address_completion_register_entry(GTK_ENTRY(entry));
gtk_table_set_col_spacings(GTK_TABLE(table), 4);
- gtk_signal_connect(GTK_OBJECT(to_entry), "activate",
- GTK_SIGNAL_FUNC(to_activated), compose);
- gtk_signal_connect(GTK_OBJECT(newsgroups_entry), "activate",
- GTK_SIGNAL_FUNC(newsgroups_activated), compose);
- gtk_signal_connect(GTK_OBJECT(subject_entry), "activate",
- GTK_SIGNAL_FUNC(subject_activated), compose);
- gtk_signal_connect(GTK_OBJECT(cc_entry), "activate",
- GTK_SIGNAL_FUNC(cc_activated), compose);
- gtk_signal_connect(GTK_OBJECT(bcc_entry), "activate",
- GTK_SIGNAL_FUNC(bcc_activated), compose);
- gtk_signal_connect(GTK_OBJECT(reply_entry), "activate",
- GTK_SIGNAL_FUNC(replyto_activated), compose);
- gtk_signal_connect(GTK_OBJECT(followup_entry), "activate",
- GTK_SIGNAL_FUNC(followupto_activated), compose);
-
- gtk_signal_connect(GTK_OBJECT(subject_entry), "grab_focus",
- GTK_SIGNAL_FUNC(compose_grab_focus_cb), compose);
- gtk_signal_connect(GTK_OBJECT(to_entry), "grab_focus",
- GTK_SIGNAL_FUNC(compose_grab_focus_cb), compose);
- gtk_signal_connect(GTK_OBJECT(newsgroups_entry), "grab_focus",
- GTK_SIGNAL_FUNC(compose_grab_focus_cb), compose);
- gtk_signal_connect(GTK_OBJECT(cc_entry), "grab_focus",
- GTK_SIGNAL_FUNC(compose_grab_focus_cb), compose);
- gtk_signal_connect(GTK_OBJECT(bcc_entry), "grab_focus",
- GTK_SIGNAL_FUNC(compose_grab_focus_cb), compose);
- gtk_signal_connect(GTK_OBJECT(reply_entry), "grab_focus",
- GTK_SIGNAL_FUNC(compose_grab_focus_cb), compose);
- gtk_signal_connect(GTK_OBJECT(followup_entry), "grab_focus",
- GTK_SIGNAL_FUNC(compose_grab_focus_cb), compose);
+ 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;
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(attach_scrwin),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_ALWAYS);
- gtk_widget_set_usize(attach_scrwin, -1, 80);
+ gtk_widget_set_size_request(attach_scrwin, -1, 80);
attach_clist = gtk_clist_new_with_titles(N_ATTACH_COLS, titles);
gtk_clist_set_column_justification(GTK_CLIST(attach_clist), COL_SIZE,
GTK_CAN_FOCUS);
gtk_container_add(GTK_CONTAINER(attach_scrwin), attach_clist);
- gtk_signal_connect(GTK_OBJECT(attach_clist), "select_row",
- GTK_SIGNAL_FUNC(attach_selected), compose);
- gtk_signal_connect(GTK_OBJECT(attach_clist), "button_press_event",
- GTK_SIGNAL_FUNC(attach_button_pressed), compose);
- gtk_signal_connect(GTK_OBJECT(attach_clist), "key_press_event",
- GTK_SIGNAL_FUNC(attach_key_pressed), compose);
+ g_signal_connect(G_OBJECT(attach_clist), "select_row",
+ G_CALLBACK(attach_selected), compose);
+ g_signal_connect(G_OBJECT(attach_clist), "button_press_event",
+ G_CALLBACK(attach_button_pressed), compose);
+ g_signal_connect(G_OBJECT(attach_clist), "key_press_event",
+ G_CALLBACK(attach_key_pressed), compose);
/* drag and drop */
gtk_drag_dest_set(attach_clist,
GTK_DEST_DEFAULT_ALL, compose_mime_types, 1,
GDK_ACTION_COPY | GDK_ACTION_MOVE);
- gtk_signal_connect(GTK_OBJECT(attach_clist), "drag_data_received",
- GTK_SIGNAL_FUNC(compose_attach_drag_received_cb),
- compose);
+ g_signal_connect(G_OBJECT(attach_clist), "drag_data_received",
+ G_CALLBACK(compose_attach_drag_received_cb),
+ compose);
compose->attach_scrwin = attach_scrwin;
compose->attach_clist = attach_clist;
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);
+ g_signal_connect(G_OBJECT(savemsg_entry), "grab_focus",
+ G_CALLBACK(compose_grab_focus_cb), compose);
if (account_get_special_folder(compose->account, F_OUTBOX)) {
folderidentifier = folder_item_get_identifier(account_get_special_folder
(compose->account, F_OUTBOX));
GtkWidget *ruler;
GtkWidget *scrolledwin;
GtkWidget *text;
+ GtkTextBuffer *buffer;
+ GtkClipboard *clipboard;
UndoMain *undostruct;
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_widget_set_size_request(window, -1, prefs_common.compose_height);
gtk_window_set_wmclass(GTK_WINDOW(window), "compose window", "Sylpheed");
if (!geometry.max_width) {
gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL,
&geometry, GDK_HINT_MAX_SIZE);
- 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);
+ g_signal_connect(G_OBJECT(window), "delete_event",
+ G_CALLBACK(compose_delete_cb), compose);
+ g_signal_connect(G_OBJECT(window), "destroy",
+ G_CALLBACK(compose_destroy_cb), compose);
MANAGE_WINDOW_SIGNALS_CONNECT(window);
gtk_widget_realize(window);
/* Notebook */
notebook = gtk_notebook_new();
- gtk_widget_set_usize(notebook, -1, 130);
+ gtk_widget_set_size_request(notebook, -1, 130);
gtk_widget_show(notebook);
/* header labels and entries */
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(text_activated), compose);
+ g_signal_connect(G_OBJECT(subject_entry), "grab_focus",
+ G_CALLBACK(compose_grab_focus_cb), compose);
gtk_widget_show(subject_entry);
compose->subject_entry = subject_entry;
gtk_container_add(GTK_CONTAINER(subject_frame), subject);
gtk_ruler_set_range(GTK_RULER(ruler), 0.0, 100.0, 1.0, 100.0);
gtk_box_pack_start(GTK_BOX(ruler_hbox), ruler, TRUE, TRUE,
BORDER_WIDTH + 1);
- gtk_widget_set_usize(ruler_hbox, 1, -1);
+ gtk_widget_set_size_request(ruler_hbox, 1, -1);
/* text widget */
scrolledwin = gtk_scrolled_window_new(NULL, NULL);
gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledwin),
GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
gtk_box_pack_start(GTK_BOX(edit_vbox), scrolledwin, TRUE, TRUE, 0);
- gtk_widget_set_usize(scrolledwin, prefs_common.compose_width, -1);
+ gtk_widget_set_size_request(scrolledwin, prefs_common.compose_width, -1);
- text = gtk_stext_new(gtk_scrolled_window_get_hadjustment
- (GTK_SCROLLED_WINDOW(scrolledwin)),
- gtk_scrolled_window_get_vadjustment
- (GTK_SCROLLED_WINDOW(scrolledwin)));
- GTK_STEXT(text)->default_tab_width = 8;
- gtk_stext_set_editable(GTK_STEXT(text), TRUE);
+ text = gtk_text_view_new();
+ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
+ gtk_text_view_set_editable(GTK_TEXT_VIEW(text), TRUE);
+ clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
+ gtk_text_buffer_add_selection_clipboard(buffer, clipboard);
+#warning FIXME_GTK2
+ /* GTK_STEXT(text)->default_tab_width = 8; */
+#warning FIXME_GTK2
+#if 0
if (prefs_common.block_cursor) {
GTK_STEXT(text)->cursor_type = GTK_STEXT_CURSOR_BLOCK;
}
+#endif
+#warning FIXME_GTK2
+#if 0
if (prefs_common.smart_wrapping) {
gtk_stext_set_word_wrap(GTK_STEXT(text), TRUE);
gtk_stext_set_wrap_rmargin(GTK_STEXT(text), prefs_common.linewrap_len);
}
+#else
+ if (prefs_common.smart_wrapping) {
+ gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(text), GTK_WRAP_WORD);
+ }
+#endif
gtk_container_add(GTK_CONTAINER(scrolledwin), text);
- gtk_signal_connect(GTK_OBJECT(text), "changed",
- 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(text_activated), compose);
- gtk_signal_connect(GTK_OBJECT(text), "insert_text",
- GTK_SIGNAL_FUNC(text_inserted), compose);
- gtk_signal_connect_after(GTK_OBJECT(text), "button_press_event",
- GTK_SIGNAL_FUNC(compose_button_press_cb),
- edit_vbox);
-#if 0
- gtk_signal_connect_after(GTK_OBJECT(text), "key_press_event",
- GTK_SIGNAL_FUNC(compose_key_press_cb),
- compose);
-#endif
- gtk_signal_connect_after(GTK_OBJECT(text), "size_allocate",
- GTK_SIGNAL_FUNC(compose_edit_size_alloc),
- ruler);
+#warning FIXME_GTK2
+#if 0 /* FIXME_GTK2 */
+ g_signal_connect(G_OBJECT(text), "activate",
+ G_CALLBACK(text_activated), compose);
+#endif /* FIXME_GTK2 */
+
+ g_signal_connect_after(G_OBJECT(text), "size_allocate",
+ G_CALLBACK(compose_edit_size_alloc),
+ ruler);
+ g_signal_connect(G_OBJECT(buffer), "changed",
+ G_CALLBACK(compose_changed_cb), compose);
+ g_signal_connect(G_OBJECT(text), "grab_focus",
+ G_CALLBACK(compose_grab_focus_cb), compose);
+ g_signal_connect(G_OBJECT(buffer), "insert-text",
+ G_CALLBACK(text_inserted), compose);
/* drag and drop */
gtk_drag_dest_set(text, GTK_DEST_DEFAULT_ALL, compose_mime_types, 1,
GDK_ACTION_COPY | GDK_ACTION_MOVE);
- gtk_signal_connect(GTK_OBJECT(text), "drag_data_received",
- GTK_SIGNAL_FUNC(compose_insert_drag_received_cb),
- compose);
+ g_signal_connect(G_OBJECT(text), "drag_data_received",
+ G_CALLBACK(compose_insert_drag_received_cb),
+ compose);
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 GtkSText when using Pixmap theme */
+#warning FIXME_GTK2
+#if 0 /* FIXME_GTK2 */
if (style->engine) {
GtkThemeEngine *engine;
new_style = gtk_style_copy(style);
style->engine = engine;
} else
+#endif /* FIXME_GTK2 */
new_style = gtk_style_copy(style);
if (prefs_common.textfont) {
- GdkFont *font;
-
- if ((font = gtkut_font_load(prefs_common.textfont)) != NULL) {
- gdk_font_unref(new_style->font);
- new_style->font = font;
+ PangoFontDescription *font_desc;
+
+ font_desc = pango_font_description_from_string
+ (prefs_common.textfont);
+ if (font_desc) {
+ if (new_style->font_desc)
+ pango_font_description_free
+ (new_style->font_desc);
+ new_style->font_desc = font_desc;
}
}
ifactory = gtk_item_factory_from_widget(menubar);
menu_set_sensitive(ifactory, "/Edit/Undo", FALSE);
menu_set_sensitive(ifactory, "/Edit/Redo", FALSE);
+ menu_set_sensitive(ifactory, "/Message/Remove references", FALSE);
tmpl_menu = gtk_item_factory_get_item(ifactory, "/Tools/Template");
#if 0 /* NEW COMPOSE GUI */
prefs_common.misspelled_col,
prefs_common.check_while_typing,
prefs_common.use_alternate,
- GTK_STEXT(text));
+ GTK_TEXT_VIEW(text));
if (!gtkaspell) {
alertpanel_error(_("Spell checker could not "
"be started.\n%s"),
"/Spelling/Spelling Configuration");
gtkaspell_populate_submenu(gtkaspell, menuitem);
menu_set_sensitive(ifactory, "/Spelling", TRUE);
- }
+ }
}
}
#endif
ac->account_name, ac->address);
MENUITEM_ADD(menu, menuitem, name, ac->account_id);
g_free(name);
- gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
- GTK_SIGNAL_FUNC(account_activated),
- compose);
+ g_signal_connect(G_OBJECT(menuitem), "activate",
+ G_CALLBACK(account_activated),
+ compose);
}
gtk_option_menu_set_menu(GTK_OPTION_MENU(optmenu), menu);
Template *tmpl = (Template *)cur->data;
item = gtk_menu_item_new_with_label(tmpl->name);
- gtk_menu_append(GTK_MENU(menu), item);
- gtk_signal_connect(GTK_OBJECT(item), "activate",
- GTK_SIGNAL_FUNC(compose_template_activate_cb),
- compose);
- gtk_object_set_data(GTK_OBJECT(item), "template", tmpl);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+ g_signal_connect(G_OBJECT(item), "activate",
+ G_CALLBACK(compose_template_activate_cb),
+ compose);
+ g_object_set_data(G_OBJECT(item), "template", tmpl);
gtk_widget_show(item);
}
static void compose_template_apply(Compose *compose, Template *tmpl,
gboolean replace)
{
+ GtkTextView *text;
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter iter;
gchar *qmark;
gchar *parsed_str;
if (!tmpl || !tmpl->value) return;
- gtk_stext_freeze(GTK_STEXT(compose->text));
+ text = GTK_TEXT_VIEW(compose->text);
+ buffer = gtk_text_view_get_buffer(text);
if (tmpl->subject && *tmpl->subject != '\0')
gtk_entry_set_text(GTK_ENTRY(compose->subject_entry),
compose_entry_append(compose, tmpl->bcc, COMPOSE_BCC);
if (replace)
- gtkut_stext_clear(GTK_STEXT(compose->text));
+ gtk_text_buffer_set_text(buffer, "\0", 1);
+
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &iter, mark);
if ((compose->replyinfo == NULL) && (compose->fwdinfo == NULL)) {
parsed_str = compose_quote_fmt(compose, NULL, tmpl->value,
compose_insert_sig(compose, FALSE);
if (replace && parsed_str) {
- gtk_editable_set_position(GTK_EDITABLE(compose->text), 0);
- gtk_stext_set_point(GTK_STEXT(compose->text), 0);
+ gtk_text_buffer_get_start_iter(buffer, &iter);
+ gtk_text_buffer_place_cursor(buffer, &iter);
}
if (parsed_str)
compose_changed_cb(NULL, compose);
-
- gtk_stext_thaw(GTK_STEXT(compose->text));
}
static void compose_destroy(Compose *compose)
ainfo->name ? ainfo->name : "");
for (;;) {
+ const gchar *entry_text;
gchar *text;
gchar *cnttype = NULL;
gchar *file = NULL;
break;
}
- text = gtk_entry_get_text(GTK_ENTRY(attach_prop.mimetype_entry));
- if (*text != '\0') {
+ entry_text = gtk_entry_get_text(GTK_ENTRY(attach_prop.mimetype_entry));
+ if (*entry_text != '\0') {
gchar *p;
- text = g_strstrip(g_strdup(text));
+ text = g_strstrip(g_strdup(entry_text));
if ((p = strchr(text, '/')) && !strchr(p + 1, '/')) {
cnttype = g_strdup(text);
g_free(text);
menu = gtk_option_menu_get_menu(optmenu);
menuitem = gtk_menu_get_active(GTK_MENU(menu));
ainfo->encoding = GPOINTER_TO_INT
- (gtk_object_get_user_data(GTK_OBJECT(menuitem)));
+ (g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID));
- text = gtk_entry_get_text(GTK_ENTRY(attach_prop.path_entry));
- if (*text != '\0') {
- if (is_file_exist(text) &&
- (size = get_file_size(text)) > 0)
- file = g_strdup(text);
+ entry_text = gtk_entry_get_text(GTK_ENTRY(attach_prop.path_entry));
+ if (*entry_text != '\0') {
+ if (is_file_exist(entry_text) &&
+ (size = get_file_size(entry_text)) > 0)
+ file = g_strdup(entry_text);
else {
alertpanel_error
(_("File doesn't exist or is empty."));
}
}
- text = gtk_entry_get_text(GTK_ENTRY(attach_prop.filename_entry));
- if (*text != '\0') {
+ entry_text = gtk_entry_get_text(GTK_ENTRY(attach_prop.filename_entry));
+ if (*entry_text != '\0') {
g_free(ainfo->name);
- ainfo->name = g_strdup(text);
+ ainfo->name = g_strdup(entry_text);
}
if (cnttype) {
debug_print("Creating attach_property window...\n");
- window = gtk_window_new(GTK_WINDOW_DIALOG);
- gtk_widget_set_usize(window, 480, -1);
+ window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+ gtk_widget_set_size_request(window, 480, -1);
gtk_container_set_border_width(GTK_CONTAINER(window), 8);
gtk_window_set_title(GTK_WINDOW(window), _("Properties"));
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
gtk_window_set_modal(GTK_WINDOW(window), TRUE);
- gtk_signal_connect(GTK_OBJECT(window), "delete_event",
- GTK_SIGNAL_FUNC(attach_property_delete_event),
- cancelled);
- gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
- GTK_SIGNAL_FUNC(attach_property_key_pressed),
- cancelled);
+ g_signal_connect(G_OBJECT(window), "delete_event",
+ G_CALLBACK(attach_property_delete_event),
+ cancelled);
+ g_signal_connect(G_OBJECT(window), "key_press_event",
+ G_CALLBACK(attach_property_key_pressed),
+ cancelled);
vbox = gtk_vbox_new(FALSE, 8);
gtk_container_add(GTK_CONTAINER(window), vbox);
gtk_box_pack_end(GTK_BOX(vbox), hbbox, FALSE, FALSE, 0);
gtk_widget_grab_default(ok_btn);
- gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked",
- GTK_SIGNAL_FUNC(attach_property_ok),
- cancelled);
- gtk_signal_connect(GTK_OBJECT(cancel_btn), "clicked",
- GTK_SIGNAL_FUNC(attach_property_cancel),
- cancelled);
+ g_signal_connect(G_OBJECT(ok_btn), "clicked",
+ G_CALLBACK(attach_property_ok),
+ cancelled);
+ g_signal_connect(G_OBJECT(cancel_btn), "clicked",
+ G_CALLBACK(attach_property_cancel),
+ cancelled);
gtk_widget_show_all(vbox);
return TRUE;
}
-static void attach_property_key_pressed(GtkWidget *widget, GdkEventKey *event,
- gboolean *cancelled)
+static gboolean attach_property_key_pressed(GtkWidget *widget,
+ GdkEventKey *event,
+ gboolean *cancelled)
{
if (event && event->keyval == GDK_Escape) {
*cancelled = TRUE;
gtk_main_quit();
}
+ return FALSE;
}
static void compose_exec_ext_editor(Compose *compose)
waitpid(compose->exteditor_pid, NULL, 0);
if (buf[0] == '0') { /* success */
- GtkSText *text = GTK_STEXT(compose->text);
+ GtkTextView *text = GTK_TEXT_VIEW(compose->text);
+ GtkTextBuffer *buffer = gtk_text_view_get_buffer(text);
- gtk_stext_freeze(text);
- gtk_stext_set_point(text, 0);
- gtk_stext_forward_delete(text, gtk_stext_get_length(text));
+ gtk_text_buffer_set_text(buffer, "\0", 1);
compose_insert_file(compose, compose->exteditor_file);
compose_changed_cb(NULL, compose);
- gtk_stext_thaw(text);
if (unlink(compose->exteditor_file) < 0)
FILE_OP_ERROR(compose->exteditor_file, "unlink");
}
}
-static gint calc_cursor_xpos(GtkSText *text, gint extra, gint char_width)
+static gint calc_cursor_xpos(GtkTextView *text, gint extra, gint char_width)
{
- gint cursor_pos;
-
- cursor_pos = (text->cursor_pos_x - extra) / char_width;
- cursor_pos = MAX(cursor_pos, 0);
-
- return cursor_pos;
+#warning FIXME_GTK2
+ return 0;
}
/* callback functions */
GtkSHRuler *shruler)
{
if (prefs_common.show_ruler) {
- gint char_width;
+ gint char_width = 0, char_height = 0;
gint line_width_in_chars;
- char_width = gtkut_get_font_width
- (GTK_WIDGET(widget)->style->font);
+ gtkut_get_font_size(GTK_WIDGET(widget),
+ &char_width, &char_height);
line_width_in_chars =
(allocation->width - allocation->x) / char_width;
/* got the maximum */
gtk_ruler_set_range(GTK_RULER(shruler),
0.0, line_width_in_chars,
- calc_cursor_xpos(GTK_STEXT(widget),
+ calc_cursor_xpos(GTK_TEXT_VIEW(widget),
allocation->x,
char_width),
/*line_width_in_chars*/ char_width);
PrefsAccount *ac;
ac = account_find_from_id(
- GPOINTER_TO_INT(gtk_object_get_user_data(GTK_OBJECT(menuitem))));
+ GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID)));
g_return_if_fail(ac != NULL);
if (ac != compose->account)
compose_attach_property(compose);
}
-static void attach_button_pressed(GtkWidget *widget, GdkEventButton *event,
- gpointer data)
+static gboolean attach_button_pressed(GtkWidget *widget, GdkEventButton *event,
+ gpointer data)
{
Compose *compose = (Compose *)data;
GtkCList *clist = GTK_CLIST(compose->attach_clist);
gint row, column;
- if (!event) return;
+ if (!event) return FALSE;
if (event->button == 3) {
if ((clist->selection && !clist->selection->next) ||
gtk_menu_popup(GTK_MENU(compose->popupmenu), NULL, NULL,
NULL, NULL, event->button, event->time);
}
+
+ return FALSE;
}
-static void attach_key_pressed(GtkWidget *widget, GdkEventKey *event,
- gpointer data)
+static gboolean attach_key_pressed(GtkWidget *widget, GdkEventKey *event,
+ gpointer data)
{
Compose *compose = (Compose *)data;
- if (!event) return;
+ if (!event) return FALSE;
switch (event->keyval) {
case GDK_Delete:
compose_attach_remove_selected(compose);
break;
}
+ return FALSE;
}
static void compose_allow_user_actions (Compose *compose, gboolean allow)
toolbar_comp_set_sensitive(compose, allow);
menu_set_sensitive(ifactory, "/File", allow);
menu_set_sensitive(ifactory, "/Edit", allow);
+#if USE_ASPELL
menu_set_sensitive(ifactory, "/Spelling", allow);
+#endif
menu_set_sensitive(ifactory, "/Message", allow);
menu_set_sensitive(ifactory, "/Tools", allow);
menu_set_sensitive(ifactory, "/Help", allow);
FolderItem *draft;
gchar *tmp;
gint msgnum;
+ MsgFlags flag = {0, 0};
static gboolean lock = FALSE;
MsgInfo *newmsginfo;
return;
}
- if ((msgnum = folder_item_add_msg(draft, tmp, TRUE)) < 0) {
+ folder_item_scan(draft);
+ if ((msgnum = folder_item_add_msg(draft, tmp, &flag, TRUE)) < 0) {
unlink(tmp);
g_free(tmp);
lock = FALSE;
procmsg_msginfo_free(newmsginfo);
}
+ folder_item_scan(draft);
+
lock = FALSE;
/* 0: quit editing 1: keep editing 2: keep editing (autosave) */
for ( tmp = file_list; tmp; tmp = tmp->next) {
gchar *file = (gchar *) tmp->data;
- compose_insert_file(compose, file);
+ gchar *filedup = g_strdup(file);
+ gchar *shortfile;
+ ComposeInsertResult res;
+
+ res = compose_insert_file(compose, file);
+ shortfile = g_basename(filedup);
+ if (res == COMPOSE_INSERT_READ_ERROR) {
+ alertpanel_error(_("File '%s' could not be read."), shortfile);
+ } else if (res == COMPOSE_INSERT_INVALID_CHARACTER) {
+ alertpanel_error(_("File '%s' contained invalid characters\n"
+ "for the current encoding, insertion may be incorrect."), shortfile);
+ }
+ g_free(filedup);
g_free(file);
}
g_list_free(file_list);
gchar *msg;
AlertValue val;
- tmpl = gtk_object_get_data(GTK_OBJECT(widget), "template");
+ 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' ?"),
undo_redo(compose->undostruct);
}
+static void entry_cut_clipboard(GtkWidget *entry) {
+ if (GTK_IS_EDITABLE(entry))
+ gtk_editable_cut_clipboard
+ (GTK_EDITABLE(entry));
+ else if (GTK_IS_TEXT_VIEW(entry))
+ gtk_text_buffer_cut_clipboard(
+ gtk_text_view_get_buffer(GTK_TEXT_VIEW(entry)),
+ gtk_clipboard_get(GDK_NONE),
+ TRUE);
+}
+
+static void entry_copy_clipboard(GtkWidget *entry) {
+ if (GTK_IS_EDITABLE(entry))
+ gtk_editable_copy_clipboard
+ (GTK_EDITABLE(entry));
+ else if (GTK_IS_TEXT_VIEW(entry))
+ gtk_text_buffer_copy_clipboard(
+ gtk_text_view_get_buffer(GTK_TEXT_VIEW(entry)),
+ gtk_clipboard_get(GDK_NONE));
+}
+
+static void entry_paste_clipboard(GtkWidget *entry) {
+ 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_NONE),
+ NULL, TRUE);
+}
+
+static void entry_allsel(GtkWidget *entry) {
+ if (GTK_IS_EDITABLE(entry))
+ gtk_editable_select_region
+ (GTK_EDITABLE(entry), 0, -1);
+ else if (GTK_IS_TEXT_VIEW(entry)) {
+ GtkTextIter startiter, enditer;
+ GtkTextBuffer *textbuf;
+
+ textbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(entry));
+ gtk_text_buffer_get_start_iter(textbuf, &startiter);
+ gtk_text_buffer_get_end_iter(textbuf, &enditer);
+
+ gtk_text_buffer_move_mark_by_name(textbuf,
+ "selection_bound", &startiter);
+ gtk_text_buffer_move_mark_by_name(textbuf,
+ "insert", &enditer);
+ }
+}
+
+
static void compose_cut_cb(Compose *compose)
{
if (compose->focused_editable &&
GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
- gtk_editable_cut_clipboard
- (GTK_EDITABLE(compose->focused_editable));
+ entry_cut_clipboard(compose->focused_editable);
}
static void compose_copy_cb(Compose *compose)
{
if (compose->focused_editable &&
GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
- gtk_editable_copy_clipboard
- (GTK_EDITABLE(compose->focused_editable));
+ entry_copy_clipboard(compose->focused_editable);
}
static void compose_paste_cb(Compose *compose)
{
if (compose->focused_editable &&
GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
- gtk_editable_paste_clipboard
- (GTK_EDITABLE(compose->focused_editable));
+ entry_paste_clipboard(compose->focused_editable);
}
static void compose_paste_as_quote_cb(Compose *compose)
gtk_object_set_data(GTK_OBJECT(compose->focused_editable),
"paste_as_quotation",
GINT_TO_POINTER(paste_as_quotation + 1));
- gtk_editable_paste_clipboard
- (GTK_EDITABLE(compose->focused_editable));
+ entry_paste_clipboard(compose->focused_editable);
}
}
{
if (compose->focused_editable &&
GTK_WIDGET_HAS_FOCUS(compose->focused_editable))
- gtk_editable_select_region
- (GTK_EDITABLE(compose->focused_editable), 0, -1);
+ entry_allsel(compose->focused_editable);
+}
+
+static void textview_move_beginning_of_line (GtkTextView *text)
+{
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter ins;
+
+ g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+
+ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &ins, mark);
+ gtk_text_iter_set_line_offset(&ins, 0);
+ gtk_text_buffer_place_cursor(buffer, &ins);
}
-static void compose_gtk_stext_action_cb(Compose *compose,
- ComposeCallGtkSTextAction action)
+static void textview_move_forward_character (GtkTextView *text)
{
- GtkSText *text = GTK_STEXT(compose->text);
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter ins;
+
+ g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+
+ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &ins, mark);
+ if (gtk_text_iter_forward_cursor_position(&ins))
+ gtk_text_buffer_place_cursor(buffer, &ins);
+}
+
+static void textview_move_backward_character (GtkTextView *text)
+{
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter ins;
+
+ g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+
+ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &ins, mark);
+ if (gtk_text_iter_backward_cursor_position(&ins))
+ gtk_text_buffer_place_cursor(buffer, &ins);
+}
+
+static void textview_move_forward_word (GtkTextView *text)
+{
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter ins;
+ gint count;
+
+ g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+
+ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &ins, mark);
+ count = gtk_text_iter_inside_word (&ins) ? 2 : 1;
+ if (gtk_text_iter_forward_word_ends(&ins, count)) {
+ gtk_text_iter_backward_word_start(&ins);
+ gtk_text_buffer_place_cursor(buffer, &ins);
+ }
+}
+
+static void textview_move_backward_word (GtkTextView *text)
+{
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter ins;
+ gint count;
+
+ g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+
+ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &ins, mark);
+ count = gtk_text_iter_inside_word (&ins) ? 2 : 1;
+ if (gtk_text_iter_backward_word_starts(&ins, 1))
+ gtk_text_buffer_place_cursor(buffer, &ins);
+}
+
+static void textview_move_end_of_line (GtkTextView *text)
+{
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter ins;
+
+ g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+
+ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &ins, mark);
+ if (gtk_text_iter_forward_to_line_end(&ins))
+ gtk_text_buffer_place_cursor(buffer, &ins);
+}
+
+static void textview_move_next_line (GtkTextView *text)
+{
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter ins;
+ gint offset;
+
+ g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+
+ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &ins, mark);
+#warning FIXME_GTK2 /* should regist current line offset */
+ offset = gtk_text_iter_get_line_offset(&ins);
+ if (gtk_text_iter_forward_line(&ins)) {
+ gtk_text_iter_set_line_offset(&ins, offset);
+ gtk_text_buffer_place_cursor(buffer, &ins);
+ }
+}
+
+static void textview_move_previous_line (GtkTextView *text)
+{
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter ins;
+ gint offset;
+
+ g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+
+ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &ins, mark);
+#warning FIXME_GTK2 /* should regist current line offset */
+ offset = gtk_text_iter_get_line_offset(&ins);
+ if (gtk_text_iter_backward_line(&ins)) {
+ gtk_text_iter_set_line_offset(&ins, offset);
+ gtk_text_buffer_place_cursor(buffer, &ins);
+ }
+}
+
+static void textview_delete_forward_character (GtkTextView *text)
+{
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter ins, end_iter;
+
+ g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+
+ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &ins, mark);
+ end_iter = ins;
+ if (gtk_text_iter_forward_char(&end_iter)) {
+ gtk_text_buffer_delete(buffer, &ins, &end_iter);
+ }
+}
+
+static void textview_delete_backward_character (GtkTextView *text)
+{
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter ins, end_iter;
+
+ g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+
+ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &ins, mark);
+ end_iter = ins;
+ if (gtk_text_iter_backward_char(&end_iter)) {
+ gtk_text_buffer_delete(buffer, &end_iter, &ins);
+ }
+}
+
+static void textview_delete_forward_word (GtkTextView *text)
+{
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter ins, end_iter;
+
+ g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+
+ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &ins, mark);
+ end_iter = ins;
+ if (gtk_text_iter_forward_word_end(&end_iter)) {
+ gtk_text_buffer_delete(buffer, &ins, &end_iter);
+ }
+}
+
+static void textview_delete_backward_word (GtkTextView *text)
+{
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter ins, end_iter;
+
+ g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+
+ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &ins, mark);
+ end_iter = ins;
+ if (gtk_text_iter_backward_word_start(&end_iter)) {
+ gtk_text_buffer_delete(buffer, &end_iter, &ins);
+ }
+}
+
+static void textview_delete_line (GtkTextView *text)
+{
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter ins, start_iter, end_iter;
+ gboolean found;
+
+ g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+
+ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &ins, mark);
+
+ start_iter = ins;
+ gtk_text_iter_set_line_offset(&start_iter, 0);
+
+ end_iter = ins;
+ if (gtk_text_iter_ends_line(&end_iter))
+ found = gtk_text_iter_forward_char(&end_iter);
+ else
+ found = gtk_text_iter_forward_to_line_end(&end_iter);
+
+ if (found)
+ gtk_text_buffer_delete(buffer, &start_iter, &end_iter);
+}
+
+static void textview_delete_to_line_end (GtkTextView *text)
+{
+ GtkTextBuffer *buffer;
+ GtkTextMark *mark;
+ GtkTextIter ins, end_iter;
+ gboolean found;
+
+ g_return_if_fail(GTK_IS_TEXT_VIEW(text));
+
+ buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
+ mark = gtk_text_buffer_get_insert(buffer);
+ gtk_text_buffer_get_iter_at_mark(buffer, &ins, mark);
+ end_iter = ins;
+ if (gtk_text_iter_ends_line(&end_iter))
+ found = gtk_text_iter_forward_char(&end_iter);
+ else
+ found = gtk_text_iter_forward_to_line_end(&end_iter);
+ if (found)
+ gtk_text_buffer_delete(buffer, &ins, &end_iter);
+}
+
+static void compose_advanced_action_cb(Compose *compose,
+ ComposeCallAdvancedAction action)
+{
+ GtkTextView *text = GTK_TEXT_VIEW(compose->text);
static struct {
- void (*do_action) (GtkSText *text);
+ void (*do_action) (GtkTextView *text);
} action_table[] = {
- {gtk_stext_move_beginning_of_line},
- {gtk_stext_move_forward_character},
- {gtk_stext_move_backward_character},
- {gtk_stext_move_forward_word},
- {gtk_stext_move_backward_word},
- {gtk_stext_move_end_of_line},
- {gtk_stext_move_next_line},
- {gtk_stext_move_previous_line},
- {gtk_stext_delete_forward_character},
- {gtk_stext_delete_backward_character},
- {gtk_stext_delete_forward_word},
- {gtk_stext_delete_backward_word},
- {gtk_stext_delete_line},
- {gtk_stext_delete_line}, /* gtk_stext_delete_line_n */
- {gtk_stext_delete_to_line_end}
+ {textview_move_beginning_of_line},
+ {textview_move_forward_character},
+ {textview_move_backward_character},
+ {textview_move_forward_word},
+ {textview_move_backward_word},
+ {textview_move_end_of_line},
+ {textview_move_next_line},
+ {textview_move_previous_line},
+ {textview_delete_forward_character},
+ {textview_delete_backward_character},
+ {textview_delete_forward_word},
+ {textview_delete_backward_word},
+ {textview_delete_line},
+ {NULL}, /* gtk_stext_delete_line_n */
+ {textview_delete_to_line_end}
};
if (!GTK_WIDGET_HAS_FOCUS(text)) return;
- if (action >= COMPOSE_CALL_GTK_STEXT_MOVE_BEGINNING_OF_LINE &&
- action <= COMPOSE_CALL_GTK_STEXT_DELETE_TO_LINE_END)
- action_table[action].do_action(text);
+ if (action >= COMPOSE_CALL_ADVANCED_ACTION_MOVE_BEGINNING_OF_LINE &&
+ action <= COMPOSE_CALL_ADVANCED_ACTION_DELETE_TO_LINE_END) {
+ if (action_table[action].do_action)
+ action_table[action].do_action(text);
+ else
+ g_warning("Not implemented yet.");
+ }
}
static void compose_grab_focus_cb(GtkWidget *widget, Compose *compose)
{
- if (GTK_IS_EDITABLE(widget))
+ if (GTK_IS_EDITABLE(widget) || GTK_IS_TEXT_VIEW(widget))
compose->focused_editable = widget;
}
-static void compose_changed_cb(GtkEditable *editable, Compose *compose)
+static void compose_changed_cb(GtkTextBuffer *textbuf, Compose *compose)
{
if (compose->modified == FALSE) {
compose->modified = TRUE;
}
}
-static void compose_button_press_cb(GtkWidget *widget, GdkEventButton *event,
- Compose *compose)
-{
- gtk_stext_set_point(GTK_STEXT(widget),
- gtk_editable_get_position(GTK_EDITABLE(widget)));
-}
-
-#if 0
-static void compose_key_press_cb(GtkWidget *widget, GdkEventKey *event,
- Compose *compose)
-{
- gtk_stext_set_point(GTK_STEXT(widget),
- gtk_editable_get_position(GTK_EDITABLE(widget)));
-}
-#endif
-
#if 0 /* NEW COMPOSE GUI */
static void compose_toggle_to_cb(gpointer data, guint action,
GtkWidget *widget)
compose->return_receipt = FALSE;
}
-void compose_headerentry_key_press_event_cb(GtkWidget *entry,
+static void compose_toggle_remove_refs_cb(gpointer data, guint action,
+ GtkWidget *widget)
+{
+ Compose *compose = (Compose *)data;
+
+ if (GTK_CHECK_MENU_ITEM(widget)->active)
+ compose->remove_references = TRUE;
+ else
+ compose->remove_references = FALSE;
+}
+
+gboolean compose_headerentry_key_press_event_cb(GtkWidget *entry,
GdkEventKey *event,
ComposeHeaderEntry *headerentry)
{
*/
gtk_signal_emit_stop_by_name(GTK_OBJECT(entry), "key-press-event");
gtk_widget_grab_focus(headerentry->compose->subject_entry);
+ return TRUE;
}
}
-
+ return FALSE;
}
-void compose_headerentry_changed_cb(GtkWidget *entry,
+gboolean 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_data
+ (GTK_OBJECT(entry), headerentry);
+
/* Automatically scroll down */
compose_show_first_last_header(headerentry->compose, FALSE);
}
+ return FALSE;
}
static void compose_show_first_last_header(Compose *compose, gboolean show_first)
compose_send_control_enter(compose);
}
-static void text_inserted(GtkWidget *widget, const gchar *text,
- gint length, gint *position, Compose *compose)
+static void text_inserted(GtkTextBuffer *buffer, GtkTextIter *iter,
+ const gchar *text, gint len, Compose *compose)
{
- GtkEditable *editable = GTK_EDITABLE(widget);
- gint paste_as_quotation = GPOINTER_TO_INT(gtk_object_get_data
- (GTK_OBJECT(widget), "paste_as_quotation"));
+ gint paste_as_quotation = GPOINTER_TO_INT(g_object_get_data
+ (G_OBJECT(compose->text), "paste_as_quotation"));
+
+ g_return_if_fail(text);
- gtk_signal_handler_block_by_func(GTK_OBJECT(widget),
- GTK_SIGNAL_FUNC(text_inserted),
- compose);
+ g_signal_handlers_block_by_func(G_OBJECT(buffer),
+ G_CALLBACK(text_inserted),
+ compose);
if (paste_as_quotation) {
gchar *new_text;
gchar *qmark;
- gint pos;
- new_text = g_strndup(text, length);
+ if (len < 0)
+ len = strlen(text);
+
+ new_text = g_strndup(text, len);
if (prefs_common.quotemark && *prefs_common.quotemark)
qmark = prefs_common.quotemark;
else
qmark = "> ";
- gtk_stext_set_point(GTK_STEXT(widget), *position);
+ gtk_text_buffer_place_cursor(buffer, iter);
compose_quote_fmt(compose, NULL, "%Q", qmark, new_text);
- pos = gtk_stext_get_point(GTK_STEXT(widget));
- gtk_editable_set_position(editable, pos);
- *position = pos;
g_free(new_text);
- gtk_object_set_data(GTK_OBJECT(widget), "paste_as_quotation",
- GINT_TO_POINTER(paste_as_quotation - 1));
+ g_object_set_data(G_OBJECT(compose->text), "paste_as_quotation",
+ GINT_TO_POINTER(paste_as_quotation - 1));
} else
- gtk_editable_insert_text(editable, text, length, position);
+ gtk_text_buffer_insert(buffer, iter, text, len);
if (prefs_common.autowrap)
compose_wrap_line_all_full(compose, TRUE);
- gtk_signal_handler_unblock_by_func(GTK_OBJECT(widget),
- GTK_SIGNAL_FUNC(text_inserted),
- compose);
- gtk_signal_emit_stop_by_name(GTK_OBJECT(editable), "insert_text");
+ g_signal_handlers_unblock_by_func(G_OBJECT(buffer),
+ G_CALLBACK(text_inserted),
+ compose);
+ g_signal_stop_emission_by_name(G_OBJECT(buffer), "insert-text");
-
if (prefs_common.autosave &&
- gtk_stext_get_length(GTK_STEXT(widget)) % prefs_common.autosave_length == 0)
- compose_draft_cb((gpointer)compose, 2, NULL);
+ gtk_text_buffer_get_char_count(buffer) % prefs_common.autosave_length == 0)
+ gtk_timeout_add(500, (GtkFunction) compose_defer_auto_save_draft, compose);
+}
+
+static gint compose_defer_auto_save_draft(Compose *compose)
+{
+ compose_draft_cb((gpointer)compose, 2, NULL);
+ return FALSE;
}
static gboolean compose_send_control_enter(Compose *compose)
GdkEvent *ev;
GdkEventKey *kev;
GtkItemFactory *ifactory;
- GtkAccelEntry *accel;
+ GtkAccelKey *accel;
GtkWidget *send_menu;
GSList *list;
GdkModifierType ignored_mods =
ifactory = gtk_item_factory_from_widget(compose->menubar);
send_menu = gtk_item_factory_get_widget(ifactory, "/Message/Send");
- list = gtk_accel_group_entries_from_object(GTK_OBJECT(send_menu));
+ list = gtk_accel_groups_from_object(G_OBJECT(send_menu));
if (!list)
return FALSE;
- accel = (GtkAccelEntry *)list->data;
- if (accel && accel->accelerator_key == kev->keyval &&
- (accel->accelerator_mods & ~ignored_mods) ==
+ accel = (GtkAccelKey *)list->data;
+ if (accel && accel->accel_key == kev->keyval &&
+ (accel->accel_mods & ~ignored_mods) ==
(kev->state & ~ignored_mods)) {
compose_send_cb(compose, 0, NULL);
return TRUE;
projects / claws.git / blobdiff