diff src/rcfile.c @ 9:d907d608745f

Sync to GQview 1.5.9 release. ######## DO NOT BASE ENHANCEMENTS OR TRANSLATION UPDATES ON CODE IN THIS CVS! This CVS is never up to date with current development and is provided solely for reference purposes, please use the latest official release package when making any changes or translation updates. ########

--- a/src/rcfile.c	Sat Feb 26 00:07:07 2005 +0000
+++ b/src/rcfile.c	Sat Feb 26 00:13:35 2005 +0000
@@ -1,20 +1,22 @@
 /*
- * GQview image viewer
- * (C)2000 John Ellis
+ * GQview
+ * (C) 2004 John Ellis
  *
  * Author: John Ellis
  *
+ * This software is released under the GNU General Public License (GNU GPL).
+ * Please read the included file COPYING for more information.
+ * This software comes with no warranty of any kind, use at your own risk!
  */
 
+
 #include "gqview.h"
+#include "rcfile.h"
 
-static gchar *quoted_value(gchar *text);
-static void write_char_option(FILE *f, gchar *label, gchar *text);
-static gchar *read_char_option(FILE *f, gchar *option, gchar *label, gchar *value, gchar *text);
-static void write_int_option(FILE *f, gchar *label, gint n);
-static gint read_int_option(FILE *f, gchar *option, gchar *label, gchar *value, gint n);
-static void write_bool_option(FILE *f, gchar *label, gint n);
-static gint read_bool_option(FILE *f, gchar *option, gchar *label, gchar *value, gint n);
+#include "filelist.h"
+#include "slideshow.h"
+#include "ui_fileops.h"
+
 
 /*
  *-----------------------------------------------------------------------------
@@ -22,9 +24,9 @@
  *-----------------------------------------------------------------------------
  */ 
 
-static gchar *quoted_value(gchar *text)
+gchar *quoted_value(const gchar *text)
 {
-	gchar *ptr;
+	const gchar *ptr;
 	gint c = 0;
 	gint l = strlen(text);
 
@@ -33,15 +35,16 @@
 	while (c < l && text[c] !='"') c++;
 	if (text[c] == '"')
 		{
+		gint e;
 		c++;
 		ptr = text + c;
-		while (c < l && text[c] !='"') c++;
-		if (text[c] == '"')
+		e = c;
+		while (e < l && text[e] !='"') e++;
+		if (text[e] == '"')
 			{
-			text[c] = '\0';
-			if (strlen(ptr) > 0)
+			if (e - c > 0)
 				{
-				return g_strdup(ptr);
+				return g_strndup(ptr, e - c);
 				}
 			}
 		}
@@ -53,8 +56,7 @@
 		while (c < l && text[c] !=' ' && text[c] !=8 && text[c] != '\n') c++;
 		if (c != 0)
 			{
-			text[c] = '\0';
-			return g_strdup(text);
+			return g_strndup(text, c);
 			}
 		}
 
