Mercurial > geeqie.yaz

comparison src/rcfile.c @ 1325:b93b39fb30c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
correctly save and restore overlay string
author nadvornik
date Wed, 25 Feb 2009 21:09:17 +0000
parents 50b325a2386e
children 2b78c7198fbf
comparison
equal deleted inserted replaced
1324:e4f9e3567f0a 1325:b93b39fb30c9
45 g_string_append_printf(str, "%*s", indent * 4, ""); 45 g_string_append_printf(str, "%*s", indent * 4, "");
46 } 46 }
47 47
48 void write_char_option(GString *str, gint indent, const gchar *label, const gchar *text) 48 void write_char_option(GString *str, gint indent, const gchar *label, const gchar *text)
49 { 49 {
50 gchar *escval = g_markup_escape_text(text ? text : "", -1); 50 /* this is needed for overlay string, because g_markup_escape_text does not handle \n and such,
51 ideas for improvement are welcome
52 */
53 static const unsigned char no_quote_utf[] = {
54 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b,
55 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
56 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2, 0xa3,
57 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
58 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb,
59 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
60 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3,
61 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
62 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb,
63 0xec, 0xed, 0xee, 0xef, 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
64 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
65 '"', 0 /* '"' is handled in g_markup_escape_text */
66 };
67
68 gchar *escval1 = g_strescape(text ? text : "", no_quote_utf);
69 gchar *escval2 = g_markup_escape_text(escval1, -1);
51 write_indent(str, indent); 70 write_indent(str, indent);
52 g_string_append_printf(str, "%s = \"%s\"\n", label, escval); 71 g_string_append_printf(str, "%s = \"%s\"\n", label, escval2);
53 g_free(escval); 72 g_free(escval2);
73 g_free(escval1);
54 } 74 }
55 75
56 gboolean read_char_option(const gchar *option, const gchar *label, const gchar *value, gchar **text) 76 gboolean read_char_option(const gchar *option, const gchar *label, const gchar *value, gchar **text)
57 { 77 {
58 if (g_ascii_strcasecmp(option, label) != 0) return FALSE; 78 if (g_ascii_strcasecmp(option, label) != 0) return FALSE;
59 if (!text) return FALSE; 79 if (!text) return FALSE;
60 80
61 g_free(*text); 81 g_free(*text);
62 *text = g_strdup(value); 82 *text = g_strcompress(value);
63 return TRUE; 83 return TRUE;
64 } 84 }
65 85
66 /* Since gdk_color_to_string() is only available since gtk 2.12 86 /* Since gdk_color_to_string() is only available since gtk 2.12
67 * here is an equivalent stub function. */ 87 * here is an equivalent stub function. */