annotate src/editors.c @ 1409:863ac709f6b4

Add missing g_key_file_free() call.
author zas_
date Mon, 09 Mar 2009 19:37:58 +0000
parents 1cc4ea53c9a3
children 25168240a247
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
1284
8b89e3ff286b Add year 2009 to copyright info everywhere.
zas_
parents: 1278
diff changeset
4 * Copyright (C) 2008 - 2009 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"
1022
9962b24b6b43 Move miscellaneous functions to their own files (new misc.[ch]).
zas_
parents: 1000
diff changeset
19 #include "misc.h"
9
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"
1022
9962b24b6b43 Move miscellaneous functions to their own files (new misc.[ch]).
zas_
parents: 1000
diff changeset
23 #include "utilops.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
24
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
25 #include <errno.h>
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
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
28 #define EDITOR_WINDOW_WIDTH 500
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
29 #define EDITOR_WINDOW_HEIGHT 300
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
30
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
31
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 typedef struct _EditorVerboseData EditorVerboseData;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
34 struct _EditorVerboseData {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
35 GenericDialog *gd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
36 GtkWidget *button_close;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
37 GtkWidget *button_stop;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
38 GtkWidget *text;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
39 GtkWidget *progress;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
40 GtkWidget *spinner;
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
41 };
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 typedef struct _EditorData EditorData;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
44 struct _EditorData {
1405
03384485676d Introduce EditorFlags type, cleanup.
zas_
parents: 1402
diff changeset
45 EditorFlags flags;
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
46 GPid pid;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
47 GList *list;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
48 gint count;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
49 gint total;
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
50 gboolean stopping;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
51 EditorVerboseData *vd;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
52 EditorCallback callback;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
53 gpointer data;
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
54 const EditorDescription *editor;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
55 };
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
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
58 static void editor_verbose_window_progress(EditorData *ed, const gchar *text);
1405
03384485676d Introduce EditorFlags type, cleanup.
zas_
parents: 1402
diff changeset
59 static EditorFlags editor_command_next_start(EditorData *ed);
03384485676d Introduce EditorFlags type, cleanup.
zas_
parents: 1402
diff changeset
60 static EditorFlags editor_command_next_finish(EditorData *ed, gint status);
03384485676d Introduce EditorFlags type, cleanup.
zas_
parents: 1402
diff changeset
61 static EditorFlags editor_command_done(EditorData *ed);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
62
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
63 /*
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
64 *-----------------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
65 * external editor routines
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
66 *-----------------------------------------------------------------------------
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
67 */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
68
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
69 GHashTable *editors = NULL;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
70
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
71 #ifdef G_KEY_FILE_DESKTOP_GROUP
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
72 #define DESKTOP_GROUP G_KEY_FILE_DESKTOP_GROUP
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
73 #else
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
74 #define DESKTOP_GROUP "Desktop Entry"
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
75 #endif
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
76
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
77 void editor_description_free(EditorDescription *editor)
768
ff51413f098d Use functions to set editors name and command and ensure they are
zas_
parents: 766
diff changeset
78 {
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
79 if (!editor) return;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
80
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
81 g_free(editor->key);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
82 g_free(editor->name);
1278
c5852c543775 Add support for NoDisplay (entry is then hidden) and Type (only Application type is valid here) keys.
zas_
parents: 1276
diff changeset
83 g_free(editor->icon);
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
84 g_free(editor->exec);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
85 g_free(editor->menu_path);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
86 g_free(editor->hotkey);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
87 string_list_free(editor->ext_list);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
88 g_free(editor->file);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
89 g_free(editor);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
90 }
768
ff51413f098d Use functions to set editors name and command and ensure they are
zas_
parents: 766
diff changeset
91
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
92 static GList *editor_mime_types_to_extensions(gchar **mime_types)
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
93 {
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
94 /* FIXME: this should be rewritten to use the shared mime database, as soon as we switch to gio */
768
ff51413f098d Use functions to set editors name and command and ensure they are
zas_
parents: 766
diff changeset
95
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
96 static const gchar *conv_table[][2] = {
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
97 {"application/x-ufraw", "%raw"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
98 {"image/*", "*"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
99 {"image/bmp", ".bmp"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
100 {"image/gif", ".gif"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
101 {"image/jpeg", ".jpeg;.jpg"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
102 {"image/jpg", ".jpg;.jpeg"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
103 {"image/pcx", ".pcx"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
104 {"image/png", ".png"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
105 {"image/svg", ".svg"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
106 {"image/svg+xml", ".svg"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
107 {"image/svg+xml-compressed", ".svg"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
108 {"image/tiff", ".tiff;.tif"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
109 {"image/x-bmp", ".bmp"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
110 {"image/x-canon-crw", ".crw"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
111 {"image/x-cr2", ".cr2"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
112 {"image/x-dcraw", "%raw"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
113 {"image/x-ico", ".ico"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
114 {"image/x-mrw", ".mrw"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
115 {"image/x-MS-bmp", ".bmp"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
116 {"image/x-nef", ".nef"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
117 {"image/x-orf", ".orf"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
118 {"image/x-pcx", ".pcx"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
119 {"image/xpm", ".xpm"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
120 {"image/x-png", ".png"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
121 {"image/x-portable-anymap", ".pam"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
122 {"image/x-portable-bitmap", ".pbm"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
123 {"image/x-portable-graymap", ".pgm"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
124 {"image/x-portable-pixmap", ".ppm"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
125 {"image/x-psd", ".psd"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
126 {"image/x-raf", ".raf"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
127 {"image/x-sgi", ".sgi"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
128 {"image/x-tga", ".tga"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
129 {"image/x-xbitmap", ".xbm"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
130 {"image/x-xcf", ".xcf"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
131 {"image/x-xpixmap", ".xpm"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
132 {"image/x-x3f", ".x3f"},
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
133 {NULL, NULL}};
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
134
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
135 gint i, j;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
136 GList *list = NULL;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
137
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
138 for (i = 0; mime_types[i]; i++)
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
139 for (j = 0; conv_table[j][0]; j++)
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
140 if (strcmp(mime_types[i], conv_table[j][0]) == 0)
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
141 list = g_list_concat(list, filter_to_list(conv_table[j][1]));
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
142
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
143 return list;
768
ff51413f098d Use functions to set editors name and command and ensure they are
zas_
parents: 766
diff changeset
144 }
ff51413f098d Use functions to set editors name and command and ensure they are
zas_
parents: 766
diff changeset
145
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
146 static gboolean editor_read_desktop_file(const gchar *path)
768
ff51413f098d Use functions to set editors name and command and ensure they are
zas_
parents: 766
diff changeset
147 {
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
148 GKeyFile *key_file;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
149 EditorDescription *editor;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
150 gchar *extensions;
1278
c5852c543775 Add support for NoDisplay (entry is then hidden) and Type (only Application type is valid here) keys.
zas_
parents: 1276
diff changeset
151 gchar *type;
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
152 const gchar *key = filename_from_path(path);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
153 gchar **categories, **only_show_in, **not_show_in;
1274
8fcdfacce91d test TryExec,
nadvornik
parents: 1272
diff changeset
154 gchar *try_exec;
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
155
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
156 if (g_hash_table_lookup(editors, key)) return FALSE; /* the file found earlier wins */
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
157
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
158 key_file = g_key_file_new();
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
159 if (!g_key_file_load_from_file(key_file, path, 0, NULL))
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
160 {
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
161 g_key_file_free(key_file);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
162 return FALSE;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
163 }
1278
c5852c543775 Add support for NoDisplay (entry is then hidden) and Type (only Application type is valid here) keys.
zas_
parents: 1276
diff changeset
164
c5852c543775 Add support for NoDisplay (entry is then hidden) and Type (only Application type is valid here) keys.
zas_
parents: 1276
diff changeset
165 type = g_key_file_get_string(key_file, DESKTOP_GROUP, "Type", NULL);
c5852c543775 Add support for NoDisplay (entry is then hidden) and Type (only Application type is valid here) keys.
zas_
parents: 1276
diff changeset
166 if (!type || strcmp(type, "Application") != 0)
c5852c543775 Add support for NoDisplay (entry is then hidden) and Type (only Application type is valid here) keys.
zas_
parents: 1276
diff changeset
167 {
c5852c543775 Add support for NoDisplay (entry is then hidden) and Type (only Application type is valid here) keys.
zas_
parents: 1276
diff changeset
168 /* We only consider desktop entries of Application type */
1409
863ac709f6b4 Add missing g_key_file_free() call.
zas_
parents: 1408
diff changeset
169 g_key_file_free(key_file);
1278
c5852c543775 Add support for NoDisplay (entry is then hidden) and Type (only Application type is valid here) keys.
zas_
parents: 1276
diff changeset
170 return FALSE;
c5852c543775 Add support for NoDisplay (entry is then hidden) and Type (only Application type is valid here) keys.
zas_
parents: 1276
diff changeset
171 }
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
172
1407
57421a728682 Revert changeset 1502. It brokes the spec: hidden desktop files from user directory should hide files from system directory with the same name.
zas_
parents: 1406
diff changeset
173 editor = g_new0(EditorDescription, 1);
57421a728682 Revert changeset 1502. It brokes the spec: hidden desktop files from user directory should hide files from system directory with the same name.
zas_
parents: 1406
diff changeset
174
57421a728682 Revert changeset 1502. It brokes the spec: hidden desktop files from user directory should hide files from system directory with the same name.
zas_
parents: 1406
diff changeset
175 editor->key = g_strdup(key);
57421a728682 Revert changeset 1502. It brokes the spec: hidden desktop files from user directory should hide files from system directory with the same name.
zas_
parents: 1406
diff changeset
176 editor->file = g_strdup(path);
57421a728682 Revert changeset 1502. It brokes the spec: hidden desktop files from user directory should hide files from system directory with the same name.
zas_
parents: 1406
diff changeset
177
57421a728682 Revert changeset 1502. It brokes the spec: hidden desktop files from user directory should hide files from system directory with the same name.
zas_
parents: 1406
diff changeset
178 g_hash_table_insert(editors, editor->key, editor);
57421a728682 Revert changeset 1502. It brokes the spec: hidden desktop files from user directory should hide files from system directory with the same name.
zas_
parents: 1406
diff changeset
179
1278
c5852c543775 Add support for NoDisplay (entry is then hidden) and Type (only Application type is valid here) keys.
zas_
parents: 1276
diff changeset
180 if (g_key_file_get_boolean(key_file, DESKTOP_GROUP, "Hidden", NULL)
c5852c543775 Add support for NoDisplay (entry is then hidden) and Type (only Application type is valid here) keys.
zas_
parents: 1276
diff changeset
181 || g_key_file_get_boolean(key_file, DESKTOP_GROUP, "NoDisplay", NULL))
c5852c543775 Add support for NoDisplay (entry is then hidden) and Type (only Application type is valid here) keys.
zas_
parents: 1276
diff changeset
182 {
1407
57421a728682 Revert changeset 1502. It brokes the spec: hidden desktop files from user directory should hide files from system directory with the same name.
zas_
parents: 1406
diff changeset
183 editor->hidden = TRUE;
1278
c5852c543775 Add support for NoDisplay (entry is then hidden) and Type (only Application type is valid here) keys.
zas_
parents: 1276
diff changeset
184 }
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
185
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
186 categories = g_key_file_get_string_list(key_file, DESKTOP_GROUP, "Categories", NULL, NULL);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
187 if (categories)
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
188 {
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
189 gboolean found = FALSE;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
190 gint i;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
191 for (i = 0; categories[i]; i++)
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
192 /* IMHO "Graphics" is exactly the category that we are interested in, so this does not have to be configurable */
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
193 if (strcmp(categories[i], "Graphics") == 0 ||
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
194 strcmp(categories[i], "X-Geeqie") == 0)
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
195 {
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
196 found = TRUE;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
197 break;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
198 }
1407
57421a728682 Revert changeset 1502. It brokes the spec: hidden desktop files from user directory should hide files from system directory with the same name.
zas_
parents: 1406
diff changeset
199 if (!found) editor->hidden = TRUE;
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
200 g_strfreev(categories);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
201 }
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
202 else
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
203 {
1407
57421a728682 Revert changeset 1502. It brokes the spec: hidden desktop files from user directory should hide files from system directory with the same name.
zas_
parents: 1406
diff changeset
204 editor->hidden = TRUE;
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
205 }
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
206
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
207 only_show_in = g_key_file_get_string_list(key_file, DESKTOP_GROUP, "OnlyShowIn", NULL, NULL);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
208 if (only_show_in)
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
209 {
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
210 gboolean found = FALSE;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
211 gint i;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
212 for (i = 0; only_show_in[i]; i++)
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
213 if (strcmp(only_show_in[i], "X-Geeqie") == 0)
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
214 {
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
215 found = TRUE;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
216 break;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
217 }
1407
57421a728682 Revert changeset 1502. It brokes the spec: hidden desktop files from user directory should hide files from system directory with the same name.
zas_
parents: 1406
diff changeset
218 if (!found) editor->hidden = TRUE;
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
219 g_strfreev(only_show_in);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
220 }
768
ff51413f098d Use functions to set editors name and command and ensure they are
zas_
parents: 766
diff changeset
221
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
222 not_show_in = g_key_file_get_string_list(key_file, DESKTOP_GROUP, "NotShowIn", NULL, NULL);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
223 if (not_show_in)
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
224 {
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
225 gboolean found = FALSE;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
226 gint i;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
227 for (i = 0; not_show_in[i]; i++)
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
228 if (strcmp(not_show_in[i], "X-Geeqie") == 0)
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
229 {
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
230 found = TRUE;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
231 break;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
232 }
1407
57421a728682 Revert changeset 1502. It brokes the spec: hidden desktop files from user directory should hide files from system directory with the same name.
zas_
parents: 1406
diff changeset
233 if (found) editor->hidden = TRUE;
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
234 g_strfreev(not_show_in);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
235 }
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
236
1407
57421a728682 Revert changeset 1502. It brokes the spec: hidden desktop files from user directory should hide files from system directory with the same name.
zas_
parents: 1406
diff changeset
237
1274
8fcdfacce91d test TryExec,
nadvornik
parents: 1272
diff changeset
238 try_exec = g_key_file_get_string(key_file, DESKTOP_GROUP, "TryExec", NULL);
8fcdfacce91d test TryExec,
nadvornik
parents: 1272
diff changeset
239 if (try_exec && !editor->hidden)
8fcdfacce91d test TryExec,
nadvornik
parents: 1272
diff changeset
240 {
8fcdfacce91d test TryExec,
nadvornik
parents: 1272
diff changeset
241 gchar *try_exec_res = g_find_program_in_path(try_exec);
1407
57421a728682 Revert changeset 1502. It brokes the spec: hidden desktop files from user directory should hide files from system directory with the same name.
zas_
parents: 1406
diff changeset
242 if (!try_exec_res) editor->hidden = TRUE;
1274
8fcdfacce91d test TryExec,
nadvornik
parents: 1272
diff changeset
243 g_free(try_exec_res);
8fcdfacce91d test TryExec,
nadvornik
parents: 1272
diff changeset
244 g_free(try_exec);
8fcdfacce91d test TryExec,
nadvornik
parents: 1272
diff changeset
245 }
8fcdfacce91d test TryExec,
nadvornik
parents: 1272
diff changeset
246
1407
57421a728682 Revert changeset 1502. It brokes the spec: hidden desktop files from user directory should hide files from system directory with the same name.
zas_
parents: 1406
diff changeset
247 if (editor->hidden)
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
248 {
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
249 /* hidden editors will be deleted, no need to parse the rest */
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
250 g_key_file_free(key_file);
1407
57421a728682 Revert changeset 1502. It brokes the spec: hidden desktop files from user directory should hide files from system directory with the same name.
zas_
parents: 1406
diff changeset
251 return TRUE;
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
252 }
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
253
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
254 editor->name = g_key_file_get_locale_string(key_file, DESKTOP_GROUP, "Name", NULL, NULL);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
255 editor->icon = g_key_file_get_string(key_file, DESKTOP_GROUP, "Icon", NULL);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
256
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
257 editor->exec = g_key_file_get_string(key_file, DESKTOP_GROUP, "Exec", NULL);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
258
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
259 /* we take only editors that accept parameters, FIXME: the test can be improved */
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
260 if (!strchr(editor->exec, '%')) editor->hidden = TRUE;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
261
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
262 editor->menu_path = g_key_file_get_string(key_file, DESKTOP_GROUP, "X-Geeqie-Menu-Path", NULL);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
263 if (!editor->menu_path) editor->menu_path = g_strdup("EditMenu/ExternalMenu");
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
264
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
265 editor->hotkey = g_key_file_get_string(key_file, DESKTOP_GROUP, "X-Geeqie-Hotkey", NULL);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
266
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
267 extensions = g_key_file_get_string(key_file, DESKTOP_GROUP, "X-Geeqie-File-Extensions", NULL);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
268 if (extensions)
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
269 editor->ext_list = filter_to_list(extensions);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
270 else
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
271 {
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
272 gchar **mime_types = g_key_file_get_string_list(key_file, DESKTOP_GROUP, "MimeType", NULL, NULL);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
273 if (mime_types)
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
274 {
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
275 editor->ext_list = editor_mime_types_to_extensions(mime_types);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
276 g_strfreev(mime_types);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
277 if (!editor->ext_list) editor->hidden = TRUE;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
278 }
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
279 }
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
280
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
281 if (g_key_file_get_boolean(key_file, DESKTOP_GROUP, "X-Geeqie-Keep-Fullscreen", NULL)) editor->flags |= EDITOR_KEEP_FS;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
282 if (g_key_file_get_boolean(key_file, DESKTOP_GROUP, "X-Geeqie-Verbose", NULL)) editor->flags |= EDITOR_VERBOSE;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
283 if (g_key_file_get_boolean(key_file, DESKTOP_GROUP, "X-Geeqie-Verbose-Multi", NULL)) editor->flags |= EDITOR_VERBOSE_MULTI;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
284 if (g_key_file_get_boolean(key_file, DESKTOP_GROUP, "X-Geeqie-Filter", NULL)) editor->flags |= EDITOR_DEST;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
285 if (g_key_file_get_boolean(key_file, DESKTOP_GROUP, "Terminal", NULL)) editor->flags |= EDITOR_TERMINAL;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
286
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
287 editor->flags |= editor_command_parse(editor, NULL, NULL);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
288 g_key_file_free(key_file);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
289
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
290 return TRUE;
768
ff51413f098d Use functions to set editors name and command and ensure they are
zas_
parents: 766
diff changeset
291 }
ff51413f098d Use functions to set editors name and command and ensure they are
zas_
parents: 766
diff changeset
292
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
293 static gboolean editor_remove_desktop_file_cb(gpointer key, gpointer value, gpointer user_data)
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
294 {
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
295 EditorDescription *editor = value;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
296 return editor->hidden;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
297 }
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
298
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
299 static void editor_read_desktop_dir(const gchar *path)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
300 {
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
301 DIR *dp;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
302 struct dirent *dir;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
303 gchar *pathl;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
304
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
305 pathl = path_from_utf8(path);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
306 dp = opendir(pathl);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
307 g_free(pathl);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
308 if (!dp)
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
309 {
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
310 /* dir not found */
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
311 return;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
312 }
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
313 while ((dir = readdir(dp)) != NULL)
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
314 {
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
315 gchar *namel = dir->d_name;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
316
1402
611c25ef73f4 Cleanup and minor fixes.
zas_
parents: 1400
diff changeset
317 if (g_str_has_suffix(namel, ".desktop"))
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
318 {
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
319 gchar *name = path_to_utf8(namel);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
320 gchar *dpath = g_build_filename(path, name, NULL);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
321 editor_read_desktop_file(dpath);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
322 g_free(dpath);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
323 g_free(name);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
324 }
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
325 }
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
326 closedir(dp);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
327 }
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
328
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
329 void editor_load_descriptions(void)
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
330 {
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
331 gchar *path;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
332 gchar *xdg_data_dirs;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
333 gchar *all_dirs;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
334 gchar **split_dirs;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
335 gint i;
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
336
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
337 if (!editors)
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
338 {
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
339 editors = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, (GDestroyNotify)editor_description_free);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
340 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
341
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
342 xdg_data_dirs = getenv("XDG_DATA_DIRS");
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
343 if (xdg_data_dirs && xdg_data_dirs[0])
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
344 xdg_data_dirs = path_to_utf8(xdg_data_dirs);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
345 else
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
346 xdg_data_dirs = g_strdup("/usr/share");
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
347
1274
8fcdfacce91d test TryExec,
nadvornik
parents: 1272
diff changeset
348 all_dirs = g_strconcat(get_rc_dir(), ":", GQ_APP_DIR, ":", xdg_data_home_get(), ":", xdg_data_dirs, NULL);
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
349
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
350 g_free(xdg_data_dirs);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
351
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
352 split_dirs = g_strsplit(all_dirs, ":", 0);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
353
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
354 g_free(all_dirs);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
355
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
356 for (i = 0; split_dirs[i]; i++)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
357 {
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
358 path = g_build_filename(split_dirs[i], "applications", NULL);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
359 editor_read_desktop_dir(path);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
360 g_free(path);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
361 }
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
362
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
363 g_strfreev(split_dirs);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
364
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
365 g_hash_table_foreach_remove(editors, editor_remove_desktop_file_cb, NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
366 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
367
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
368 static void editor_list_add_cb(gpointer key, gpointer value, gpointer data)
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
369 {
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
370 GList **listp = data;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
371 EditorDescription *editor = value;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
372
1402
611c25ef73f4 Cleanup and minor fixes.
zas_
parents: 1400
diff changeset
373 /* do not show the special commands in any list, they are called explicitly */
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
374 if (strcmp(editor->key, CMD_COPY) == 0 ||
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
375 strcmp(editor->key, CMD_MOVE) == 0 ||
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
376 strcmp(editor->key, CMD_RENAME) == 0 ||
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
377 strcmp(editor->key, CMD_DELETE) == 0 ||
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
378 strcmp(editor->key, CMD_FOLDER) == 0) return;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
379
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
380 *listp = g_list_prepend(*listp, editor);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
381 }
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
382
1276
4177057ca11b editor_list_get() now returns a sorted list, this way items appear in the same order in all menus.
zas_
parents: 1274
diff changeset
383 static gint editor_sort(gconstpointer a, gconstpointer b)
4177057ca11b editor_list_get() now returns a sorted list, this way items appear in the same order in all menus.
zas_
parents: 1274
diff changeset
384 {
4177057ca11b editor_list_get() now returns a sorted list, this way items appear in the same order in all menus.
zas_
parents: 1274
diff changeset
385 const EditorDescription *ea = a;
4177057ca11b editor_list_get() now returns a sorted list, this way items appear in the same order in all menus.
zas_
parents: 1274
diff changeset
386 const EditorDescription *eb = b;
1402
611c25ef73f4 Cleanup and minor fixes.
zas_
parents: 1400
diff changeset
387 gint ret;
1276
4177057ca11b editor_list_get() now returns a sorted list, this way items appear in the same order in all menus.
zas_
parents: 1274
diff changeset
388
4177057ca11b editor_list_get() now returns a sorted list, this way items appear in the same order in all menus.
zas_
parents: 1274
diff changeset
389 ret = strcmp(ea->menu_path, eb->menu_path);
4177057ca11b editor_list_get() now returns a sorted list, this way items appear in the same order in all menus.
zas_
parents: 1274
diff changeset
390 if (ret != 0) return ret;
4177057ca11b editor_list_get() now returns a sorted list, this way items appear in the same order in all menus.
zas_
parents: 1274
diff changeset
391
4177057ca11b editor_list_get() now returns a sorted list, this way items appear in the same order in all menus.
zas_
parents: 1274
diff changeset
392 return g_utf8_collate(ea->name, eb->name);
4177057ca11b editor_list_get() now returns a sorted list, this way items appear in the same order in all menus.
zas_
parents: 1274
diff changeset
393 }
4177057ca11b editor_list_get() now returns a sorted list, this way items appear in the same order in all menus.
zas_
parents: 1274
diff changeset
394
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
395 GList *editor_list_get(void)
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
396 {
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
397 GList *editors_list = NULL;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
398 g_hash_table_foreach(editors, editor_list_add_cb, &editors_list);
1276
4177057ca11b editor_list_get() now returns a sorted list, this way items appear in the same order in all menus.
zas_
parents: 1274
diff changeset
399 editors_list = g_list_sort(editors_list, editor_sort);
4177057ca11b editor_list_get() now returns a sorted list, this way items appear in the same order in all menus.
zas_
parents: 1274
diff changeset
400
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
401 return editors_list;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
402 }
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
403
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
404 /* ------------------------------ */
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
405
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
406
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
407 static void editor_verbose_data_free(EditorData *ed)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
408 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
409 if (!ed->vd) return;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
410 g_free(ed->vd);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
411 ed->vd = NULL;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
412 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
413
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
414 static void editor_data_free(EditorData *ed)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
415 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
416 editor_verbose_data_free(ed);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
417 g_free(ed);
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
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
420 static void editor_verbose_window_close(GenericDialog *gd, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
421 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
422 EditorData *ed = data;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
423
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
424 generic_dialog_close(gd);
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
425 editor_verbose_data_free(ed);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
426 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
427 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
428
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
429 static void editor_verbose_window_stop(GenericDialog *gd, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
430 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
431 EditorData *ed = data;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
432 ed->stopping = TRUE;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
433 ed->count = 0;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
434 editor_verbose_window_progress(ed, _("stopping..."));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
435 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
436
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
437 static void editor_verbose_window_enable_close(EditorVerboseData *vd)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
438 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
439 vd->gd->cancel_cb = editor_verbose_window_close;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
440
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
441 spinner_set_interval(vd->spinner, -1);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
442 gtk_widget_set_sensitive(vd->button_stop, FALSE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
443 gtk_widget_set_sensitive(vd->button_close, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
444 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
445
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
446 static EditorVerboseData *editor_verbose_window(EditorData *ed, const gchar *text)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
447 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
448 EditorVerboseData *vd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
449 GtkWidget *scrolled;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
450 GtkWidget *hbox;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
451 gchar *buf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
452
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
453 vd = g_new0(EditorVerboseData, 1);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
454
1174
0bea79d87065 Drop useless wmclass stuff. Gtk will take care of it and as said in the documentation using gtk_window_set_wmclass() is sort of pointless.
zas_
parents: 1055
diff changeset
455 vd->gd = file_util_gen_dlg(_("Edit command results"), "editor_results",
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
456 NULL, FALSE,
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
457 NULL, ed);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
458 buf = g_strdup_printf(_("Output of %s"), text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
459 generic_dialog_add_message(vd->gd, NULL, buf, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
460 g_free(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
461 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
462 editor_verbose_window_stop, FALSE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
463 gtk_widget_set_sensitive(vd->button_stop, FALSE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
464 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
465 editor_verbose_window_close, TRUE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
466 gtk_widget_set_sensitive(vd->button_close, FALSE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
467
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
468 scrolled = gtk_scrolled_window_new(NULL, NULL);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
469 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
470 gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled),
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
471 GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
472 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
473 gtk_widget_show(scrolled);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
474
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
475 vd->text = gtk_text_view_new();
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
476 gtk_text_view_set_editable(GTK_TEXT_VIEW(vd->text), FALSE);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
477 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
478 gtk_container_add(GTK_CONTAINER(scrolled), vd->text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
479 gtk_widget_show(vd->text);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
480
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
481 hbox = gtk_hbox_new(FALSE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
482 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
483 gtk_widget_show(hbox);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
484
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
485 vd->progress = gtk_progress_bar_new();
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
486 gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(vd->progress), 0.0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
487 gtk_box_pack_start(GTK_BOX(hbox), vd->progress, TRUE, TRUE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
488 gtk_widget_show(vd->progress);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
489
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
490 vd->spinner = spinner_new(NULL, SPINNER_SPEED);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
491 gtk_box_pack_start(GTK_BOX(hbox), vd->spinner, FALSE, FALSE, 0);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
492 gtk_widget_show(vd->spinner);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
493
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
494 gtk_widget_show(vd->gd->dialog);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
495
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
496 ed->vd = vd;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
497 return vd;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
498 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
499
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
500 static void editor_verbose_window_fill(EditorVerboseData *vd, gchar *text, gint len)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
501 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
502 GtkTextBuffer *buffer;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
503 GtkTextIter iter;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
504
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
505 buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(vd->text));
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
506 gtk_text_buffer_get_iter_at_offset(buffer, &iter, -1);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
507 gtk_text_buffer_insert(buffer, &iter, text, len);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
508 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
509
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
510 static void editor_verbose_window_progress(EditorData *ed, const gchar *text)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
511 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
512 if (!ed->vd) return;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
513
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
514 if (ed->total)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
515 {
1000
4fe8f9656107 For the sake of consistency, use glib basic types everywhere.
zas_
parents: 995
diff changeset
516 gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(ed->vd->progress), (gdouble)ed->count / ed->total);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
517 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
518
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
519 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
520 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
521
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
522 static gboolean editor_verbose_io_cb(GIOChannel *source, GIOCondition condition, gpointer data)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
523 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
524 EditorData *ed = data;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
525 gchar buf[512];
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
526 gsize count;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
527
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
528 if (condition & G_IO_IN)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
529 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
530 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
531 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
532 if (!g_utf8_validate(buf, count, NULL))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
533 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
534 gchar *utf8;
444
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
535
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
536 utf8 = g_locale_to_utf8(buf, count, NULL, NULL, NULL);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
537 if (utf8)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
538 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
539 editor_verbose_window_fill(ed->vd, utf8, -1);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
540 g_free(utf8);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
541 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
542 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
543 {
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
544 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
545 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
546 }
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
547 else
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
548 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
549 editor_verbose_window_fill(ed->vd, buf, count);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
550 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
551 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
552 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
553
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
554 if (condition & (G_IO_ERR | G_IO_HUP))
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
555 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
556 g_io_channel_shutdown(source, TRUE, NULL);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
557 return FALSE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
558 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
559
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
560 return TRUE;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
561 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
562
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
563 typedef enum {
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
564 PATH_FILE,
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
565 PATH_FILE_URL,
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
566 PATH_DEST
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
567 } PathType;
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
568
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
569
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
570 static gchar *editor_command_path_parse(const FileData *fd, PathType type, const EditorDescription *editor)
123
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
571 {
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
572 GString *string;
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
573 gchar *pathl;
1408
1cc4ea53c9a3 Fix editor_command_path_parse().
zas_
parents: 1407
diff changeset
574 const gchar *p = NULL;
123
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
575
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
576 string = g_string_new("");
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
577
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
578 if (type == PATH_FILE || type == PATH_FILE_URL)
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
579 {
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
580 GList *work = editor->ext_list;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
581
147
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
582 if (!work)
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
583 p = fd->path;
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
584 else
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
585 {
516
b7e99bfeadc9 Convert the minority of while() to while ().
zas_
parents: 475
diff changeset
586 while (work)
147
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
587 {
444
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
588 GList *work2;
147
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
589 gchar *ext = work->data;
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
590 work = work->next;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
591
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
592 if (strcmp(ext, "*") == 0 ||
1307
e8f21b91885d Glibification again.
zas_
parents: 1284
diff changeset
593 g_ascii_strcasecmp(ext, fd->extension) == 0)
147
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
594 {
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
595 p = fd->path;
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
596 break;
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
597 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
598
444
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
599 work2 = fd->sidecar_files;
516
b7e99bfeadc9 Convert the minority of while() to while ().
zas_
parents: 475
diff changeset
600 while (work2)
147
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
601 {
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
602 FileData *sfd = work2->data;
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
603 work2 = work2->next;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
604
1307
e8f21b91885d Glibification again.
zas_
parents: 1284
diff changeset
605 if (g_ascii_strcasecmp(ext, sfd->extension) == 0)
147
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
606 {
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
607 p = sfd->path;
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
608 break;
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
609 }
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
610 }
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
611 if (p) break;
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
612 }
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
613 if (!p) return NULL;
b2266996fa83 added possibility to specify prefered file type for external commands
nadvornik
parents: 140
diff changeset
614 }
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
615 }
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
616 else if (type == PATH_DEST)
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
617 {
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
618 if (fd->change && fd->change->dest)
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
619 p = fd->change->dest;
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
620 else
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
621 p = "";
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
622 }
444
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
623
1407
57421a728682 Revert changeset 1502. It brokes the spec: hidden desktop files from user directory should hide files from system directory with the same name.
zas_
parents: 1406
diff changeset
624 g_assert(p);
123
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
625 while (*p != '\0')
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
626 {
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
627 /* must escape \, ", `, and $ to avoid problems,
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
628 * 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
629 */
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
630 if (strchr("\\\"`$", *p) != NULL)
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
631 {
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
632 string = g_string_append_c(string, '\\');
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
633 }
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
634 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
635 p++;
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
636 }
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
637
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
638 if (type == PATH_FILE_URL) g_string_prepend(string, "file://");
123
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
639 pathl = path_from_utf8(string->str);
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
640 g_string_free(string, TRUE);
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
641
1402
611c25ef73f4 Cleanup and minor fixes.
zas_
parents: 1400
diff changeset
642 if (pathl && !pathl[0]) /* empty string case */
611c25ef73f4 Cleanup and minor fixes.
zas_
parents: 1400
diff changeset
643 {
611c25ef73f4 Cleanup and minor fixes.
zas_
parents: 1400
diff changeset
644 g_free(pathl);
611c25ef73f4 Cleanup and minor fixes.
zas_
parents: 1400
diff changeset
645 pathl = NULL;
611c25ef73f4 Cleanup and minor fixes.
zas_
parents: 1400
diff changeset
646 }
611c25ef73f4 Cleanup and minor fixes.
zas_
parents: 1400
diff changeset
647
123
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
648 return pathl;
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
649 }
3602a4aa7c71 Sat Dec 2 20:15:22 2006 John Ellis <johne@verizon.net>
gqview
parents: 60
diff changeset
650
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
651
1405
03384485676d Introduce EditorFlags type, cleanup.
zas_
parents: 1402
diff changeset
652 EditorFlags editor_command_parse(const EditorDescription *editor, GList *list, gchar **output)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
653 {
1405
03384485676d Introduce EditorFlags type, cleanup.
zas_
parents: 1402
diff changeset
654 EditorFlags flags = 0;
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
655 const gchar *p;
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
656 GString *result = NULL;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
657
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
658 if (output)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
659 result = g_string_new("");
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
660
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
661 if (editor->exec[0] == '\0')
140
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 flags |= EDITOR_ERROR_EMPTY;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
664 goto err;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
665 }
669
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
666
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
667 p = editor->exec;
669
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
668 /* skip leading whitespaces if any */
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
669 while (g_ascii_isspace(*p)) p++;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
670
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
671 /* command */
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
672
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
673 while (*p)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
674 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
675 if (*p != '%')
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
676 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
677 if (output) result = g_string_append_c(result, *p);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
678 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
679 else /* *p == '%' */
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
680 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
681 gchar *pathl = NULL;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
682
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
683 p++;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
684
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
685 switch (*p)
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
686 {
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
687 case 'f': /* single file */
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
688 case 'u': /* single url */
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
689 flags |= EDITOR_FOR_EACH;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
690 if (flags & EDITOR_SINGLE_COMMAND)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
691 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
692 flags |= EDITOR_ERROR_INCOMPATIBLE;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
693 goto err;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
694 }
1399
7dfa34e4de15 Fix up editor execution.
zas_
parents: 1397
diff changeset
695 if (list)
1397
a0bd58a6535f In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents: 1367
diff changeset
696 {
1399
7dfa34e4de15 Fix up editor execution.
zas_
parents: 1397
diff changeset
697 /* use the first file from the list */
7dfa34e4de15 Fix up editor execution.
zas_
parents: 1397
diff changeset
698 if (!list->data)
7dfa34e4de15 Fix up editor execution.
zas_
parents: 1397
diff changeset
699 {
7dfa34e4de15 Fix up editor execution.
zas_
parents: 1397
diff changeset
700 flags |= EDITOR_ERROR_NO_FILE;
7dfa34e4de15 Fix up editor execution.
zas_
parents: 1397
diff changeset
701 goto err;
7dfa34e4de15 Fix up editor execution.
zas_
parents: 1397
diff changeset
702 }
7dfa34e4de15 Fix up editor execution.
zas_
parents: 1397
diff changeset
703 pathl = editor_command_path_parse((FileData *)list->data,
7dfa34e4de15 Fix up editor execution.
zas_
parents: 1397
diff changeset
704 (*p == 'f') ? PATH_FILE : PATH_FILE_URL,
7dfa34e4de15 Fix up editor execution.
zas_
parents: 1397
diff changeset
705 editor);
7dfa34e4de15 Fix up editor execution.
zas_
parents: 1397
diff changeset
706 if (!pathl)
7dfa34e4de15 Fix up editor execution.
zas_
parents: 1397
diff changeset
707 {
7dfa34e4de15 Fix up editor execution.
zas_
parents: 1397
diff changeset
708 flags |= EDITOR_ERROR_NO_FILE;
7dfa34e4de15 Fix up editor execution.
zas_
parents: 1397
diff changeset
709 goto err;
7dfa34e4de15 Fix up editor execution.
zas_
parents: 1397
diff changeset
710 }
7dfa34e4de15 Fix up editor execution.
zas_
parents: 1397
diff changeset
711 if (output)
7dfa34e4de15 Fix up editor execution.
zas_
parents: 1397
diff changeset
712 {
7dfa34e4de15 Fix up editor execution.
zas_
parents: 1397
diff changeset
713 result = g_string_append_c(result, '"');
7dfa34e4de15 Fix up editor execution.
zas_
parents: 1397
diff changeset
714 result = g_string_append(result, pathl);
7dfa34e4de15 Fix up editor execution.
zas_
parents: 1397
diff changeset
715 result = g_string_append_c(result, '"');
7dfa34e4de15 Fix up editor execution.
zas_
parents: 1397
diff changeset
716 }
7dfa34e4de15 Fix up editor execution.
zas_
parents: 1397
diff changeset
717 g_free(pathl);
1397
a0bd58a6535f In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents: 1367
diff changeset
718 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
719 break;
60
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
720
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
721 case 'F':
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
722 case 'U':
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
723 flags |= EDITOR_SINGLE_COMMAND;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
724 if (flags & (EDITOR_FOR_EACH | EDITOR_DEST))
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
725 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
726 flags |= EDITOR_ERROR_INCOMPATIBLE;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
727 goto err;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
728 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
729
1399
7dfa34e4de15 Fix up editor execution.
zas_
parents: 1397
diff changeset
730 if (list)
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
731 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
732 /* use whole list */
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
733 GList *work = list;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
734 gboolean ok = FALSE;
444
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
735
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
736 while (work)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
737 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
738 FileData *fd = work->data;
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
739 pathl = editor_command_path_parse(fd, (*p == 'F') ? PATH_FILE : PATH_FILE_URL, editor);
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
740 if (pathl)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
741 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
742 ok = TRUE;
1397
a0bd58a6535f In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents: 1367
diff changeset
743
a0bd58a6535f In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents: 1367
diff changeset
744 if (output)
a0bd58a6535f In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents: 1367
diff changeset
745 {
a0bd58a6535f In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents: 1367
diff changeset
746 ok = TRUE;
a0bd58a6535f In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents: 1367
diff changeset
747 if (work != list) g_string_append_c(result, ' ');
a0bd58a6535f In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents: 1367
diff changeset
748 result = g_string_append_c(result, '"');
a0bd58a6535f In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents: 1367
diff changeset
749 result = g_string_append(result, pathl);
a0bd58a6535f In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents: 1367
diff changeset
750 result = g_string_append_c(result, '"');
a0bd58a6535f In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents: 1367
diff changeset
751 }
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
752 g_free(pathl);
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 work = work->next;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
755 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
756 if (!ok)
140
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 flags |= EDITOR_ERROR_NO_FILE;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
759 goto err;
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 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
762 break;
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
763 case 'i':
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
764 if (output)
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
765 {
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
766 result = g_string_append(result, editor->icon);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
767 }
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
768 break;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
769 case 'c':
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
770 if (output)
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
771 {
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
772 result = g_string_append(result, editor->name);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
773 }
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
774 break;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
775 case 'k':
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
776 if (output)
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
777 {
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
778 result = g_string_append(result, editor->file);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
779 }
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
780 break;
669
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
781 case '%':
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
782 /* %% = % escaping */
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
783 if (output) result = g_string_append_c(result, *p);
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
784 break;
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
785 case 'd':
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
786 case 'D':
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
787 case 'n':
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
788 case 'N':
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
789 case 'v':
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
790 case 'm':
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
791 /* deprecated according to spec, ignore */
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
792 break;
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
793 default:
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
794 flags |= EDITOR_ERROR_SYNTAX;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
795 goto err;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
796 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
797 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
798 p++;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
799 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
800
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
801 if (output) *output = g_string_free(result, FALSE);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
802 return flags;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
803
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
804
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
805 err:
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
806 if (output)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
807 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
808 g_string_free(result, TRUE);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
809 *output = NULL;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
810 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
811 return flags;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
812 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
813
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
814
1397
a0bd58a6535f In various Edit context menus, only display editors that match the file types in the selection.
zas_
parents: 1367
diff changeset
815 static void editor_child_exit_cb(GPid pid, gint status, gpointer data)
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
816 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
817 EditorData *ed = data;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
818 g_spawn_close_pid(pid);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
819 ed->pid = -1;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
820
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
821 editor_command_next_finish(ed, status);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
822 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
823
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
824
1405
03384485676d Introduce EditorFlags type, cleanup.
zas_
parents: 1402
diff changeset
825 static EditorFlags editor_command_one(const EditorDescription *editor, GList *list, EditorData *ed)
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
826 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
827 gchar *command;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
828 FileData *fd = list->data;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
829 GPid pid;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
830 gint standard_output;
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
831 gint standard_error;
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
832 gboolean ok;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
833
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
834 ed->pid = -1;
1405
03384485676d Introduce EditorFlags type, cleanup.
zas_
parents: 1402
diff changeset
835 ed->flags = editor->flags;
03384485676d Introduce EditorFlags type, cleanup.
zas_
parents: 1402
diff changeset
836 ed->flags |= editor_command_parse(editor, list, &command);
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
837
1400
67573155210c Add helper macros EDITOR_ERRORS() and EDITOR_ERRORS_BUT_SKIPPED() to clean up the code a bit. Minor tidy up.
zas_
parents: 1399
diff changeset
838 ok = !EDITOR_ERRORS(ed->flags);
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
839
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
840 if (ok)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
841 {
737
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 731
diff changeset
842 ok = (options->shell.path && *options->shell.path);
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 731
diff changeset
843 if (!ok) log_printf("ERROR: empty shell command\n");
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 731
diff changeset
844
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 731
diff changeset
845 if (ok)
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 731
diff changeset
846 {
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 731
diff changeset
847 ok = (access(options->shell.path, X_OK) == 0);
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 731
diff changeset
848 if (!ok) log_printf("ERROR: cannot execute shell command '%s'\n", options->shell.path);
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 731
diff changeset
849 }
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 731
diff changeset
850
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 731
diff changeset
851 if (!ok) ed->flags |= EDITOR_ERROR_CANT_EXEC;
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 731
diff changeset
852 }
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 731
diff changeset
853
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 731
diff changeset
854 if (ok)
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 731
diff changeset
855 {
443
e7361d06d83a editor_command_one(): tidy up.
zas_
parents: 442
diff changeset
856 gchar *working_directory;
e7361d06d83a editor_command_one(): tidy up.
zas_
parents: 442
diff changeset
857 gchar *args[4];
737
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 731
diff changeset
858 guint n = 0;
443
e7361d06d83a editor_command_one(): tidy up.
zas_
parents: 442
diff changeset
859
e7361d06d83a editor_command_one(): tidy up.
zas_
parents: 442
diff changeset
860 working_directory = remove_level_from_path(fd->path);
737
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 731
diff changeset
861 args[n++] = options->shell.path;
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 731
diff changeset
862 if (options->shell.options && *options->shell.options)
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 731
diff changeset
863 args[n++] = options->shell.options;
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 731
diff changeset
864 args[n++] = command;
8a8873e7a552 Make shell command and its option rc file options instead of hardcoded strings.
zas_
parents: 731
diff changeset
865 args[n] = NULL;
443
e7361d06d83a editor_command_one(): tidy up.
zas_
parents: 442
diff changeset
866
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
867 if ((ed->flags & EDITOR_DEST) && fd->change && fd->change->dest) /* FIXME: error handling */
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
868 {
1402
611c25ef73f4 Cleanup and minor fixes.
zas_
parents: 1400
diff changeset
869 g_setenv("GEEQIE_DESTINATION", fd->change->dest, TRUE);
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
870 }
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
871 else
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
872 {
1402
611c25ef73f4 Cleanup and minor fixes.
zas_
parents: 1400
diff changeset
873 g_unsetenv("GEEQIE_DESTINATION");
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
874 }
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
875
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
876 ok = g_spawn_async_with_pipes(working_directory, args, NULL,
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
877 G_SPAWN_DO_NOT_REAP_CHILD, /* GSpawnFlags */
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
878 NULL, NULL,
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
879 &pid,
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
880 NULL,
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
881 ed->vd ? &standard_output : NULL,
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
882 ed->vd ? &standard_error : NULL,
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
883 NULL);
443
e7361d06d83a editor_command_one(): tidy up.
zas_
parents: 442
diff changeset
884
e7361d06d83a editor_command_one(): tidy up.
zas_
parents: 442
diff changeset
885 g_free(working_directory);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
886
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
887 if (!ok) ed->flags |= EDITOR_ERROR_CANT_EXEC;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
888 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
889
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
890 if (ok)
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
891 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
892 g_child_watch_add(pid, editor_child_exit_cb, ed);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
893 ed->pid = pid;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
894 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
895
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
896 if (ed->vd)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
897 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
898 if (!ok)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
899 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
900 gchar *buf;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
901
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
902 buf = g_strdup_printf(_("Failed to run command:\n%s\n"), editor->file);
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
903 editor_verbose_window_fill(ed->vd, buf, strlen(buf));
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
904 g_free(buf);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
905
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
906 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
907 else
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
908 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
909 GIOChannel *channel_output;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
910 GIOChannel *channel_error;
444
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
911
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
912 channel_output = g_io_channel_unix_new(standard_output);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
913 g_io_channel_set_flags(channel_output, G_IO_FLAG_NONBLOCK, NULL);
926
978f52f8a79d Set GIO channels to binary encoding.
zas_
parents: 911
diff changeset
914 g_io_channel_set_encoding(channel_output, NULL, NULL);
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
915
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
916 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
917 editor_verbose_io_cb, ed, NULL);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
918 g_io_channel_unref(channel_output);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
919
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
920 channel_error = g_io_channel_unix_new(standard_error);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
921 g_io_channel_set_flags(channel_error, G_IO_FLAG_NONBLOCK, NULL);
926
978f52f8a79d Set GIO channels to binary encoding.
zas_
parents: 911
diff changeset
922 g_io_channel_set_encoding(channel_error, NULL, NULL);
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
923
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
924 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
925 editor_verbose_io_cb, ed, NULL);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
926 g_io_channel_unref(channel_error);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
927 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
928 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
929
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
930 g_free(command);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
931
1400
67573155210c Add helper macros EDITOR_ERRORS() and EDITOR_ERRORS_BUT_SKIPPED() to clean up the code a bit. Minor tidy up.
zas_
parents: 1399
diff changeset
932 return EDITOR_ERRORS(ed->flags);
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
933 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
934
1405
03384485676d Introduce EditorFlags type, cleanup.
zas_
parents: 1402
diff changeset
935 static EditorFlags editor_command_next_start(EditorData *ed)
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
936 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
937 if (ed->vd) editor_verbose_window_fill(ed->vd, "\n", 1);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
938
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
939 if (ed->list && ed->count < ed->total)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
940 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
941 FileData *fd;
1405
03384485676d Introduce EditorFlags type, cleanup.
zas_
parents: 1402
diff changeset
942 EditorFlags error;
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
943
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
944 fd = ed->list->data;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
945
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
946 if (ed->vd)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
947 {
1402
611c25ef73f4 Cleanup and minor fixes.
zas_
parents: 1400
diff changeset
948 if (ed->flags & EDITOR_FOR_EACH)
611c25ef73f4 Cleanup and minor fixes.
zas_
parents: 1400
diff changeset
949 editor_verbose_window_progress(ed, fd->path);
611c25ef73f4 Cleanup and minor fixes.
zas_
parents: 1400
diff changeset
950 else
611c25ef73f4 Cleanup and minor fixes.
zas_
parents: 1400
diff changeset
951 editor_verbose_window_progress(ed, _("running..."));
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
952 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
953 ed->count++;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
954
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
955 error = editor_command_one(ed->editor, ed->list, ed);
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
956 if (!error && ed->vd)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
957 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
958 gtk_widget_set_sensitive(ed->vd->button_stop, (ed->list != NULL) );
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
959 if (ed->flags & EDITOR_FOR_EACH)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
960 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
961 editor_verbose_window_fill(ed->vd, fd->path, strlen(fd->path));
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
962 editor_verbose_window_fill(ed->vd, "\n", 1);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
963 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
964 }
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
965
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
966 if (!error)
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
967 return 0;
1402
611c25ef73f4 Cleanup and minor fixes.
zas_
parents: 1400
diff changeset
968
611c25ef73f4 Cleanup and minor fixes.
zas_
parents: 1400
diff changeset
969 /* command was not started, call the finish immediately */
611c25ef73f4 Cleanup and minor fixes.
zas_
parents: 1400
diff changeset
970 return editor_command_next_finish(ed, 0);
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
971 }
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
972
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
973 /* everything is done */
237
404629011caa Add missing return at the end of editor_command_next_start().
zas_
parents: 196
diff changeset
974 return editor_command_done(ed);
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
975 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
976
1405
03384485676d Introduce EditorFlags type, cleanup.
zas_
parents: 1402
diff changeset
977 static EditorFlags editor_command_next_finish(EditorData *ed, gint status)
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
978 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
979 gint cont = ed->stopping ? EDITOR_CB_SKIP : EDITOR_CB_CONTINUE;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
980
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
981 if (status)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
982 ed->flags |= EDITOR_ERROR_STATUS;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
983
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
984 if (ed->flags & EDITOR_FOR_EACH)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
985 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
986 /* handle the first element from the list */
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
987 GList *fd_element = ed->list;
444
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
988
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
989 ed->list = g_list_remove_link(ed->list, fd_element);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
990 if (ed->callback)
911
8adf248bf5c9 fixed stop button in editor dialog
nadvornik
parents: 768
diff changeset
991 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
992 cont = ed->callback(ed->list ? ed : NULL, ed->flags, fd_element, ed->data);
911
8adf248bf5c9 fixed stop button in editor dialog
nadvornik
parents: 768
diff changeset
993 if (ed->stopping && cont == EDITOR_CB_CONTINUE) cont = EDITOR_CB_SKIP;
8adf248bf5c9 fixed stop button in editor dialog
nadvornik
parents: 768
diff changeset
994 }
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
995 filelist_free(fd_element);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
996 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
997 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
998 {
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
999 /* handle whole list */
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1000 if (ed->callback)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1001 cont = ed->callback(NULL, ed->flags, ed->list, ed->data);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1002 filelist_free(ed->list);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1003 ed->list = NULL;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1004 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1005
1400
67573155210c Add helper macros EDITOR_ERRORS() and EDITOR_ERRORS_BUT_SKIPPED() to clean up the code a bit. Minor tidy up.
zas_
parents: 1399
diff changeset
1006 switch (cont)
67573155210c Add helper macros EDITOR_ERRORS() and EDITOR_ERRORS_BUT_SKIPPED() to clean up the code a bit. Minor tidy up.
zas_
parents: 1399
diff changeset
1007 {
67573155210c Add helper macros EDITOR_ERRORS() and EDITOR_ERRORS_BUT_SKIPPED() to clean up the code a bit. Minor tidy up.
zas_
parents: 1399
diff changeset
1008 case EDITOR_CB_SUSPEND:
67573155210c Add helper macros EDITOR_ERRORS() and EDITOR_ERRORS_BUT_SKIPPED() to clean up the code a bit. Minor tidy up.
zas_
parents: 1399
diff changeset
1009 return EDITOR_ERRORS(ed->flags);
67573155210c Add helper macros EDITOR_ERRORS() and EDITOR_ERRORS_BUT_SKIPPED() to clean up the code a bit. Minor tidy up.
zas_
parents: 1399
diff changeset
1010 case EDITOR_CB_SKIP:
67573155210c Add helper macros EDITOR_ERRORS() and EDITOR_ERRORS_BUT_SKIPPED() to clean up the code a bit. Minor tidy up.
zas_
parents: 1399
diff changeset
1011 return editor_command_done(ed);
67573155210c Add helper macros EDITOR_ERRORS() and EDITOR_ERRORS_BUT_SKIPPED() to clean up the code a bit. Minor tidy up.
zas_
parents: 1399
diff changeset
1012 }
67573155210c Add helper macros EDITOR_ERRORS() and EDITOR_ERRORS_BUT_SKIPPED() to clean up the code a bit. Minor tidy up.
zas_
parents: 1399
diff changeset
1013
67573155210c Add helper macros EDITOR_ERRORS() and EDITOR_ERRORS_BUT_SKIPPED() to clean up the code a bit. Minor tidy up.
zas_
parents: 1399
diff changeset
1014 return editor_command_next_start(ed);
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1015 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1016
1405
03384485676d Introduce EditorFlags type, cleanup.
zas_
parents: 1402
diff changeset
1017 static EditorFlags editor_command_done(EditorData *ed)
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1018 {
1405
03384485676d Introduce EditorFlags type, cleanup.
zas_
parents: 1402
diff changeset
1019 EditorFlags flags;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1020
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1021 if (ed->vd)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1022 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1023 if (ed->count == ed->total)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1024 {
1402
611c25ef73f4 Cleanup and minor fixes.
zas_
parents: 1400
diff changeset
1025 editor_verbose_window_progress(ed, _("done"));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1026 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1027 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1028 {
1402
611c25ef73f4 Cleanup and minor fixes.
zas_
parents: 1400
diff changeset
1029 editor_verbose_window_progress(ed, _("stopped by user"));
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1030 }
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1031 editor_verbose_window_enable_close(ed->vd);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1032 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1033
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1034 /* free the not-handled items */
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1035 if (ed->list)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1036 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1037 ed->flags |= EDITOR_ERROR_SKIPPED;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1038 if (ed->callback) ed->callback(NULL, ed->flags, ed->list, ed->data);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1039 filelist_free(ed->list);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1040 ed->list = NULL;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1041 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1042
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1043 ed->count = 0;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1044
1400
67573155210c Add helper macros EDITOR_ERRORS() and EDITOR_ERRORS_BUT_SKIPPED() to clean up the code a bit. Minor tidy up.
zas_
parents: 1399
diff changeset
1045 flags = EDITOR_ERRORS(ed->flags);
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1046
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1047 if (!ed->vd) editor_data_free(ed);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1048
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1049 return flags;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1050 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1051
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1052 void editor_resume(gpointer ed)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1053 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1054 editor_command_next_start(ed);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1055 }
443
e7361d06d83a editor_command_one(): tidy up.
zas_
parents: 442
diff changeset
1056
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1057 void editor_skip(gpointer ed)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1058 {
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
1059 editor_command_done(ed);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1060 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1061
1405
03384485676d Introduce EditorFlags type, cleanup.
zas_
parents: 1402
diff changeset
1062 static EditorFlags editor_command_start(const EditorDescription *editor, const gchar *text, GList *list, EditorCallback cb, gpointer data)
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1063 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1064 EditorData *ed;
1405
03384485676d Introduce EditorFlags type, cleanup.
zas_
parents: 1402
diff changeset
1065 EditorFlags flags = editor->flags;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
1066
1400
67573155210c Add helper macros EDITOR_ERRORS() and EDITOR_ERRORS_BUT_SKIPPED() to clean up the code a bit. Minor tidy up.
zas_
parents: 1399
diff changeset
1067 if (EDITOR_ERRORS(flags)) return EDITOR_ERRORS(flags);
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1068
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1069 ed = g_new0(EditorData, 1);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1070 ed->list = filelist_copy(list);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1071 ed->flags = flags;
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1072 ed->editor = editor;
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1073 ed->total = (flags & EDITOR_SINGLE_COMMAND) ? 1 : g_list_length(list);
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1074 ed->callback = cb;
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1075 ed->data = data;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
1076
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1077 if ((flags & EDITOR_VERBOSE_MULTI) && list && list->next)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1078 flags |= EDITOR_VERBOSE;
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
1079
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1080 if (flags & EDITOR_VERBOSE)
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1081 editor_verbose_window(ed, text);
442
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
1082
4b2d7f9af171 Big whitespaces cleanup:
zas_
parents: 440
diff changeset
1083 editor_command_next_start(ed);
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1084 /* errors from editor_command_next_start will be handled via callback */
1400
67573155210c Add helper macros EDITOR_ERRORS() and EDITOR_ERRORS_BUT_SKIPPED() to clean up the code a bit. Minor tidy up.
zas_
parents: 1399
diff changeset
1085 return EDITOR_ERRORS(flags);
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1086 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1087
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1088 gboolean is_valid_editor_command(const gchar *key)
444
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
1089 {
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1090 if (!key) return FALSE;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1091 return g_hash_table_lookup(editors, key) != NULL;
444
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
1092 }
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
1093
1405
03384485676d Introduce EditorFlags type, cleanup.
zas_
parents: 1402
diff changeset
1094 EditorFlags start_editor_from_filelist_full(const gchar *key, GList *list, EditorCallback cb, gpointer data)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1095 {
1405
03384485676d Introduce EditorFlags type, cleanup.
zas_
parents: 1402
diff changeset
1096 EditorFlags error;
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1097 EditorDescription *editor;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1098 if (!key) return FALSE;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1099
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1100 editor = g_hash_table_lookup(editors, key);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1101
444
452b7ffeb7ad Minor cleanup and code redundancy reduction.
zas_
parents: 443
diff changeset
1102 if (!list) return FALSE;
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1103 if (!editor) return FALSE;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1104
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1105 error = editor_command_start(editor, editor->name, list, cb, data);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1106
1400
67573155210c Add helper macros EDITOR_ERRORS() and EDITOR_ERRORS_BUT_SKIPPED() to clean up the code a bit. Minor tidy up.
zas_
parents: 1399
diff changeset
1107 if (EDITOR_ERRORS(error))
669
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
1108 {
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1109 gchar *text = g_strdup_printf(_("%s\n\"%s\""), editor_get_error_str(error), editor->file);
669
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
1110
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
1111 file_util_warning_dialog(_("Invalid editor command"), text, GTK_STOCK_DIALOG_ERROR, NULL);
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
1112 g_free(text);
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
1113 }
dd5d7fe9458f Improve editors a bit:
zas_
parents: 586
diff changeset
1114
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1115 return error;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1116 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1117
1405
03384485676d Introduce EditorFlags type, cleanup.
zas_
parents: 1402
diff changeset
1118 EditorFlags start_editor_from_filelist(const gchar *key, GList *list)
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1119 {
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1120 return start_editor_from_filelist_full(key, list, NULL, NULL);
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1121 }
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1122
1405
03384485676d Introduce EditorFlags type, cleanup.
zas_
parents: 1402
diff changeset
1123 EditorFlags start_editor_from_file_full(const gchar *key, FileData *fd, EditorCallback cb, gpointer data)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1124 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1125 GList *list;
1405
03384485676d Introduce EditorFlags type, cleanup.
zas_
parents: 1402
diff changeset
1126 EditorFlags error;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1127
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
1128 if (!fd) return FALSE;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1129
138
71e1ebee420e replaced gchar* path with FileData *fd
nadvornik
parents: 136
diff changeset
1130 list = g_list_append(NULL, fd);
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1131 error = start_editor_from_filelist_full(key, list, cb, data);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1132 g_list_free(list);
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1133 return error;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents:
diff changeset
1134 }
60
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
1135
1405
03384485676d Introduce EditorFlags type, cleanup.
zas_
parents: 1402
diff changeset
1136 EditorFlags start_editor_from_file(const gchar *key, FileData *fd)
136
18c2a29e681c more external commands
nadvornik
parents: 135
diff changeset
1137 {
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1138 return start_editor_from_file_full(key, fd, NULL, NULL);
136
18c2a29e681c more external commands
nadvornik
parents: 135
diff changeset
1139 }
18c2a29e681c more external commands
nadvornik
parents: 135
diff changeset
1140
1405
03384485676d Introduce EditorFlags type, cleanup.
zas_
parents: 1402
diff changeset
1141 gboolean editor_window_flag_set(const gchar *key)
60
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
1142 {
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1143 EditorDescription *editor;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1144 if (!key) return TRUE;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1145
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1146 editor = g_hash_table_lookup(editors, key);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1147 if (!editor) return TRUE;
60
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
1148
1405
03384485676d Introduce EditorFlags type, cleanup.
zas_
parents: 1402
diff changeset
1149 return !!(editor->flags & EDITOR_KEEP_FS);
60
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
1150 }
9c0c402b0ef3 Mon Jun 13 17:31:46 2005 John Ellis <johne@verizon.net>
gqview
parents: 9
diff changeset
1151
1405
03384485676d Introduce EditorFlags type, cleanup.
zas_
parents: 1402
diff changeset
1152 gboolean editor_is_filter(const gchar *key)
753
477f48ba28d8 rewritten utilops.h:
nadvornik
parents: 737
diff changeset
1153 {
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1154 EditorDescription *editor;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1155 if (!key) return TRUE;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1156
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1157 editor = g_hash_table_lookup(editors, key);
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1158 if (!editor) return TRUE;
753
477f48ba28d8 rewritten utilops.h:
nadvornik
parents: 737
diff changeset
1159
1405
03384485676d Introduce EditorFlags type, cleanup.
zas_
parents: 1402
diff changeset
1160 return !!(editor->flags & EDITOR_DEST);
753
477f48ba28d8 rewritten utilops.h:
nadvornik
parents: 737
diff changeset
1161 }
477f48ba28d8 rewritten utilops.h:
nadvornik
parents: 737
diff changeset
1162
1405
03384485676d Introduce EditorFlags type, cleanup.
zas_
parents: 1402
diff changeset
1163 const gchar *editor_get_error_str(EditorFlags flags)
140
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1164 {
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1165 if (flags & EDITOR_ERROR_EMPTY) return _("Editor template is empty.");
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1166 if (flags & EDITOR_ERROR_SYNTAX) return _("Editor template has incorrect syntax.");
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1167 if (flags & EDITOR_ERROR_INCOMPATIBLE) return _("Editor template uses incompatible macros.");
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1168 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
1169 if (flags & EDITOR_ERROR_CANT_EXEC) return _("Can't execute external editor.");
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1170 if (flags & EDITOR_ERROR_STATUS) return _("External editor returned error status.");
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1171 if (flags & EDITOR_ERROR_SKIPPED) return _("File was skipped.");
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1172 return _("Unknown error.");
e57b0207e180 editors.c was almost completely rewritten:
nadvornik
parents: 138
diff changeset
1173 }
731
fa8f7d7396cf Introduce an helper function that returns the name of an editor.
zas_
parents: 730
diff changeset
1174
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1175 const gchar *editor_get_name(const gchar *key)
731
fa8f7d7396cf Introduce an helper function that returns the name of an editor.
zas_
parents: 730
diff changeset
1176 {
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1177 EditorDescription *editor = g_hash_table_lookup(editors, key);
731
fa8f7d7396cf Introduce an helper function that returns the name of an editor.
zas_
parents: 730
diff changeset
1178
1272
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1179 if (!editor) return NULL;
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1180
e0e12512cde2 read external editors from .desktop files
nadvornik
parents: 1229
diff changeset
1181 return editor->name;
731
fa8f7d7396cf Introduce an helper function that returns the name of an editor.
zas_
parents: 730
diff changeset
1182 }
1055
1646720364cf Adding a vim modeline to all files - patch by Klaus Ethgen
nadvornik
parents: 1022
diff changeset
1183 /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */