annotate src/editors.c @ 682:54980ddfe1ce

Memorize text to display in the log window when the window is not yet created. On log window display, the memorized text is then recalled and displayed.
author zas_
date Sun, 18 May 2008 11:39:58 +0000
parents 8268cbe682f1
children 2d8a8e892b5e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1 /*
196
f6e307c7bad6 rename GQview -> Geeqie over the code
nadvornik
parents: 190
diff changeset
2 * Geeqie
123
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
3 * (C) 2006 John Ellis
475
48c8e49b571c updated copyright in source files
nadvornik
parents: 444
diff changeset
4 * Copyright (C) 2008 The Geeqie Team
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
5 *
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
6 * Author: John Ellis
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
7 *
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
8 * This software is released under the GNU General Public License (GNU GPL).
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
9 * Please read the included file COPYING for more information.
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
10 * This software comes with no warranty of any kind, use at your own risk!
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
11 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
12
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
13
281
9995c5fb202a gqview.h -> main.h
zas_
parents: 261
diff changeset
14 #include "main.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
15 #include "editors.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
16
669
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
17 #include "filedata.h"
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
18 #include "filefilter.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
19 #include "utilops.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
20 #include "ui_fileops.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
21 #include "ui_spinner.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
22 #include "ui_utildlg.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
23
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
24 #include <errno.h>
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
25
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
26
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
27 #define EDITOR_WINDOW_WIDTH 500
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
28 #define EDITOR_WINDOW_HEIGHT 300
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
29
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
30 #define COMMAND_SHELL "/bin/sh"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
31 #define COMMAND_OPT "-c"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
32
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
33
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
34 typedef struct _EditorVerboseData EditorVerboseData;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
35 struct _EditorVerboseData {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
36 GenericDialog *gd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
37 GtkWidget *button_close;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
38 GtkWidget *button_stop;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
39 GtkWidget *text;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
40 GtkWidget *progress;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
41 GtkWidget *spinner;
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
42 };
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
43
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
44 typedef struct _EditorData EditorData;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
45 struct _EditorData {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
46 gint flags;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
47 GPid pid;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
48 gchar *command_template;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
49 GList *list;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
50 gint count;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
51 gint total;
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
52 gboolean stopping;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
53 EditorVerboseData *vd;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
54 EditorCallback callback;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
55 gpointer data;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
56 };
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
57
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
58
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
59 static gchar *editor_slot_defaults[GQ_EDITOR_SLOTS * 2] = {
416
054a26ac407f gimp-remote has no -n option.
zas_
parents: 318
diff changeset
60 N_("The Gimp"), "gimp-remote %{.cr2;.crw;.nef;.raw;*}f",
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
61 N_("XV"), "xv %f",
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
62 N_("Xpaint"), "xpaint %f",
147
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
63 N_("UFraw"), "ufraw %{.cr2;.crw;.nef;.raw}p",
190
c2923efebfdc whitelist of files that can have an xmp sidecar, sample external command
nadvornik
parents: 147
diff changeset
64 N_("Add XMP sidecar"), "%vFILE=%{.cr2;.crw;.nef;.raw}p;XMP=`echo \"$FILE\"|sed -e 's|\\.[^.]*$|.xmp|'`; exiftool -tagsfromfile \"$FILE\" \"$XMP\"",
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
65 NULL, NULL,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
66 NULL, NULL,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
67 NULL, NULL,
147
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
68 N_("Rotate jpeg clockwise"), "%vif jpegtran -rotate 90 -copy all -outfile %{.jpg;.jpeg}p_tmp %{.jpg;.jpeg}p; then mv %{.jpg;.jpeg}p_tmp %{.jpg;.jpeg}p;else rm %{.jpg;.jpeg}p_tmp;fi",
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
69 N_("Rotate jpeg counterclockwise"), "%vif jpegtran -rotate 270 -copy all -outfile %{.jpg;.jpeg}p_tmp %{.jpg;.jpeg}p; then mv %{.jpg;.jpeg}p_tmp %{.jpg;.jpeg}p;else rm %{.jpg;.jpeg}p_tmp;fi",
134
9009856628f7 started implementation of external commands; external Delete should work
nadvornik
parents: 123
diff changeset
70 /* special slots */
136
18c2a29e681c more external commands
nadvornik
parents: 135
diff changeset
71 #if 1
18c2a29e681c more external commands
nadvornik
parents: 135
diff changeset
72 /* for testing */
261
68b4c8d2653e Mark strings as translatable.
zas_
parents: 254
diff changeset
73 N_("External Copy command"), "%vset -x;cp %p %d",
68b4c8d2653e Mark strings as translatable.
zas_
parents: 254
diff changeset
74 N_("External Move command"), "%vset -x;mv %p %d",
68b4c8d2653e Mark strings as translatable.
zas_
parents: 254
diff changeset
75 N_("External Rename command"), "%vset -x;mv %p %d",
440
3d16af3b133a rm as external delete command is too dangerous, even for testing
nadvornik
parents: 416
diff changeset
76 N_("External Delete command"), NULL,
261
68b4c8d2653e Mark strings as translatable.
zas_
parents: 254
diff changeset
77 N_("External New Folder command"), NULL
136
18c2a29e681c more external commands
nadvornik
parents: 135
diff changeset
78 #else
261
68b4c8d2653e Mark strings as translatable.
zas_
parents: 254
diff changeset
79 N_("External Copy command"), NULL,
68b4c8d2653e Mark strings as translatable.
zas_
parents: 254
diff changeset
80 N_("External Move command"), NULL,
68b4c8d2653e Mark strings as translatable.
zas_
parents: 254
diff changeset
81 N_("External Rename command"), NULL,
68b4c8d2653e Mark strings as translatable.
zas_
parents: 254
diff changeset
82 N_("External Delete command"), NULL,
68b4c8d2653e Mark strings as translatable.
zas_
parents: 254
diff changeset
83 N_("External New Folder command"), NULL
136
18c2a29e681c more external commands
nadvornik
parents: 135
diff changeset
84 #endif
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
85 };
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
86
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
87 static void editor_verbose_window_progress(EditorData *ed, const gchar *text);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
88 static gint editor_command_next_start(EditorData *ed);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
89 static gint editor_command_next_finish(EditorData *ed, gint status);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
90 static gint editor_command_done(EditorData *ed);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
91
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
92 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
93 *-----------------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
94 * external editor routines
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
95 *-----------------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
96 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
97
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
98 void editor_reset_defaults(void)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
99 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
100 gint i;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
101
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
102 for (i = 0; i < GQ_EDITOR_SLOTS; i++)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
103 {
318
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 288
diff changeset
104 g_free(options->editor_name[i]);
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 288
diff changeset
105 options->editor_name[i] = g_strdup(_(editor_slot_defaults[i * 2]));
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 288
diff changeset
106 g_free(options->editor_command[i]);
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 288
diff changeset
107 options->editor_command[i] = g_strdup(editor_slot_defaults[i * 2 + 1]);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
108 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
109 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
110
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
111 static void editor_verbose_data_free(EditorData *ed)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
112 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
113 if (!ed->vd) return;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
114 g_free(ed->vd);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
115 ed->vd = NULL;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
116 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
117
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
118 static void editor_data_free(EditorData *ed)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
119 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
120 editor_verbose_data_free(ed);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
121 g_free(ed->command_template);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
122 g_free(ed);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
123 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
124
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
125 static void editor_verbose_window_close(GenericDialog *gd, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
126 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
127 EditorData *ed = data;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
128
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
129 generic_dialog_close(gd);
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
130 editor_verbose_data_free(ed);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
131 if (ed->pid == -1) editor_data_free(ed); /* the process has already terminated */
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
132 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
133
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
134 static void editor_verbose_window_stop(GenericDialog *gd, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
135 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
136 EditorData *ed = data;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
137 ed->stopping = TRUE;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
138 ed->count = 0;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
139 editor_verbose_window_progress(ed, _("stopping..."));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
140 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
141
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
142 static void editor_verbose_window_enable_close(EditorVerboseData *vd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
143 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
144 vd->gd->cancel_cb = editor_verbose_window_close;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
145
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
146 spinner_set_interval(vd->spinner, -1);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
147 gtk_widget_set_sensitive(vd->button_stop, FALSE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
148 gtk_widget_set_sensitive(vd->button_close, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
149 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
150
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
151 static EditorVerboseData *editor_verbose_window(EditorData *ed, const gchar *text)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
152 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
153 EditorVerboseData *vd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
154 GtkWidget *scrolled;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
155 GtkWidget *hbox;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
156 gchar *buf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
157
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
158 vd = g_new0(EditorVerboseData, 1);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
159
254
9faf34f047b1 Make the wmclass value unique among the code by defining
zas_
parents: 238
diff changeset
160 vd->gd = file_util_gen_dlg(_("Edit command results"), GQ_WMCLASS, "editor_results",
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
161 NULL, FALSE,
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
162 NULL, ed);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
163 buf = g_strdup_printf(_("Output of %s"), text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
164 generic_dialog_add_message(vd->gd, NULL, buf, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
165 g_free(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
166 vd->button_stop = generic_dialog_add_button(vd->gd, GTK_STOCK_STOP, NULL,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
167 editor_verbose_window_stop, FALSE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
168 gtk_widget_set_sensitive(vd->button_stop, FALSE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
169 vd->button_close = generic_dialog_add_button(vd->gd, GTK_STOCK_CLOSE, NULL,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
170 editor_verbose_window_close, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
171 gtk_widget_set_sensitive(vd->button_close, FALSE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
172
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
173 scrolled = gtk_scrolled_window_new(NULL, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
174 gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
175 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
176 GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
177 gtk_box_pack_start(GTK_BOX(vd->gd->vbox), scrolled, TRUE, TRUE, 5);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
178 gtk_widget_show(scrolled);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
179
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
180 vd->text = gtk_text_view_new();
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
181 gtk_text_view_set_editable(GTK_TEXT_VIEW(vd->text), FALSE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
182 gtk_widget_set_size_request(vd->text, EDITOR_WINDOW_WIDTH, EDITOR_WINDOW_HEIGHT);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
183 gtk_container_add(GTK_CONTAINER(scrolled), vd->text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
184 gtk_widget_show(vd->text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
185
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
186 hbox = gtk_hbox_new(FALSE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
187 gtk_box_pack_start(GTK_BOX(vd->gd->vbox), hbox, FALSE, FALSE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
188 gtk_widget_show(hbox);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
189
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
190 vd->progress = gtk_progress_bar_new();
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
191 gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(vd->progress), 0.0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
192 gtk_box_pack_start(GTK_BOX(hbox), vd->progress, TRUE, TRUE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
193 gtk_widget_show(vd->progress);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
194
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
195 vd->spinner = spinner_new(NULL, SPINNER_SPEED);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
196 gtk_box_pack_start(GTK_BOX(hbox), vd->spinner, FALSE, FALSE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
197 gtk_widget_show(vd->spinner);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
198
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
199 gtk_widget_show(vd->gd->dialog);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
200
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
201 ed->vd = vd;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
202 return vd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
203 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
204
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
205 static void editor_verbose_window_fill(EditorVerboseData *vd, gchar *text, gint len)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
206 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
207 GtkTextBuffer *buffer;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
208 GtkTextIter iter;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
209
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
210 buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(vd->text));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
211 gtk_text_buffer_get_iter_at_offset(buffer, &iter, -1);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
212 gtk_text_buffer_insert(buffer, &iter, text, len);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
213 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
214
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
215 static void editor_verbose_window_progress(EditorData *ed, const gchar *text)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
216 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
217 if (!ed->vd) return;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
218
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
219 if (ed->total)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
220 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
221 gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ed->vd->progress), (double)ed->count / ed->total);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
222 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
223
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
224 gtk_progress_bar_set_text(GTK_PROGRESS_BAR(ed->vd->progress), (text) ? text : "");
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
225 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
226
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
227 static gboolean editor_verbose_io_cb(GIOChannel *source, GIOCondition condition, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
228 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
229 EditorData *ed = data;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
230 gchar buf[512];
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
231 gsize count;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
232
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
233 if (condition & G_IO_IN)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
234 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
235 while (g_io_channel_read_chars(source, buf, sizeof(buf), &count, NULL) == G_IO_STATUS_NORMAL)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
236 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
237 if (!g_utf8_validate(buf, count, NULL))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
238 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
239 gchar *utf8;
444
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
240
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
241 utf8 = g_locale_to_utf8(buf, count, NULL, NULL, NULL);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
242 if (utf8)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
243 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
244 editor_verbose_window_fill(ed->vd, utf8, -1);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
245 g_free(utf8);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
246 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
247 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
248 {
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
249 editor_verbose_window_fill(ed->vd, "Error converting text to valid utf8\n", -1);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
250 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
251 }
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
252 else
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
253 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
254 editor_verbose_window_fill(ed->vd, buf, count);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
255 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
256 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
257 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
258
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
259 if (condition & (G_IO_ERR | G_IO_HUP))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
260 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
261 g_io_channel_shutdown(source, TRUE, NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
262 return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
263 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
264
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
265 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
266 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
267
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
268 typedef enum {
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
269 PATH_FILE,
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
270 PATH_DEST
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
271 } PathType;
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
272
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
273
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
274 static gchar *editor_command_path_parse(const FileData *fd, PathType type, const gchar *extensions)
123
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
275 {
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
276 GString *string;
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
277 gchar *pathl;
147
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
278 const gchar *p = NULL;
123
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
279
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
280 string = g_string_new("");
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
281
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
282 if (type == PATH_FILE)
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
283 {
147
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
284 GList *ext_list = filter_to_list(extensions);
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
285 GList *work = ext_list;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
286
147
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
287 if (!work)
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
288 p = fd->path;
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
289 else
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
290 {
516
b7e99bfeadc9 Convert the minority of while() to while ().
zas_
parents: 475
diff changeset
291 while (work)
147
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
292 {
444
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
293 GList *work2;
147
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
294 gchar *ext = work->data;
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
295 work = work->next;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
296
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
297 if (strcmp(ext, "*") == 0 ||
147
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
298 strcasecmp(ext, fd->extension) == 0)
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
299 {
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
300 p = fd->path;
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
301 break;
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
302 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
303
444
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
304 work2 = fd->sidecar_files;
516
b7e99bfeadc9 Convert the minority of while() to while ().
zas_
parents: 475
diff changeset
305 while (work2)
147
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
306 {
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
307 FileData *sfd = work2->data;
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
308 work2 = work2->next;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
309
147
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
310 if (strcasecmp(ext, sfd->extension) == 0)
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
311 {
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
312 p = sfd->path;
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
313 break;
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
314 }
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
315 }
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
316 if (p) break;
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
317 }
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
318 string_list_free(ext_list);
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
319 if (!p) return NULL;
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
320 }
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
321 }
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
322 else if (type == PATH_DEST)
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
323 {
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
324 if (fd->change && fd->change->dest)
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
325 p = fd->change->dest;
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
326 else
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
327 p = "";
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
328 }
444
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
329
123
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
330 while (*p != '\0')
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
331 {
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
332 /* must escape \, ", `, and $ to avoid problems,
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
333 * we assume system shell supports bash-like escaping
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
334 */
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
335 if (strchr("\\\"`$", *p) != NULL)
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
336 {
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
337 string = g_string_append_c(string, '\\');
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
338 }
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
339 string = g_string_append_c(string, *p);
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
340 p++;
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
341 }
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
342
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
343 pathl = path_from_utf8(string->str);
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
344 g_string_free(string, TRUE);
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
345
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
346 return pathl;
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
347 }
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
348
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
349
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
350 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
351 * The supported macros for editor commands:
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
352 *
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
353 * %f first occurence replaced by quoted sequence of filenames, command is run once.
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
354 * only one occurence of this macro is supported.
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
355 * ([ls %f] results in [ls "file1" "file2" ... "lastfile"])
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
356 * %p command is run for each filename in turn, each instance replaced with single filename.
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
357 * multiple occurences of this macro is supported for complex shell commands.
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
358 * This macro will BLOCK THE APPLICATION until it completes, since command is run once
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
359 * for every file in syncronous order. To avoid blocking add the %v macro, below.
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
360 * ([ls %p] results in [ls "file1"], [ls "file2"] ... [ls "lastfile"])
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
361 * none if no macro is supplied, the result is equivalent to "command %f"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
362 * ([ls] results in [ls "file1" "file2" ... "lastfile"])
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
363 *
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
364 * Only one of the macros %f or %p may be used in a given commmand.
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
365 *
60
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
366 * %v must be the first two characters[1] in a command, causes a window to display
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
367 * showing the output of the command(s).
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
368 * %V same as %v except in the case of %p only displays a window for multiple files,
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
369 * operating on a single file is suppresses the output dialog.
60
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
370 *
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
371 * %w must be first two characters in a command, presence will disable full screen
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
372 * from exiting upon invocation.
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
373 *
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
374 *
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
375 * [1] Note: %v,%V may also be preceded by "%w".
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
376 */
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
377
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
378
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
379 gint editor_command_parse(const gchar *template, GList *list, gchar **output)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
380 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
381 gint flags = 0;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
382 const gchar *p = template;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
383 GString *result = NULL;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
384 gchar *extensions = NULL;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
385
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
386 if (output)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
387 result = g_string_new("");
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
388
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
389 if (!template || template[0] == '\0')
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
390 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
391 flags |= EDITOR_ERROR_EMPTY;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
392 goto err;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
393 }
669
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
394
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
395 /* skip leading whitespaces if any */
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
396 while (g_ascii_isspace(*p)) p++;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
397
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
398 /* global flags */
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
399 while (*p == '%')
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
400 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
401 switch (*++p)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
402 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
403 case 'w':
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
404 flags |= EDITOR_KEEP_FS;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
405 p++;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
406 break;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
407 case 'v':
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
408 flags |= EDITOR_VERBOSE;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
409 p++;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
410 break;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
411 case 'V':
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
412 flags |= EDITOR_VERBOSE_MULTI;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
413 p++;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
414 break;
669
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
415 default:
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
416 flags |= EDITOR_ERROR_SYNTAX;
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
417 goto err;
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
418 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
419 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
420
669
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
421 /* skip whitespaces if any */
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
422 while (g_ascii_isspace(*p)) p++;
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
423
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
424 /* command */
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
425
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
426 while (*p)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
427 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
428 if (*p != '%')
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
429 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
430 if (output) result = g_string_append_c(result, *p);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
431 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
432 else /* *p == '%' */
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
433 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
434 extensions = NULL;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
435 gchar *pathl = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
436
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
437 p++;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
438
147
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
439 /* for example "%f" or "%{.crw;.raw;.cr2}f" */
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
440 if (*p == '{')
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
441 {
444
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
442 gchar *end;
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
443
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
444 p++;
444
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
445 end = strchr(p, '}');
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
446 if (!end)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
447 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
448 flags |= EDITOR_ERROR_SYNTAX;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
449 goto err;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
450 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
451
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
452 extensions = g_strndup(p, end - p);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
453 p = end + 1;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
454 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
455
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
456 switch (*p)
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
457 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
458 case 'd':
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
459 flags |= EDITOR_DEST;
669
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
460 /* fall through */
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
461 case 'p':
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
462 flags |= EDITOR_FOR_EACH;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
463 if (flags & EDITOR_SINGLE_COMMAND)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
464 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
465 flags |= EDITOR_ERROR_INCOMPATIBLE;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
466 goto err;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
467 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
468 if (output)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
469 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
470 /* use the first file from the list */
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
471 if (!list || !list->data)
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
472 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
473 flags |= EDITOR_ERROR_NO_FILE;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
474 goto err;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
475 }
669
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
476 pathl = editor_command_path_parse((FileData *)list->data,
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
477 (flags & EDITOR_DEST) ? PATH_DEST : PATH_FILE,
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
478 extensions);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
479 if (!pathl)
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
480 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
481 flags |= EDITOR_ERROR_NO_FILE;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
482 goto err;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
483 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
484 result = g_string_append_c(result, '"');
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
485 result = g_string_append(result, pathl);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
486 g_free(pathl);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
487 result = g_string_append_c(result, '"');
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
488 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
489 break;
60
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
490
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
491 case 'f':
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
492 flags |= EDITOR_SINGLE_COMMAND;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
493 if (flags & (EDITOR_FOR_EACH | EDITOR_DEST))
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
494 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
495 flags |= EDITOR_ERROR_INCOMPATIBLE;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
496 goto err;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
497 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
498
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
499 if (output)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
500 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
501 /* use whole list */
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
502 GList *work = list;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
503 gboolean ok = FALSE;
444
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
504
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
505 while (work)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
506 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
507 FileData *fd = work->data;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
508 pathl = editor_command_path_parse(fd, PATH_FILE, extensions);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
509
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
510 if (pathl)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
511 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
512 ok = TRUE;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
513 if (work != list) g_string_append_c(result, ' ');
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
514 result = g_string_append_c(result, '"');
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
515 result = g_string_append(result, pathl);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
516 g_free(pathl);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
517 result = g_string_append_c(result, '"');
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
518 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
519 work = work->next;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
520 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
521 if (!ok)
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
522 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
523 flags |= EDITOR_ERROR_NO_FILE;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
524 goto err;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
525 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
526 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
527 break;
669
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
528 case '%':
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
529 /* %% = % escaping */
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
530 if (output) result = g_string_append_c(result, *p);
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
531 break;
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
532 default:
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
533 flags |= EDITOR_ERROR_SYNTAX;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
534 goto err;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
535 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
536 if (extensions) g_free(extensions);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
537 extensions = NULL;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
538 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
539 p++;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
540 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
541
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
542 if (output) *output = g_string_free(result, FALSE);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
543 return flags;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
544
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
545
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
546 err:
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
547 if (output)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
548 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
549 g_string_free(result, TRUE);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
550 *output = NULL;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
551 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
552 if (extensions) g_free(extensions);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
553 return flags;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
554 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
555
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
556 static void editor_child_exit_cb (GPid pid, gint status, gpointer data)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
557 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
558 EditorData *ed = data;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
559 g_spawn_close_pid(pid);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
560 ed->pid = -1;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
561
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
562 editor_command_next_finish(ed, status);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
563 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
564
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
565
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
566 static gint editor_command_one(const gchar *template, GList *list, EditorData *ed)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
567 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
568 gchar *command;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
569 FileData *fd = list->data;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
570 GPid pid;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
571 gint standard_output;
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
572 gint standard_error;
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
573 gboolean ok;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
574
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
575 ed->pid = -1;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
576 ed->flags = editor_command_parse(template, list, &command);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
577
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
578 ok = !(ed->flags & EDITOR_ERROR_MASK);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
579
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
580 if (ok)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
581 {
443
e7361d06d83a editor_command_one(): tidy up.
zas_
parents: 442
diff changeset
582 gchar *working_directory;
e7361d06d83a editor_command_one(): tidy up.
zas_
parents: 442
diff changeset
583 gchar *args[4];
e7361d06d83a editor_command_one(): tidy up.
zas_
parents: 442
diff changeset
584
e7361d06d83a editor_command_one(): tidy up.
zas_
parents: 442
diff changeset
585 working_directory = remove_level_from_path(fd->path);
e7361d06d83a editor_command_one(): tidy up.
zas_
parents: 442
diff changeset
586 args[0] = COMMAND_SHELL;
e7361d06d83a editor_command_one(): tidy up.
zas_
parents: 442
diff changeset
587 args[1] = COMMAND_OPT;
e7361d06d83a editor_command_one(): tidy up.
zas_
parents: 442
diff changeset
588 args[2] = command;
e7361d06d83a editor_command_one(): tidy up.
zas_
parents: 442
diff changeset
589 args[3] = NULL;
e7361d06d83a editor_command_one(): tidy up.
zas_
parents: 442
diff changeset
590
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
591 ok = g_spawn_async_with_pipes(working_directory, args, NULL,
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
592 G_SPAWN_DO_NOT_REAP_CHILD, /* GSpawnFlags */
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
593 NULL, NULL,
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
594 &pid,
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
595 NULL,
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
596 ed->vd ? &standard_output : NULL,
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
597 ed->vd ? &standard_error : NULL,
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
598 NULL);
443
e7361d06d83a editor_command_one(): tidy up.
zas_
parents: 442
diff changeset
599
e7361d06d83a editor_command_one(): tidy up.
zas_
parents: 442
diff changeset
600 g_free(working_directory);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
601
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
602 if (!ok) ed->flags |= EDITOR_ERROR_CANT_EXEC;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
603 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
604
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
605 if (ok)
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
606 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
607 g_child_watch_add(pid, editor_child_exit_cb, ed);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
608 ed->pid = pid;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
609 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
610
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
611 if (ed->vd)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
612 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
613 if (!ok)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
614 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
615 gchar *buf;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
616
147
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
617 buf = g_strdup_printf(_("Failed to run command:\n%s\n"), template);
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
618 editor_verbose_window_fill(ed->vd, buf, strlen(buf));
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
619 g_free(buf);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
620
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
621 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
622 else
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
623 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
624 GIOChannel *channel_output;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
625 GIOChannel *channel_error;
444
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
626
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
627 channel_output = g_io_channel_unix_new(standard_output);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
628 g_io_channel_set_flags(channel_output, G_IO_FLAG_NONBLOCK, NULL);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
629
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
630 g_io_add_watch_full(channel_output, G_PRIORITY_HIGH, G_IO_IN | G_IO_ERR | G_IO_HUP,
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
631 editor_verbose_io_cb, ed, NULL);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
632 g_io_channel_unref(channel_output);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
633
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
634 channel_error = g_io_channel_unix_new(standard_error);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
635 g_io_channel_set_flags(channel_error, G_IO_FLAG_NONBLOCK, NULL);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
636
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
637 g_io_add_watch_full(channel_error, G_PRIORITY_HIGH, G_IO_IN | G_IO_ERR | G_IO_HUP,
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
638 editor_verbose_io_cb, ed, NULL);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
639 g_io_channel_unref(channel_error);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
640 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
641 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
642
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
643 g_free(command);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
644
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
645 return ed->flags & EDITOR_ERROR_MASK;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
646 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
647
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
648 static gint editor_command_next_start(EditorData *ed)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
649 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
650 if (ed->vd) editor_verbose_window_fill(ed->vd, "\n", 1);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
651
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
652 if (ed->list && ed->count < ed->total)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
653 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
654 FileData *fd;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
655 gint error;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
656
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
657 fd = ed->list->data;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
658
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
659 if (ed->vd)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
660 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
661 editor_verbose_window_progress(ed, (ed->flags & EDITOR_FOR_EACH) ? fd->path : _("running..."));
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
662 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
663 ed->count++;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
664
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
665 error = editor_command_one(ed->command_template, ed->list, ed);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
666 if (!error && ed->vd)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
667 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
668 gtk_widget_set_sensitive(ed->vd->button_stop, (ed->list != NULL) );
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
669 if (ed->flags & EDITOR_FOR_EACH)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
670 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
671 editor_verbose_window_fill(ed->vd, fd->path, strlen(fd->path));
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
672 editor_verbose_window_fill(ed->vd, "\n", 1);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
673 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
674 }
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
675
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
676 if (!error)
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
677 return 0;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
678 else
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
679 /* command was not started, call the finish immediately */
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
680 return editor_command_next_finish(ed, 0);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
681 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
682
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
683 /* everything is done */
237
404629011caa Add missing return at the end of editor_command_next_start().
zas_
parents: 196
diff changeset
684 return editor_command_done(ed);
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
685 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
686
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
687 static gint editor_command_next_finish(EditorData *ed, gint status)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
688 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
689 gint cont = ed->stopping ? EDITOR_CB_SKIP : EDITOR_CB_CONTINUE;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
690
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
691 if (status)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
692 ed->flags |= EDITOR_ERROR_STATUS;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
693
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
694 if (ed->flags & EDITOR_FOR_EACH)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
695 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
696 /* handle the first element from the list */
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
697 GList *fd_element = ed->list;
444
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
698
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
699 ed->list = g_list_remove_link(ed->list, fd_element);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
700 if (ed->callback)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
701 cont = ed->callback(ed->list ? ed : NULL, ed->flags, fd_element, ed->data);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
702 filelist_free(fd_element);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
703 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
704 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
705 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
706 /* handle whole list */
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
707 if (ed->callback)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
708 cont = ed->callback(NULL, ed->flags, ed->list, ed->data);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
709 filelist_free(ed->list);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
710 ed->list = NULL;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
711 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
712
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
713 if (cont == EDITOR_CB_SUSPEND)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
714 return ed->flags & EDITOR_ERROR_MASK;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
715 else if (cont == EDITOR_CB_SKIP)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
716 return editor_command_done(ed);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
717 else
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
718 return editor_command_next_start(ed);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
719 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
720
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
721 static gint editor_command_done(EditorData *ed)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
722 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
723 gint flags;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
724
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
725 if (ed->vd)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
726 {
444
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
727 const gchar *text;
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
728
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
729 if (ed->count == ed->total)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
730 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
731 text = _("done");
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
732 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
733 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
734 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
735 text = _("stopped by user");
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
736 }
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
737 editor_verbose_window_progress(ed, text);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
738 editor_verbose_window_enable_close(ed->vd);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
739 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
740
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
741 /* free the not-handled items */
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
742 if (ed->list)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
743 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
744 ed->flags |= EDITOR_ERROR_SKIPPED;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
745 if (ed->callback) ed->callback(NULL, ed->flags, ed->list, ed->data);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
746 filelist_free(ed->list);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
747 ed->list = NULL;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
748 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
749
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
750 ed->count = 0;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
751
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
752 flags = ed->flags & EDITOR_ERROR_MASK;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
753
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
754 if (!ed->vd) editor_data_free(ed);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
755
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
756 return flags;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
757 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
758
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
759 void editor_resume(gpointer ed)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
760 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
761 editor_command_next_start(ed);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
762 }
443
e7361d06d83a editor_command_one(): tidy up.
zas_
parents: 442
diff changeset
763
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
764 void editor_skip(gpointer ed)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
765 {
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
766 editor_command_done(ed);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
767 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
768
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
769 static gint editor_command_start(const gchar *template, const gchar *text, GList *list, EditorCallback cb, gpointer data)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
770 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
771 EditorData *ed;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
772 gint flags = editor_command_parse(template, NULL, NULL);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
773
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
774 if (flags & EDITOR_ERROR_MASK) return flags & EDITOR_ERROR_MASK;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
775
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
776 ed = g_new0(EditorData, 1);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
777 ed->list = filelist_copy(list);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
778 ed->flags = flags;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
779 ed->command_template = g_strdup(template);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
780 ed->total = (flags & EDITOR_SINGLE_COMMAND) ? 1 : g_list_length(list);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
781 ed->count = 0;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
782 ed->stopping = FALSE;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
783 ed->callback = cb;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
784 ed->data = data;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
785
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
786 if ((flags & EDITOR_VERBOSE_MULTI) && list && list->next)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
787 flags |= EDITOR_VERBOSE;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
788
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
789 if (flags & EDITOR_VERBOSE)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
790 editor_verbose_window(ed, text);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
791
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
792 editor_command_next_start(ed);
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
793 /* errors from editor_command_next_start will be handled via callback */
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
794 return flags & EDITOR_ERROR_MASK;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
795 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
796
444
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
797 static gint is_valid_editor_command(gint n)
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
798 {
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
799 return (n >= 0 && n < GQ_EDITOR_SLOTS
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
800 && options->editor_command[n]
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
801 && strlen(options->editor_command[n]) > 0);
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
802 }
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
803
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
804 gint start_editor_from_filelist_full(gint n, GList *list, EditorCallback cb, gpointer data)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
805 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
806 gchar *command;
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
807 gint error;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
808
444
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
809 if (!list) return FALSE;
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
810 if (!is_valid_editor_command(n)) return FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
811
318
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 288
diff changeset
812 command = g_locale_from_utf8(options->editor_command[n], -1, NULL, NULL, NULL);
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 288
diff changeset
813 error = editor_command_start(command, options->editor_name[n], list, cb, data);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
814 g_free(command);
669
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
815
670
a484500de88d Improve editor commands error display:
zas_
parents: 669
diff changeset
816 if (n < GQ_EDITOR_GENERIC_SLOTS && (error & EDITOR_ERROR_MASK))
669
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
817 {
670
a484500de88d Improve editor commands error display:
zas_
parents: 669
diff changeset
818 gchar *text = g_strdup_printf(_("%s\n#%d \"%s\":\n%s"), editor_get_error_str(error), n+1,
669
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
819 options->editor_name[n], options->editor_command[n]);
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
820
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
821 file_util_warning_dialog(_("Invalid editor command"), text, GTK_STOCK_DIALOG_ERROR, NULL);
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
822 g_free(text);
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
823 }
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
824
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
825 return error;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
826 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
827
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
828 gint start_editor_from_filelist(gint n, GList *list)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
829 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
830 return start_editor_from_filelist_full(n, list, NULL, NULL);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
831 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
832
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
833 gint start_editor_from_file_full(gint n, FileData *fd, EditorCallback cb, gpointer data)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
834 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
835 GList *list;
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
836 gint error;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
837
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
838 if (!fd) return FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
839
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
840 list = g_list_append(NULL, fd);
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
841 error = start_editor_from_filelist_full(n, list, cb, data);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
842 g_list_free(list);
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
843 return error;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
844 }
60
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
845
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
846 gint start_editor_from_file(gint n, FileData *fd)
136
18c2a29e681c more external commands
nadvornik
parents: 135
diff changeset
847 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
848 return start_editor_from_file_full(n, fd, NULL, NULL);
136
18c2a29e681c more external commands
nadvornik
parents: 135
diff changeset
849 }
18c2a29e681c more external commands
nadvornik
parents: 135
diff changeset
850
60
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
851 gint editor_window_flag_set(gint n)
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
852 {
444
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
853 if (!is_valid_editor_command(n)) return TRUE;
60
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
854
318
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 288
diff changeset
855 return (editor_command_parse(options->editor_command[n], NULL, NULL) & EDITOR_KEEP_FS);
60
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
856 }
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
857
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
858 const gchar *editor_get_error_str(gint flags)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
859 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
860 if (flags & EDITOR_ERROR_EMPTY) return _("Editor template is empty.");
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
861 if (flags & EDITOR_ERROR_SYNTAX) return _("Editor template has incorrect syntax.");
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
862 if (flags & EDITOR_ERROR_INCOMPATIBLE) return _("Editor template uses incompatible macros.");
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
863 if (flags & EDITOR_ERROR_NO_FILE) return _("Can't find matching file type.");
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
864 if (flags & EDITOR_ERROR_CANT_EXEC) return _("Can't execute external editor.");
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
865 if (flags & EDITOR_ERROR_STATUS) return _("External editor returned error status.");
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
866 if (flags & EDITOR_ERROR_SKIPPED) return _("File was skipped.");
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
867 return _("Unknown error.");
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
868 }