#include <string.h>
#include <stdlib.h>
+#include <glib.h>
+#include <glib/gstdio.h>
#define TEST_BOOLEAN(str) (! ((str)[0] == '\0' || (str)[0] == '0' || (str)[0] == 'n' || (str)[0] == 'N' || (str)[0] == 'f' || (str)[0] == 'F') )
#define VIK_MAGIC "#VIK"
for ( i = 0; i < params_count; i++ )
{
data = get_param(l,i);
- fprintf ( f, "%s=", params[i].name );
- switch ( params[i].type )
- {
- case VIK_LAYER_PARAM_DOUBLE: {
-// char buf[15]; /* locale independent */
-// fprintf ( f, "%s\n", (char *) g_dtostr (data.d, buf, sizeof (buf)) ); break;
- fprintf ( f, "%f\n", data.d );
- break;
- }
- case VIK_LAYER_PARAM_UINT: fprintf ( f, "%d\n", data.u ); break;
- case VIK_LAYER_PARAM_INT: fprintf ( f, "%d\n", data.i ); break;
- case VIK_LAYER_PARAM_BOOLEAN: fprintf ( f, "%c\n", data.b ? 't' : 'f' ); break;
- case VIK_LAYER_PARAM_STRING: fprintf ( f, "%s\n", data.s ); break;
- case VIK_LAYER_PARAM_COLOR: fprintf ( f, "#%.2x%.2x%.2x\n", (int)(data.c.red/256),(int)(data.c.green/256),(int)(data.c.blue/256)); break;
+
+ /* string lists are handled differently. We get a GList (that shouldn't
+ * be freed) back for get_param and if it is null we shouldn't write
+ * anything at all (otherwise we'd read in a list with an empty string,
+ * not an empty string list.
+ */
+ if ( params[i].type == VIK_LAYER_PARAM_STRING_LIST ) {
+ if ( data.sl ) {
+ GList *iter = (GList *)data.sl;
+ while ( iter ) {
+ fprintf ( f, "%s=", params[i].name );
+ fprintf ( f, "%s\n", (gchar *)(iter->data) );
+ iter = iter->next;
+ }
+ }
+ } else {
+ fprintf ( f, "%s=", params[i].name );
+ switch ( params[i].type )
+ {
+ case VIK_LAYER_PARAM_DOUBLE: {
+ // char buf[15]; /* locale independent */
+ // fprintf ( f, "%s\n", (char *) g_dtostr (data.d, buf, sizeof (buf)) ); break;
+ fprintf ( f, "%f\n", data.d );
+ break;
+ }
+ case VIK_LAYER_PARAM_UINT: fprintf ( f, "%d\n", data.u ); break;
+ case VIK_LAYER_PARAM_INT: fprintf ( f, "%d\n", data.i ); break;
+ case VIK_LAYER_PARAM_BOOLEAN: fprintf ( f, "%c\n", data.b ? 't' : 'f' ); break;
+ case VIK_LAYER_PARAM_STRING: fprintf ( f, "%s\n", data.s ); break;
+ case VIK_LAYER_PARAM_COLOR: fprintf ( f, "#%.2x%.2x%.2x\n", (int)(data.c.red/256),(int)(data.c.green/256),(int)(data.c.blue/256)); break;
+ }
}
}
}
*/
}
+static void string_list_delete ( gpointer key, gpointer l, gpointer user_data )
+{
+ GList *iter = (GList *) iter;
+ while ( iter ) {
+ g_free ( iter->data );
+ iter = iter->next;
+ }
+ g_list_free ( (GList *) iter );
+}
+
+static void string_list_set_param (gint i, GList *list, gpointer *layer_and_vp)
+{
+ VikLayerParamData x;
+ x.sl = list;
+ vik_layer_set_param ( VIK_LAYER(layer_and_vp[0]), i, x, layer_and_vp[1] );
+}
+
static void file_read ( VikAggregateLayer *top, FILE *f, gpointer vp )
{
Stack *stack;
guint16 len;
long line_num = 0;
- VikLayerParam *params; /* for current layer, so we don't have to keep on looking up interface */
- guint8 params_count;
+ VikLayerParam *params = NULL; /* for current layer, so we don't have to keep on looking up interface */
+ guint8 params_count = 0;
+
+ GHashTable *string_lists = g_hash_table_new(g_direct_hash,g_direct_equal);
push(&stack);
stack->under = NULL;
g_warning ( "Line %ld: Mismatched ~EndLayer command", line_num );
else
{
+ /* add any string lists we've accumulated */
+ gpointer layer_and_vp[2];
+ layer_and_vp[0] = stack->data;
+ layer_and_vp[1] = vp;
+ g_hash_table_foreach ( string_lists, (GHFunc) string_list_set_param, layer_and_vp );
+ g_hash_table_remove_all ( string_lists );
+
if ( stack->data && stack->under->data )
{
if (VIK_LAYER(stack->under->data)->type == VIK_LAYER_AGGREGATE) {
vik_viewport_set_background_color ( VIK_VIEWPORT(vp), line+6 );
else if ( stack->under == NULL && eq_pos == 9 && strncasecmp ( line, "drawscale", eq_pos ) == 0 )
vik_viewport_set_draw_scale ( VIK_VIEWPORT(vp), TEST_BOOLEAN(line+10) );
- else if ( stack->under == NULL && eq_pos == 9 && strncasecmp ( line, "drawcentermark", eq_pos ) == 0 )
- vik_viewport_set_draw_centermark ( VIK_VIEWPORT(vp), TEST_BOOLEAN(line+10) );
+ else if ( stack->under == NULL && eq_pos == 14 && strncasecmp ( line, "drawcentermark", eq_pos ) == 0 )
+ vik_viewport_set_draw_centermark ( VIK_VIEWPORT(vp), TEST_BOOLEAN(line+15) );
else if ( stack->under && eq_pos == 4 && strncasecmp ( line, "name", eq_pos ) == 0 )
vik_layer_rename ( VIK_LAYER(stack->data), line+5 );
else if ( eq_pos == 7 && strncasecmp ( line, "visible", eq_pos ) == 0 )
else if ( eq_pos != -1 && stack->under )
{
gboolean found_match = FALSE;
+
/* go thru layer params. if len == eq_pos && starts_with jazz, set it. */
/* also got to check for name and visible. */
{
VikLayerParamData x;
line += eq_pos+1;
- switch ( params[i].type )
- {
- case VIK_LAYER_PARAM_DOUBLE: x.d = strtod(line, NULL); break;
- case VIK_LAYER_PARAM_UINT: x.u = strtoul(line, NULL, 10); break;
- case VIK_LAYER_PARAM_INT: x.i = strtol(line, NULL, 10); break;
- case VIK_LAYER_PARAM_BOOLEAN: x.b = TEST_BOOLEAN(line); break;
- case VIK_LAYER_PARAM_COLOR: memset(&(x.c), 0, sizeof(x.c)); /* default: black */
+ if ( params[i].type == VIK_LAYER_PARAM_STRING_LIST ) {
+ GList *l = g_list_append ( g_hash_table_lookup ( string_lists, (gpointer) ((gint) i) ), g_strdup(line) );
+ g_hash_table_replace ( string_lists, (gpointer) ((gint)i), l );
+ /* add the value to a list, possibly making a new list.
+ * this will be passed to the layer when we read an ~EndLayer */
+ } else {
+ switch ( params[i].type )
+ {
+ case VIK_LAYER_PARAM_DOUBLE: x.d = strtod(line, NULL); break;
+ case VIK_LAYER_PARAM_UINT: x.u = strtoul(line, NULL, 10); break;
+ case VIK_LAYER_PARAM_INT: x.i = strtol(line, NULL, 10); break;
+ case VIK_LAYER_PARAM_BOOLEAN: x.b = TEST_BOOLEAN(line); break;
+ case VIK_LAYER_PARAM_COLOR: memset(&(x.c), 0, sizeof(x.c)); /* default: black */
gdk_color_parse ( line, &(x.c) ); break;
- default: x.s = line;
+ /* STRING or STRING_LIST -- if STRING_LIST, just set param to add a STRING */
+ default: x.s = line;
+ }
+ vik_layer_set_param ( VIK_LAYER(stack->data), i, x, vp );
}
- vik_layer_set_param ( VIK_LAYER(stack->data), i, x, vp );
found_match = TRUE;
break;
}
if ( ( ! VIK_LAYER(top)->visible ) && VIK_LAYER(top)->realized )
vik_treeview_item_set_visible ( VIK_LAYER(top)->vt, &(VIK_LAYER(top)->iter), FALSE );
+
+ /* delete anything we've forgotten about -- should only happen when file ends before an EndLayer */
+ g_hash_table_foreach ( string_lists, string_list_delete, NULL );
+ g_hash_table_destroy ( string_lists );
}
/*
home = mktemp(temp);
viking_dir = g_strdup_printf("%s/%s", home, ".viking");
if (access(viking_dir, F_OK))
- mkdir(viking_dir, 0755);
+ g_mkdir(viking_dir, 0755);
}
return viking_dir;
projects / andy / viking.git / blobdiff