#include "compose.h"
#include "procmsg.h"
#include "gtkstext.h"
+#include "mimeview.h"
-#define WAIT_LAP 10000
-
-typedef enum {
-ACTION_NONE = 1 << 0,
-ACTION_PIPE_IN = 1 << 1,
-ACTION_PIPE_OUT = 1 << 2,
-ACTION_SINGLE = 1 << 3,
-ACTION_MULTIPLE = 1 << 4,
-ACTION_ASYNC = 1 << 5,
-ACTION_OPEN_IN = 1 << 6,
-ACTION_HIDE_IN = 1 << 7,
-ACTION_ERROR = 1 << 8,
-} ActionsTypes;
-
-static struct Actions {
+typedef enum
+{
+ ACTION_NONE = 1 << 0,
+ ACTION_PIPE_IN = 1 << 1,
+ ACTION_PIPE_OUT = 1 << 2,
+ ACTION_SINGLE = 1 << 3,
+ ACTION_MULTIPLE = 1 << 4,
+ ACTION_ASYNC = 1 << 5,
+ ACTION_OPEN_IN = 1 << 6,
+ ACTION_HIDE_IN = 1 << 7,
+ ACTION_ERROR = 1 << 8,
+} ActionType;
+
+static struct Actions
+{
GtkWidget *window;
GtkWidget *ok_btn;
} actions;
typedef struct _Children Children;
-struct _Children {
- GtkWidget *window;
- GtkWidget *dialog;
- GtkWidget *text;
- GtkWidget *input_entry;
- GtkWidget *input_hbox;
- GtkWidget *abort_btn;
- GtkWidget *hide_btn;
- GtkWidget *scrolledwin;
-
- gchar *action;
- guint timer;
- GSList *list;
+typedef struct _ChildInfo ChildInfo;
+
+struct _Children
+{
+ GtkWidget *window;
+ GtkWidget *dialog;
+ GtkWidget *text;
+ GtkWidget *input_entry;
+ GtkWidget *input_hbox;
+ GtkWidget *abort_btn;
+ GtkWidget *close_btn;
+ GtkWidget *scrolledwin;
+
+ gchar *action;
+ GSList *list;
gint nb;
gint open_in;
gboolean output;
};
-typedef struct _ChildInfo ChildInfo;
-struct _ChildInfo {
+struct _ChildInfo
+{
Children *children;
- gchar *cmd;
- guint type;
- pid_t pid;
- gint chld_in;
+ gchar *cmd;
+ guint type;
+ pid_t pid;
+ gint chld_in;
gint chld_out;
gint chld_err;
gint chld_status;
static gint prefs_actions_clist_set_row (gint row);
/* callback functions */
-static void prefs_actions_help_cb (GtkWidget *w, gpointer data);
-static void prefs_actions_register_cb (GtkWidget *w, gpointer data);
-static void prefs_actions_substitute_cb (GtkWidget *w, gpointer data);
-static void prefs_actions_delete_cb (GtkWidget *w, gpointer data);
-static void prefs_actions_up (GtkWidget *w, gpointer data);
-static void prefs_actions_down (GtkWidget *w, gpointer data);
+static void prefs_actions_help_cb (GtkWidget *w,
+ gpointer data);
+static void prefs_actions_register_cb (GtkWidget *w,
+ gpointer data);
+static void prefs_actions_substitute_cb (GtkWidget *w,
+ gpointer data);
+static void prefs_actions_delete_cb (GtkWidget *w,
+ gpointer data);
+static void prefs_actions_up (GtkWidget *w,
+ gpointer data);
+static void prefs_actions_down (GtkWidget *w,
+ gpointer data);
static void prefs_actions_select (GtkCList *clist,
gint row,
gint column,
static void prefs_actions_key_pressed (GtkWidget *widget,
GdkEventKey *event,
gpointer data);
-static void prefs_actions_cancel (GtkWidget *w, gpointer data);
-static void prefs_actions_ok (GtkWidget *w, gpointer data);
-static void update_actions_menu (GtkItemFactory *ifactory,
- gchar *branch_path,
- gpointer callback,
- gpointer data);
+static void prefs_actions_cancel (GtkWidget *w,
+ gpointer data);
+static void prefs_actions_ok (GtkWidget *w,
+ gpointer data);
+static void update_actions_menu (GtkItemFactory *ifactory,
+ gchar *branch_path,
+ gpointer callback,
+ gpointer data);
static void mainwin_actions_execute_cb (MainWindow *mainwin,
- guint action_nb,
- GtkWidget *widget);
+ guint action_nb,
+ GtkWidget *widget);
static void compose_actions_execute_cb (Compose *compose,
guint action_nb,
GtkWidget *widget);
-static guint get_action_type (gchar *action);
+static guint get_action_type (gchar *action);
-static gboolean execute_actions (gchar *action,
- GtkWidget *window,
- GtkCTree *ctree,
- GtkWidget *text);
+static gboolean execute_actions (gchar *action,
+ GtkWidget *window,
+ GtkCTree *ctree,
+ GtkWidget *text,
+ MimeView *mimeview);
-static gchar *parse_action_cmd (gchar *action,
- MsgInfo *msginfo,
- GtkCTree *ctree);
-static GString *parse_append_filename (GString *cmd,
- MsgInfo *msginfo);
+static gchar *parse_action_cmd (gchar *action,
+ MsgInfo *msginfo,
+ GtkCTree *ctree,
+ MimeView *mimeview);
+static GString *parse_append_filename (GString *cmd,
+ MsgInfo *msginfo);
-ChildInfo *fork_child (gchar *cmd,
- gint action_type,
- GtkWidget *text,
- Children *children);
+static GString *parse_append_msgpart (GString *cmd,
+ MsgInfo *msginfo,
+ MimeView *mimeview);
-static gint wait_for_children (gpointer data);
+ChildInfo *fork_child (gchar *cmd,
+ gint action_type,
+ GtkWidget *text,
+ Children *children);
-static void free_children (Children *children);
+static gint wait_for_children (gpointer data);
-static void childinfo_close_pipes (ChildInfo *child_info);
+static void free_children (Children *children);
-static void create_io_dialog (Children *children);
+static void childinfo_close_pipes (ChildInfo *child_info);
-static void update_io_dialog (Children *children);
+static void create_io_dialog (Children *children);
+static void update_io_dialog (Children *children);
-static void hide_io_dialog_cb (GtkWidget *widget,
- gpointer data);
+static void hide_io_dialog_cb (GtkWidget *widget,
+ gpointer data);
-static void catch_output (gpointer data,
- gint source,
- GdkInputCondition cond);
-static void catch_input (gpointer data,
- gint source,
- GdkInputCondition cond);
-static void catch_status (gpointer data,
- gint source,
- GdkInputCondition cond);
+static void catch_output (gpointer data,
+ gint source,
+ GdkInputCondition cond);
+static void catch_input (gpointer data,
+ gint source,
+ GdkInputCondition cond);
+static void catch_status (gpointer data,
+ gint source,
+ GdkInputCondition cond);
void prefs_actions_open(MainWindow *mainwin)
{
+#if 0
if (prefs_rc_is_readonly(ACTIONS_RC))
return;
+#endif
inc_lock();
if (!actions.window)
prefs_actions_create(mainwin);
-
+
manage_window_set_transient(GTK_WINDOW(actions.window));
gtk_widget_grab_focus(actions.ok_btn);
GtkWidget *confirm_area;
GtkWidget *vbox1;
+
+ GtkWidget *entry_vbox;
GtkWidget *hbox;
GtkWidget *name_label;
GtkWidget *name_entry;
GtkWidget *btn_vbox;
GtkWidget *up_btn;
GtkWidget *down_btn;
-
+
gchar *title[1];
- debug_print(_("Creating actions setting window...\n"));
+ debug_print("Creating actions setting window...\n");
window = gtk_window_new (GTK_WINDOW_DIALOG);
-
- gtk_container_set_border_width (GTK_CONTAINER (window), 8);
- gtk_window_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER);
- gtk_window_set_modal (GTK_WINDOW (window), TRUE);
- gtk_window_set_policy (GTK_WINDOW (window), FALSE, TRUE, TRUE);
- vbox = gtk_vbox_new (FALSE, 6);
- gtk_widget_show (vbox);
- gtk_container_add (GTK_CONTAINER (window), vbox);
+ gtk_container_set_border_width(GTK_CONTAINER (window), 8);
+ gtk_window_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
+ gtk_window_set_modal(GTK_WINDOW(window), TRUE);
+ gtk_window_set_policy(GTK_WINDOW(window), FALSE, TRUE, TRUE);
+ gtk_window_set_default_size(GTK_WINDOW(window), 400, -1);
+
+ vbox = gtk_vbox_new(FALSE, 6);
+ gtk_widget_show(vbox);
+ gtk_container_add(GTK_CONTAINER(window), vbox);
gtkut_button_set_create(&confirm_area, &ok_btn, _("OK"),
&cancel_btn, _("Cancel"), NULL, NULL);
- gtk_widget_show (confirm_area);
- gtk_box_pack_end (GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
- gtk_widget_grab_default (ok_btn);
-
- gtk_window_set_title (GTK_WINDOW(window),
- _("Actions setting"));
- gtk_signal_connect (GTK_OBJECT(window), "delete_event",
- GTK_SIGNAL_FUNC(prefs_actions_deleted), NULL);
- gtk_signal_connect (GTK_OBJECT(window), "key_press_event",
- GTK_SIGNAL_FUNC(prefs_actions_key_pressed), NULL);
- MANAGE_WINDOW_SIGNALS_CONNECT (window);
- gtk_signal_connect (GTK_OBJECT(ok_btn), "clicked",
- GTK_SIGNAL_FUNC(prefs_actions_ok), mainwin);
- gtk_signal_connect (GTK_OBJECT(cancel_btn), "clicked",
- GTK_SIGNAL_FUNC(prefs_actions_cancel), NULL);
-
- vbox1 = gtk_vbox_new (FALSE, VSPACING);
- gtk_widget_show (vbox1);
- gtk_box_pack_start (GTK_BOX (vbox), vbox1, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (vbox1), 2);
-
- hbox = gtk_hbox_new (FALSE, 0);
- gtk_box_pack_start (GTK_BOX(vbox1), hbox, TRUE, TRUE, 0);
-
- name_label = gtk_label_new(_("Menu name: "));
- gtk_widget_show(name_label);
- gtk_box_pack_start (GTK_BOX (hbox), name_label, FALSE, FALSE, 0);
+ gtk_widget_show(confirm_area);
+ gtk_box_pack_end(GTK_BOX(vbox), confirm_area, FALSE, FALSE, 0);
+ gtk_widget_grab_default(ok_btn);
+
+ gtk_window_set_title(GTK_WINDOW(window), _("Actions setting"));
+ gtk_signal_connect(GTK_OBJECT(window), "delete_event",
+ GTK_SIGNAL_FUNC(prefs_actions_deleted), NULL);
+ gtk_signal_connect(GTK_OBJECT(window), "key_press_event",
+ GTK_SIGNAL_FUNC(prefs_actions_key_pressed), NULL);
+ MANAGE_WINDOW_SIGNALS_CONNECT(window);
+ gtk_signal_connect(GTK_OBJECT(ok_btn), "clicked",
+ GTK_SIGNAL_FUNC(prefs_actions_ok), mainwin);
+ gtk_signal_connect(GTK_OBJECT(cancel_btn), "clicked",
+ GTK_SIGNAL_FUNC(prefs_actions_cancel), NULL);
+
+ vbox1 = gtk_vbox_new(FALSE, 8);
+ gtk_widget_show(vbox1);
+ gtk_box_pack_start(GTK_BOX(vbox), vbox1, TRUE, TRUE, 0);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox1), 2);
+
+ entry_vbox = gtk_vbox_new(FALSE, 4);
+ gtk_box_pack_start(GTK_BOX(vbox1), entry_vbox, FALSE, FALSE, 0);
+
+ hbox = gtk_hbox_new(FALSE, 8);
+ gtk_box_pack_start(GTK_BOX(entry_vbox), hbox, FALSE, FALSE, 0);
+
+ name_label = gtk_label_new(_("Menu name:"));
+ gtk_box_pack_start(GTK_BOX(hbox), name_label, FALSE, FALSE, 0);
name_entry = gtk_entry_new();
- gtk_widget_show(name_entry);
- gtk_box_pack_start (GTK_BOX (hbox), name_entry, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), name_entry, TRUE, TRUE, 0);
- gtk_widget_show_all(hbox);
+ hbox = gtk_hbox_new(FALSE, 8);
+ gtk_box_pack_start(GTK_BOX(entry_vbox), hbox, TRUE, TRUE, 0);
- hbox = gtk_hbox_new (FALSE, 0);
- gtk_box_pack_start (GTK_BOX(vbox1), hbox, TRUE, TRUE, 0);
-
- cmd_label = gtk_label_new(_("Command line: "));
- gtk_box_pack_start (GTK_BOX (hbox), cmd_label, FALSE, FALSE, 0);
+ cmd_label = gtk_label_new(_("Command line:"));
+ gtk_box_pack_start(GTK_BOX(hbox), cmd_label, FALSE, FALSE, 0);
cmd_entry = gtk_entry_new();
- gtk_box_pack_start (GTK_BOX (hbox), cmd_entry, TRUE, TRUE, 0);
+ gtk_box_pack_start(GTK_BOX(hbox), cmd_entry, TRUE, TRUE, 0);
- gtk_widget_show_all(hbox);
+ gtk_widget_show_all(entry_vbox);
help_vbox = gtk_vbox_new(FALSE, 8);
- gtk_box_pack_start (GTK_BOX (vbox1), help_vbox, TRUE, TRUE, 0);
-
- help_label = gtk_label_new (_("Menu name:\n"
- " Use '/' in menu name to make submenus.\n"
- "Command line:\n"
- " Begin with:\n '|' to send message "
- "body or selection "
- "to command\n '>' to send user provided"
- " text to command\n '*' to send user "
- "provided hidden text to command\n"
- " End with:\n '|' to replace "
- "message body or selection with command "
- "output\n '&' to "
- "run command asynchronously\n Use '%f' "
- "for message file name\n and '%F' for the"
- " list of the file names of selected "
- "messages."));
+ gtk_box_pack_start(GTK_BOX(vbox1), help_vbox, FALSE, FALSE, 0);
+
+ help_label = gtk_label_new
+ (_("Menu name:\n"
+ " Use / in menu name to make submenus.\n"
+ "Command line:\n"
+ " Begin with:\n"
+ " | to send message body or selection to command\n"
+ " > to send user provided text to command\n"
+ " * to send user provided hidden text to command\n"
+ " End with:\n"
+ " | to replace message body or selection with command output\n"
+ " & to run command asynchronously\n"
+ " Use %f for message file name\n"
+ " %F for the list of the file names of selected messages\n"
+ " %p for the selected message part."));
gtk_misc_set_alignment(GTK_MISC(help_label), 0, 0.5);
- gtk_label_set_justify (GTK_LABEL(help_label), GTK_JUSTIFY_LEFT);
- gtk_widget_show (help_label);
- gtk_box_pack_start (GTK_BOX (help_vbox), help_label, TRUE, TRUE, 0);
+ gtk_label_set_justify(GTK_LABEL(help_label), GTK_JUSTIFY_LEFT);
+ gtk_widget_show(help_label);
+ gtk_box_pack_start(GTK_BOX(help_vbox), help_label, FALSE, FALSE, 0);
gtk_widget_hide(help_vbox);
- /* register / substitute / delete */
-
- reg_hbox = gtk_hbox_new (FALSE, 4);
- gtk_widget_show (reg_hbox);
- gtk_box_pack_start (GTK_BOX (vbox1), reg_hbox, FALSE, FALSE, 0);
-
- arrow = gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_OUT);
- gtk_widget_show (arrow);
- gtk_box_pack_start (GTK_BOX (reg_hbox), arrow, FALSE, FALSE, 0);
- gtk_widget_set_usize (arrow, -1, 16);
-
- btn_hbox = gtk_hbox_new (FALSE, 4);
- gtk_widget_show (btn_hbox);
- gtk_box_pack_start (GTK_BOX (reg_hbox), btn_hbox, FALSE, FALSE, 0);
-
- reg_btn = gtk_button_new_with_label (_("Register"));
- gtk_widget_show (reg_btn);
- gtk_box_pack_start (GTK_BOX (btn_hbox), reg_btn, FALSE, TRUE, 0);
- gtk_signal_connect (GTK_OBJECT (reg_btn), "clicked",
- GTK_SIGNAL_FUNC (prefs_actions_register_cb), NULL);
-
- subst_btn = gtk_button_new_with_label (_(" Substitute "));
- gtk_widget_show (subst_btn);
- gtk_box_pack_start (GTK_BOX (btn_hbox), subst_btn, FALSE, TRUE, 0);
- gtk_signal_connect (GTK_OBJECT (subst_btn), "clicked",
- GTK_SIGNAL_FUNC (prefs_actions_substitute_cb),
- NULL);
-
- del_btn = gtk_button_new_with_label (_("Delete"));
- gtk_widget_show (del_btn);
- gtk_box_pack_start (GTK_BOX (btn_hbox), del_btn, FALSE, TRUE, 0);
- gtk_signal_connect (GTK_OBJECT (del_btn), "clicked",
- GTK_SIGNAL_FUNC (prefs_actions_delete_cb), NULL);
-
- help_toggle = gtk_toggle_button_new_with_label (_("Help on syntax"));
- gtk_widget_show (help_toggle);
- gtk_box_pack_end (GTK_BOX (btn_hbox), help_toggle, FALSE, TRUE, 0);
- gtk_signal_connect (GTK_OBJECT (help_toggle), "toggled",
- GTK_SIGNAL_FUNC (prefs_actions_help_cb), help_vbox);
-
- cond_hbox = gtk_hbox_new (FALSE, 8);
- gtk_widget_show (cond_hbox);
- gtk_box_pack_start (GTK_BOX (vbox1), cond_hbox, TRUE, TRUE, 0);
-
- cond_scrolledwin = gtk_scrolled_window_new (NULL, NULL);
- gtk_widget_show (cond_scrolledwin);
- gtk_widget_set_usize (cond_scrolledwin, -1, 150);
- gtk_box_pack_start (GTK_BOX (cond_hbox), cond_scrolledwin,
- TRUE, TRUE, 0);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (cond_scrolledwin),
- GTK_POLICY_AUTOMATIC,
- GTK_POLICY_AUTOMATIC);
+ /* register / substitute / delete */
+
+ reg_hbox = gtk_hbox_new(FALSE, 4);
+ gtk_widget_show(reg_hbox);
+ gtk_box_pack_start(GTK_BOX(vbox1), reg_hbox, FALSE, FALSE, 0);
+
+ arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
+ gtk_widget_show(arrow);
+ gtk_box_pack_start(GTK_BOX(reg_hbox), arrow, FALSE, FALSE, 0);
+ gtk_widget_set_usize(arrow, -1, 16);
+
+ btn_hbox = gtk_hbox_new(TRUE, 4);
+ gtk_widget_show(btn_hbox);
+ gtk_box_pack_start(GTK_BOX(reg_hbox), btn_hbox, FALSE, FALSE, 0);
+
+ reg_btn = gtk_button_new_with_label(_("Register"));
+ gtk_widget_show(reg_btn);
+ gtk_box_pack_start(GTK_BOX(btn_hbox), reg_btn, FALSE, TRUE, 0);
+ gtk_signal_connect(GTK_OBJECT(reg_btn), "clicked",
+ GTK_SIGNAL_FUNC(prefs_actions_register_cb), NULL);
+
+ subst_btn = gtk_button_new_with_label(_(" Substitute "));
+ gtk_widget_show(subst_btn);
+ gtk_box_pack_start(GTK_BOX(btn_hbox), subst_btn, FALSE, TRUE, 0);
+ gtk_signal_connect(GTK_OBJECT(subst_btn), "clicked",
+ GTK_SIGNAL_FUNC(prefs_actions_substitute_cb),
+ NULL);
+
+ del_btn = gtk_button_new_with_label(_("Delete"));
+ gtk_widget_show(del_btn);
+ gtk_box_pack_start(GTK_BOX(btn_hbox), del_btn, FALSE, TRUE, 0);
+ gtk_signal_connect(GTK_OBJECT(del_btn), "clicked",
+ GTK_SIGNAL_FUNC(prefs_actions_delete_cb), NULL);
+
+ help_toggle = gtk_toggle_button_new_with_label(_(" Syntax help "));
+ gtk_widget_show(help_toggle);
+ gtk_box_pack_end(GTK_BOX(reg_hbox), help_toggle, FALSE, FALSE, 0);
+ gtk_signal_connect(GTK_OBJECT(help_toggle), "toggled",
+ GTK_SIGNAL_FUNC(prefs_actions_help_cb), help_vbox);
+
+ cond_hbox = gtk_hbox_new(FALSE, 8);
+ gtk_widget_show(cond_hbox);
+ gtk_box_pack_start(GTK_BOX(vbox1), cond_hbox, TRUE, TRUE, 0);
+
+ cond_scrolledwin = gtk_scrolled_window_new(NULL, NULL);
+ gtk_widget_show(cond_scrolledwin);
+ gtk_widget_set_usize(cond_scrolledwin, -1, 150);
+ gtk_box_pack_start(GTK_BOX(cond_hbox), cond_scrolledwin,
+ TRUE, TRUE, 0);
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW (cond_scrolledwin),
+ GTK_POLICY_AUTOMATIC,
+ GTK_POLICY_AUTOMATIC);
title[0] = _("Registered actions");
cond_clist = gtk_clist_new_with_titles(1, title);
- gtk_widget_show (cond_clist);
- gtk_container_add (GTK_CONTAINER (cond_scrolledwin), cond_clist);
- gtk_clist_set_column_width (GTK_CLIST (cond_clist), 0, 80);
- gtk_clist_set_selection_mode (GTK_CLIST (cond_clist),
- GTK_SELECTION_BROWSE);
- GTK_WIDGET_UNSET_FLAGS (GTK_CLIST (cond_clist)->column[0].button,
- GTK_CAN_FOCUS);
- gtk_signal_connect (GTK_OBJECT (cond_clist), "select_row",
- GTK_SIGNAL_FUNC (prefs_actions_select), NULL);
- gtk_signal_connect_after (GTK_OBJECT (cond_clist), "row_move",
- GTK_SIGNAL_FUNC (prefs_actions_row_move),
- NULL);
-
- btn_vbox = gtk_vbox_new (FALSE, 8);
- gtk_widget_show (btn_vbox);
- gtk_box_pack_start (GTK_BOX (cond_hbox), btn_vbox, FALSE, FALSE, 0);
-
- up_btn = gtk_button_new_with_label (_("Up"));
- gtk_widget_show (up_btn);
- gtk_box_pack_start (GTK_BOX (btn_vbox), up_btn, FALSE, FALSE, 0);
- gtk_signal_connect (GTK_OBJECT (up_btn), "clicked",
- GTK_SIGNAL_FUNC (prefs_actions_up), NULL);
-
- down_btn = gtk_button_new_with_label (_("Down"));
- gtk_widget_show (down_btn);
- gtk_box_pack_start (GTK_BOX (btn_vbox), down_btn, FALSE, FALSE, 0);
- gtk_signal_connect (GTK_OBJECT (down_btn), "clicked",
- GTK_SIGNAL_FUNC (prefs_actions_down), NULL);
+ gtk_widget_show(cond_clist);
+ gtk_container_add(GTK_CONTAINER (cond_scrolledwin), cond_clist);
+ gtk_clist_set_column_width(GTK_CLIST (cond_clist), 0, 80);
+ gtk_clist_set_selection_mode(GTK_CLIST (cond_clist),
+ GTK_SELECTION_BROWSE);
+ GTK_WIDGET_UNSET_FLAGS(GTK_CLIST(cond_clist)->column[0].button,
+ GTK_CAN_FOCUS);
+ gtk_signal_connect(GTK_OBJECT(cond_clist), "select_row",
+ GTK_SIGNAL_FUNC(prefs_actions_select), NULL);
+ gtk_signal_connect_after(GTK_OBJECT(cond_clist), "row_move",
+ GTK_SIGNAL_FUNC(prefs_actions_row_move),
+ NULL);
+
+ btn_vbox = gtk_vbox_new(FALSE, 8);
+ gtk_widget_show(btn_vbox);
+ gtk_box_pack_start(GTK_BOX(cond_hbox), btn_vbox, FALSE, FALSE, 0);
+
+ up_btn = gtk_button_new_with_label(_("Up"));
+ gtk_widget_show(up_btn);
+ gtk_box_pack_start(GTK_BOX(btn_vbox), up_btn, FALSE, FALSE, 0);
+ gtk_signal_connect(GTK_OBJECT(up_btn), "clicked",
+ GTK_SIGNAL_FUNC(prefs_actions_up), NULL);
+
+ down_btn = gtk_button_new_with_label(_("Down"));
+ gtk_widget_show(down_btn);
+ gtk_box_pack_start(GTK_BOX(btn_vbox), down_btn, FALSE, FALSE, 0);
+ gtk_signal_connect(GTK_OBJECT(down_btn), "clicked",
+ GTK_SIGNAL_FUNC(prefs_actions_down), NULL);
gtk_widget_show(window);
actions.name_entry = name_entry;
actions.cmd_entry = cmd_entry;
-
+
actions.actions_clist = cond_clist;
}
gtk_widget_hide(GTK_WIDGET(data));
}
-void prefs_actions_read_config()
+void prefs_actions_read_config(void)
{
gchar *rcpath;
FILE *fp;
gchar buf[PREFSBUFSIZE];
gchar *act;
- debug_print(_("Reading actions configurations...\n"));
+ debug_print("Reading actions configurations...\n");
rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, ACTIONS_RC, NULL);
if ((fp = fopen(rcpath, "rb")) == NULL) {
}
g_free(rcpath);
- while (prefs_common.actionslst != NULL) {
- act = (gchar *) prefs_common.actionslst->data;
- prefs_common.actionslst = g_slist_remove(
- prefs_common.actionslst,
- act);
+ while (prefs_common.actions_list != NULL) {
+ act = (gchar *)prefs_common.actions_list->data;
+ prefs_common.actions_list =
+ g_slist_remove(prefs_common.actions_list, act);
g_free(act);
}
-
+
while (fgets(buf, sizeof(buf), fp) != NULL) {
g_strchomp(buf);
act = strstr(buf, ": ");
if (act && act[2] &&
get_action_type(&act[2]) != ACTION_ERROR)
- prefs_common.actionslst = g_slist_append(
- prefs_common.actionslst,
- g_strdup(buf));
+ prefs_common.actions_list =
+ g_slist_append(prefs_common.actions_list,
+ g_strdup(buf));
}
fclose(fp);
}
-void prefs_actions_write_config()
+void prefs_actions_write_config(void)
{
gchar *rcpath;
PrefFile *pfile;
GSList *cur;
- debug_print(_("Writing actions configuration...\n"));
+ debug_print("Writing actions configuration...\n");
rcpath = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, ACTIONS_RC, NULL);
if ((pfile= prefs_write_open(rcpath)) == NULL) {
return;
}
- for (cur = prefs_common.actionslst; cur != NULL; cur = cur->next) {
- gchar *act = (gchar *) cur->data;
+ for (cur = prefs_common.actions_list; cur != NULL; cur = cur->next) {
+ gchar *act = (gchar *)cur->data;
if (fputs(act, pfile->fp) == EOF ||
fputc('\n', pfile->fp) == EOF) {
FILE_OP_ERROR(rcpath, "fputs || fputc");
{
gchar *p;
guint action_type = ACTION_NONE;
-
+
g_return_val_if_fail(action, ACTION_ERROR);
g_return_val_if_fail(*action, ACTION_ERROR);
while (*p && action_type != ACTION_ERROR) {
if (p[0] == '%') {
switch (p[1]) {
- case 'f': action_type |= ACTION_SINGLE;
- break;
- case 'F': action_type |= ACTION_MULTIPLE;
- break;
- default: action_type = ACTION_ERROR;
- break;
+ case 'f':
+ action_type |= ACTION_SINGLE;
+ break;
+ case 'F':
+ action_type |= ACTION_MULTIPLE;
+ break;
+ case 'p':
+ action_type |= ACTION_SINGLE;
+ break;
+ default:
+ action_type = ACTION_ERROR;
+ break;
}
} else if (p[0] == '|') {
if (p[1] == 0x00)
action_type |= ACTION_PIPE_OUT;
- else
- action_type = ACTION_ERROR;
} else if (p[0] == '&') {
if (p[1] == 0x00)
action_type |= ACTION_ASYNC;
else
- action_type = ACTION_ERROR;
+ action_type = ACTION_ERROR;
}
p++;
}
return action_type;
}
-static gchar *parse_action_cmd (gchar *action,
- MsgInfo *msginfo,
- GtkCTree *ctree)
+static gchar *parse_action_cmd(gchar *action, MsgInfo *msginfo,
+ GtkCTree *ctree, MimeView *mimeview)
{
- GString *cmd;
+ GString *cmd, *tmpcmd;
gchar *p;
GList *cur;
MsgInfo *msg;
cmd = g_string_sized_new(strlen(action));
- while (p[0] && p[0] != '|' && p[0] != '&') {
+ while (p[0] && !(p[0] == '|' && !p[1]) && p[0] != '&') {
if (p[0] == '%' && p[1]) {
switch (p[1]) {
- case 'f': cmd = parse_append_filename(cmd, msginfo);
- p++;
- break;
- case 'F':
- for (cur =GTK_CLIST(ctree)->selection;
- cur; cur = cur->next) {
+ case 'f':
+ cmd = parse_append_filename(cmd, msginfo);
+ p++;
+ break;
+ case 'F':
+ for (cur = GTK_CLIST(ctree)->selection;
+ cur != NULL; cur = cur->next) {
msg = gtk_ctree_node_get_row_data(ctree,
GTK_CTREE_NODE(cur->data));
cmd = parse_append_filename(cmd, msg);
- cmd = g_string_append_c(cmd, ' ');
- }
- p++;
- break;
- default: cmd = g_string_append_c(cmd, p[0]);
- cmd = g_string_append_c(cmd, p[1]);
- p++;
+ if (cur->next)
+ cmd = g_string_append_c(cmd, ' ');
+ }
+ p++;
+ break;
+ case 'p':
+ tmpcmd = parse_append_msgpart
+ (cmd, msginfo, mimeview);
+ if (tmpcmd)
+ cmd = tmpcmd;
+ else {
+ g_string_free(cmd, TRUE);
+ return NULL;
+ }
+ p++;
+ break;
+ default:
+ cmd = g_string_append_c(cmd, p[0]);
+ cmd = g_string_append_c(cmd, p[1]);
+ p++;
}
} else {
cmd = g_string_append_c(cmd, p[0]);
}
p++;
}
- if (!cmd->len) {
+ if (cmd->len == 0) {
g_string_free(cmd, TRUE);
return NULL;
}
return cmd;
}
-static void prefs_actions_set_dialog (void)
+static GString *parse_append_msgpart(GString *cmd, MsgInfo *msginfo,
+ MimeView *mimeview)
+{
+ gchar *filename;
+ gchar *partname;
+ MimeInfo *partinfo;
+ gint ret;
+ FILE *fp;
+
+ if (!mimeview) {
+#if USE_GPGME
+ if ((fp = procmsg_open_message_decrypted(msginfo, &partinfo))
+ == NULL) {
+ alertpanel_error(_("Could not get message file."));
+ return NULL;
+ }
+#else
+ if ((fp = procmsg_open_message(msginfo)) == NULL) {
+ alertpanel_error(_("Could not get message file."));
+ return NULL;
+ }
+ partinfo = procmime_scan_mime_header(fp);
+#endif
+ fclose(fp);
+ if (!partinfo) {
+ procmime_mimeinfo_free(partinfo);
+ alertpanel_error(_("Could not get message part."));
+ return NULL;
+ }
+ filename = procmsg_get_message_file(msginfo);
+ } else {
+ if (!mimeview->opened) {
+ alertpanel_error(_("No message part selected."));
+ return NULL;
+ }
+ if (!mimeview->file) {
+ alertpanel_error(_("No message file selected."));
+ return NULL;
+ }
+ partinfo = gtk_ctree_node_get_row_data
+ (GTK_CTREE(mimeview->ctree),
+ mimeview->opened);
+ g_return_val_if_fail(partinfo != NULL, cmd);
+ filename = mimeview->file;
+ }
+ partname = procmime_get_tmp_file_name(partinfo);
+
+ ret = procmime_get_part(partname, filename, partinfo);
+
+ if (!mimeview) {
+ procmime_mimeinfo_free(partinfo);
+ g_free(filename);
+ }
+
+ if (ret < 0) {
+ alertpanel_error(_("Can't get part of multipart message"));
+ g_free(partname);
+ return NULL;
+ }
+
+ cmd = g_string_append(cmd,partname);
+
+ g_free(partname);
+
+ return cmd;
+}
+
+static void prefs_actions_set_dialog(void)
{
GtkCList *clist = GTK_CLIST(actions.actions_clist);
GSList *cur;
row = gtk_clist_append(clist, action_str);
gtk_clist_set_row_data(clist, row, NULL);
- for (cur = prefs_common.actionslst; cur != NULL; cur = cur->next) {
+ for (cur = prefs_common.actions_list; cur != NULL; cur = cur->next) {
gchar *action[1];
- action[0] = (gchar *) cur->data;
+ action[0] = (gchar *)cur->data;
row = gtk_clist_append(clist, action);
gtk_clist_set_row_data(clist, row, action[0]);
}
-
+
gtk_clist_thaw(clist);
}
+
static void prefs_actions_set_list(void)
{
gint row = 1;
gchar *action;
-
- g_slist_free(prefs_common.actionslst);
- prefs_common.actionslst = NULL;
-
- while ( (action = (gchar *) gtk_clist_get_row_data(GTK_CLIST(
- actions.actions_clist), row))
- != NULL) {
- prefs_common.actionslst = g_slist_append(prefs_common.actionslst,
- action);
+
+ g_slist_free(prefs_common.actions_list);
+ prefs_common.actions_list = NULL;
+
+ while ((action = (gchar *)gtk_clist_get_row_data
+ (GTK_CLIST(actions.actions_clist), row)) != NULL) {
+ prefs_common.actions_list =
+ g_slist_append(prefs_common.actions_list, action);
row++;
}
}
-
#define GET_ENTRY(entry) \
entry_text = gtk_entry_get_text(GTK_ENTRY(entry))
-static gint prefs_actions_clist_set_row (gint row)
+
+static gint prefs_actions_clist_set_row(gint row)
{
GtkCList *clist = GTK_CLIST(actions.actions_clist);
gchar *entry_text;
gint len;
gchar action[PREFSBUFSIZE];
gchar *buf[1];
-
-
- g_return_val_if_fail(row != 0, -1);
-
+ g_return_val_if_fail(row != 0, -1);
GET_ENTRY(actions.name_entry);
if (entry_text[0] == '\0') {
alertpanel_error(_("Colon ':' is not allowed in the menu name."));
return -1;
}
-
+
strncpy(action, entry_text, PREFSBUFSIZE - 1);
g_strstrip(action);
entry_text);
return -1;
}
-
+
strcat(action, entry_text);
buf[0] = action;
}
buf[0] = g_strdup(action);
-
+
gtk_clist_set_row_data(clist, row, buf[0]);
prefs_actions_set_list();
return 0;
}
-
+
/* callback functions */
-static void prefs_actions_register_cb (GtkWidget *w, gpointer data)
+
+static void prefs_actions_register_cb(GtkWidget *w, gpointer data)
{
prefs_actions_clist_set_row(-1);
}
-static void prefs_actions_substitute_cb (GtkWidget *w, gpointer data)
+static void prefs_actions_substitute_cb(GtkWidget *w, gpointer data)
{
GtkCList *clist = GTK_CLIST(actions.actions_clist);
gchar *action;
action = gtk_clist_get_row_data(clist, row);
if (!action) return;
-
+
prefs_actions_clist_set_row(row);
}
-static void prefs_actions_delete_cb (GtkWidget *w, gpointer data)
+static void prefs_actions_delete_cb(GtkWidget *w, gpointer data)
{
GtkCList *clist = GTK_CLIST(actions.actions_clist);
gchar *action;
action = gtk_clist_get_row_data(clist, row);
g_free(action);
gtk_clist_remove(clist, row);
- prefs_common.actionslst = g_slist_remove(prefs_common.actionslst, action);
+ prefs_common.actions_list = g_slist_remove(prefs_common.actions_list,
+ action);
}
-static void prefs_actions_up (GtkWidget *w, gpointer data)
+static void prefs_actions_up(GtkWidget *w, gpointer data)
{
GtkCList *clist = GTK_CLIST(actions.actions_clist);
gint row;
gtk_clist_row_move(clist, row, row - 1);
}
-static void prefs_actions_down (GtkWidget *w, gpointer data)
+static void prefs_actions_down(GtkWidget *w, gpointer data)
{
GtkCList *clist = GTK_CLIST(actions.actions_clist);
gint row;
#define ENTRY_SET_TEXT(entry, str) \
gtk_entry_set_text(GTK_ENTRY(entry), str ? str : "")
-static void prefs_actions_select (GtkCList *clist,
- gint row,
- gint column,
- GdkEvent *event)
+
+static void prefs_actions_select(GtkCList *clist, gint row, gint column,
+ GdkEvent *event)
{
gchar *action;
gchar *cmd;
ENTRY_SET_TEXT(actions.cmd_entry, "");
return;
}
-
+
strncpy(buf, action, PREFSBUFSIZE - 1);
buf[PREFSBUFSIZE - 1] = 0x00;
- cmd = strstr2(buf, ": ");
+ cmd = strstr(buf, ": ");
if (cmd && cmd[2])
ENTRY_SET_TEXT(actions.cmd_entry, &cmd[2]);
*cmd = 0x00;
ENTRY_SET_TEXT(actions.name_entry, buf);
}
-
-static void prefs_actions_row_move (GtkCList *clist,
- gint source_row,
- gint dest_row)
+
+static void prefs_actions_row_move(GtkCList *clist,
+ gint source_row, gint dest_row)
{
prefs_actions_set_list();
if (gtk_clist_row_is_visible(clist, dest_row) != GTK_VISIBILITY_FULL) {
}
}
-static gint prefs_actions_deleted (GtkWidget *widget,
- GdkEventAny *event,
- gpointer *data)
+static gint prefs_actions_deleted(GtkWidget *widget, GdkEventAny *event,
+ gpointer *data)
{
prefs_actions_cancel(widget, data);
return TRUE;
}
-static void prefs_actions_key_pressed (GtkWidget *widget,
- GdkEventKey *event,
- gpointer data)
+static void prefs_actions_key_pressed(GtkWidget *widget, GdkEventKey *event,
+ gpointer data)
{
if (event && event->keyval == GDK_Escape)
prefs_actions_cancel(widget, data);
}
-static void prefs_actions_cancel (GtkWidget *w, gpointer data)
+static void prefs_actions_cancel(GtkWidget *w, gpointer data)
{
prefs_actions_read_config();
gtk_widget_hide(actions.window);
inc_unlock();
}
-static void prefs_actions_ok (GtkWidget *widget, gpointer data)
+static void prefs_actions_ok(GtkWidget *widget, gpointer data)
{
GtkItemFactory *ifactory;
- MainWindow *mainwin = (MainWindow *) data;
+ MainWindow *mainwin = (MainWindow *)data;
prefs_actions_write_config();
ifactory = gtk_item_factory_from_widget(mainwin->menubar);
inc_unlock();
}
-void update_mainwin_actions_menu(GtkItemFactory *ifactory,
+void update_mainwin_actions_menu(GtkItemFactory *ifactory,
MainWindow *mainwin)
{
- update_actions_menu(ifactory, "/Edit/Actions",
- mainwin_actions_execute_cb,
+ update_actions_menu(ifactory, "/Tools/Actions",
+ mainwin_actions_execute_cb,
mainwin);
}
-void update_compose_actions_menu(GtkItemFactory *ifactory,
+void update_compose_actions_menu(GtkItemFactory *ifactory,
gchar *branch_path,
Compose *compose)
{
- update_actions_menu(ifactory, branch_path,
- compose_actions_execute_cb,
+ update_actions_menu(ifactory, branch_path,
+ compose_actions_execute_cb,
compose);
}
-
+
+void actions_execute(MainWindow *mainwin,
+ guint action_nb,
+ GtkWidget *widget)
+{
+ mainwin_actions_execute_cb(mainwin, action_nb, widget);
+}
+
+
static void update_actions_menu(GtkItemFactory *ifactory,
gchar *branch_path,
gpointer callback,
gchar *menu_path;
GSList *cur;
gchar *action, *action_p;
- GtkWidget *menu;
-
- GtkItemFactoryEntry ifentry = {
- branch_path, NULL, NULL, 0, "<Branch>"};
- menuitem = gtk_item_factory_get_item(ifactory, branch_path);
- /* FIXME: is there a better way to remove unknown submenu items? */
- /* Deleting and recreating the parent looses the translation */
- menu = GTK_WIDGET(GTK_MENU_ITEM(menuitem)->submenu);
- if (GTK_MENU_SHELL(menu)->children) {
- GList *amenu, *alist;
- for (amenu = (GTK_MENU_SHELL(menu)->children); amenu; ) {
- alist = amenu->next;
- gtk_widget_destroy(GTK_WIDGET(amenu->data));
- amenu = alist;
- }
+ GList *amenu;
+ GtkItemFactoryEntry ifentry = {NULL, NULL, NULL, 0, "<Branch>"};
+
+ ifentry.path = branch_path;
+ menuitem = gtk_item_factory_get_widget(ifactory, branch_path);
+ g_return_if_fail(menuitem != NULL);
+
+ amenu = GTK_MENU_SHELL(menuitem)->children;
+ while (amenu != NULL) {
+ GList *alist = amenu->next;
+ gtk_widget_destroy(GTK_WIDGET(amenu->data));
+ amenu = alist;
}
ifentry.accelerator = NULL;
ifentry.callback = callback;
ifentry.item_type = NULL;
- for (cur = prefs_common.actionslst; cur; cur = cur->next) {
- action = g_strdup((gchar *) cur->data);
+ for (cur = prefs_common.actions_list; cur; cur = cur->next) {
+ action = g_strdup((gchar *)cur->data);
action_p = strstr(action, ": ");
if (action_p && action_p[2] &&
get_action_type(&action_p[2]) != ACTION_ERROR) {
action_p[0] = 0x00;
- menu_path = g_strdup_printf("%s/%s", branch_path,
+ menu_path = g_strdup_printf("%s/%s", branch_path,
action);
ifentry.path = menu_path;
gtk_item_factory_create_item(ifactory, &ifentry, data,
g_free(menu_path);
}
g_free(action);
- ifentry.callback_action++;
+ ifentry.callback_action++;
}
}
-static void compose_actions_execute_cb (Compose *compose,
- guint action_nb,
- GtkWidget *widget)
+static void compose_actions_execute_cb(Compose *compose, guint action_nb,
+ GtkWidget *widget)
{
gchar *buf, *action;
- guint action_type;
+ guint action_type;
- g_return_if_fail(action_nb < g_slist_length(prefs_common.actionslst));
-
- buf = (gchar *) g_slist_nth_data(prefs_common.actionslst, action_nb);
-
- g_return_if_fail(buf);
- g_return_if_fail(action = strstr(buf, ": "));
+ g_return_if_fail(action_nb < g_slist_length(prefs_common.actions_list));
+
+ buf = (gchar *)g_slist_nth_data(prefs_common.actions_list, action_nb);
+ g_return_if_fail(buf != NULL);
+ action = strstr(buf, ": ");
+ g_return_if_fail(action != NULL);
/* Point to the beginning of the command-line */
- action++;
- action++;
-
+ action += 2;
+
action_type = get_action_type(action);
- if (action_type & ACTION_MULTIPLE ||
- action_type & ACTION_SINGLE ) {
- alertpanel_warning(_("The selected action is not a pipe "
- "action.\n You can only use pipe actions "
- "when composing a message."));
+ if (action_type & (ACTION_SINGLE | ACTION_MULTIPLE)) {
+ alertpanel_warning
+ (_("The selected action cannot be used in the compose window\n"
+ "because it contains %%f, %%F or %%p."));
return;
}
- execute_actions(action, compose->window, NULL, compose->text);
+ execute_actions(action, compose->window, NULL, compose->text, NULL);
}
-static void mainwin_actions_execute_cb (MainWindow *mainwin,
- guint action_nb,
- GtkWidget *widget)
+static void mainwin_actions_execute_cb(MainWindow *mainwin, guint action_nb,
+ GtkWidget *widget)
{
MessageView *messageview = mainwin->messageview;
GtkWidget *text = NULL;
gchar *buf,
*action;
-
- g_return_if_fail (action_nb < g_slist_length(prefs_common.actionslst));
+ MimeView *mimeview = NULL;
+
+ g_return_if_fail(action_nb < g_slist_length(prefs_common.actions_list));
+
+ buf = (gchar *)g_slist_nth_data(prefs_common.actions_list, action_nb);
- buf = (gchar *) g_slist_nth_data(prefs_common.actionslst, action_nb);
-
g_return_if_fail(buf);
g_return_if_fail(action = strstr(buf, ": "));
/* Point to the beginning of the command-line */
- action++;
- action++;
+ action += 2;
switch (messageview->type) {
- case MVIEW_TEXT:
- if (messageview->textview &&
- messageview->textview->text)
- text = messageview->textview->text;
- break;
- case MVIEW_MIME:
- if (messageview->mimeview &&
- messageview->mimeview->type == MIMEVIEW_TEXT &&
- messageview->mimeview->textview &&
- messageview->mimeview->textview->text)
- text = messageview->mimeview->textview->text;
- break;
+ case MVIEW_TEXT:
+ if (messageview->textview && messageview->textview->text)
+ text = messageview->textview->text;
+ break;
+ case MVIEW_MIME:
+ if (messageview->mimeview &&
+ messageview->mimeview->type == MIMEVIEW_TEXT &&
+ messageview->mimeview->textview &&
+ messageview->mimeview->textview->text) {
+ text = messageview->mimeview->textview->text;
+ mimeview = messageview->mimeview;
+ }
+ break;
}
execute_actions(action, mainwin->window,
- GTK_CTREE(mainwin->summaryview->ctree), text);
+ GTK_CTREE(mainwin->summaryview->ctree), text, mimeview);
}
-static gboolean execute_actions(gchar *action,
- GtkWidget *window,
- GtkCTree *ctree,
- GtkWidget *text)
+static gboolean execute_actions(gchar *action, GtkWidget *window,
+ GtkCTree *ctree, GtkWidget *text,
+ MimeView *mimeview)
{
- GList *cur, *selection;
+ GList *cur, *selection = NULL;
GSList *children_list = NULL;
gint is_ok = TRUE;
- gint selection_len;
+ gint selection_len = 0;
Children *children;
ChildInfo *child_info;
gint action_type;
selection = GTK_CLIST(ctree)->selection;
selection_len = g_list_length(selection);
}
-
- if ((action_type & (ACTION_PIPE_OUT | ACTION_PIPE_IN))) {
+
+ if (action_type & (ACTION_PIPE_OUT | ACTION_PIPE_IN)) {
if (ctree && selection_len > 1)
return FALSE; /* ERR: pipe + multiple selection */
if (!text)
return FALSE; /* ERR: pipe and no displayed text */
}
- if (!(action_type & ACTION_ASYNC) && window) {
- gtk_widget_set_sensitive(window, FALSE);
- }
-
children = g_new0(Children, 1);
if (action_type & ACTION_SINGLE) {
is_ok = FALSE; /* ERR: msginfo missing */
break;
}
- cmd = parse_action_cmd(action, msginfo, ctree);
+ cmd = parse_action_cmd(action, msginfo, ctree,
+ mimeview);
if (!cmd) {
- debug_print(_("Action command error\n"));
+ debug_print("Action command error\n");
is_ok = FALSE; /* ERR: incorrect command */
break;
}
children))) {
children_list = g_slist_append(children_list,
child_info);
- children->open_in = (selection_len == 1) ?
- (action_type &
+ children->open_in = (selection_len == 1) ?
+ (action_type &
(ACTION_OPEN_IN |
ACTION_HIDE_IN)) : 0;
}
g_free(cmd);
}
} else {
- cmd = parse_action_cmd(action, NULL, ctree);
+ cmd = parse_action_cmd(action, NULL, ctree, mimeview);
if (cmd) {
if ((child_info = fork_child(cmd, action_type, text,
children))) {
if (!children_list) {
/* If not waiting for children, return */
g_free(children);
- if (!(action_type & ACTION_ASYNC) && window) {
- gtk_widget_set_sensitive(window, TRUE);
- }
} else {
GSList *cur;
-
+
children->action = g_strdup(action);
children->window = window;
children->dialog = NULL;
GDK_INPUT_READ,
catch_status, child_info);
}
- children->timer = children->open_in ? 0 :
- gtk_timeout_add(WAIT_LAP, wait_for_children,
- children);
- }
- if (children->open_in)
+
create_io_dialog(children);
+ }
- return is_ok ;
+ return is_ok;
}
-ChildInfo *fork_child(gchar *cmd,
- gint action_type,
- GtkWidget *text,
+ChildInfo *fork_child(gchar *cmd, gint action_type, GtkWidget *text,
Children *children)
{
gint chld_in[2], chld_out[2], chld_err[2], chld_status[2];
- gchar **cmdline;
+ gchar *cmdline[4];
gint start, end, is_selection;
gchar *selection;
- pid_t pid_c, pid_gc;
+ pid_t pid, gch_pid;
ChildInfo *child_info;
+ gint sync;
- if (action_type & ACTION_ASYNC) {
- execute_command_line(cmd, TRUE);
- return NULL; /* Asynchronous command */
- }
+ sync = !(action_type & ACTION_ASYNC);
+
+ chld_in[0] = chld_in[1] = chld_out[0] = chld_out[1] = chld_err[0]
+ = chld_err[1] = chld_status[0] = chld_status[1] = -1;
- if (pipe(chld_in) || pipe(chld_out) || pipe(chld_err) ||
- pipe(chld_status)) {
- alertpanel_error(_("Command could not started. Pipe creation"
- " failed.\n%s"), g_strerror(errno));
- return NULL; /* Pipe error */
+ if (sync) {
+ if (pipe(chld_status) || pipe(chld_in) || pipe(chld_out) ||
+ pipe(chld_err)) {
+ alertpanel_error(_("Command could not be started. "
+ "Pipe creation failed.\n%s"),
+ g_strerror(errno));
+ /* Closing fd = -1 fails silently */
+ close(chld_in[0]);
+ close(chld_in[1]);
+ close(chld_out[0]);
+ close(chld_out[1]);
+ close(chld_err[0]);
+ close(chld_err[1]);
+ close(chld_status[0]);
+ close(chld_status[1]);
+ return NULL; /* Pipe error */
+ }
}
-
- debug_print(_("Forking child and granchild.\n"));
- pid_c = fork();
- if (pid_c == (pid_t) 0) {/* Child */
+ debug_print("Forking child and grandchild.\n");
+
+ pid = fork();
+ if (pid == 0) { /* Child */
if (setpgid(0, 0))
perror("setpgid");
close(ConnectionNumber(gdk_display));
- pid_gc = fork();
+ gch_pid = fork();
- if (pid_gc == 0) {
+ if (gch_pid == 0) {
if (setpgid(0, getppid()))
perror("setpgid");
- if (action_type &
- (ACTION_PIPE_IN | ACTION_OPEN_IN | ACTION_HIDE_IN)) {
- close(fileno(stdin));
- dup (chld_in[0]);
+ if (sync) {
+ if (action_type &
+ (ACTION_PIPE_IN |
+ ACTION_OPEN_IN |
+ ACTION_HIDE_IN)) {
+ close(fileno(stdin));
+ dup (chld_in[0]);
+ }
+ close(chld_in[0]);
+ close(chld_in[1]);
+
+ close(fileno(stdout));
+ dup (chld_out[1]);
+ close(chld_out[0]);
+ close(chld_out[1]);
+
+ close(fileno(stderr));
+ dup (chld_err[1]);
+ close(chld_err[0]);
+ close(chld_err[1]);
}
- close(chld_in[0]);
- close(chld_in[1]);
- close(fileno(stdout));
- dup (chld_out[1]);
- close(chld_out[0]);
- close(chld_out[1]);
+ cmdline[0] = "sh";
+ cmdline[1] = "-c";
+ cmdline[2] = cmd;
+ cmdline[3] = 0;
+ execvp("/bin/sh", cmdline);
- close(fileno(stderr));
- dup (chld_err[1]);
- close(chld_err[0]);
- close(chld_err[1]);
-
- cmdline = strsplit_with_quote(cmd, " ", 1024);
-
- execvp(cmdline[0], cmdline);
perror("execvp");
- g_strfreev(cmdline);
-
_exit(1);
- } else if (pid_gc < (pid_t) 0) {/* Fork erro */
- write(chld_status[1], "1\n", 2);
+ } else if (gch_pid < (pid_t) 0) { /* Fork error */
+ if (sync)
+ write(chld_status[1], "1\n", 2);
perror("fork");
_exit(1);
} else {/* Child */
- close(chld_in[0]);
- close(chld_in[1]);
- close(chld_out[0]);
- close(chld_out[1]);
- close(chld_err[0]);
- close(chld_err[1]);
+ if (sync) {
+ close(chld_in[0]);
+ close(chld_in[1]);
+ close(chld_out[0]);
+ close(chld_out[1]);
+ close(chld_err[0]);
+ close(chld_err[1]);
+ close(chld_status[0]);
+ }
- close(chld_status[0]);
- debug_print(_("Child: Waiting for grandchild\n"));
- waitpid(pid_gc, NULL, 0);
- debug_print(_("Child: grandchild ended\n"));
- write(chld_status[1], "0\n", 2);
- close(chld_status[1]);
+ debug_print("Child: Waiting for grandchild\n");
+ waitpid(gch_pid, NULL, 0);
+ debug_print("Child: grandchild ended\n");
+ if (sync) {
+ write(chld_status[1], "0\n", 2);
+ close(chld_status[1]);
+ }
_exit(0);
}
- } else if (pid_c < (pid_t) 0) {/* Fork error */
+ } else if (pid < 0) { /* Fork error */
alertpanel_error(_("Could not fork to execute the following "
- "command:\n%s\n%s"),
+ "command:\n%s\n%s"),
cmd, g_strerror(errno));
return NULL;
}
+
/* Parent */
+ if (!sync)
+ return NULL;
+
close(chld_in[0]);
if (!(action_type & (ACTION_PIPE_IN | ACTION_OPEN_IN | ACTION_HIDE_IN)))
close(chld_in[1]);
child_info = g_new0(ChildInfo, 1);
- child_info->children = children;
-
- child_info->pid = pid_c;
- child_info->cmd = g_strdup(cmd);
- child_info->type = action_type;
- child_info->new_out = FALSE;
- child_info->output = g_string_sized_new(0);
- child_info->chld_in = (action_type & (ACTION_PIPE_IN | ACTION_OPEN_IN
- | ACTION_HIDE_IN))
- ? chld_in [1] : -1;
- child_info->chld_out = chld_out[0];
- child_info->chld_err = chld_err[0];
+ child_info->children = children;
+
+ child_info->pid = pid;
+ child_info->cmd = g_strdup(cmd);
+ child_info->type = action_type;
+ child_info->new_out = FALSE;
+ child_info->output = g_string_sized_new(0);
+ child_info->chld_in =
+ (action_type &
+ (ACTION_PIPE_IN | ACTION_OPEN_IN | ACTION_HIDE_IN))
+ ? chld_in [1] : -1;
+ child_info->chld_out = chld_out[0];
+ child_info->chld_err = chld_err[0];
child_info->chld_status = chld_status[0];
- child_info->tag_in = -1;
- child_info->tag_out = gdk_input_add(chld_out[0], GDK_INPUT_READ,
- catch_output, child_info);
- child_info->tag_err = gdk_input_add(chld_err[0], GDK_INPUT_READ,
- catch_output, child_info);
+ child_info->tag_in = -1;
+ child_info->tag_out = gdk_input_add(chld_out[0], GDK_INPUT_READ,
+ catch_output, child_info);
+ child_info->tag_err = gdk_input_add(chld_err[0], GDK_INPUT_READ,
+ catch_output, child_info);
if (!(action_type & (ACTION_PIPE_IN | ACTION_PIPE_OUT)))
return child_info;
- child_info->text = text;
+ child_info->text = text;
start = 0;
end = gtk_stext_get_length(GTK_STEXT(text));
is_selection = TRUE;
if (start == end) {
start = 0;
- end = gtk_stext_get_length(GTK_STEXT(text));
+ end = gtk_stext_get_length(GTK_STEXT(text));
is_selection = FALSE;
}
}
selection = gtk_editable_get_chars(GTK_EDITABLE(text), start, end);
-
if (action_type & ACTION_PIPE_IN) {
write(chld_in[1], selection, strlen(selection));
if (!(action_type & (ACTION_OPEN_IN | ACTION_HIDE_IN)))
}
gtk_stext_thaw(GTK_STEXT(text));
-
+
return child_info;
}
-
+
static void kill_children_cb(GtkWidget *widget, gpointer data)
{
GSList *cur;
for (cur = children->list; cur; cur = cur->next) {
child_info = (ChildInfo *)(cur->data);
- debug_print(_("Killing child group id %d\n"), child_info->pid);
- if (child_info->pid && (kill(-child_info->pid, SIGTERM) < 0))
- perror("kill");
+ debug_print("Killing child group id %d\n", child_info->pid);
+ if (child_info->pid && kill(-child_info->pid, SIGTERM) < 0)
+ perror("kill");
}
}
static gint wait_for_children(gpointer data)
{
gboolean new_output;
- Children *children = (Children *) data;
+ Children *children = (Children *)data;
ChildInfo *child_info;
GSList *cur;
gint nb = children->nb;
children->nb = 0;
-
+
cur = children->list;
new_output = FALSE;
while (cur) {
- child_info = (ChildInfo *) cur->data;
+ child_info = (ChildInfo *)cur->data;
if (child_info->pid)
children->nb++;
new_output |= child_info->new_out;
cur = cur->next;
}
- if (!children->dialog &&
- (new_output || children->timer))
- create_io_dialog(children);
-
- if (children->timer) {
- gtk_timeout_remove(children->timer);
- children->timer = 0;
- }
children->output |= new_output;
if (new_output || (children->dialog && (nb != children->nb)))
return FALSE;
if (!children->dialog) {
- gtk_widget_set_sensitive(children->window, TRUE);
free_children(children);
} else if (!children->output) {
gtk_widget_destroy(children->dialog);
}
+
return FALSE;
}
{
Children *children = (Children *) data;
ChildInfo *child_info = (ChildInfo *) children->list->data;
-
+
child_info->tag_in = gdk_input_add(child_info->chld_in,
GDK_INPUT_WRITE,
catch_input, children);
static void hide_io_dialog_cb(GtkWidget *w, gpointer data)
{
- Children *children = (Children *) data;
+ Children *children = (Children *)data;
if (!children->nb) {
- gtk_widget_set_sensitive(children->window, TRUE);
gtk_signal_disconnect_by_data(GTK_OBJECT(children->dialog),
children);
gtk_widget_destroy(children->dialog);
GSList *cur;
ChildInfo *child_info;
- debug_print(_("Freeing children data %x\n"), (guint) children);
-
+ debug_print("Freeing children data %p\n", children);
+
g_free(children->action);
for (cur = children->list; cur;) {
- child_info = (ChildInfo *) cur->data;
+ child_info = (ChildInfo *)cur->data;
g_free(child_info->cmd);
g_string_free(child_info->output, TRUE);
children->list = g_slist_remove(children->list, child_info);
cur = children->list;
}
g_free(children);
-}
+}
static void update_io_dialog(Children *children)
{
GSList *cur;
- debug_print(_("Updating actions input/output dialog.\n"));
+ debug_print("Updating actions input/output dialog.\n");
if (!children->nb) {
gtk_widget_set_sensitive(children->abort_btn, FALSE);
- gtk_widget_set_sensitive(children->hide_btn, TRUE);
+ gtk_widget_set_sensitive(children->close_btn, TRUE);
if (children->input_hbox)
gtk_widget_set_sensitive(children->input_hbox, FALSE);
}
gtk_text_set_point(GTK_TEXT(text), 0);
gtk_text_forward_delete(GTK_TEXT(text),
gtk_text_get_length(GTK_TEXT(text)));
- for (cur = children->list; cur; cur = cur->next)
- {
- child_info = (ChildInfo *) cur->data;
+ for (cur = children->list; cur; cur = cur->next) {
+ child_info = (ChildInfo *)cur->data;
if (child_info->pid)
- caption = g_strdup_printf(_("--- Running: %s\n")
- , child_info->cmd);
+ caption = g_strdup_printf
+ (_("--- Running: %s\n"),
+ child_info->cmd);
else
- caption = g_strdup_printf(_("--- Ended: %s\n")
- , child_info->cmd);
-
+ caption = g_strdup_printf
+ (_("--- Ended: %s\n"),
+ child_info->cmd);
+
gtk_text_insert(GTK_TEXT(text), NULL, NULL, NULL,
- caption, -1);
+ caption, -1);
gtk_text_insert(GTK_TEXT(text), NULL, NULL, NULL,
- child_info->output->str, -1);
+ child_info->output->str, -1);
g_free(caption);
child_info->new_out = FALSE;
}
gtk_text_thaw(GTK_TEXT(text));
}
}
-
-
+
static void create_io_dialog(Children *children)
{
GtkWidget *dialog;
- GtkWidget *entry;
- GtkWidget *input_hbox;
+ GtkWidget *vbox;
+ GtkWidget *entry = NULL;
+ GtkWidget *input_hbox = NULL;
GtkWidget *send_button;
GtkWidget *label;
GtkWidget *text;
GtkWidget *scrolledwin;
GtkWidget *hbox;
GtkWidget *abort_button;
- GtkWidget *hide_button;
-
- debug_print(_("Creating actions dialog\n"));
+ GtkWidget *close_button;
- dialog = gtk_dialog_new();
- label = gtk_label_new(children->action);
- gtk_misc_set_padding(GTK_MISC(label), 8, 8);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox), label, FALSE,
- FALSE, 0);
+ debug_print("Creating action IO dialog\n");
- gtk_window_set_title(GTK_WINDOW(dialog), _("Actions' input/output"));
+ dialog = gtk_dialog_new();
+ gtk_container_set_border_width
+ (GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), 5);
+ gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER);
+ gtk_window_set_title(GTK_WINDOW(dialog), _("Action's input/output"));
+ gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
+ manage_window_set_transient(GTK_WINDOW(dialog));
gtk_signal_connect(GTK_OBJECT(dialog), "delete_event",
GTK_SIGNAL_FUNC(delete_io_dialog_cb), children);
gtk_signal_connect(GTK_OBJECT(dialog), "destroy",
GTK_SIGNAL_FUNC(hide_io_dialog_cb),
children);
+ vbox = gtk_vbox_new(FALSE, 8);
+ gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), vbox);
+ gtk_container_set_border_width(GTK_CONTAINER(vbox), 8);
+ gtk_widget_show(vbox);
+
+ label = gtk_label_new(children->action);
+ gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0);
+ gtk_widget_show(label);
+
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(GTK_DIALOG(dialog)->vbox), scrolledwin, TRUE,
- TRUE, 0);
- gtk_widget_set_usize(scrolledwin, 600, 200);
+ gtk_box_pack_start(GTK_BOX(vbox), scrolledwin, TRUE, TRUE, 0);
+ gtk_widget_set_usize(scrolledwin, 480, 200);
gtk_widget_hide(scrolledwin);
text = gtk_text_new(gtk_scrolled_window_get_hadjustment
gtk_widget_show(input_hbox);
entry = gtk_entry_new();
+ gtk_widget_set_usize(entry, 320, -1);
gtk_signal_connect(GTK_OBJECT(entry), "activate",
GTK_SIGNAL_FUNC(send_input), children);
- gtk_box_pack_start(GTK_BOX(input_hbox), entry, TRUE, TRUE, 8);
+ gtk_box_pack_start(GTK_BOX(input_hbox), entry, TRUE, TRUE, 0);
if (children->open_in & ACTION_HIDE_IN)
gtk_entry_set_visibility(GTK_ENTRY(entry), FALSE);
gtk_widget_show(entry);
- send_button = gtk_button_new_with_label(_("Send"));
+ send_button = gtk_button_new_with_label(_(" Send "));
gtk_signal_connect(GTK_OBJECT(send_button), "clicked",
GTK_SIGNAL_FUNC(send_input), children);
- gtk_box_pack_start(GTK_BOX(input_hbox), send_button, FALSE,
- FALSE, 8);
+ gtk_box_pack_start(GTK_BOX(input_hbox), send_button, FALSE,
+ FALSE, 0);
gtk_widget_show(send_button);
- gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),
- input_hbox, FALSE, FALSE, 8);
+ gtk_box_pack_start(GTK_BOX(vbox), input_hbox, FALSE, FALSE, 0);
gtk_widget_grab_focus(entry);
}
- hbox = gtk_hbox_new(TRUE, 0);
- gtk_widget_show(hbox);
-
- abort_button = gtk_button_new_with_label(_("Abort actions"));
+ gtkut_button_set_create(&hbox, &abort_button, _("Abort"),
+ &close_button, _("Close"), NULL, NULL);
gtk_signal_connect(GTK_OBJECT(abort_button), "clicked",
GTK_SIGNAL_FUNC(kill_children_cb), children);
- gtk_box_pack_start(GTK_BOX(hbox), abort_button, TRUE, TRUE, 8);
- gtk_widget_show(abort_button);
-
- hide_button = gtk_button_new_with_label(_("Close window"));
- gtk_signal_connect(GTK_OBJECT(hide_button), "clicked",
+ gtk_signal_connect(GTK_OBJECT(close_button), "clicked",
GTK_SIGNAL_FUNC(hide_io_dialog_cb), children);
- gtk_box_pack_start(GTK_BOX(hbox), hide_button, TRUE, TRUE, 8);
- gtk_widget_show(hide_button);
+ gtk_widget_show(hbox);
if (children->nb)
- gtk_widget_set_sensitive(hide_button, FALSE);
+ gtk_widget_set_sensitive(close_button, FALSE);
- gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area),
- hbox);
+ gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area), hbox);
children->dialog = dialog;
children->scrolledwin = scrolledwin;
children->input_hbox = children->open_in ? input_hbox : NULL;
children->input_entry = children->open_in ? entry : NULL;
children->abort_btn = abort_button;
- children->hide_btn = hide_button;
+ children->close_btn = close_button;
gtk_widget_show(dialog);
}
static void catch_status(gpointer data, gint source, GdkInputCondition cond)
{
- ChildInfo *child_info = (ChildInfo *) data;
+ ChildInfo *child_info = (ChildInfo *)data;
gchar buf;
gint c;
gdk_input_remove(child_info->tag_status);
c = read(source, &buf, 1);
- debug_print(_("Child returned %c\n"), buf);
+ debug_print("Child returned %c\n", buf);
waitpid(-child_info->pid, NULL, 0);
childinfo_close_pipes(child_info);
child_info->pid = 0;
-
+
wait_for_children(child_info->children);
}
static void catch_input(gpointer data, gint source, GdkInputCondition cond)
{
- Children *children = (Children *) data;
- ChildInfo *child_info = (ChildInfo *) children->list->data;
+ Children *children = (Children *)data;
+ ChildInfo *child_info = (ChildInfo *)children->list->data;
gchar *input;
gint c;
- debug_print(_("Sending input to grand child.\n"));
+ debug_print("Sending input to grand child.\n");
if (!(cond && GDK_INPUT_WRITE))
return;
-
+
gdk_input_remove(child_info->tag_in);
child_info->tag_in = -1;
- input = gtk_editable_get_chars(GTK_EDITABLE(children->input_entry), 0,
- -1);
+ input = gtk_editable_get_chars(GTK_EDITABLE(children->input_entry),
+ 0, -1);
c = write(child_info->chld_in, input, strlen(input));
g_free(input);
gtk_entry_set_text(GTK_ENTRY(children->input_entry), "");
gtk_widget_set_sensitive(children->input_hbox, TRUE);
- debug_print(_("Input to grand child sent.\n"));
+ debug_print("Input to grand child sent.\n");
}
static void catch_output(gpointer data, gint source, GdkInputCondition cond)
{
- ChildInfo *child_info = (ChildInfo *) data;
+ ChildInfo *child_info = (ChildInfo *)data;
gint c, i;
gchar buf[PREFSBUFSIZE];
- debug_print(_("Catching grand child's output.\n"));
+ debug_print("Catching grand child's output.\n");
if (child_info->type & ACTION_PIPE_OUT
&& source == child_info->chld_out) {
gboolean is_selection = FALSE;
is_selection = TRUE;
gtk_stext_freeze(GTK_STEXT(text));
while (TRUE) {
- c =read(source, buf, PREFSBUFSIZE - 1);
+ c = read(source, buf, PREFSBUFSIZE - 1);
if (c == 0)
break;
gtk_stext_insert(GTK_STEXT(text), NULL, NULL, NULL,
* so we just change selection position and
* defere drawing when thawing. Hack?
*/
- GTK_EDITABLE(text)->selection_end_pos =
+ GTK_EDITABLE(text)->selection_end_pos =
gtk_stext_get_point(GTK_STEXT(text));
}
gtk_stext_thaw(GTK_STEXT(child_info->text));
} else {
- while (TRUE) {
- c = read(source, buf, PREFSBUFSIZE - 1);
- if (c == 0)
- break;
- for (i = 0; i < c; i++)
- child_info->output = g_string_append_c(
- child_info->output, buf[i]);
+ c = read(source, buf, PREFSBUFSIZE - 1);
+ for (i = 0; i < c; i++)
+ child_info->output = g_string_append_c
+ (child_info->output, buf[i]);
+ if (c > 0)
child_info->new_out = TRUE;
- }
}
}
projects / claws.git / blobdiff