X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/bb8aed99bce1e602a63b265f5b7524dc00a2d002..3986744ba1895257f41b9bbec2148cf662579b80:/src/vikgpslayer.c diff --git a/src/vikgpslayer.c b/src/vikgpslayer.c index 60cb91da..499593ce 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 @@ -31,33 +32,32 @@ #include "icons/icons.h" #include "babel.h" +#ifdef HAVE_UNISTD_H +#include +#endif #ifdef HAVE_STRING_H #include #endif -#include +#include #include #include #ifdef VIK_CONFIG_REALTIME_GPS_TRACKING #include #endif -#if ! GLIB_CHECK_VERSION(2,14,0) -inline guint g_timeout_add_seconds(guint interval, GSourceFunc function, gpointer data) { - return g_timeout_add(interval*1000, function, data); -} -#endif - #define DISCONNECT_UPDATE_SIGNAL(vl, val) g_signal_handlers_disconnect_matched(vl, G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, val) 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 ); @@ -68,21 +68,25 @@ static void gps_download_cb( gpointer layer_and_vlp[2] ); 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 +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) +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); +static void rt_gpsd_disconnect(VikGpsLayer *vgl); +static gboolean rt_gpsd_connect(VikGpsLayer *vgl, gboolean ask_if_failed); #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"}; -/*#define NUM_PROTOCOLS (sizeof(params_protocols)/sizeof(params_protocols[0]) - 1) */ +// Shouldn't need to use these much any more as the protocol is now saved as a string. +// They are kept for compatibility loading old .vik files +typedef enum {GARMIN_P = 0, MAGELLAN_P, DELORME_P, NAVILINK_P, OLD_NUM_PROTOCOLS} vik_gps_proto; +static gchar * protocols_args[] = {"garmin", "magellan", "delbin", "navilink", NULL}; #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}; @@ -90,18 +94,18 @@ static gchar * old_params_ports[] = {"com1", "usb:", NULL}; 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 { GMutex *mutex; - gps_dir direction; + vik_gps_dir direction; gchar *port; gboolean ok; gint total_count; gint count; VikTrwLayer *vtl; + VikTrack *track; gchar *cmd_args; - gchar * window_title; + gchar *window_title; GtkWidget *dialog; GtkWidget *status_label; GtkWidget *gps_label; @@ -110,19 +114,23 @@ typedef struct { GtkWidget *wp_label; GtkWidget *progress_label; GtkWidget *trk_label; + VikViewport *vvp; +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) + gboolean realtime_tracking; +#endif } GpsSession; static void gps_session_delete(GpsSession *sess); static gchar *params_groups[] = { "Data Mode", -#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) "Realtime Tracking Mode", #endif }; enum {GROUP_DATA_MODE, GROUP_REALTIME_MODE}; -#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) static gchar *params_vehicle_position[] = { "Keep vehicle at center", "Keep vehicle on screen", @@ -137,10 +145,13 @@ enum { #endif 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_protocol", VIK_LAYER_PARAM_STRING, GROUP_DATA_MODE, N_("GPS Protocol:"), VIK_LAYER_WIDGET_COMBOBOX, NULL, NULL}, // List now assigned at runtime { "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 + { "gps_download_tracks", VIK_LAYER_PARAM_BOOLEAN, GROUP_DATA_MODE, N_("Download Tracks:"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL}, + { "gps_upload_tracks", VIK_LAYER_PARAM_BOOLEAN, GROUP_DATA_MODE, N_("Upload Tracks:"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL}, + { "gps_download_waypoints", VIK_LAYER_PARAM_BOOLEAN, GROUP_DATA_MODE, N_("Download Waypoints:"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL}, + { "gps_upload_waypoints", VIK_LAYER_PARAM_BOOLEAN, GROUP_DATA_MODE, N_("Upload Waypoints:"), VIK_LAYER_WIDGET_CHECKBUTTON, NULL, NULL}, +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) { "record_tracking", VIK_LAYER_PARAM_BOOLEAN, GROUP_REALTIME_MODE, N_("Recording tracks"), VIK_LAYER_WIDGET_CHECKBUTTON}, { "center_start_tracking", VIK_LAYER_PARAM_BOOLEAN, GROUP_REALTIME_MODE, N_("Jump to current position on start"), VIK_LAYER_WIDGET_CHECKBUTTON}, { "moving_map_method", VIK_LAYER_PARAM_UINT, GROUP_REALTIME_MODE, N_("Moving Map Method:"), VIK_LAYER_WIDGET_RADIOGROUP_STATIC, params_vehicle_position, NULL}, @@ -151,13 +162,17 @@ static VikLayerParam gps_layer_params[] = { }; enum { PARAM_PROTOCOL=0, PARAM_PORT, -#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING + PARAM_DOWNLOAD_TRACKS, PARAM_UPLOAD_TRACKS, + PARAM_DOWNLOAD_WAYPOINTS, PARAM_UPLOAD_WAYPOINTS, +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) PARAM_REALTIME_REC, PARAM_REALTIME_CENTER_START, PARAM_VEHICLE_POSITION, PARAM_GPSD_HOST, PARAM_GPSD_PORT, PARAM_GPSD_RETRY_INTERVAL, #endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */ NUM_PARAMS}; VikLayerInterface vik_gps_layer_interface = { "GPS", + N_("GPS"), + NULL, &vikgpslayer_pixbuf, NULL, @@ -168,7 +183,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, @@ -187,6 +202,9 @@ VikLayerInterface vik_gps_layer_interface = { (VikLayerFuncSublayerRenameRequest) NULL, (VikLayerFuncSublayerToggleVisible) NULL, + (VikLayerFuncSublayerTooltip) NULL, + (VikLayerFuncLayerTooltip) gps_layer_tooltip, + (VikLayerFuncLayerSelected) NULL, (VikLayerFuncMarshall) gps_layer_marshall, (VikLayerFuncUnmarshall) gps_layer_unmarshall, @@ -198,25 +216,31 @@ VikLayerInterface vik_gps_layer_interface = { (VikLayerFuncWriteFileData) NULL, (VikLayerFuncDeleteItem) NULL, + (VikLayerFuncCutItem) NULL, (VikLayerFuncCopyItem) NULL, (VikLayerFuncPasteItem) NULL, (VikLayerFuncFreeCopiedItem) NULL, (VikLayerFuncDragDropRequest) gps_layer_drag_drop_request, + + (VikLayerFuncSelectClick) NULL, + (VikLayerFuncSelectMove) NULL, + (VikLayerFuncSelectRelease) NULL, + (VikLayerFuncSelectedViewportMenu) NULL, }; enum {TRW_DOWNLOAD=0, TRW_UPLOAD, -#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) TRW_REALTIME, #endif NUM_TRW}; static gchar * trw_names[] = { N_("GPS Download"), N_("GPS Upload"), -#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) N_("GPS Realtime Tracking"), #endif }; -#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) typedef struct { struct gps_data_t gpsd; VikGpsLayer *vgl; @@ -234,7 +258,7 @@ struct _VikGpsLayer { VikTrwLayer * trw_children[NUM_TRW]; GList * children; /* used only for writing file */ int cur_read_child; /* used only for reading file */ -#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) VglGpsd *vgpsd; gboolean realtime_tracking; /* set/reset only by the callback */ gboolean first_realtime_trackpoint; @@ -242,7 +266,6 @@ struct _VikGpsLayer { GpsFix last_fix; VikTrack *realtime_track; - gchar *realtime_track_name; GIOChannel *realtime_io_channel; guint realtime_io_watch_id; @@ -261,10 +284,36 @@ struct _VikGpsLayer { gboolean realtime_jump_to_start; guint vehicle_position; #endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */ - guint protocol_id; + gchar *protocol; gchar *serial_port; + gboolean download_tracks; + gboolean download_waypoints; + gboolean upload_tracks; + gboolean upload_waypoints; }; +/** + * Overwrite the static setup with dynamically generated GPS Babel device list + */ +static void gps_layer_inst_init ( VikGpsLayer *self ) +{ + gint new_proto = 0; + // +1 for luck (i.e the NULL terminator) + gchar **new_protocols = g_malloc(1 + g_list_length(a_babel_device_list)*sizeof(gpointer)); + + GList *gl = g_list_first ( a_babel_device_list ); + while ( gl ) { + // should be using label property but use name for now + // thus don't need to mess around converting label to name later on + new_protocols[new_proto++] = ((BabelDevice*)gl->data)->name; + gl = g_list_next ( gl ); + } + new_protocols[new_proto] = NULL; + + vik_gps_layer_interface.params[0].widget_data = new_protocols; + // assigned to [0] because this^ is the GPS protocol in the params list +} + GType vik_gps_layer_get_type () { static GType val_type = 0; @@ -281,7 +330,7 @@ GType vik_gps_layer_get_type () NULL, /* class_data */ sizeof (VikGpsLayer), 0, - NULL /* instance init */ + (GInstanceInitFunc) gps_layer_inst_init, }; val_type = g_type_register_static ( VIK_LAYER_TYPE, "VikGpsLayer", &val_info, 0 ); } @@ -303,6 +352,11 @@ static VikGpsLayer *vik_gps_layer_create (VikViewport *vp) return rv; } +static const gchar* gps_layer_tooltip ( VikGpsLayer *vgl ) +{ + return vgl->protocol; +} + /* "Copy" */ static void gps_layer_marshall( VikGpsLayer *vgl, guint8 **data, gint *datalen ) { @@ -344,7 +398,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; @@ -367,21 +421,32 @@ 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 ) { case PARAM_PROTOCOL: - if (data.u < NUM_PROTOCOLS) - vgl->protocol_id = data.u; + if (data.s) { + g_free(vgl->protocol); + // Backwards Compatibility: previous versions protocol = g_strdup(protocols_args[index]); + else + vgl->protocol = g_strdup(data.s); + g_debug("%s: %s", __FUNCTION__, vgl->protocol); + } else g_warning(_("Unknown GPS Protocol")); break; case PARAM_PORT: - if (data.s) -{ + if (data.s) { g_free(vgl->serial_port); - /* Compat: previous version stored serial_port as an array index */ + // Backwards Compatibility: previous versions serial_port = g_strdup(old_params_ports[index]); else vgl->serial_port = g_strdup(data.s); - g_debug("%s: %s", __FUNCTION__, vgl->serial_port); -} + g_debug("%s: %s", __FUNCTION__, vgl->serial_port); + } else g_warning(_("Unknown serial port device")); break; -#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING + case PARAM_DOWNLOAD_TRACKS: + vgl->download_tracks = data.b; + break; + case PARAM_UPLOAD_TRACKS: + vgl->upload_tracks = data.b; + break; + case PARAM_DOWNLOAD_WAYPOINTS: + vgl->download_waypoints = data.b; + break; + case PARAM_UPLOAD_WAYPOINTS: + vgl->upload_waypoints = data.b; + break; +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) case PARAM_GPSD_HOST: if (vgl->gpsd_host) g_free(vgl->gpsd_host); @@ -427,19 +504,32 @@ 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 ) { case PARAM_PROTOCOL: - rv.u = vgl->protocol_id; + rv.s = vgl->protocol; + g_debug("%s: %s", __FUNCTION__, rv.s); break; case PARAM_PORT: rv.s = vgl->serial_port; g_debug("%s: %s", __FUNCTION__, rv.s); break; -#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING + case PARAM_DOWNLOAD_TRACKS: + rv.b = vgl->download_tracks; + break; + case PARAM_UPLOAD_TRACKS: + rv.b = vgl->upload_tracks; + break; + case PARAM_DOWNLOAD_WAYPOINTS: + rv.b = vgl->download_waypoints; + break; + case PARAM_UPLOAD_WAYPOINTS: + rv.b = vgl->upload_waypoints; + break; +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) case PARAM_GPSD_HOST: rv.s = vgl->gpsd_host ? vgl->gpsd_host : ""; break; @@ -470,14 +560,14 @@ VikGpsLayer *vik_gps_layer_new (VikViewport *vp) { gint i; VikGpsLayer *vgl = VIK_GPS_LAYER ( g_object_new ( VIK_GPS_LAYER_TYPE, NULL ) ); - vik_layer_init ( VIK_LAYER(vgl), VIK_LAYER_GPS ); + vik_layer_set_type ( VIK_LAYER(vgl), VIK_LAYER_GPS ); for (i = 0; i < NUM_TRW; i++) { vgl->trw_children[i] = NULL; } vgl->children = NULL; vgl->cur_read_child = 0; -#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) vgl->realtime_tracking = FALSE; vgl->first_realtime_trackpoint = FALSE; vgl->vgpsd = NULL; @@ -499,8 +589,27 @@ VikGpsLayer *vik_gps_layer_new (VikViewport *vp) vgl->vehicle_position = VEHICLE_POSITION_ON_SCREEN; vgl->gpsd_retry_interval = 10; #endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */ - vgl->protocol_id = 0; + vgl->protocol = g_strdup("garmin"); vgl->serial_port = NULL; + vgl->download_tracks = TRUE; + vgl->download_waypoints = TRUE; + vgl->upload_tracks = TRUE; + vgl->upload_waypoints = TRUE; + +#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; } @@ -524,7 +633,7 @@ static void vik_gps_layer_draw ( VikGpsLayer *vgl, gpointer data ) if (!vik_viewport_get_half_drawn( VIK_VIEWPORT(data))) vik_layer_draw ( vl, data ); } -#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) if (vgl->realtime_tracking) { if (VIK_LAYER(vgl) == trigger) { if ( vik_viewport_get_half_drawn ( VIK_VIEWPORT(data) ) ) { @@ -559,20 +668,26 @@ 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") ); + /* Now with icons */ + item = gtk_image_menu_item_new_with_mnemonic ( _("_Upload to GPS") ); + gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_GO_UP, GTK_ICON_SIZE_MENU) ); 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_image_menu_item_new_with_mnemonic ( _("Download from _GPS") ); + gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_MENU) ); 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" ); +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) + item = gtk_image_menu_item_new_with_mnemonic ( vgl->realtime_tracking ? + "_Stop Realtime Tracking" : + "_Start Realtime Tracking" ); + gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, vgl->realtime_tracking ? + gtk_image_new_from_stock (GTK_STOCK_MEDIA_STOP, GTK_ICON_SIZE_MENU) : + gtk_image_new_from_stock (GTK_STOCK_MEDIA_PLAY, GTK_ICON_SIZE_MENU) ); 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 ); @@ -580,19 +695,28 @@ 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_image_menu_item_new_with_mnemonic ( _("Empty _Realtime") ); + gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU) ); + 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_image_menu_item_new_with_mnemonic ( _("E_mpty Upload") ); + gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU) ); 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_image_menu_item_new_with_mnemonic ( _("_Empty Download") ); + gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU) ); 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_image_menu_item_new_with_mnemonic ( _("Empty _All") ); + gtk_image_menu_item_set_image ( (GtkImageMenuItem*)item, gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU) ); 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 ); @@ -601,7 +725,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 ) @@ -612,7 +744,8 @@ static void vik_gps_layer_free ( VikGpsLayer *vgl ) disconnect_layer_signal(VIK_LAYER(vgl->trw_children[i]), vgl); g_object_unref(vgl->trw_children[i]); } -#ifdef VIK_CONFIG_REALTIME_GPS_TRACKING +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) + rt_gpsd_disconnect(vgl); if (vgl->realtime_track_gc != NULL) g_object_unref(vgl->realtime_track_gc); if (vgl->realtime_track_bg_gc != NULL) @@ -646,6 +779,11 @@ static void vik_gps_layer_realize ( VikGpsLayer *vgl, VikTreeview *vt, GtkTreeIt GtkTreeIter iter; int ix; + // TODO set to garmin by default + //if (a_babel_device_list) + // device = ((BabelDevice*)g_list_nth_data(a_babel_device_list, last_active))->name; + // Need to access uibuild widgets somehow.... + for (ix = 0; ix < NUM_TRW; ix++) { VikLayer * trw = VIK_LAYER(vgl->trw_children[ix]); vik_treeview_add_layer ( VIK_LAYER(vgl)->vt, layer_iter, &iter, @@ -690,12 +828,9 @@ static void gps_layer_drag_drop_request ( VikGpsLayer *val_src, VikGpsLayer *val { VikTreeview *vt = VIK_LAYER(val_src)->vt; VikLayer *vl = vik_treeview_item_get_pointer(vt, src_item_iter); - GtkTreeIter dest_iter; gchar *dp; - gboolean target_exists; dp = gtk_tree_path_to_string(dest_path); - target_exists = vik_treeview_get_iter_from_path_str(vt, &dest_iter, dp); /* vik_gps_layer_delete unrefs, but we don't want that here. * we're still using the layer. */ @@ -823,6 +958,14 @@ static void gps_download_progress_func(BabelProgressCode c, gpointer data, GpsSe case BABEL_DIAG_OUTPUT: line = (gchar *)data; + gdk_threads_enter(); + g_mutex_lock(sess->mutex); + if (sess->ok) { + gtk_label_set_text ( GTK_LABEL(sess->status_label), _("Status: Working...") ); + } + g_mutex_unlock(sess->mutex); + gdk_threads_leave(); + /* tells us how many items there will be */ if (strstr(line, "Xfer Wpt")) { sess->progress_label = sess->wp_label; @@ -851,6 +994,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; @@ -895,6 +1050,14 @@ static void gps_upload_progress_func(BabelProgressCode c, gpointer data, GpsSess case BABEL_DIAG_OUTPUT: line = (gchar *)data; + gdk_threads_enter(); + g_mutex_lock(sess->mutex); + if (sess->ok) { + gtk_label_set_text ( GTK_LABEL(sess->status_label), _("Status: Working...") ); + } + g_mutex_unlock(sess->mutex); + gdk_threads_leave(); + if (strstr(line, "PRDDAT")) { gchar **tokens = g_strsplit(line, " ", 0); gchar info[128]; @@ -958,13 +1121,13 @@ static void gps_comm_thread(GpsSession *sess) gboolean result; if (sess->direction == GPS_DOWN) - result = a_babel_convert_from (sess->vtl, sess->cmd_args, - (BabelStatusFunc) gps_download_progress_func, sess->port, sess); - else - result = a_babel_convert_to (sess->vtl, sess->cmd_args, - (BabelStatusFunc) gps_upload_progress_func, sess->port, sess); + result = a_babel_convert_from (sess->vtl, sess->cmd_args, sess->port, + (BabelStatusFunc) gps_download_progress_func, sess); + else { + result = a_babel_convert_to (sess->vtl, sess->track, sess->cmd_args, sess->port, + (BabelStatusFunc) gps_upload_progress_func, sess); + } - gdk_threads_enter(); if (!result) { gtk_label_set_text ( GTK_LABEL(sess->status_label), _("Error: couldn't find gpsbabel.") ); } @@ -974,6 +1137,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 */ +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) + if (!sess->realtime_tracking) +#endif + { + if ( sess->vvp && sess->direction == GPS_DOWN ) { + /* View the data available */ + vik_trw_layer_auto_set_view ( sess->vtl, sess->vvp) ; + vik_layer_emit_update ( VIK_LAYER(sess->vtl), TRUE ); // Yes update from background thread + } + } } else { /* canceled */ } @@ -989,60 +1164,133 @@ static void gps_comm_thread(GpsSession *sess) g_mutex_unlock(sess->mutex); gps_session_delete(sess); } - gdk_threads_leave(); g_thread_exit(NULL); } -static gint gps_comm(VikTrwLayer *vtl, gps_dir dir, vik_gps_proto proto, gchar *port) { +/** + * vik_gps_comm: + * @vtl: The TrackWaypoint layer to operate on + * @track: Operate on a particular track when specified + * @dir: The direction of the transfer + * @protocol: The GPS device communication protocol + * @port: The GPS serial port + * @tracking: If tracking then viewport display update will be skipped + * @vvp: A viewport is required as the display may get updated + * @vlp: A layers panel is needed for uploading as the items maybe modified + * @do_tracks: Whether tracks shoud be processed + * @do_waypoints: Whether waypoints shoud be processed + * @turn_off: Whether we should attempt to turn off the GPS device after the transfer (only some devices support this) + * + * Talk to a GPS Device using a thread which updates a dialog with the progress + */ +gint vik_gps_comm ( VikTrwLayer *vtl, + VikTrack *track, + vik_gps_dir dir, + gchar *protocol, + gchar *port, + gboolean tracking, + VikViewport *vvp, + VikLayersPanel *vlp, + gboolean do_tracks, + gboolean do_waypoints, + gboolean turn_off ) +{ GpsSession *sess = g_malloc(sizeof(GpsSession)); + char *tracks = NULL; + char *waypoints = NULL; sess->mutex = g_mutex_new(); sess->direction = dir; sess->vtl = vtl; + sess->track = track; sess->port = g_strdup(port); sess->ok = TRUE; - 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; + + // This must be done inside the main thread as the uniquify causes screen updates + // (originally performed this nearer the point of upload in the thread) + if ( dir == GPS_UP ) { + // Enforce unique names in the layer upload to the GPS device + // NB this may only be a Garmin device restriction (and may be not every Garmin device either...) + // Thus this maintains the older code in built restriction + if ( ! vik_trw_layer_uniquify ( sess->vtl, vlp ) ) + vik_statusbar_set_message ( vik_window_get_statusbar (VIK_WINDOW(VIK_GTK_WINDOW_FROM_LAYER(sess->vtl))), VIK_STATUSBAR_INFO, + _("Warning - GPS Upload items may overwrite each other") ); + } - 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 ); - gtk_window_set_title ( GTK_WINDOW(sess->dialog), sess->window_title ); +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) + sess->realtime_tracking = tracking; +#endif + + if (do_tracks) + tracks = "-t"; + else + tracks = ""; + if (do_waypoints) + waypoints = "-w"; + else + waypoints = ""; + + sess->cmd_args = g_strdup_printf("-D 9 %s %s -%c %s", + tracks, waypoints, (dir == GPS_DOWN) ? 'i' : 'o', protocol); + tracks = NULL; + waypoints = NULL; - sess->status_label = gtk_label_new (_("Status: detecting gpsbabel")); - gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(sess->dialog)->vbox), - sess->status_label, FALSE, FALSE, 5 ); - gtk_widget_show_all(sess->status_label); + // Only create dialog if we're going to do some transferring + if ( do_tracks || do_waypoints ) { + 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 ); + gtk_window_set_title ( GTK_WINDOW(sess->dialog), sess->window_title ); - sess->gps_label = gtk_label_new (_("GPS device: N/A")); - sess->ver_label = gtk_label_new (""); - sess->id_label = gtk_label_new (""); - sess->wp_label = gtk_label_new (""); - sess->trk_label = gtk_label_new (""); + sess->status_label = gtk_label_new (_("Status: detecting gpsbabel")); + gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(sess->dialog)->vbox), sess->status_label, FALSE, FALSE, 5 ); + gtk_widget_show_all(sess->status_label); - gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(sess->dialog)->vbox), sess->gps_label, FALSE, FALSE, 5 ); - gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(sess->dialog)->vbox), sess->wp_label, FALSE, FALSE, 5 ); - gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(sess->dialog)->vbox), sess->trk_label, FALSE, FALSE, 5 ); + sess->gps_label = gtk_label_new (_("GPS device: N/A")); + sess->ver_label = gtk_label_new (""); + sess->id_label = gtk_label_new (""); + sess->wp_label = gtk_label_new (""); + sess->trk_label = gtk_label_new (""); - gtk_widget_show_all(sess->dialog); + gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(sess->dialog)->vbox), sess->gps_label, FALSE, FALSE, 5 ); + gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(sess->dialog)->vbox), sess->wp_label, FALSE, FALSE, 5 ); + gtk_box_pack_start ( GTK_BOX(GTK_DIALOG(sess->dialog)->vbox), sess->trk_label, FALSE, FALSE, 5 ); - sess->progress_label = sess->wp_label; - sess->total_count = -1; + gtk_widget_show_all(sess->dialog); - /* TODO: starting gps read/write thread here */ - g_thread_create((GThreadFunc)gps_comm_thread, sess, FALSE, NULL ); + sess->progress_label = sess->wp_label; + sess->total_count = -1; - gtk_dialog_run(GTK_DIALOG(sess->dialog)); + // Starting gps read/write thread + g_thread_create((GThreadFunc)gps_comm_thread, sess, FALSE, NULL ); - gtk_widget_destroy(sess->dialog); + gtk_dialog_set_default_response ( GTK_DIALOG(sess->dialog), GTK_RESPONSE_ACCEPT ); + gtk_dialog_run(GTK_DIALOG(sess->dialog)); + + gtk_widget_destroy(sess->dialog); + } + else { + if ( !turn_off ) + a_dialog_info_msg ( VIK_GTK_WINDOW_FROM_LAYER(vtl), _("No GPS items selected for transfer.") ); + } g_mutex_lock(sess->mutex); + if (sess->ok) { sess->ok = FALSE; /* tell thread to stop */ g_mutex_unlock(sess->mutex); } else { + if ( turn_off ) { + // No need for thread for powering off device (should be quick operation...) - so use babel command directly: + gchar *device_off = g_strdup_printf("-i %s,%s", protocol, "power_off"); + gboolean result = a_babel_convert_from (NULL, (const char*)device_off, (const char*)port, NULL, NULL); + if ( !result ) + a_dialog_error_msg ( VIK_GTK_WINDOW_FROM_LAYER(vtl), _("Could not turn off device.") ); + g_free ( device_off ); + } g_mutex_unlock(sess->mutex); gps_session_delete(sess); } @@ -1053,20 +1301,34 @@ static gint gps_comm(VikTrwLayer *vtl, gps_dir dir, vik_gps_proto proto, gchar * static void gps_upload_cb( gpointer layer_and_vlp[2] ) { VikGpsLayer *vgl = (VikGpsLayer *)layer_and_vlp[0]; + VikLayersPanel *vlp = VIK_LAYERS_PANEL(layer_and_vlp[1]); VikTrwLayer *vtl = vgl->trw_children[TRW_UPLOAD]; - gps_comm(vtl, GPS_UP, vgl->protocol_id, vgl->serial_port); + VikWindow *vw = VIK_WINDOW(VIK_GTK_WINDOW_FROM_LAYER(vgl)); + VikViewport *vvp = vik_window_viewport(vw); + vik_gps_comm(vtl, NULL, GPS_UP, vgl->protocol, vgl->serial_port, FALSE, vvp, vlp, vgl->upload_tracks, vgl->upload_waypoints, FALSE); } 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, vgl->serial_port); + VikWindow *vw = VIK_WINDOW(VIK_GTK_WINDOW_FROM_LAYER(vgl)); + VikViewport *vvp = vik_window_viewport(vw); +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) + vik_gps_comm(vtl, NULL, GPS_DOWN, vgl->protocol, vgl->serial_port, vgl->realtime_tracking, vvp, NULL, vgl->download_tracks, vgl->download_waypoints, FALSE); +#else + vik_gps_comm(vtl, NULL, GPS_DOWN, vgl->protocol, vgl->serial_port, FALSE, vvp, NULL, vgl->download_tracks, vgl->download_waypoints, FALSE); +#endif } static void gps_empty_upload_cb( gpointer layer_and_vlp[2] ) { VikGpsLayer *vgl = (VikGpsLayer *)layer_and_vlp[0]; + // Get confirmation from the user + if ( ! a_dialog_yes_or_no ( VIK_GTK_WINDOW_FROM_WIDGET(layer_and_vlp[1]), + _("Are you sure you want to delete GPS Upload data?"), + NULL ) ) + return; vik_trw_layer_delete_all_waypoints ( vgl-> trw_children[TRW_UPLOAD]); vik_trw_layer_delete_all_tracks ( vgl-> trw_children[TRW_UPLOAD]); } @@ -1074,23 +1336,48 @@ static void gps_empty_upload_cb( gpointer layer_and_vlp[2] ) static void gps_empty_download_cb( gpointer layer_and_vlp[2] ) { VikGpsLayer *vgl = (VikGpsLayer *)layer_and_vlp[0]; + // Get confirmation from the user + if ( ! a_dialog_yes_or_no ( VIK_GTK_WINDOW_FROM_WIDGET(layer_and_vlp[1]), + _("Are you sure you want to delete GPS Download data?"), + NULL ) ) + return; vik_trw_layer_delete_all_waypoints ( vgl-> trw_children[TRW_DOWNLOAD]); vik_trw_layer_delete_all_tracks ( vgl-> trw_children[TRW_DOWNLOAD]); } +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) +static void gps_empty_realtime_cb( gpointer layer_and_vlp[2] ) +{ + VikGpsLayer *vgl = (VikGpsLayer *)layer_and_vlp[0]; + // Get confirmation from the user + if ( ! a_dialog_yes_or_no ( VIK_GTK_WINDOW_FROM_WIDGET(layer_and_vlp[1]), + _("Are you sure you want to delete GPS Realtime data?"), + NULL ) ) + return; + 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]; + // Get confirmation from the user + if ( ! a_dialog_yes_or_no ( VIK_GTK_WINDOW_FROM_WIDGET(layer_and_vlp[1]), + _("Are you sure you want to delete All GPS data?"), + NULL ) ) + return; vik_trw_layer_delete_all_waypoints ( vgl-> trw_children[TRW_UPLOAD]); 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]); +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) + 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 -static void rt_gpsd_disconnect(VikGpsLayer *vgl); -static gboolean rt_gpsd_connect(VikGpsLayer *vgl, gboolean ask_if_failed); - +#if defined (VIK_CONFIG_REALTIME_GPS_TRACKING) && defined (GPSD_API_MAJOR_VERSION) static void realtime_tracking_draw(VikGpsLayer *vgl, VikViewport *vp) { struct LatLon ll; @@ -1109,7 +1396,7 @@ static void realtime_tracking_draw(VikGpsLayer *vgl, VikViewport *vp) gint half_back_x, half_back_y; gint half_back_bg_x, half_back_bg_y; gint pt_x, pt_y; - gint ptbg_x, ptbg_y; + gint ptbg_x; gint side1_x, side1_y, side2_x, side2_y; gint side1bg_x, side1bg_y, side2bg_x, side2bg_y; @@ -1128,7 +1415,7 @@ static void realtime_tracking_draw(VikGpsLayer *vgl, VikViewport *vp) pt_y = half_back_y-24*heading_cos; pt_x = half_back_x+24*heading_sin; - ptbg_y = half_back_bg_y-28*heading_cos; + //ptbg_y = half_back_bg_y-28*heading_cos; ptbg_x = half_back_bg_x+28*heading_sin; side1_y = half_back_y+9*heading_sin; @@ -1272,7 +1559,7 @@ static void gpsd_raw_hook(VglGpsd *vgpsd, gchar *data) vgl->first_realtime_trackpoint = FALSE; create_realtime_trackpoint(vgl, FALSE); - vik_layer_emit_update ( update_all ? VIK_LAYER(vgl) : VIK_LAYER(vgl->trw_children[TRW_REALTIME])); + vik_layer_emit_update ( update_all ? VIK_LAYER(vgl) : VIK_LAYER(vgl->trw_children[TRW_REALTIME]), TRUE); // Yes update from background thread } } @@ -1280,8 +1567,17 @@ static gboolean gpsd_data_available(GIOChannel *source, GIOCondition condition, { VikGpsLayer *vgl = data; if (condition == G_IO_IN) { - if (!gps_poll(&vgl->vgpsd->gpsd)) +#if GPSD_API_MAJOR_VERSION == 3 || GPSD_API_MAJOR_VERSION == 4 + if (!gps_poll(&vgl->vgpsd->gpsd)) { +#elif GPSD_API_MAJOR_VERSION == 5 + if (gps_read(&vgl->vgpsd->gpsd) > -1) { + // Reuse old function to perform operations on the new GPS data + gpsd_raw_hook(vgl->vgpsd, NULL); +#else + // Broken compile +#endif return TRUE; + } else { g_warning("Disconnected from gpsd. Trying to reconnect"); rt_gpsd_disconnect(vgl); @@ -1310,21 +1606,26 @@ static gchar *make_track_name(VikTrwLayer *vtl) static gboolean rt_gpsd_try_connect(gpointer *data) { VikGpsLayer *vgl = (VikGpsLayer *)data; -#ifndef HAVE_GPS_OPEN_R +#if GPSD_API_MAJOR_VERSION == 3 struct gps_data_t *gpsd = gps_open(vgl->gpsd_host, vgl->gpsd_port); if (gpsd == NULL) { -#else +#elif GPSD_API_MAJOR_VERSION == 4 vgl->vgpsd = g_malloc(sizeof(VglGpsd)); if (gps_open_r(vgl->gpsd_host, vgl->gpsd_port, /*(struct gps_data_t *)*/vgl->vgpsd) != 0) { +#elif GPSD_API_MAJOR_VERSION == 5 + vgl->vgpsd = g_malloc(sizeof(VglGpsd)); + if (gps_open(vgl->gpsd_host, vgl->gpsd_port, &vgl->vgpsd->gpsd) != 0) { +#else +// Delibrately break compilation... #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 */ } -#ifndef HAVE_GPS_OPEN_R +#if GPSD_API_MAJOR_VERSION == 3 vgl->vgpsd = realloc(gpsd, sizeof(VglGpsd)); #endif vgl->vgpsd->vgl = vgl; @@ -1338,19 +1639,24 @@ static gboolean rt_gpsd_try_connect(gpointer *data) VikTrwLayer *vtl = vgl->trw_children[TRW_REALTIME]; vgl->realtime_track = vik_track_new(); vgl->realtime_track->visible = TRUE; - vgl->realtime_track_name = make_track_name(vtl); - vik_trw_layer_add_track(vtl, vgl->realtime_track_name, vgl->realtime_track); + vik_trw_layer_add_track(vtl, make_track_name(vtl), vgl->realtime_track); } +#if GPSD_API_MAJOR_VERSION == 3 || GPSD_API_MAJOR_VERSION == 4 gps_set_raw_hook(&vgl->vgpsd->gpsd, gpsd_raw_hook); +#endif + 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 + +#if GPSD_API_MAJOR_VERSION == 3 gps_query(&vgl->vgpsd->gpsd, "w+x"); #endif +#if GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5 + gps_stream(&vgl->vgpsd->gpsd, WATCH_ENABLE, NULL); +#endif + return FALSE; /* no longer called by timeout */ } @@ -1389,33 +1695,35 @@ static gboolean rt_gpsd_connect(VikGpsLayer *vgl, gboolean ask_if_failed) static void rt_gpsd_disconnect(VikGpsLayer *vgl) { - if (vgl->realtime_io_watch_id) { - g_source_remove(vgl->realtime_io_watch_id); - vgl->realtime_io_watch_id = 0; - } if (vgl->realtime_retry_timer) { g_source_remove(vgl->realtime_retry_timer); vgl->realtime_retry_timer = 0; } + if (vgl->realtime_io_watch_id) { + g_source_remove(vgl->realtime_io_watch_id); + vgl->realtime_io_watch_id = 0; + } if (vgl->realtime_io_channel) { GError *error = NULL; g_io_channel_shutdown (vgl->realtime_io_channel, FALSE, &error); vgl->realtime_io_channel = NULL; } if (vgl->vgpsd) { +#if GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5 + gps_stream(&vgl->vgpsd->gpsd, WATCH_DISABLE, NULL); +#endif gps_close(&vgl->vgpsd->gpsd); -#ifdef HAVE_GPS_OPEN_R - g_free(vgl->vgpsd); -#else +#if GPSD_API_MAJOR_VERSION == 3 free(vgl->vgpsd); +#elif GPSD_API_MAJOR_VERSION == 4 || GPSD_API_MAJOR_VERSION == 5 + g_free(vgl->vgpsd); #endif vgl->vgpsd = NULL; } if (vgl->realtime_record && vgl->realtime_track) { - create_realtime_trackpoint(vgl, TRUE); if ((vgl->realtime_track->trackpoints == NULL) || (vgl->realtime_track->trackpoints->next == NULL)) - vik_trw_layer_delete_track(vgl->trw_children[TRW_REALTIME], vgl->realtime_track_name); + vik_trw_layer_delete_track(vgl->trw_children[TRW_REALTIME], vgl->realtime_track); vgl->realtime_track = NULL; } } @@ -1441,4 +1749,3 @@ static void gps_start_stop_tracking_cb( gpointer layer_and_vlp[2]) } } #endif /* VIK_CONFIG_REALTIME_GPS_TRACKING */ -