geeqie: src/editors.c comparison

comparison src/editors.c @ 669:dd5d7fe9458f

Improve editors a bit: - allow whitespaces before and after %v, %V, %w - allow % escaping using %% (mandatory to use shell commands than contain % characters) - display a dialog on execution if a syntax error is detected (only for generic editors) - update README editors section

author	zas_
date	Fri, 16 May 2008 08:37:07 +0000
parents	905688aa2317
children	a484500de88d

comparison

equal deleted inserted replaced

-:a074514d418e
+:dd5d7fe9458f
 #include "main.h"
 #include "editors.h"
+#include "debug.h"
+#include "filedata.h"
+#include "filefilter.h"
 #include "utilops.h"
 #include "ui_fileops.h"
 #include "ui_spinner.h"
 #include "ui_utildlg.h"
-#include "filedata.h"
-#include "filefilter.h"
 #include <errno.h>
 #define EDITOR_WINDOW_WIDTH 500
 	if (!template || template[0] == '\0')
 		{
 		flags |= EDITOR_ERROR_EMPTY;
 		goto err;
 		}
+	/* skip leading whitespaces if any */
+	while (g_ascii_isspace(*p)) p++;
 	/* global flags */
 	while (*p == '%')
 		{
 		switch (*++p)
 				break;
 			case 'V':
 				flags |= EDITOR_VERBOSE_MULTI;
 				p++;
 				break;
-			}
+			default:
-		}
+				flags |= EDITOR_ERROR_SYNTAX;
+				goto err;
+			}
+		}
+	/* skip whitespaces if any */
+	while (g_ascii_isspace(*p)) p++;
 	/* command */
 	while (*p)
 		{
 			switch (*p)
 				{
 				case 'd':
 					flags |= EDITOR_DEST;
+					/* fall through */
 				case 'p':
 					flags |= EDITOR_FOR_EACH;
 					if (flags & EDITOR_SINGLE_COMMAND)
 						{
 						flags |= EDITOR_ERROR_INCOMPATIBLE;
 						if (!list || !list->data)
 							{
 							flags |= EDITOR_ERROR_NO_FILE;
 							goto err;
 							}
-						pathl = editor_command_path_parse((FileData *)list->data, (*p == 'd') ? PATH_DEST : PATH_FILE, extensions);
+						pathl = editor_command_path_parse((FileData *)list->data,
+										  (flags & EDITOR_DEST) ? PATH_DEST : PATH_FILE,
+										  extensions);
 						if (!pathl)
 							{
 							flags |= EDITOR_ERROR_NO_FILE;
 							goto err;
 							}
 							flags |= EDITOR_ERROR_NO_FILE;
 							goto err;
 							}
 						}
 					break;
+				case '%':
+					/* %% = % escaping */
+					if (output) result = g_string_append_c(result, *p);
+					break;
 				default:
 					flags |= EDITOR_ERROR_SYNTAX;
 					goto err;
 				}
 			if (extensions) g_free(extensions);
 	if (!is_valid_editor_command(n)) return FALSE;
 	command = g_locale_from_utf8(options->editor_command[n], -1, NULL, NULL, NULL);
 	error = editor_command_start(command, options->editor_name[n], list, cb, data);
 	g_free(command);
+	if (n < GQ_EDITOR_GENERIC_SLOTS && (error & EDITOR_ERROR_SYNTAX))
+		{
+		gchar *text = g_strdup_printf(_("Syntax error in the editor template \"%s\":\n%s"),
+					      options->editor_name[n], options->editor_command[n]);
+		file_util_warning_dialog(_("Invalid editor command"), text, GTK_STOCK_DIALOG_ERROR, NULL);
+		g_free(text);
+		}
 	return error;
 }
 gint start_editor_from_filelist(gint n, GList *list)
 {

Mercurial > geeqie

comparison src/editors.c @ 669:dd5d7fe9458f