@@ -71,7 +73,7 @@
 
 static gchar *read_char_option(FILE *f, gchar *option, gchar *label, gchar *value, gchar *text)
 {
-	if (!strcasecmp(option, label))
+	if (strcasecmp(option, label) == 0)
 		{
 		g_free(text);
 		text = quoted_value(value);
@@ -86,9 +88,55 @@
 
 static gint read_int_option(FILE *f, gchar *option, gchar *label, gchar *value, gint n)
 {
-	if (!strcasecmp(option, label))
+	if (strcasecmp(option, label) == 0)
+		{
+		n = strtol(value, NULL, 10);
+		}
+	return n;
+}
+
+static void write_int_unit_option(FILE *f, gchar *label, gint n, gint subunits)
+{
+	gint l, r;
+
+	if (subunits > 0)
+		{
+		l = n / subunits;
+		r = n % subunits;
+		}
+	else
 		{
-		n = strtol(value,NULL,0);
+		l = n;
+		r = 0;
+		}
+
+	fprintf(f,"%s: %d.%d\n\n", label, l, r);
+}
+
+static gint read_int_unit_option(FILE *f, gchar *option, gchar *label, gchar *value, gint n, gint subunits)
+{
+	if (strcasecmp(option, label) == 0)
+		{
+		gint l, r;
+		gchar *ptr;
+
+		ptr = value;
+		while (*ptr != '\0' && *ptr != '.') ptr++;
+		if (*ptr == '.')
+			{
+			*ptr = '\0';
+			l = strtol(value, NULL, 10);
+			*ptr = '.';
+			ptr++;
+			r = strtol(ptr, NULL, 10);
+			}
+		else
+			{
+			l = strtol(value, NULL, 10);
+			r = 0;
+			}
+
+		n = l * subunits + r;
 		}
 	return n;
 }
@@ -102,9 +150,9 @@
 
 static gint read_bool_option(FILE *f, gchar *option, gchar *label, gchar *value, gint n)
 {
-	if (!strcasecmp(option, label))
+	if (strcasecmp(option, label) == 0)
 		{
-		if (!strcasecmp(value, "true"))
+		if (strcasecmp(value, "true") == 0)
 			n = TRUE;
 		else
 			n = FALSE;
@@ -118,32 +166,50 @@
  *-----------------------------------------------------------------------------
  */ 
 
-void save_options()
+void save_options(void)
 {
 	FILE *f;
 	gchar *rc_path;
+	gchar *rc_pathl;
 	gint i;
 
-	rc_path = g_strconcat(homedir(), "/", RC_FILE_NAME, NULL);
+	rc_path = g_strconcat(homedir(), "/", GQVIEW_RC_DIR, "/", RC_FILE_NAME, NULL);
 
-	f = fopen(rc_path,"w");
+	rc_pathl = path_from_utf8(rc_path);
+	f = fopen(rc_pathl, "w");
+	g_free(rc_pathl);
 	if (!f)
 		{
-		printf(_("error saving config file: %s\n"), rc_path);
+		gchar *buf;
+
+		buf = g_strdup_printf(_("error saving config file: %s\n"), rc_path);
+		print_term(buf);
+		g_free(buf);
+
 		g_free(rc_path);
 		return;
 		}
 
 	fprintf(f,"######################################################################\n");
 	fprintf(f,"#                         GQview config file         version %7s #\n", VERSION);
-	fprintf(f,"#                                                                    #\n");
-	fprintf(f,"#  Everything in this file can be changed in the option dialogs.     #\n");
-	fprintf(f,"#      (so there should be no need to edit this file by hand)        #\n");
-	fprintf(f,"#                                                                    #\n");
 	fprintf(f,"######################################################################\n");
 	fprintf(f,"\n");
 	fprintf(f,"##### General Options #####\n\n");
 
+	write_int_option(f, "layout_style", layout_style);
+	write_char_option(f, "layout_order", layout_order);
+	fprintf(f,"\n");
+	write_bool_option(f, "layout_view_as_icons", layout_view_icons);
+	write_bool_option(f, "layout_view_as_tree", layout_view_tree);
+	write_bool_option(f, "show_icon_names", show_icon_names);
+	fprintf(f,"\n");
+
+	write_bool_option(f, "tree_descend_folders", tree_descend_subdirs);
+	write_bool_option(f, "lazy_image_sync", lazy_image_sync);
+	write_bool_option(f, "update_on_time_change", update_on_time_change);
+	write_bool_option(f, "exif_auto_rotate", exif_rotate_enable);
+	fprintf(f,"\n");
+
 	write_bool_option(f, "enable_startup_path", startup_path_enable);
 	write_char_option(f, "startup_path", startup_path);
 	fprintf(f,"\n");
@@ -152,6 +218,10 @@
 	if (zoom_mode == ZOOM_RESET_ORIGINAL) fprintf(f,"original\n");
 	if (zoom_mode == ZOOM_RESET_FIT_WINDOW) fprintf(f,"fit\n");
 	if (zoom_mode == ZOOM_RESET_NONE) fprintf(f,"dont_change\n");
+
+	write_bool_option(f, "two_pass_scaling", two_pass_zoom);
+
+	write_bool_option(f, "zoom_to_fit_allow_expand", zoom_to_fit_expands);
 	fprintf(f,"\n");
 
 	write_bool_option(f, "fit_window_to_image", fit_window);
@@ -160,26 +230,67 @@
 	fprintf(f,"\n");
 
 	write_bool_option(f, "progressive_keyboard_scrolling", progressive_key_scrolling);
+	write_int_option(f, "scroll_reset_method", scroll_reset_method);
 	fprintf(f,"\n");
 
 	write_bool_option(f, "enable_thumbnails", thumbnails_enabled);
 	write_int_option(f, "thumbnail_width", thumb_max_width);
 	write_int_option(f, "thumbnail_height", thumb_max_height);
 	write_bool_option(f, "cache_thumbnails", enable_thumb_caching);
+	write_bool_option(f, "cache_thumbnails_into_dirs", enable_thumb_dirs);
 	write_bool_option(f, "use_xvpics_thumbnails", use_xvpics_thumbnails);
+	write_bool_option(f, "thumbnail_spec_standard", thumbnail_spec_standard);
+	fprintf(f,"\n");
+
+	write_bool_option(f, "local_metadata", enable_metadata_dirs);
+	fprintf(f,"\n");
+
+	write_int_option(f, "sort_method", (gint)file_sort_method);
+	write_bool_option(f, "sort_ascending", file_sort_ascending);
+	write_bool_option(f, "sort_case_sensitive", file_sort_case_sensitive);
 	fprintf(f,"\n");
 
 	write_bool_option(f, "confirm_delete", confirm_delete);
+	write_bool_option(f, "enable_delete_key", enable_delete_key);
+	write_bool_option(f, "safe_delete", safe_delete_enable);
+	write_char_option(f, "safe_delete_path", safe_delete_path);
+	write_int_option(f, "safe_delete_size", safe_delete_size);
 	fprintf(f,"\n");
 	write_bool_option(f, "tools_float", tools_float);
 	write_bool_option(f, "tools_hidden", tools_hidden);
 	write_bool_option(f, "restore_tool_state", restore_tool);
 
+	write_bool_option(f, "toolbar_hidden", toolbar_hidden);
+
 	write_bool_option(f, "mouse_wheel_scrolls", mousewheel_scrolls);
+	write_bool_option(f, "in_place_rename", enable_in_place_rename);
+
+	write_int_option(f, "open_recent_max", recent_list_max);
+
+	write_int_option(f, "image_cache_size_max", tile_cache_max);
+
+	write_int_option(f, "thumbnail_quality", thumbnail_quality);
+	write_int_option(f, "zoom_quality", zoom_quality);
+	write_int_option(f, "dither_quality", dither_quality);
+
+	write_int_option(f, "zoom_increment", zoom_increment);
+
+	write_bool_option(f, "enable_read_ahead", enable_read_ahead);
+
+	write_bool_option(f, "display_dialogs_under_mouse", place_dialogs_under_mouse);
+
+	write_bool_option(f, "black_window_background", black_window_background);
+
+	write_int_option(f, "fullscreen_screen", fullscreen_screen);
+	write_bool_option(f, "fullscreen_clean_flip", fullscreen_clean_flip);
+	write_bool_option(f, "fullscreen_disable_saver", fullscreen_disable_saver);
+	write_bool_option(f, "fullscreen_above", fullscreen_above);
+
+	write_int_option(f, "custom_similarity_threshold", dupe_custom_threshold);
 
 	fprintf(f,"\n##### Slideshow Options #####\n\n");
 
-	write_int_option(f, "slideshow_delay", slideshow_delay);
+	write_int_unit_option(f, "slideshow_delay", slideshow_delay, SLIDESHOW_SUBSECOND_PRECISION);
 
 	write_bool_option(f, "slideshow_random", slideshow_random);
 	write_bool_option(f, "slideshow_repeat", slideshow_repeat);
@@ -188,32 +299,25 @@
 
 	write_bool_option(f, "show_dotfiles", show_dot_files);
 	write_bool_option(f, "disable_filtering", file_filter_disable);
-	fprintf(f,"\n");
-	write_bool_option(f, "filter_ppm", filter_include_ppm);
-	write_bool_option(f, "filter_png", filter_include_png);
-	write_bool_option(f, "filter_jpg", filter_include_jpg);
-	write_bool_option(f, "filter_tif", filter_include_tif);
-	write_bool_option(f, "filter_pgm", filter_include_pgm);
-	write_bool_option(f, "filter_xpm", filter_include_xpm);
-	write_bool_option(f, "filter_gif", filter_include_gif);
-	write_bool_option(f, "filter_pcx", filter_include_pcx);
-	write_bool_option(f, "filter_bmp", filter_include_bmp);
-	fprintf(f,"\n");
-	write_char_option(f, "custom_filter", custom_filter);
+	filter_write_list(f);
 
 	fprintf(f,"\n##### External Programs #####\n");
 	fprintf(f,"# Maximum of 8 programs (external_1 through external 8)\n");
 	fprintf(f,"# format: external_n: \"menu name\" \"command line\"\n\n");
 
-	for (i=0; i<8; i++)
+	for (i = 0; i < GQVIEW_EDITOR_SLOTS; i++)
 		{
 		fprintf(f,"external_%d: \"", i+1);
-		if (editor_name[i]) fprintf(f, editor_name[i]);
+		if (editor_name[i]) fprintf(f, "%s", editor_name[i]);
 		fprintf(f, "\" \"");
-		if (editor_command[i]) fprintf(f, editor_command[i]);
+		if (editor_command[i]) fprintf(f, "%s", editor_command[i]);
 		fprintf(f, "\"\n");
 		}
 
+	fprintf(f,"\n##### Collection Options #####\n\n");
+
+	write_bool_option(f, "rectangular_selections", collection_rectangular_selection);
+
 	fprintf(f,"\n##### Window Positions #####\n\n");
 
 	write_bool_option(f, "restore_window_positions", save_window_positions);
@@ -222,10 +326,14 @@
 	write_int_option(f, "main_window_y", main_window_y);
 	write_int_option(f, "main_window_width", main_window_w);
 	write_int_option(f, "main_window_height", main_window_h);
+	write_bool_option(f, "main_window_maximized", main_window_maximized);
 	write_int_option(f, "float_window_x", float_window_x);
 	write_int_option(f, "float_window_y", float_window_y);
 	write_int_option(f, "float_window_width", float_window_w);
 	write_int_option(f, "float_window_height", float_window_h);
+	write_int_option(f, "float_window_divider", float_window_divider);
+	write_int_option(f, "divider_position_h", window_hdivider_pos);
+	write_int_option(f, "divider_position_v", window_vdivider_pos);
 
 	fprintf(f,"######################################################################\n");
 	fprintf(f,"#                      end of GQview config file                     #\n");
@@ -242,19 +350,23 @@
  *-----------------------------------------------------------------------------
  */ 
 
-void load_options()
+void load_options(void)
 {
 	FILE *f;
 	gchar *rc_path;
+	gchar *rc_pathl;
 	gchar s_buf[1024];
 	gchar *s_buf_ptr;
 	gchar option[1024];
 	gchar value[1024];
 	gchar value_all[1024];
 	gint c,l,i;
-	rc_path = g_strconcat(homedir(), "/", RC_FILE_NAME, NULL);
+
+	rc_path = g_strconcat(homedir(), "/", GQVIEW_RC_DIR, "/", RC_FILE_NAME, NULL);
 
-	f = fopen(rc_path,"r");
+	rc_pathl = path_from_utf8(rc_path);
+	f = fopen(rc_pathl,"r");
+	g_free(rc_pathl);
 	if (!f)
 		{
 		g_free(rc_path);
@@ -271,29 +383,51 @@
 		if (c >= l) continue;
 		s_buf[c] = '\0';
 		c++;
-		while (s_buf[c] == ' ' && c < l) c++;
-		while (s_buf[c] == 8 && c < l) c++;
-		while (s_buf[c] == ' ' && c < l) c++;
+		while ((s_buf[c] == ' ' || s_buf[c] == 8) && c < l) c++;
 		s_buf_ptr = s_buf + c;
-		strcpy(value_all,s_buf_ptr);
+		strncpy(value_all, s_buf_ptr, sizeof(value_all));
 		while (s_buf[c] != 8 && s_buf[c] != ' ' && s_buf[c] != '\n' && c < l) c++;
 		s_buf[c] = '\0';
-		strcpy(option,s_buf);
-		strcpy(value,s_buf_ptr);
+		strncpy(option, s_buf, sizeof(option));
+		strncpy(value, s_buf_ptr, sizeof(value));
 
 		/* general options */
 
+		layout_style = read_int_option(f, option,
+			"layout_style", value, layout_style);
+		layout_order = read_char_option(f, option,
+			"layout_order", value, layout_order);
+		layout_view_icons = read_bool_option(f, option,
+			"layout_view_as_icons", value, layout_view_icons);
+		layout_view_tree = read_bool_option(f, option,
+			"layout_view_as_tree", value, layout_view_tree);
+		show_icon_names = read_bool_option(f, option,
+			"show_icon_names", value, show_icon_names);
+
+		tree_descend_subdirs = read_bool_option(f, option,
+			"tree_descend_folders", value, tree_descend_subdirs);
+		lazy_image_sync = read_bool_option(f, option,
+			"lazy_image_sync", value, lazy_image_sync);
+		update_on_time_change = read_bool_option(f, option,
+			"update_on_time_change", value, update_on_time_change);
+		exif_rotate_enable = read_bool_option(f, option,
+			"exif_auto_rotate", value, exif_rotate_enable);
+
 		startup_path_enable = read_bool_option(f, option,
 			"enable_startup_path", value, startup_path_enable);
 		startup_path = read_char_option(f, option,
 			"startup_path", value_all, startup_path);
 
-		if (!strcasecmp(option,"zoom_mode"))
+		if (strcasecmp(option,"zoom_mode") == 0)
                         {
-                        if (!strcasecmp(value,"original")) zoom_mode = ZOOM_RESET_ORIGINAL;
-                        if (!strcasecmp(value,"fit")) zoom_mode = ZOOM_RESET_FIT_WINDOW;
-                        if (!strcasecmp(value,"dont_change")) zoom_mode = ZOOM_RESET_NONE;
+                        if (strcasecmp(value, "original") == 0) zoom_mode = ZOOM_RESET_ORIGINAL;
+                        if (strcasecmp(value, "fit") == 0) zoom_mode = ZOOM_RESET_FIT_WINDOW;
+                        if (strcasecmp(value, "dont_change") == 0) zoom_mode = ZOOM_RESET_NONE;
                         }
+		two_pass_zoom = read_bool_option(f, option,
+			"two_pass_scaling", value, two_pass_zoom);
+		zoom_to_fit_expands = read_bool_option(f, option,
+			"zoom_to_fit_allow_expand", value, zoom_to_fit_expands);
 
 		fit_window = read_bool_option(f, option,
 			"fit_window_to_image", value, fit_window);
@@ -303,6 +437,8 @@
 			"max_window_size", value, max_window_size);
 		progressive_key_scrolling = read_bool_option(f, option,
 			"progressive_keyboard_scrolling", value, progressive_key_scrolling);
+		scroll_reset_method = read_int_option(f, option,
+			"scroll_reset_method", value, scroll_reset_method);
 
 		thumbnails_enabled = read_bool_option(f, option,
 			"enable_thumbnails", value, thumbnails_enabled);
@@ -312,11 +448,33 @@
 			"thumbnail_height", value, thumb_max_height);
 		enable_thumb_caching = read_bool_option(f, option,
 			"cache_thumbnails", value, enable_thumb_caching);
+		enable_thumb_dirs = read_bool_option(f, option,
+			"cache_thumbnails_into_dirs", value, enable_thumb_dirs);
 		use_xvpics_thumbnails = read_bool_option(f, option,
 			"use_xvpics_thumbnails", value, use_xvpics_thumbnails);
+		thumbnail_spec_standard = read_bool_option(f, option,
+			"thumbnail_spec_standard", value, thumbnail_spec_standard);
+
+		enable_metadata_dirs = read_bool_option(f, option,
+			"local_metadata", value, enable_metadata_dirs);
+
+		file_sort_method = (SortType)read_int_option(f, option,
+			"sort_method", value, (gint)file_sort_method);
+		file_sort_ascending = read_bool_option(f, option,
+			"sort_ascending", value, file_sort_ascending);
+		file_sort_case_sensitive = read_bool_option(f, option,
+			"sort_case_sensitive", value, file_sort_case_sensitive);
 
 		confirm_delete = read_bool_option(f, option,
 			"confirm_delete", value, confirm_delete);
+		enable_delete_key = read_bool_option(f, option,
+			"enable_delete_key", value, enable_delete_key);
+		safe_delete_enable = read_bool_option(f, option,
+			"safe_delete",  value, safe_delete_enable);
+		safe_delete_path = read_char_option(f, option,
+			"safe_delete_path", value, safe_delete_path);
+		safe_delete_size = read_int_option(f, option,
+			"safe_delete_size", value, safe_delete_size);
 
 		tools_float = read_bool_option(f, option,
 			"tools_float", value, tools_float);
@@ -325,14 +483,55 @@
 		restore_tool = read_bool_option(f, option,
 			"restore_tool_state", value, restore_tool);
 
+		toolbar_hidden = read_bool_option(f, option,
+			"toolbar_hidden", value, toolbar_hidden);
+
 		mousewheel_scrolls = read_bool_option(f, option,
 			"mouse_wheel_scrolls", value, mousewheel_scrolls);
+		enable_in_place_rename = read_bool_option(f, option,
+			"in_place_rename", value, enable_in_place_rename);
 
+		recent_list_max = read_int_option(f, option,
+			"open_recent_max", value, recent_list_max);
+
+		tile_cache_max = read_int_option(f, option,
+			"image_cache_size_max", value, tile_cache_max);
+
+		thumbnail_quality = CLAMP(read_int_option(f, option,
+			"thumbnail_quality", value, thumbnail_quality), GDK_INTERP_NEAREST, GDK_INTERP_HYPER);
+		zoom_quality = CLAMP(read_int_option(f, option,
+			"zoom_quality", value, zoom_quality), GDK_INTERP_NEAREST, GDK_INTERP_HYPER);
+		dither_quality = CLAMP(read_int_option(f, option,
+			"dither_quality", value, dither_quality), GDK_RGB_DITHER_NONE, GDK_RGB_DITHER_MAX);
+
+		zoom_increment = read_int_option(f, option,
+			"zoom_increment", value, zoom_increment);
+
+		enable_read_ahead = read_bool_option(f, option,
+			"enable_read_ahead", value, enable_read_ahead);
 
-		/* slideshow opitons */
+		place_dialogs_under_mouse = read_bool_option(f, option,
+			"display_dialogs_under_mouse", value, place_dialogs_under_mouse);
+
+		black_window_background = read_bool_option(f, option,
+			"black_window_background", value, black_window_background);
 
-		slideshow_delay = read_int_option(f, option,
-			"slideshow_delay", value, slideshow_delay);
+		fullscreen_screen = read_int_option(f, option,
+			"fullscreen_screen", value, fullscreen_screen);
+		fullscreen_clean_flip = read_bool_option(f, option,
+			"fullscreen_clean_flip", value, fullscreen_clean_flip);
+		fullscreen_disable_saver = read_bool_option(f, option,
+			"fullscreen_disable_saver", value, fullscreen_disable_saver);
+		fullscreen_above = read_bool_option(f, option,
+			"fullscreen_above", value, fullscreen_above);
+
+		dupe_custom_threshold = read_int_option(f, option,
+			"custom_similarity_threshold", value, dupe_custom_threshold);
+
+		/* slideshow options */
+
+		slideshow_delay = read_int_unit_option(f, option,
+			"slideshow_delay", value, slideshow_delay, SLIDESHOW_SUBSECOND_PRECISION);
 		slideshow_random = read_bool_option(f, option,
 			"slideshow_random", value, slideshow_random);
 		slideshow_repeat = read_bool_option(f, option,
@@ -345,34 +544,17 @@
 		file_filter_disable = read_bool_option(f, option,
 			"disable_filtering", value, file_filter_disable);
 
-		filter_include_ppm = read_bool_option(f, option,
-			"filter_ppm", value, filter_include_ppm);
-		filter_include_png = read_bool_option(f, option,
-			"filter_png", value, filter_include_png);
-		filter_include_jpg = read_bool_option(f, option,
-			"filter_jpg", value, filter_include_jpg);
-		filter_include_tif = read_bool_option(f, option,
-			"filter_tif", value, filter_include_tif);
-		filter_include_pgm = read_bool_option(f, option,
-			"filter_pgm", value, filter_include_pgm);
-		filter_include_xpm = read_bool_option(f, option,
-			"filter_xpm", value, filter_include_xpm);
-		filter_include_gif = read_bool_option(f, option,
-			"filter_gif", value, filter_include_gif);
-		filter_include_pcx = read_bool_option(f, option,
-			"filter_pcx", value, filter_include_pcx);
-		filter_include_bmp = read_bool_option(f, option,
-			"filter_bmp", value, filter_include_bmp);
-
-		custom_filter = read_char_option(f, option,
-			"custom_filter", value_all, custom_filter);
+		if (strcasecmp(option, "filter_ext") == 0)
+			{
+			filter_parse(value_all);
+			}
 
 		/* External Programs */
 
-		if (!strncasecmp(option,"external_",9))
+		if (strncasecmp(option, "external_", 9) == 0)
 			{
 			i = strtol(option + 9, NULL, 0);
-			if (i>0 && i<9)
+			if (i > 0 && i <= GQVIEW_EDITOR_SLOTS)
 				{
 				gchar *ptr1, *ptr2;
 				i--;
@@ -402,8 +584,9 @@
 							{
 							c++;
 							ptr2 = ptr1 + c;
-							while (c<l && value_all[c] !='"') c++;
-							if (ptr1[c] == '"' && ptr1 + c - 1 != ptr2)
+							while (value_all[c] != '\0') c++;
+							while (c > 0 && value_all[c] != '"') c--;
+							if (ptr1[c] == '"' && ptr1 + c > ptr2)
 								{
 								ptr1[c] = '\0';
 								editor_command[i] = g_strdup(ptr2);
@@ -414,6 +597,11 @@
 				}
 			}
 
+		/* colection options */
+
+		collection_rectangular_selection = read_bool_option(f, option,
+			"rectangular_selections", value, collection_rectangular_selection);
+
 		/* window positions */
 
 		save_window_positions = read_bool_option(f, option,
@@ -427,6 +615,8 @@
 			"main_window_width", value, main_window_w);
 		main_window_h = read_int_option(f, option,
 			"main_window_height", value, main_window_h);
+		main_window_maximized = read_bool_option(f, option,
+			"main_window_maximized", value, main_window_maximized);
 		float_window_x = read_int_option(f, option,
 			"float_window_x", value, float_window_x);
 		float_window_y = read_int_option(f, option,
@@ -435,6 +625,13 @@
 			"float_window_width", value, float_window_w);
 		float_window_h = read_int_option(f, option,
 			"float_window_height", value, float_window_h);
+		float_window_divider = read_int_option(f, option,
+			"float_window_divider", value, float_window_divider);
+		window_hdivider_pos = read_int_option(f, option,
+			"divider_position_h", value, window_hdivider_pos);
+		window_vdivider_pos = read_int_option(f, option,
+			"divider_position_v", value, window_vdivider_pos);
+
 		}
 
 	fclose(f);