annotate src/rcfile.c @ 372:8ce8d565c038

Add and use few new macros in rc file writing code.
author zas_
date Tue, 15 Apr 2008 20:00:27 +0000
parents 673d1eb5af73
children 61a3c8b05b24
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
1 /*
196
f6e307c7bad6 rename GQview -> Geeqie over the code
nadvornik
parents: 170
diff changeset
2 * Geeqie
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
3 * (C) 2006 John Ellis
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
4 *
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
5 * Author: John Ellis
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
6 *
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
7 * This software is released under the GNU General Public License (GNU GPL).
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
8 * Please read the included file COPYING for more information.
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
9 * This software comes with no warranty of any kind, use at your own risk!
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
10 */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
11
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
12 #include <glib/gstdio.h>
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
13 #include <errno.h>
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
14
281
9995c5fb202a gqview.h -> main.h
zas_
parents: 276
diff changeset
15 #include "main.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
16 #include "rcfile.h"
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
17
307
667e49f52168 Move secure save code to its own files: secure_save.{c,h}.
zas_
parents: 288
diff changeset
18 #include "bar_exif.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
19 #include "filelist.h"
307
667e49f52168 Move secure save code to its own files: secure_save.{c,h}.
zas_
parents: 288
diff changeset
20 #include "secure_save.h"
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
21 #include "slideshow.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
22 #include "ui_fileops.h"
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
23
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
24
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
25 /*
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
26 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
27 * line write/parse routines (private)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
28 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
29 */
217
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
30
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
31 /*
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
32 returns text without quotes or NULL for empty or broken string
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
33 any text up to first '"' is skipped
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
34 tail is set to point at the char after the second '"'
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
35 or at the ending \0
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
36
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
37 */
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
38
217
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
39 gchar *quoted_value(const gchar *text, const gchar **tail)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
40 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
41 const gchar *ptr;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
42 gint c = 0;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
43 gint l = strlen(text);
210
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
44 gchar *retval = NULL;
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
45
217
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
46 if (tail) *tail = text;
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
47
210
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
48 if (l == 0) return retval;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
49
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
50 while (c < l && text[c] !='"') c++;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
51 if (text[c] == '"')
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
52 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
53 gint e;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
54 c++;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
55 ptr = text + c;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
56 e = c;
210
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
57 while (e < l)
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
58 {
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
59 if (text[e-1] != '\\' && text[e] == '"') break;
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
60 e++;
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
61 }
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
62 if (text[e] == '"')
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
63 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
64 if (e - c > 0)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
65 {
210
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
66 gchar *substring = g_strndup(ptr, e - c);
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
67
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
68 if (substring)
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
69 {
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
70 retval = g_strcompress(substring);
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
71 g_free(substring);
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
72 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
73 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
74 }
217
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
75 if (tail) *tail = text + e + 1;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
76 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
77 else
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
78 /* for compatibility with older formats (<0.3.7)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
79 * read a line without quotes too */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
80 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
81 c = 0;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
82 while (c < l && text[c] !=' ' && text[c] !=8 && text[c] != '\n') c++;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
83 if (c != 0)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
84 {
210
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
85 retval = g_strndup(text, c);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
86 }
217
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
87 if (tail) *tail = text + c;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
88 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
89
210
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
90 return retval;
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
91 }
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
92
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
93 gchar *escquote_value(const gchar *text)
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
94 {
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
95 gchar *e;
250
22ed43d4c849 Drop a bunch of unused variables.
zas_
parents: 226
diff changeset
96
217
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
97 if (!text) return g_strdup("\"\"");
210
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
98
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
99 e = g_strescape(text, "");
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
100 if (e)
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
101 {
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
102 gchar *retval = g_strdup_printf("\"%s\"", e);
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
103 g_free(e);
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
104 return retval;
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
105 }
217
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
106 return g_strdup("\"\"");
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
107 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
108
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
109 static void write_char_option(SecureSaveInfo *ssi, gchar *label, gchar *text)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
110 {
210
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
111 gchar *escval = escquote_value(text);
3fa93ab9b119 Improve escaping and quoting of strings saved in rc files.
zas_
parents: 209
diff changeset
112
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
113 secure_fprintf(ssi, "%s: %s\n", label, escval);
217
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
114 g_free(escval);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
115 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
116
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
117 static void read_char_option(FILE *f, gchar *option, gchar *label, gchar *value, gchar **text)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
118 {
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
119 if (text && strcasecmp(option, label) == 0)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
120 {
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
121 g_free(*text);
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
122 *text = quoted_value(value, NULL);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
123 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
124 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
125
267
a9adf9e1a746 Remove dependency on GTK 2.12, reported by John Vodden and Vladimir
zas_
parents: 250
diff changeset
126 /* Since gdk_color_to_string() is only available since gtk 2.12
a9adf9e1a746 Remove dependency on GTK 2.12, reported by John Vodden and Vladimir
zas_
parents: 250
diff changeset
127 * here is an equivalent stub function. */
a9adf9e1a746 Remove dependency on GTK 2.12, reported by John Vodden and Vladimir
zas_
parents: 250
diff changeset
128 static gchar *color_to_string(GdkColor *color)
a9adf9e1a746 Remove dependency on GTK 2.12, reported by John Vodden and Vladimir
zas_
parents: 250
diff changeset
129 {
a9adf9e1a746 Remove dependency on GTK 2.12, reported by John Vodden and Vladimir
zas_
parents: 250
diff changeset
130 return g_strdup_printf("#%04X%04X%04X", color->red, color->green, color->blue);
a9adf9e1a746 Remove dependency on GTK 2.12, reported by John Vodden and Vladimir
zas_
parents: 250
diff changeset
131 }
a9adf9e1a746 Remove dependency on GTK 2.12, reported by John Vodden and Vladimir
zas_
parents: 250
diff changeset
132
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
133 static void write_color_option(SecureSaveInfo *ssi, gchar *label, GdkColor *color)
208
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
134 {
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
135 if (color)
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
136 {
267
a9adf9e1a746 Remove dependency on GTK 2.12, reported by John Vodden and Vladimir
zas_
parents: 250
diff changeset
137 gchar *colorstring = color_to_string(color);
208
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
138
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
139 write_char_option(ssi, label, colorstring);
208
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
140 g_free(colorstring);
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
141 }
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
142 else
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
143 secure_fprintf(ssi, "%s: \n", label);
208
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
144 }
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
145
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
146 static void read_color_option(FILE *f, gchar *option, gchar *label, gchar *value, GdkColor *color)
208
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
147 {
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
148 if (color && strcasecmp(option, label) == 0)
208
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
149 {
217
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
150 gchar *colorstr = quoted_value(value, NULL);
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
151 if (colorstr) gdk_color_parse(colorstr, color);
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
152 g_free(colorstr);
208
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
153 }
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
154 }
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
155
fa0e05f985c3 set user-defined color as image background - patch by Laurent MONIN
nadvornik
parents: 196
diff changeset
156
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
157 static void write_int_option(SecureSaveInfo *ssi, gchar *label, gint n)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
158 {
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
159 secure_fprintf(ssi, "%s: %d\n", label, n);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
160 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
161
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
162 static void read_int_option(FILE *f, gchar *option, gchar *label, gchar *value, gint *n)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
163 {
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
164 if (n && strcasecmp(option, label) == 0)
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
165 {
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
166 *n = strtol(value, NULL, 10);
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
167 }
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
168 }
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
169
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
170 static void read_uint_option(FILE *f, gchar *option, gchar *label, gchar *value, guint *n)
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
171 {
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
172 if (n && strcasecmp(option, label) == 0)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
173 {
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
174 *n = strtoul(value, NULL, 10);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
175 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
176 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
177
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
178
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
179
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
180 static void read_int_option_clamp(FILE *f, gchar *option, gchar *label, gchar *value, gint *n, gint min, gint max)
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
181 {
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
182 if (n && strcasecmp(option, label) == 0)
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
183 {
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
184 *n = CLAMP(strtol(value, NULL, 10), min, max);
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
185 }
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
186 }
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
187
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
188
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
189 static void write_int_unit_option(SecureSaveInfo *ssi, gchar *label, gint n, gint subunits)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
190 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
191 gint l, r;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
192
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
193 if (subunits > 0)
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
194 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
195 l = n / subunits;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
196 r = n % subunits;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
197 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
198 else
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
199 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
200 l = n;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
201 r = 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
202 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
203
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
204 secure_fprintf(ssi, "%s: %d.%d\n", label, l, r);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
205 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
206
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
207 static void read_int_unit_option(FILE *f, gchar *option, gchar *label, gchar *value, gint *n, gint subunits)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
208 {
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
209 if (n && strcasecmp(option, label) == 0)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
210 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
211 gint l, r;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
212 gchar *ptr;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
213
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
214 ptr = value;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
215 while (*ptr != '\0' && *ptr != '.') ptr++;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
216 if (*ptr == '.')
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
217 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
218 *ptr = '\0';
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
219 l = strtol(value, NULL, 10);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
220 *ptr = '.';
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
221 ptr++;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
222 r = strtol(ptr, NULL, 10);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
223 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
224 else
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
225 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
226 l = strtol(value, NULL, 10);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
227 r = 0;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
228 }
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
229
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
230 *n = l * subunits + r;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
231 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
232 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
233
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
234 static void write_bool_option(SecureSaveInfo *ssi, gchar *label, gint n)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
235 {
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
236 secure_fprintf(ssi, "%s: ", label);
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
237 if (n) secure_fprintf(ssi, "true\n"); else secure_fprintf(ssi, "false\n");
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
238 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
239
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
240 static void read_bool_option(FILE *f, gchar *option, gchar *label, gchar *value, gint *n)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
241 {
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
242 if (n && strcasecmp(option, label) == 0)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
243 {
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
244 if (strcasecmp(value, "true") == 0 || strcmp(value, "1") == 0)
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
245 *n = TRUE;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
246 else
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
247 *n = FALSE;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
248 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
249 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
250
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
251 /*
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
252 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
253 * save configuration (public)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
254 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
255 */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
256
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
257 void save_options(void)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
258 {
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
259 SecureSaveInfo *ssi;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
260 gchar *rc_path;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
261 gchar *rc_pathl;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
262 gint i;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
263
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
264 rc_path = g_strconcat(homedir(), "/", GQ_RC_DIR, "/", RC_FILE_NAME, NULL);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
265
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
266 rc_pathl = path_from_utf8(rc_path);
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
267 ssi = secure_open(rc_pathl);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
268 g_free(rc_pathl);
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
269 if (!ssi)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
270 {
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
271 gchar *buf;
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
272
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
273 buf = g_strdup_printf(_("error saving config file: %s\n"), rc_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
274 print_term(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
275 g_free(buf);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
276
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
277 g_free(rc_path);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
278 return;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
279 }
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
280
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
281 #define WRITE_BOOL(_name_) write_bool_option(ssi, #_name_, options->_name_)
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
282 #define WRITE_INT(_name_) write_int_option(ssi, #_name_, options->_name_)
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
283 #define WRITE_INT_UNIT(_name_, _unit_) write_int_unit_option(ssi, #_name_, options->_name_, _unit_)
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
284 #define WRITE_CHAR(_name_) write_char_option(ssi, #_name_, options->_name_)
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
285 #define WRITE_COLOR(_name_) write_color_option(ssi, #_name_, &options->_name_)
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
286
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
287 #define WRITE_SEPARATOR() secure_fputc(ssi, '\n')
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
288 #define WRITE_SUBTITLE(_title_) secure_fprintf(ssi, "\n\n##### "_title_" #####\n\n")
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
289
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
290 secure_fprintf(ssi, "######################################################################\n");
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
291 secure_fprintf(ssi, "# %30s config file version %7s #\n", GQ_APPNAME, VERSION);
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
292 secure_fprintf(ssi, "######################################################################\n");
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
293 WRITE_SEPARATOR();
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
294
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
295 secure_fprintf(ssi, "# Note: This file is autogenerated. Options can be changed here,\n");
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
296 secure_fprintf(ssi, "# but user comments and formatting will be lost.\n");
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
297 WRITE_SEPARATOR();
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
298
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
299 WRITE_SUBTITLE("General Options");
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
300
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
301 WRITE_BOOL(show_icon_names);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
302 WRITE_SEPARATOR();
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
303
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
304 WRITE_BOOL(tree_descend_subdirs);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
305 WRITE_BOOL(lazy_image_sync);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
306 WRITE_BOOL(update_on_time_change);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
307 WRITE_SEPARATOR();
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
308
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
309 WRITE_BOOL(startup_path_enable);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
310 WRITE_CHAR(startup_path);
335
0cb7f0ac5c20 Beautify rc file, adding sub-sections titles.
zas_
parents: 334
diff changeset
311
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
312 WRITE_BOOL(progressive_key_scrolling);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
313 WRITE_BOOL(enable_metadata_dirs);
335
0cb7f0ac5c20 Beautify rc file, adding sub-sections titles.
zas_
parents: 334
diff changeset
314
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
315 WRITE_INT(duplicates_similarity_threshold);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
316 WRITE_SEPARATOR();
335
0cb7f0ac5c20 Beautify rc file, adding sub-sections titles.
zas_
parents: 334
diff changeset
317
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
318 WRITE_BOOL(mousewheel_scrolls);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
319 WRITE_INT(open_recent_list_maxsize);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
320 WRITE_BOOL(place_dialogs_under_mouse);
341
15c6b94545a2 Move safe_delete* and in place rename options to file_ops
zas_
parents: 340
diff changeset
321
15c6b94545a2 Move safe_delete* and in place rename options to file_ops
zas_
parents: 340
diff changeset
322
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
323 WRITE_SUBTITLE("File operations Options");
341
15c6b94545a2 Move safe_delete* and in place rename options to file_ops
zas_
parents: 340
diff changeset
324
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
325 WRITE_BOOL(file_ops.enable_in_place_rename);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
326 WRITE_BOOL(file_ops.confirm_delete);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
327 WRITE_BOOL(file_ops.enable_delete_key);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
328 WRITE_BOOL(file_ops.safe_delete_enable);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
329 WRITE_CHAR(file_ops.safe_delete_path);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
330 WRITE_INT(file_ops.safe_delete_folder_maxsize);
341
15c6b94545a2 Move safe_delete* and in place rename options to file_ops
zas_
parents: 340
diff changeset
331
339
de1c2cd06fce Rename user_specified_window_background and window_background_color
zas_
parents: 338
diff changeset
332
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
333 WRITE_SUBTITLE("Layout Options");
335
0cb7f0ac5c20 Beautify rc file, adding sub-sections titles.
zas_
parents: 334
diff changeset
334
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
335 WRITE_INT(layout.style);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
336 WRITE_CHAR(layout.order);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
337 WRITE_BOOL(layout.view_as_icons);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
338 WRITE_BOOL(layout.view_as_tree);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
339 WRITE_BOOL(layout.show_thumbnails);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
340 WRITE_SEPARATOR();
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
341
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
342 WRITE_BOOL(layout.save_window_positions);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
343 WRITE_SEPARATOR();
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
344
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
345 WRITE_INT(layout.main_window.x);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
346 WRITE_INT(layout.main_window.y);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
347 WRITE_INT(layout.main_window.w);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
348 WRITE_INT(layout.main_window.h);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
349 WRITE_BOOL(layout.main_window.maximized);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
350 WRITE_INT(layout.main_window.hdivider_pos);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
351 WRITE_INT(layout.main_window.vdivider_pos);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
352 WRITE_SEPARATOR();
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
353
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
354 WRITE_INT(layout.float_window.x);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
355 WRITE_INT(layout.float_window.y);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
356 WRITE_INT(layout.float_window.w);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
357 WRITE_INT(layout.float_window.h);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
358 WRITE_INT(layout.float_window.vdivider_pos);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
359 WRITE_SEPARATOR();
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
360
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
361 WRITE_BOOL(layout.tools_float);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
362 WRITE_BOOL(layout.tools_hidden);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
363 WRITE_BOOL(layout.tools_restore_state);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
364 WRITE_SEPARATOR();
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
365
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
366 WRITE_BOOL(layout.toolbar_hidden);
335
0cb7f0ac5c20 Beautify rc file, adding sub-sections titles.
zas_
parents: 334
diff changeset
367
0cb7f0ac5c20 Beautify rc file, adding sub-sections titles.
zas_
parents: 334
diff changeset
368
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
369 WRITE_SUBTITLE("Image Options");
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
370
334
df868b947aa0 Rename image-related options.
zas_
parents: 333
diff changeset
371 secure_fprintf(ssi, "image.zoom_mode: ");
df868b947aa0 Rename image-related options.
zas_
parents: 333
diff changeset
372 if (options->image.zoom_mode == ZOOM_RESET_ORIGINAL) secure_fprintf(ssi, "original\n");
df868b947aa0 Rename image-related options.
zas_
parents: 333
diff changeset
373 if (options->image.zoom_mode == ZOOM_RESET_FIT_WINDOW) secure_fprintf(ssi, "fit\n");
df868b947aa0 Rename image-related options.
zas_
parents: 333
diff changeset
374 if (options->image.zoom_mode == ZOOM_RESET_NONE) secure_fprintf(ssi, "dont_change\n");
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
375 WRITE_BOOL(image.zoom_2pass);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
376 WRITE_BOOL(image.zoom_to_fit_allow_expand);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
377 WRITE_INT(image.zoom_quality);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
378 WRITE_INT(image.zoom_increment);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
379 WRITE_BOOL(image.fit_window_to_image);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
380 WRITE_BOOL(image.limit_window_size);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
381 WRITE_INT(image.max_window_size);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
382 WRITE_BOOL(image.limit_autofit_size);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
383 WRITE_INT(image.max_autofit_size);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
384 WRITE_INT(image.scroll_reset_method);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
385 WRITE_INT(image.tile_cache_max);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
386 WRITE_INT(image.dither_quality);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
387 WRITE_BOOL(image.enable_read_ahead);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
388 WRITE_BOOL(image.exif_rotate_enable);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
389 WRITE_BOOL(image.use_custom_border_color);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
390 WRITE_COLOR(image.border_color);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
391
335
0cb7f0ac5c20 Beautify rc file, adding sub-sections titles.
zas_
parents: 334
diff changeset
392
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
393 WRITE_SUBTITLE("Thumbnails Options");
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
394
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
395 WRITE_INT(thumbnails.max_width);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
396 WRITE_INT(thumbnails.max_height);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
397 WRITE_BOOL(thumbnails.enable_caching);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
398 WRITE_BOOL(thumbnails.cache_into_dirs);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
399 WRITE_BOOL(thumbnails.fast);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
400 WRITE_BOOL(thumbnails.use_xvpics);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
401 WRITE_BOOL(thumbnails.spec_standard);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
402 WRITE_INT(thumbnails.quality);
335
0cb7f0ac5c20 Beautify rc file, adding sub-sections titles.
zas_
parents: 334
diff changeset
403
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
404
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
405 WRITE_SUBTITLE("File sorting Options");
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
406
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
407 WRITE_INT(file_sort.method);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
408 WRITE_BOOL(file_sort.ascending);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
409 WRITE_BOOL(file_sort.case_sensitive);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
410
335
0cb7f0ac5c20 Beautify rc file, adding sub-sections titles.
zas_
parents: 334
diff changeset
411
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
412 WRITE_SUBTITLE("Fullscreen Options");
4
e149abcda4eb Syncing to 0.8.1
gqview
parents: 3
diff changeset
413
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
414 WRITE_INT(fullscreen.screen);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
415 WRITE_BOOL(fullscreen.clean_flip);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
416 WRITE_BOOL(fullscreen.disable_saver);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
417 WRITE_BOOL(fullscreen.above);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
418 WRITE_BOOL(fullscreen.show_info);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
419 WRITE_CHAR(fullscreen.info);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
420
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
421 WRITE_SUBTITLE("Slideshow Options");
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
422
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
423 WRITE_INT_UNIT(slideshow.delay, SLIDESHOW_SUBSECOND_PRECISION);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
424 WRITE_BOOL(slideshow.random);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
425 WRITE_BOOL(slideshow.repeat);
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
426
335
0cb7f0ac5c20 Beautify rc file, adding sub-sections titles.
zas_
parents: 334
diff changeset
427
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
428 WRITE_SUBTITLE("Collection Options");
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
429
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
430 WRITE_BOOL(collections.rectangular_selection);
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
431
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
432
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
433 WRITE_SUBTITLE("Filtering Options");
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
434
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
435 WRITE_BOOL(file_filter.show_hidden_files);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
436 WRITE_BOOL(file_filter.disable);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
437 WRITE_SEPARATOR();
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
438
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
439 filter_write_list(ssi);
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
440
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
441
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
442 WRITE_SUBTITLE("Sidecars Options");
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
443
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
444 sidecar_ext_write(ssi);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
445
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
446
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
447 WRITE_SUBTITLE("Color Profiles");
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
448
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
449 #ifndef HAVE_LCMS
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
450 secure_fprintf(ssi, "# NOTICE: %s was not built with support for color profiles,\n"
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
451 "# color profile options will have no effect.\n\n", GQ_APPNAME);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
452 #endif
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
453
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
454 WRITE_BOOL(color_profile.enabled);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
455 WRITE_BOOL(color_profile.use_image);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
456 WRITE_INT(color_profile.input_type);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
457 WRITE_SEPARATOR();
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
458
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
459 for (i = 0; i < COLOR_PROFILE_INPUTS; i++)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
460 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
461 gchar *buf;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
462
327
049d6b00cc14 Rename color profile options.
zas_
parents: 326
diff changeset
463 buf = g_strdup_printf("color_profile.input_file_%d", i + 1);
049d6b00cc14 Rename color profile options.
zas_
parents: 326
diff changeset
464 write_char_option(ssi, buf, options->color_profile.input_file[i]);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
465 g_free(buf);
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
466
327
049d6b00cc14 Rename color profile options.
zas_
parents: 326
diff changeset
467 buf = g_strdup_printf("color_profile.input_name_%d", i + 1);
049d6b00cc14 Rename color profile options.
zas_
parents: 326
diff changeset
468 write_char_option(ssi, buf, options->color_profile.input_name[i]);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
469 g_free(buf);
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
470 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
471
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
472 WRITE_SEPARATOR();
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
473 WRITE_INT(color_profile.screen_type);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
474 WRITE_CHAR(color_profile.screen_file);
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
475
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
476 WRITE_SUBTITLE("External Programs");
348
3514f4d49447 Add a note in the rc file about special editor slots.
zas_
parents: 347
diff changeset
477 secure_fprintf(ssi, "# Maximum of %d programs (external_1 through external_%d)\n", GQ_EDITOR_GENERIC_SLOTS, GQ_EDITOR_GENERIC_SLOTS);
3514f4d49447 Add a note in the rc file about special editor slots.
zas_
parents: 347
diff changeset
478 secure_fprintf(ssi, "# external_%d through external_%d are used for file ops\n", GQ_EDITOR_GENERIC_SLOTS + 1, GQ_EDITOR_SLOTS);
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
479 secure_fprintf(ssi, "# format: external_n: \"menu name\" \"command line\"\n\n");
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
480
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
481 for (i = 0; i < GQ_EDITOR_SLOTS; i++)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
482 {
348
3514f4d49447 Add a note in the rc file about special editor slots.
zas_
parents: 347
diff changeset
483 if (i == GQ_EDITOR_GENERIC_SLOTS) secure_fputc(ssi, '\n');
318
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 307
diff changeset
484 gchar *qname = escquote_value(options->editor_name[i]);
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 307
diff changeset
485 gchar *qcommand = escquote_value(options->editor_command[i]);
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
486 secure_fprintf(ssi, "external_%d: %s %s\n", i+1, qname, qcommand);
217
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
487 g_free(qname);
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
488 g_free(qcommand);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
489 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
490
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
491
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
492 WRITE_SUBTITLE("Exif Options");
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
493 secure_fprintf(ssi, "# Display: 0: never\n"
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
494 "# 1: if set\n"
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
495 "# 2: always\n\n");
222
77f1bcc6c161 various exif improvements based on patch by Uwe Ohse
nadvornik
parents: 218
diff changeset
496 for (i = 0; ExifUIList[i].key; i++)
77f1bcc6c161 various exif improvements based on patch by Uwe Ohse
nadvornik
parents: 218
diff changeset
497 {
349
452a4c25da22 exif_* -> exif.display.*
zas_
parents: 348
diff changeset
498 secure_fprintf(ssi, "exif.display.");
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
499 write_int_option(ssi, (gchar *)ExifUIList[i].key, ExifUIList[i].current);
222
77f1bcc6c161 various exif improvements based on patch by Uwe Ohse
nadvornik
parents: 218
diff changeset
500 }
77f1bcc6c161 various exif improvements based on patch by Uwe Ohse
nadvornik
parents: 218
diff changeset
501
372
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
502 WRITE_SEPARATOR();
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
503 WRITE_SEPARATOR();
8ce8d565c038 Add and use few new macros in rc file writing code.
zas_
parents: 356
diff changeset
504
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
505 secure_fprintf(ssi, "######################################################################\n");
288
d1f74154463e Replace occurences of Geeqie / geeqie by constants defined in main.h.
zas_
parents: 283
diff changeset
506 secure_fprintf(ssi, "# end of config file #\n");
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
507 secure_fprintf(ssi, "######################################################################\n");
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
508
276
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
509
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
510 if (secure_close(ssi))
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
511 {
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
512 gchar *buf;
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
513
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
514 buf = g_strdup_printf(_("error saving config file: %s\nerror: %s\n"), rc_path,
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
515 secsave_strerror(secsave_errno));
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
516 print_term(buf);
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
517 g_free(buf);
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
518
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
519 g_free(rc_path);
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
520 return;
4f526d436873 Implement secure rc file saving.
zas_
parents: 267
diff changeset
521 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
522
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
523 g_free(rc_path);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
524 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
525
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
526 /*
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
527 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
528 * load configuration (public)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
529 *-----------------------------------------------------------------------------
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
530 */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
531
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
532 void load_options(void)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
533 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
534 FILE *f;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
535 gchar *rc_path;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
536 gchar *rc_pathl;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
537 gchar s_buf[1024];
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
538 gchar option[1024];
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
539 gchar value[1024];
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
540 gchar value_all[1024];
350
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
541 gint i;
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
542
222
77f1bcc6c161 various exif improvements based on patch by Uwe Ohse
nadvornik
parents: 218
diff changeset
543 for (i = 0; ExifUIList[i].key; i++)
77f1bcc6c161 various exif improvements based on patch by Uwe Ohse
nadvornik
parents: 218
diff changeset
544 ExifUIList[i].current = ExifUIList[i].default_value;
77f1bcc6c161 various exif improvements based on patch by Uwe Ohse
nadvornik
parents: 218
diff changeset
545
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
546 rc_path = g_strconcat(homedir(), "/", GQ_RC_DIR, "/", RC_FILE_NAME, NULL);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
547
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
548 rc_pathl = path_from_utf8(rc_path);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
549 f = fopen(rc_pathl,"r");
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
550 g_free(rc_pathl);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
551 if (!f)
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
552 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
553 g_free(rc_path);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
554 return;
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
555 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
556
350
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
557 while (fgets(s_buf, sizeof(s_buf), f))
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
558 {
350
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
559 gchar *option_start, *value_start;
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
560 gchar *p = s_buf;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
561
350
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
562 while(g_ascii_isspace(*p)) p++;
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
563 if (!*p || *p == '\n' || *p == '#') continue;
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
564 option_start = p;
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
565 while(*p && *p != ':') p++;
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
566 if (!*p) continue;
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
567 *p = '\0';
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
568 p++;
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
569 strncpy(option, option_start, sizeof(option));
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
570 while(g_ascii_isspace(*p)) p++;
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
571 value_start = p;
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
572 strncpy(value_all, value_start, sizeof(value_all));
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
573 while(*p && !g_ascii_isspace(*p) && *p != '\n') p++;
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
574 *p = '\0';
00696edf1dd3 Partly rewrite option parser to accept whitespaces at start
zas_
parents: 349
diff changeset
575 strncpy(value, value_start, sizeof(value));
341
15c6b94545a2 Move safe_delete* and in place rename options to file_ops
zas_
parents: 340
diff changeset
576
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
577 #define READ_BOOL(_name_) read_bool_option(f, option, #_name_, value, &options->_name_)
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
578 #define READ_INT(_name_) read_int_option(f, option, #_name_, value, &options->_name_)
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
579 #define READ_UINT(_name_) read_uint_option(f, option, #_name_, value, &options->_name_)
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
580 #define READ_INT_CLAMP(_name_, _min_, _max_) read_int_option_clamp(f, option, #_name_, value, &options->_name_, _min_, _max_)
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
581 #define READ_INT_UNIT(_name_, _unit_) read_int_unit_option(f, option, #_name_, value, &options->_name_, _unit_)
353
691fcf15aca1 Fix a typo, READ_CHAR() must use value_all.
zas_
parents: 352
diff changeset
582 #define READ_CHAR(_name_) read_char_option(f, option, #_name_, value_all, &options->_name_)
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
583 #define READ_COLOR(_name_) read_color_option(f, option, #_name_, value, &options->_name_)
341
15c6b94545a2 Move safe_delete* and in place rename options to file_ops
zas_
parents: 340
diff changeset
584
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
585 /* general options */
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
586 READ_BOOL(show_icon_names);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
587 READ_BOOL(show_icon_names);
341
15c6b94545a2 Move safe_delete* and in place rename options to file_ops
zas_
parents: 340
diff changeset
588
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
589 READ_BOOL(tree_descend_subdirs);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
590 READ_BOOL(lazy_image_sync);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
591 READ_BOOL(update_on_time_change);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
592
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
593 READ_BOOL(startup_path_enable);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
594 READ_CHAR(startup_path);
341
15c6b94545a2 Move safe_delete* and in place rename options to file_ops
zas_
parents: 340
diff changeset
595
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
596 READ_INT(duplicates_similarity_threshold);
341
15c6b94545a2 Move safe_delete* and in place rename options to file_ops
zas_
parents: 340
diff changeset
597
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
598 READ_BOOL(progressive_key_scrolling);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
599
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
600 READ_BOOL(enable_metadata_dirs);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
601
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
602 READ_BOOL(mousewheel_scrolls);
341
15c6b94545a2 Move safe_delete* and in place rename options to file_ops
zas_
parents: 340
diff changeset
603
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
604 READ_INT(open_recent_list_maxsize);
341
15c6b94545a2 Move safe_delete* and in place rename options to file_ops
zas_
parents: 340
diff changeset
605
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
606 READ_BOOL(place_dialogs_under_mouse);
341
15c6b94545a2 Move safe_delete* and in place rename options to file_ops
zas_
parents: 340
diff changeset
607
15c6b94545a2 Move safe_delete* and in place rename options to file_ops
zas_
parents: 340
diff changeset
608
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
609 /* layout options */
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
610
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
611 READ_INT(layout.style);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
612 READ_CHAR(layout.order);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
613 READ_BOOL(layout.view_as_icons);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
614 READ_BOOL(layout.view_as_tree);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
615 READ_BOOL(layout.show_thumbnails);
340
77103f3f2cb1 Rename option thumbnails.enabled to layout.show_thumbnails as it makes
zas_
parents: 339
diff changeset
616
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
617 /* window positions */
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
618
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
619 READ_BOOL(layout.save_window_positions);
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
620
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
621 READ_INT(layout.main_window.x);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
622 READ_INT(layout.main_window.y);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
623 READ_INT(layout.main_window.w);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
624 READ_INT(layout.main_window.h);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
625 READ_BOOL(layout.main_window.maximized);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
626 READ_INT(layout.float_window.x);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
627 READ_INT(layout.float_window.y);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
628 READ_INT(layout.float_window.w);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
629 READ_INT(layout.float_window.h);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
630 READ_INT(layout.float_window.vdivider_pos);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
631 READ_INT(layout.main_window.hdivider_pos);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
632 READ_INT(layout.main_window.vdivider_pos);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
633 READ_BOOL(layout.tools_float);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
634 READ_BOOL(layout.tools_hidden);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
635 READ_BOOL(layout.tools_restore_state);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
636 READ_BOOL(layout.toolbar_hidden);
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
637
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
638
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
639 /* image options */
334
df868b947aa0 Rename image-related options.
zas_
parents: 333
diff changeset
640 if (strcasecmp(option, "image.zoom_mode") == 0)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
641 {
334
df868b947aa0 Rename image-related options.
zas_
parents: 333
diff changeset
642 if (strcasecmp(value, "original") == 0) options->image.zoom_mode = ZOOM_RESET_ORIGINAL;
df868b947aa0 Rename image-related options.
zas_
parents: 333
diff changeset
643 if (strcasecmp(value, "fit") == 0) options->image.zoom_mode = ZOOM_RESET_FIT_WINDOW;
df868b947aa0 Rename image-related options.
zas_
parents: 333
diff changeset
644 if (strcasecmp(value, "dont_change") == 0) options->image.zoom_mode = ZOOM_RESET_NONE;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
645 }
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
646 READ_BOOL(image.zoom_2pass);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
647 READ_BOOL(image.zoom_to_fit_allow_expand);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
648 READ_BOOL(image.fit_window_to_image);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
649 READ_BOOL(image.limit_window_size);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
650 READ_INT(image.max_window_size);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
651 READ_BOOL(image.limit_autofit_size);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
652 READ_INT(image.max_autofit_size);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
653 READ_INT(image.scroll_reset_method);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
654 READ_INT(image.tile_cache_max);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
655 READ_INT_CLAMP(image.zoom_quality, GDK_INTERP_NEAREST, GDK_INTERP_HYPER);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
656 READ_INT_CLAMP(image.dither_quality, GDK_RGB_DITHER_NONE, GDK_RGB_DITHER_MAX);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
657 READ_INT(image.zoom_increment);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
658 READ_BOOL(image.enable_read_ahead);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
659 READ_BOOL(image.exif_rotate_enable);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
660 READ_BOOL(image.use_custom_border_color);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
661 READ_COLOR(image.border_color);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
662
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
663
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
664 /* thumbnails options */
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
665 READ_INT_CLAMP(thumbnails.max_width, 16, 512);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
666 READ_INT_CLAMP(thumbnails.max_height, 16, 512);
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
667
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
668 READ_BOOL(thumbnails.enable_caching);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
669 READ_BOOL(thumbnails.cache_into_dirs);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
670 READ_BOOL(thumbnails.fast);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
671 READ_BOOL(thumbnails.use_xvpics);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
672 READ_BOOL(thumbnails.spec_standard);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
673 READ_INT_CLAMP(thumbnails.quality, GDK_INTERP_NEAREST, GDK_INTERP_HYPER);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
674
338
41c3cb73120f Rename window options (moved to layout) and re-order rc file.
zas_
parents: 337
diff changeset
675 /* file sorting options */
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
676 READ_UINT(file_sort.method);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
677 READ_BOOL(file_sort.ascending);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
678 READ_BOOL(file_sort.case_sensitive);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
679
341
15c6b94545a2 Move safe_delete* and in place rename options to file_ops
zas_
parents: 340
diff changeset
680 /* file operations options */
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
681 READ_BOOL(file_ops.enable_in_place_rename);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
682 READ_BOOL(file_ops.confirm_delete);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
683 READ_BOOL(file_ops.enable_delete_key);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
684 READ_BOOL(file_ops.safe_delete_enable);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
685 READ_CHAR(file_ops.safe_delete_path);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
686 READ_INT(file_ops.safe_delete_folder_maxsize);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
687
341
15c6b94545a2 Move safe_delete* and in place rename options to file_ops
zas_
parents: 340
diff changeset
688 /* fullscreen options */
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
689 READ_INT(fullscreen.screen);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
690 READ_BOOL(fullscreen.clean_flip);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
691 READ_BOOL(fullscreen.disable_saver);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
692 READ_BOOL(fullscreen.above);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
693 READ_BOOL(fullscreen.show_info);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
694 READ_CHAR(fullscreen.info);
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
695
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
696 /* slideshow options */
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
697
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
698 READ_INT_UNIT(slideshow.delay, SLIDESHOW_SUBSECOND_PRECISION);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
699 READ_BOOL(slideshow.random);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
700 READ_BOOL(slideshow.repeat);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
701
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
702 /* collection options */
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
703
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
704 READ_BOOL(collections.rectangular_selection);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
705
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
706 /* filtering options */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
707
356
673d1eb5af73 Rename show_dot_files to show_hidden_files.
zas_
parents: 353
diff changeset
708 READ_BOOL(file_filter.show_hidden_files);
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
709 READ_BOOL(file_filter.disable);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
710
332
3c4bad726e98 Rename file filtering options.
zas_
parents: 330
diff changeset
711 if (strcasecmp(option, "file_filter.ext") == 0)
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
712 {
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
713 filter_parse(value_all);
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
714 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
715
347
6dc0eaa0fcea sidecar_ext -> sidecar.ext
zas_
parents: 346
diff changeset
716 if (strcasecmp(option, "sidecar.ext") == 0)
145
8be2cc687304 fixed grouping sidecar files and made it configurable via config file
nadvornik
parents: 113
diff changeset
717 {
170
9a56e3d13e67 basic sidecar files configuration via preferences dialog
nadvornik
parents: 145
diff changeset
718 sidecar_ext_parse(value_all, TRUE);
145
8be2cc687304 fixed grouping sidecar files and made it configurable via config file
nadvornik
parents: 113
diff changeset
719 }
8be2cc687304 fixed grouping sidecar files and made it configurable via config file
nadvornik
parents: 113
diff changeset
720
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
721 /* Color Profiles */
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
722
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
723 READ_BOOL(color_profile.enabled);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
724 READ_BOOL(color_profile.use_image);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
725 READ_INT(color_profile.input_type);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
726
327
049d6b00cc14 Rename color profile options.
zas_
parents: 326
diff changeset
727 if (strncasecmp(option, "color_profile.input_file_", 25) == 0)
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
728 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
729 i = strtol(option + 25, NULL, 0) - 1;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
730 if (i >= 0 && i < COLOR_PROFILE_INPUTS)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
731 {
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
732 read_char_option(f, option, option, value, &options->color_profile.input_file[i]);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
733 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
734 }
327
049d6b00cc14 Rename color profile options.
zas_
parents: 326
diff changeset
735 if (strncasecmp(option, "color_profile.input_name_", 25) == 0)
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
736 {
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
737 i = strtol(option + 25, NULL, 0) - 1;
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
738 if (i >= 0 && i < COLOR_PROFILE_INPUTS)
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
739 {
351
55ee774d5bc3 Simplify read_*_option() stuff by passing pointer to option value.
zas_
parents: 350
diff changeset
740 read_char_option(f, option, option, value, &options->color_profile.input_name[i]);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
741 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
742 }
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
743
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
744 READ_INT(color_profile.screen_type);
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
745 READ_CHAR(color_profile.screen_file);
113
55166d93498d Fri Nov 24 21:37:01 2006 John Ellis <johne@verizon.net>
gqview
parents: 41
diff changeset
746
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
747 /* External Programs */
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
748
9
d907d608745f Sync to GQview 1.5.9 release.
gqview
parents: 4
diff changeset
749 if (strncasecmp(option, "external_", 9) == 0)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
750 {
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
751 i = strtol(option + 9, NULL, 0);
283
e213fb025621 GQVIEW_* -> GQ_*
zas_
parents: 281
diff changeset
752 if (i > 0 && i <= GQ_EDITOR_SLOTS)
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
753 {
217
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
754 const gchar *ptr;
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
755 i--;
318
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 307
diff changeset
756 g_free(options->editor_name[i]);
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 307
diff changeset
757 g_free(options->editor_command[i]);
217
5bdab7ed4bcd use quoted_value everywhere
nadvornik
parents: 210
diff changeset
758
318
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 307
diff changeset
759 options->editor_name[i] = quoted_value(value_all, &ptr);
b16b9b8979e5 Add a new struct ConfOptions to handle options.
zas_
parents: 307
diff changeset
760 options->editor_command[i] = quoted_value(ptr, NULL);
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
761 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
762 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
763
352
7e7c9fa8fdeb Use convenient macros to read options, it will ensure options
zas_
parents: 351
diff changeset
764 /* Exif */
349
452a4c25da22 exif_* -> exif.display.*
zas_
parents: 348
diff changeset
765 if (0 == strncasecmp(option, "exif.display.", 13))
222
77f1bcc6c161 various exif improvements based on patch by Uwe Ohse
nadvornik
parents: 218
diff changeset
766 {
77f1bcc6c161 various exif improvements based on patch by Uwe Ohse
nadvornik
parents: 218
diff changeset
767 for (i = 0; ExifUIList[i].key; i++)
349
452a4c25da22 exif_* -> exif.display.*
zas_
parents: 348
diff changeset
768 if (0 == strcasecmp(option + 13, ExifUIList[i].key))
222
77f1bcc6c161 various exif improvements based on patch by Uwe Ohse
nadvornik
parents: 218
diff changeset
769 ExifUIList[i].current = strtol(value, NULL, 10);
77f1bcc6c161 various exif improvements based on patch by Uwe Ohse
nadvornik
parents: 218
diff changeset
770 }
1
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
771 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
772
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
773 fclose(f);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
774 g_free(rc_path);
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
775 }
b3e0e515fabf Initial revision
gqview
parents:
diff changeset
776