X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/24953b45d7480dafafda85a7e9c5e029db0ddccb..4f14a010d0a7d09721c32f0d35ffbeae05ea994c:/src/vikgpslayer.c diff --git a/src/vikgpslayer.c b/src/vikgpslayer.c index ebf9ff21..8ccec135 100644 --- a/src/vikgpslayer.c +++ b/src/vikgpslayer.c @@ -2,6 +2,7 @@ * viking -- GPS Data and Topo Analyzer, Explorer, and Manager * * Copyright (C) 2003-2005, Evan Battaglia + * Copyright (C) 2006-2008, Quy Tonthat * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,13 +25,20 @@ #endif #include +#ifdef HAVE_MATH_H #include +#endif #include "viking.h" #include "icons/icons.h" #include "babel.h" +#ifdef HAVE_UNISTD_H +#include +#endif +#ifdef HAVE_STRING_H #include -#include +#endif +#include #include #include #ifdef VIK_CONFIG_REALTIME_GPS_TRACKING @@ -48,12 +56,14 @@ static VikGpsLayer *vik_gps_layer_create (VikViewport *vp); static void vik_gps_layer_realize ( VikGpsLayer *val, VikTreeview *vt, GtkTreeIter *layer_iter ); static void vik_gps_layer_free ( VikGpsLayer *val ); static void vik_gps_layer_draw ( VikGpsLayer *val, gpointer data ); -VikGpsLayer *vik_gps_layer_new (); +static VikGpsLayer *vik_gps_layer_new ( VikViewport *vp ); static void gps_layer_marshall( VikGpsLayer *val, guint8 **data, gint *len ); static VikGpsLayer *gps_layer_unmarshall( guint8 *data, gint len, VikViewport *vvp ); -static gboolean gps_layer_set_param ( VikGpsLayer *vgl, guint16 id, VikLayerParamData data, VikViewport *vp ); -static VikLayerParamData gps_layer_get_param ( VikGpsLayer *vgl, guint16 id ); +static gboolean gps_layer_set_param ( VikGpsLayer *vgl, guint16 id, VikLayerParamData data, VikViewport *vp, gboolean is_file_operation ); +static VikLayerParamData gps_layer_get_param ( VikGpsLayer *vgl, guint16 id, gboolean is_file_operation ); + +static const gchar* gps_layer_tooltip ( VikGpsLayer *vgl ); static void gps_layer_change_coord_mode ( VikGpsLayer *val, VikCoordMode mode ); static void gps_layer_add_menu_items( VikGpsLayer *vtl, GtkMenu *menu, gpointer vlp ); @@ -65,20 +75,29 @@ static void gps_empty_upload_cb( gpointer layer_and_vlp[2] ); static void gps_empty_download_cb( gpointer layer_and_vlp[2] ); static void gps_empty_all_cb( gpointer layer_and_vlp[2] ); #ifdef VIK_CONFIG_REALTIME_GPS_TRACKING +static void gps_empty_realtime_cb( gpointer layer_and_vlp[2] ); static void gps_start_stop_tracking_cb( gpointer layer_and_vlp[2] ); static void realtime_tracking_draw(VikGpsLayer *vgl, VikViewport *vp); #endif -typedef enum {GARMIN_P = 0, MAGELLAN_P, NUM_PROTOCOLS} vik_gps_proto; -static gchar * params_protocols[] = {"Garmin", "Magellan", NULL}; -static gchar * protocols_args[] = {"garmin", "magellan"}; +typedef enum {GARMIN_P = 0, MAGELLAN_P, DELORME_P, NAVILINK_P, NUM_PROTOCOLS} vik_gps_proto; +static gchar * params_protocols[] = {"Garmin", "Magellan", "DeLorme", "NAViLink", NULL}; +static gchar * protocols_args[] = {"garmin", "magellan", "delbin", "navilink"}; /*#define NUM_PROTOCOLS (sizeof(params_protocols)/sizeof(params_protocols[0]) - 1) */ #ifdef WINDOWS static gchar * params_ports[] = {"com1", "usb:", NULL}; #else static gchar * params_ports[] = {"/dev/ttyS0", "/dev/ttyS1", "/dev/ttyUSB0", "/dev/ttyUSB1", "usb:", NULL}; #endif -#define NUM_PORTS (sizeof(params_ports)/sizeof(params_ports[0]) - 1) +/* NUM_PORTS not actually used */ +/* #define NUM_PORTS (sizeof(params_ports)/sizeof(params_ports[0]) - 1) */ +/* Compatibility with previous versions */ +#ifdef WINDOWS +static gchar * old_params_ports[] = {"com1", "usb:", NULL}; +#else +static gchar * old_params_ports[] = {"/dev/ttyS0", "/dev/ttyS1", "/dev/ttyUSB0", "/dev/ttyUSB1", "usb:", NULL}; +#endif +#define OLD_NUM_PORTS (sizeof(old_params_ports)/sizeof(old_params_ports[0]) - 1) typedef enum {GPS_DOWN=0, GPS_UP} gps_dir; typedef struct { @@ -99,6 +118,10 @@ typedef struct { GtkWidget *wp_label; GtkWidget *progress_label; GtkWidget *trk_label; + VikViewport *vvp; +#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING + gboolean realtime_tracking; +#endif } GpsSession; static void gps_session_delete(GpsSession *sess); @@ -127,7 +150,7 @@ enum { static VikLayerParam gps_layer_params[] = { { "gps_protocol", VIK_LAYER_PARAM_UINT, GROUP_DATA_MODE, N_("GPS Protocol:"), VIK_LAYER_WIDGET_COMBOBOX, params_protocols, NULL}, - { "gps_port", VIK_LAYER_PARAM_UINT, GROUP_DATA_MODE, N_("Serial Port:"), VIK_LAYER_WIDGET_COMBOBOX, params_ports, NULL}, + { "gps_port", VIK_LAYER_PARAM_STRING, GROUP_DATA_MODE, N_("Serial Port:"), VIK_LAYER_WIDGET_COMBOBOX, params_ports, NULL}, #ifdef VIK_CONFIG_REALTIME_GPS_TRACKING { "record_tracking", VIK_LAYER_PARAM_BOOLEAN, GROUP_REALTIME_MODE, N_("Recording tracks"), VIK_LAYER_WIDGET_CHECKBUTTON}, @@ -157,7 +180,7 @@ VikLayerInterface vik_gps_layer_interface = { params_groups, sizeof(params_groups)/sizeof(params_groups[0]), - VIK_MENU_ITEM_ALL & ~(VIK_MENU_ITEM_CUT|VIK_MENU_ITEM_COPY), + VIK_MENU_ITEM_ALL, (VikLayerFuncCreate) vik_gps_layer_create, (VikLayerFuncRealize) vik_gps_layer_realize, @@ -176,6 +199,8 @@ VikLayerInterface vik_gps_layer_interface = { (VikLayerFuncSublayerRenameRequest) NULL, (VikLayerFuncSublayerToggleVisible) NULL, + (VikLayerFuncSublayerTooltip) NULL, + (VikLayerFuncLayerTooltip) gps_layer_tooltip, (VikLayerFuncMarshall) gps_layer_marshall, (VikLayerFuncUnmarshall) gps_layer_unmarshall, @@ -187,6 +212,7 @@ VikLayerInterface vik_gps_layer_interface = { (VikLayerFuncWriteFileData) NULL, (VikLayerFuncDeleteItem) NULL, + (VikLayerFuncCutItem) NULL, (VikLayerFuncCopyItem) NULL, (VikLayerFuncPasteItem) NULL, (VikLayerFuncFreeCopiedItem) NULL, @@ -230,8 +256,6 @@ struct _VikGpsLayer { GpsFix realtime_fix; GpsFix last_fix; - enum unit realtime_gpsd_unit; - VikTrack *realtime_track; gchar *realtime_track_name; @@ -253,7 +277,7 @@ struct _VikGpsLayer { guint vehicle_position; #endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */ guint protocol_id; - guint serial_port_id; + gchar *serial_port; }; GType vik_gps_layer_get_type () @@ -294,6 +318,11 @@ static VikGpsLayer *vik_gps_layer_create (VikViewport *vp) return rv; } +static const gchar* gps_layer_tooltip ( VikGpsLayer *vgl ) +{ + return params_protocols[vgl->protocol_id]; +} + /* "Copy" */ static void gps_layer_marshall( VikGpsLayer *vgl, guint8 **data, gint *datalen ) { @@ -335,7 +364,7 @@ static VikGpsLayer *gps_layer_unmarshall( guint8 *data, gint len, VikViewport *v len -= sizeof(gint) + alm_size; \ data += sizeof(gint) + alm_size; - VikGpsLayer *rv = vik_gps_layer_new(); + VikGpsLayer *rv = vik_gps_layer_new(vvp); VikLayer *child_layer; gint i; @@ -358,7 +387,7 @@ static VikGpsLayer *gps_layer_unmarshall( guint8 *data, gint len, VikViewport *v #undef alm_next } -static gboolean gps_layer_set_param ( VikGpsLayer *vgl, guint16 id, VikLayerParamData data, VikViewport *vp ) +static gboolean gps_layer_set_param ( VikGpsLayer *vgl, guint16 id, VikLayerParamData data, VikViewport *vp, gboolean is_file_operation ) { switch ( id ) { @@ -369,8 +398,21 @@ static gboolean gps_layer_set_param ( VikGpsLayer *vgl, guint16 id, VikLayerPara g_warning(_("Unknown GPS Protocol")); break; case PARAM_PORT: - if (data.u < NUM_PORTS) - vgl->serial_port_id = data.u; + if (data.s) +{ + g_free(vgl->serial_port); + /* Compat: previous version stored serial_port as an array index */ + int index = data.s[0] - '0'; + if (data.s[0] != '\0' && + g_ascii_isdigit (data.s[0]) && + data.s[1] == '\0' && + index < OLD_NUM_PORTS) + /* It is a single digit: activate compatibility */ + vgl->serial_port = g_strdup(old_params_ports[index]); + else + vgl->serial_port = g_strdup(data.s); + g_debug("%s: %s", __FUNCTION__, vgl->serial_port); +} else g_warning(_("Unknown serial port device")); break; @@ -405,7 +447,7 @@ static gboolean gps_layer_set_param ( VikGpsLayer *vgl, guint16 id, VikLayerPara return TRUE; } -static VikLayerParamData gps_layer_get_param ( VikGpsLayer *vgl, guint16 id ) +static VikLayerParamData gps_layer_get_param ( VikGpsLayer *vgl, guint16 id, gboolean is_file_operation ) { VikLayerParamData rv; switch ( id ) @@ -414,7 +456,8 @@ static VikLayerParamData gps_layer_get_param ( VikGpsLayer *vgl, guint16 id ) rv.u = vgl->protocol_id; break; case PARAM_PORT: - rv.u = vgl->serial_port_id; + rv.s = vgl->serial_port; + g_debug("%s: %s", __FUNCTION__, rv.s); break; #ifdef VIK_CONFIG_REALTIME_GPS_TRACKING case PARAM_GPSD_HOST: @@ -466,8 +509,6 @@ VikGpsLayer *vik_gps_layer_new (VikViewport *vp) vgl->realtime_track_pt1_gc = vik_viewport_new_gc ( vp, "red", 2 ); vgl->realtime_track_pt2_gc = vik_viewport_new_gc ( vp, "green", 2 ); vgl->realtime_track_pt_gc = vgl->realtime_track_pt1_gc; - vgl->realtime_gpsd_unit = gpsd_units(); - // fprintf(stderr, "DEBUG: gpsd_unit = %d\n", vgl->realtime_gpsd_unit); vgl->realtime_track = NULL; /* Setting params here */ @@ -479,7 +520,22 @@ VikGpsLayer *vik_gps_layer_new (VikViewport *vp) vgl->gpsd_retry_interval = 10; #endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */ vgl->protocol_id = 0; - vgl->serial_port_id = 0; + vgl->serial_port = NULL; + +#ifndef WINDOWS + /* Attempt to auto set default USB serial port entry */ + /* Ordered to make lowest device favourite if available */ + if (g_access ("/dev/ttyUSB1", R_OK) == 0) { + if (vgl->serial_port != NULL) + g_free (vgl->serial_port); + vgl->serial_port = g_strdup ("/dev/ttyUSB1"); + } + if (g_access ("/dev/ttyUSB0", R_OK) == 0) { + if (vgl->serial_port != NULL) + g_free (vgl->serial_port); + vgl->serial_port = g_strdup ("/dev/ttyUSB0"); + } +#endif return vgl; } @@ -538,20 +594,20 @@ static void gps_layer_add_menu_items( VikGpsLayer *vgl, GtkMenu *menu, gpointer gtk_menu_shell_append ( GTK_MENU_SHELL(menu), item ); gtk_widget_show ( item ); - item = gtk_menu_item_new_with_label ( _("Upload to GPS") ); + item = gtk_menu_item_new_with_mnemonic ( _("_Upload to GPS") ); g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(gps_upload_cb), pass_along ); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_widget_show ( item ); - item = gtk_menu_item_new_with_label ( _("Download from GPS") ); + item = gtk_menu_item_new_with_mnemonic ( _("Download from _GPS") ); g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(gps_download_cb), pass_along ); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_widget_show ( item ); #ifdef VIK_CONFIG_REALTIME_GPS_TRACKING - item = gtk_menu_item_new_with_label ( vgl->realtime_tracking ? - "Stop realtime tracking" : - "Start realtime tracking" ); + item = gtk_menu_item_new_with_mnemonic ( vgl->realtime_tracking ? + "_Stop Realtime Tracking" : + "_Start Realtime Tracking" ); g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(gps_start_stop_tracking_cb), pass_along ); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_widget_show ( item ); @@ -559,19 +615,24 @@ static void gps_layer_add_menu_items( VikGpsLayer *vgl, GtkMenu *menu, gpointer item = gtk_menu_item_new(); gtk_menu_shell_append ( GTK_MENU_SHELL(menu), item ); gtk_widget_show ( item ); + + item = gtk_menu_item_new_with_mnemonic ( _("Empty _Realtime") ); + g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(gps_empty_realtime_cb), pass_along ); + gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); + gtk_widget_show ( item ); #endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */ - item = gtk_menu_item_new_with_label ( _("Empty Upload") ); + item = gtk_menu_item_new_with_mnemonic ( _("E_mpty Upload") ); g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(gps_empty_upload_cb), pass_along ); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_widget_show ( item ); - item = gtk_menu_item_new_with_label ( _("Empty Download") ); + item = gtk_menu_item_new_with_mnemonic ( _("_Empty Download") ); g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(gps_empty_download_cb), pass_along ); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_widget_show ( item ); - item = gtk_menu_item_new_with_label ( _("Empty All") ); + item = gtk_menu_item_new_with_mnemonic ( _("Empty _All") ); g_signal_connect_swapped ( G_OBJECT(item), "activate", G_CALLBACK(gps_empty_all_cb), pass_along ); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_widget_show ( item ); @@ -580,7 +641,15 @@ static void gps_layer_add_menu_items( VikGpsLayer *vgl, GtkMenu *menu, gpointer static void disconnect_layer_signal ( VikLayer *vl, VikGpsLayer *vgl ) { - g_assert(DISCONNECT_UPDATE_SIGNAL(vl,vgl)==1); + guint number_handlers = DISCONNECT_UPDATE_SIGNAL(vl,vgl); + if ( number_handlers != 1 ) { + /* + NB It's not fatal if this gives 2 for example! Hence removal of the g_assert + This happens when copied GPS layer is deleted (not sure why the number_handlers would be 2) + I don't think there's any side effects and certainly better than the program just aborting + */ + g_warning(_("Unexpected number of disconnected handlers: %d"), number_handlers); + } } static void vik_gps_layer_free ( VikGpsLayer *vgl ) @@ -830,6 +899,18 @@ static void gps_download_progress_func(BabelProgressCode c, gpointer data, GpsSe } g_strfreev(tokens); } + /* eg: "Unit:\teTrex Legend HCx Software Version 2.90\n" */ + if (strstr(line, "Unit:")) { + gchar **tokens = g_strsplit(line, "\t", 0); + int n_tokens = 0; + while (tokens[n_tokens]) + n_tokens++; + + if (n_tokens > 1) { + set_gps_info(tokens[1], sess); + } + g_strfreev(tokens); + } if (strstr(line, "RECORD")) { int lsb, msb, cnt; @@ -953,6 +1034,18 @@ static void gps_comm_thread(GpsSession *sess) gtk_label_set_text ( GTK_LABEL(sess->status_label), _("Done.") ); gtk_dialog_set_response_sensitive ( GTK_DIALOG(sess->dialog), GTK_RESPONSE_ACCEPT, TRUE ); gtk_dialog_set_response_sensitive ( GTK_DIALOG(sess->dialog), GTK_RESPONSE_REJECT, FALSE ); + + /* Do not change the view if we are following the current GPS position */ +#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING + if (!sess->realtime_tracking) +#endif + { + if (sess->vvp) { + /* View the data available */ + vik_trw_layer_auto_set_view ( sess->vtl, sess->vvp) ; + vik_layer_emit_update ( VIK_LAYER(sess->vtl) ); + } + } } else { /* canceled */ } @@ -972,7 +1065,7 @@ static void gps_comm_thread(GpsSession *sess) g_thread_exit(NULL); } -static gint gps_comm(VikTrwLayer *vtl, gps_dir dir, vik_gps_proto proto, gchar *port) { +static gint gps_comm(VikTrwLayer *vtl, gps_dir dir, vik_gps_proto proto, gchar *port, gboolean tracking, VikViewport *vvp) { GpsSession *sess = g_malloc(sizeof(GpsSession)); sess->mutex = g_mutex_new(); @@ -983,7 +1076,10 @@ static gint gps_comm(VikTrwLayer *vtl, gps_dir dir, vik_gps_proto proto, gchar * sess->cmd_args = g_strdup_printf("-D 9 -t -w -%c %s", (dir == GPS_DOWN) ? 'i' : 'o', protocols_args[proto]); sess->window_title = (dir == GPS_DOWN) ? _("GPS Download") : _("GPS Upload"); - + sess->vvp = vvp; +#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING + sess->realtime_tracking = tracking; +#endif sess->dialog = gtk_dialog_new_with_buttons ( "", VIK_GTK_WINDOW_FROM_LAYER(vtl), 0, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL ); gtk_dialog_set_response_sensitive ( GTK_DIALOG(sess->dialog), GTK_RESPONSE_ACCEPT, FALSE ); @@ -1012,6 +1108,7 @@ static gint gps_comm(VikTrwLayer *vtl, gps_dir dir, vik_gps_proto proto, gchar * /* TODO: starting gps read/write thread here */ g_thread_create((GThreadFunc)gps_comm_thread, sess, FALSE, NULL ); + gtk_dialog_set_default_response ( GTK_DIALOG(sess->dialog), GTK_RESPONSE_ACCEPT ); gtk_dialog_run(GTK_DIALOG(sess->dialog)); gtk_widget_destroy(sess->dialog); @@ -1033,14 +1130,20 @@ static void gps_upload_cb( gpointer layer_and_vlp[2] ) { VikGpsLayer *vgl = (VikGpsLayer *)layer_and_vlp[0]; VikTrwLayer *vtl = vgl->trw_children[TRW_UPLOAD]; - gps_comm(vtl, GPS_UP, vgl->protocol_id, params_ports[vgl->serial_port_id]); + gps_comm(vtl, GPS_UP, vgl->protocol_id, vgl->serial_port, FALSE, NULL); } static void gps_download_cb( gpointer layer_and_vlp[2] ) { VikGpsLayer *vgl = (VikGpsLayer *)layer_and_vlp[0]; VikTrwLayer *vtl = vgl->trw_children[TRW_DOWNLOAD]; - gps_comm(vtl, GPS_DOWN, vgl->protocol_id, params_ports[vgl->serial_port_id]); + VikWindow *vw = VIK_WINDOW(VIK_GTK_WINDOW_FROM_LAYER(vgl)); + VikViewport *vvp = vik_window_viewport(vw); +#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING + gps_comm(vtl, GPS_DOWN, vgl->protocol_id, vgl->serial_port, vgl->realtime_tracking, vvp); +#else + gps_comm(vtl, GPS_DOWN, vgl->protocol_id, vgl->serial_port, FALSE, vvp); +#endif } static void gps_empty_upload_cb( gpointer layer_and_vlp[2] ) @@ -1057,6 +1160,15 @@ static void gps_empty_download_cb( gpointer layer_and_vlp[2] ) vik_trw_layer_delete_all_tracks ( vgl-> trw_children[TRW_DOWNLOAD]); } +#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING +static void gps_empty_realtime_cb( gpointer layer_and_vlp[2] ) +{ + VikGpsLayer *vgl = (VikGpsLayer *)layer_and_vlp[0]; + vik_trw_layer_delete_all_waypoints ( vgl-> trw_children[TRW_REALTIME]); + vik_trw_layer_delete_all_tracks ( vgl-> trw_children[TRW_REALTIME]); +} +#endif + static void gps_empty_all_cb( gpointer layer_and_vlp[2] ) { VikGpsLayer *vgl = (VikGpsLayer *)layer_and_vlp[0]; @@ -1064,6 +1176,10 @@ static void gps_empty_all_cb( gpointer layer_and_vlp[2] ) vik_trw_layer_delete_all_tracks ( vgl-> trw_children[TRW_UPLOAD]); vik_trw_layer_delete_all_waypoints ( vgl-> trw_children[TRW_DOWNLOAD]); vik_trw_layer_delete_all_tracks ( vgl-> trw_children[TRW_DOWNLOAD]); +#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING + vik_trw_layer_delete_all_waypoints ( vgl-> trw_children[TRW_REALTIME]); + vik_trw_layer_delete_all_tracks ( vgl-> trw_children[TRW_REALTIME]); +#endif } #ifdef VIK_CONFIG_REALTIME_GPS_TRACKING @@ -1177,7 +1293,6 @@ static void create_realtime_trackpoint(VikGpsLayer *vgl, gboolean forced) tp->course = vgl->realtime_fix.fix.track; tp->nsats = vgl->realtime_fix.satellites_used; tp->fix_mode = vgl->realtime_fix.fix.mode; - tp->extended = TRUE; ll.lat = vgl->realtime_fix.fix.latitude; ll.lon = vgl->realtime_fix.fix.longitude; @@ -1227,7 +1342,7 @@ static void gpsd_raw_hook(VglGpsd *vgpsd, gchar *data) vik_viewport_set_center_coord(vvp, &vehicle_coord); update_all = TRUE; } - else { + else if (vgl->vehicle_position == VEHICLE_POSITION_ON_SCREEN) { const int hdiv = 6; const int vdiv = 6; const int px = 20; /* adjust ment in pixels to make sure vehicle is inside the box */ @@ -1252,7 +1367,9 @@ static void gpsd_raw_hook(VglGpsd *vgpsd, gchar *data) vgl->first_realtime_trackpoint = FALSE; create_realtime_trackpoint(vgl, FALSE); + gdk_threads_enter(); vik_layer_emit_update ( update_all ? VIK_LAYER(vgl) : VIK_LAYER(vgl->trw_children[TRW_REALTIME])); + gdk_threads_leave(); } } @@ -1290,15 +1407,23 @@ static gchar *make_track_name(VikTrwLayer *vtl) static gboolean rt_gpsd_try_connect(gpointer *data) { VikGpsLayer *vgl = (VikGpsLayer *)data; +#ifndef HAVE_GPS_OPEN_R struct gps_data_t *gpsd = gps_open(vgl->gpsd_host, vgl->gpsd_port); if (gpsd == NULL) { +#else + vgl->vgpsd = g_malloc(sizeof(VglGpsd)); + + if (gps_open_r(vgl->gpsd_host, vgl->gpsd_port, /*(struct gps_data_t *)*/vgl->vgpsd) != 0) { +#endif g_warning("Failed to connect to gpsd at %s (port %s). Will retry in %d seconds", vgl->gpsd_host, vgl->gpsd_port, vgl->gpsd_retry_interval); return TRUE; /* keep timer running */ } - vgl->vgpsd = g_realloc(gpsd, sizeof(VglGpsd)); +#ifndef HAVE_GPS_OPEN_R + vgl->vgpsd = realloc(gpsd, sizeof(VglGpsd)); +#endif vgl->vgpsd->vgl = vgl; vgl->realtime_fix.dirty = vgl->last_fix.dirty = FALSE; @@ -1318,7 +1443,11 @@ static gboolean rt_gpsd_try_connect(gpointer *data) vgl->realtime_io_channel = g_io_channel_unix_new(vgl->vgpsd->gpsd.gps_fd); vgl->realtime_io_watch_id = g_io_add_watch( vgl->realtime_io_channel, G_IO_IN | G_IO_ERR | G_IO_HUP, gpsd_data_available, vgl); +#if HAVE_GPS_STREAM + gps_stream(&vgl->vgpsd->gpsd, WATCH_ENABLE, NULL); +#else gps_query(&vgl->vgpsd->gpsd, "w+x"); +#endif return FALSE; /* no longer called by timeout */ } @@ -1372,6 +1501,11 @@ static void rt_gpsd_disconnect(VikGpsLayer *vgl) } if (vgl->vgpsd) { gps_close(&vgl->vgpsd->gpsd); +#ifdef HAVE_GPS_OPEN_R + g_free(vgl->vgpsd); +#else + free(vgl->vgpsd); +#endif vgl->vgpsd = NULL; }