*
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
#include "viking.h"
#include "gpx.h"
#include <string.h>
#include <stdlib.h>
+#include <stdio.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
#include <glib.h>
#include <glib/gstdio.h>
+/* Relax some dependencies */
+#if ! GLIB_CHECK_VERSION(2,12,0)
+static gboolean return_true (gpointer a, gpointer b, gpointer c) { return TRUE; }
+static g_hash_table_remove_all (GHashTable *ght) { g_hash_table_foreach_remove ( ght, (GHRFunc) return_true, FALSE ); }
+#endif
+
#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"
#define GPX_MAGIC "<?xm"
return -1;
}
-static void write_layer_params_and_data ( VikLayer *l, FILE *f )
-{
- VikLayerParam *params = vik_layer_get_interface(l->type)->params;
- VikLayerFuncGetParam get_param = vik_layer_get_interface(l->type)->get_param;
-
- fprintf ( f, "name=%s\n", l->name ? l->name : "" );
- if ( !l->visible )
- fprintf ( f, "visible=f\n" );
-
- if ( params && get_param )
- {
- VikLayerParamData data;
- guint16 i, params_count = vik_layer_get_interface(l->type)->params_count;
- for ( i = 0; i < params_count; i++ )
- {
- data = get_param(l,i);
-
+void file_write_layer_param ( FILE *f, const gchar *name, guint8 type, VikLayerParamData data ) {
/* 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.
+ * not an empty string list.
*/
- if ( params[i].type == VIK_LAYER_PARAM_STRING_LIST ) {
+ if ( 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=", name );
fprintf ( f, "%s\n", (gchar *)(iter->data) );
iter = iter->next;
}
}
} else {
- fprintf ( f, "%s=", params[i].name );
- switch ( params[i].type )
+ fprintf ( f, "%s=", name );
+ switch ( type )
{
case VIK_LAYER_PARAM_DOUBLE: {
// char buf[15]; /* locale independent */
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 write_layer_params_and_data ( VikLayer *l, FILE *f )
+{
+ VikLayerParam *params = vik_layer_get_interface(l->type)->params;
+ VikLayerFuncGetParam get_param = vik_layer_get_interface(l->type)->get_param;
+
+ fprintf ( f, "name=%s\n", l->name ? l->name : "" );
+ if ( !l->visible )
+ fprintf ( f, "visible=f\n" );
+
+ if ( params && get_param )
+ {
+ VikLayerParamData data;
+ guint16 i, params_count = vik_layer_get_interface(l->type)->params_count;
+ for ( i = 0; i < params_count; i++ )
+ {
+ data = get_param(l,i);
+ file_write_layer_param(f, params[i].name, params[i].type, data);
}
}
if ( vik_layer_get_interface(l->type)->write_file_data )
Stack *stack = NULL;
VikLayer *current_layer;
struct LatLon ll;
+ VikViewportDrawMode mode;
gchar *modestring;
push(&stack);
/* crazhy CRAZHY */
vik_coord_to_latlon ( vik_viewport_get_center ( VIK_VIEWPORT(vp) ), &ll );
- switch ( vik_viewport_get_drawmode ( VIK_VIEWPORT(vp) ) ) {
+ mode = vik_viewport_get_drawmode ( VIK_VIEWPORT(vp) );
+ switch ( mode ) {
case VIK_VIEWPORT_DRAWMODE_UTM: modestring = "utm"; break;
case VIK_VIEWPORT_DRAWMODE_EXPEDIA: modestring = "expedia"; break;
case VIK_VIEWPORT_DRAWMODE_GOOGLE: modestring = "google"; break;
case VIK_VIEWPORT_DRAWMODE_KH: modestring = "kh"; break;
- default: modestring = "mercator";
+ case VIK_VIEWPORT_DRAWMODE_MERCATOR: modestring = "mercator"; break;
+ default:
+ g_critical("Houston, we've had a problem. mode=%d", mode);
}
fprintf ( f, "#VIKING GPS Data file " VIKING_URL "\n\nxmpp=%f\nympp=%f\nlat=%f\nlon=%f\nmode=%s\ncolor=%s\ndrawscale=%s\ndrawcentermark=%s",
static void string_list_delete ( gpointer key, gpointer l, gpointer user_data )
{
- GList *iter = (GList *) iter;
+ /* 20071021 bugfix */
+ GList *iter = (GList *) l;
while ( iter ) {
g_free ( iter->data );
iter = iter->next;
}
- g_list_free ( (GList *) iter );
+ g_list_free ( (GList *) l );
}
static void string_list_set_param (gint i, GList *list, gpointer *layer_and_vp)
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 )
+static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp )
{
Stack *stack;
struct LatLon ll = { 0.0, 0.0 };
push(&stack);
if ( type == -1 )
{
- g_warning ( "Line %ld: Unknown type %s\n", line_num, line+6 );
+ g_warning ( "Line %ld: Unknown type %s", line_num, line+6 );
stack->data = NULL;
}
else if (parent_type == VIK_LAYER_GPS)
{
if (VIK_LAYER(stack->under->data)->type == VIK_LAYER_AGGREGATE) {
vik_aggregate_layer_add_layer ( VIK_AGGREGATE_LAYER(stack->under->data), VIK_LAYER(stack->data) );
- vik_layer_post_read ( VIK_LAYER(stack->data), vp );
+ vik_layer_post_read ( VIK_LAYER(stack->data), vp, TRUE );
}
else if (VIK_LAYER(stack->under->data)->type == VIK_LAYER_GPS) {
/* TODO: anything else needs to be done here ? */
VikLayerParamData x;
line += eq_pos+1;
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 );
+ GList *l = g_list_append ( g_hash_table_lookup ( string_lists, GINT_TO_POINTER ((gint) i) ),
+ g_strdup(line) );
+ g_hash_table_replace ( string_lists, GINT_TO_POINTER ((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 {
if ( stack->under && stack->under->data && stack->data )
{
vik_aggregate_layer_add_layer ( VIK_AGGREGATE_LAYER(stack->under->data), VIK_LAYER(stack->data) );
- vik_layer_post_read ( VIK_LAYER(stack->data), vp );
+ vik_layer_post_read ( VIK_LAYER(stack->data), vp, TRUE );
}
pop(&stack);
}
if ( strcmp(fn,"-") == 0 )
return stdin;
else
- return fopen(fn, "r");
+ return g_fopen(fn, "r");
}
static void xfclose ( FILE *f )
{
- if ( f != stdin && f != stdout )
+ if ( f != stdin && f != stdout ) {
fclose ( f );
+ f = NULL;
+ }
}
/* 0 on failure, 1 on success (vik file) 2 on success (other file) */
-gshort a_file_load ( VikAggregateLayer *top, gpointer vp, const gchar *filename )
+gshort a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar *filename )
{
FILE *f = xfopen ( filename, "r" );
else
a_gpspoint_read_file ( VIK_TRW_LAYER(vtl), f );
- vik_layer_post_read ( vtl, vp );
+ vik_layer_post_read ( vtl, vp, TRUE );
vik_aggregate_layer_add_layer ( top, vtl );
gboolean a_file_save ( VikAggregateLayer *top, gpointer vp, const gchar *filename )
{
- FILE *f = fopen(filename, "w");
+ FILE *f = g_fopen(filename, "w");
if ( ! f )
return FALSE;
file_write ( top, f, vp );
fclose(f);
+ f = NULL;
return TRUE;
}
gboolean a_file_export ( VikTrwLayer *vtl, const gchar *filename, gshort file_type )
{
- FILE *f = fopen ( filename, "w" );
+ FILE *f = g_fopen ( filename, "w" );
if ( f )
{
if ( file_type == FILE_TYPE_GPSMAPPER )
else
a_gpspoint_write_file ( vtl, f );
fclose ( f );
+ f = NULL;
return TRUE;
}
return FALSE;
{
static gchar *viking_dir = NULL;
+ // TODO: use g_get_user_config_dir ?
+
if (!viking_dir) {
- gchar *temp[] = {"/tmp/vikXXXXXX"};
- gchar *home = getenv("HOME");
- if (!home || access(home, W_OK))
- home = mktemp(temp);
- viking_dir = g_strdup_printf("%s/%s", home, ".viking");
- if (access(viking_dir, F_OK))
+ const gchar *home = g_getenv("HOME");
+ if (!home || g_access(home, W_OK))
+ home = g_get_home_dir ();
+#ifdef HAVE_MKDTEMP
+ if (!home || g_access(home, W_OK))
+ {
+ static gchar temp[] = {"/tmp/vikXXXXXX"};
+ home = mkdtemp(temp);
+ }
+#endif
+ if (!home || g_access(home, W_OK))
+ /* Fatal error */
+ g_critical("Unable to find a base directory");
+
+ /* Build the name of the directory */
+ viking_dir = g_build_filename(home, ".viking", NULL);
+ if (g_file_test(viking_dir, G_FILE_TEST_EXISTS) == FALSE)
g_mkdir(viking_dir, 0755);
}
projects / andy / viking.git / blobdiff