Fix usage of vvp in gpslayer in uploading TRW layer data.

[andy/viking.git] / src / viklayer.c

diff --git a/src/viklayer.c b/src/viklayer.c
index d6be86ffd2753d149085bd7350c984244715d73e..926b93905e3d57e84a4da8ac68f2855ff9a31934 100644 (file)
--- a/src/viklayer.c
+++ b/src/viklayer.c
@@ -95,28 +95,49 @@ static void layer_class_init (VikLayerClass *klass)
       g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 }
 
-void vik_layer_emit_update ( VikLayer *vl )
+/**
+ * Invoke the actual drawing via signal method
+ */
+static gboolean idle_draw ( VikLayer *vl )
+{
+  g_signal_emit ( G_OBJECT(vl), layer_signals[VL_UPDATE_SIGNAL], 0 );
+  return FALSE; // Nothing else to do
+}
+
+/**
+ * Draw specified layer
+ */
+void vik_layer_emit_update ( VikLayer *vl, gboolean from_background )
 {
   if ( vl->visible ) {
     vik_window_set_redraw_trigger(vl);
-    g_signal_emit ( G_OBJECT(vl), layer_signals[VL_UPDATE_SIGNAL], 0 );
+
+    // Only ever draw when there is time to do so
+    if ( from_background )
+      // Drawing requested from background thread, so handle via the gdk thread method
+      gdk_threads_add_idle ( (GSourceFunc) idle_draw, vl );
+    else
+      g_idle_add ( (GSourceFunc) idle_draw, vl );
   }
 }
 
-/* should only be done by VikLayersPanel -- need to redraw and record trigger
- * when we make a layer invisible.
+/**
+ * should only be done by VikLayersPanel (hence never used from the background)
+ * need to redraw and record trigger when we make a layer invisible.
  */
 void vik_layer_emit_update_although_invisible ( VikLayer *vl )
 {
   vik_window_set_redraw_trigger(vl);
-  g_signal_emit ( G_OBJECT(vl), layer_signals[VL_UPDATE_SIGNAL], 0 );
+  g_idle_add ( (GSourceFunc) idle_draw, vl );
 }
 
 /* doesn't set the trigger. should be done by aggregate layer when child emits update. */
 void vik_layer_emit_update_secondary ( VikLayer *vl )
 {
   if ( vl->visible )
-    g_signal_emit ( G_OBJECT(vl), layer_signals[VL_UPDATE_SIGNAL], 0 );
+    // TODO: this can used from the background - eg in acquire
+    //       so will need to flow background update status through too
+    g_idle_add ( (GSourceFunc) idle_draw, vl );
 }
 
 static VikLayerInterface *vik_layer_interfaces[VIK_LAYER_NUM_TYPES] = {
@@ -394,6 +415,14 @@ gboolean vik_layer_sublayer_toggle_visible ( VikLayer *l, gint subtype, gpointer
   return TRUE; /* if unknown, will always be visible */
 }
 
+gboolean vik_layer_selected ( VikLayer *l, gint subtype, gpointer sublayer, gint type, gpointer vlp )
+{
+  if ( vik_layer_interfaces[l->type]->layer_selected )
+    return vik_layer_interfaces[l->type]->layer_selected ( l, subtype, sublayer, type, vlp );
+  /* Since no 'layer_selected' function explicitly turn off here */
+  return vik_window_clear_highlight ( (VikWindow *)VIK_GTK_WINDOW_FROM_LAYER(l) );
+}
+
 void vik_layer_realize ( VikLayer *l, VikTreeview *vt, GtkTreeIter *layer_iter )
 {
   l->vt = vt;
@@ -423,10 +452,10 @@ void vik_layer_add_menu_items ( VikLayer *l, GtkMenu *menu, gpointer vlp )
     vik_layer_interfaces[l->type]->add_menu_items ( l, menu, vlp );
 }
 
-gboolean vik_layer_sublayer_add_menu_items ( VikLayer *l, GtkMenu *menu, gpointer vlp, gint subtype, gpointer sublayer, GtkTreeIter *iter )
+gboolean vik_layer_sublayer_add_menu_items ( VikLayer *l, GtkMenu *menu, gpointer vlp, gint subtype, gpointer sublayer, GtkTreeIter *iter, VikViewport *vvp )
 {
   if ( vik_layer_interfaces[l->type]->sublayer_add_menu_items )
-    return vik_layer_interfaces[l->type]->sublayer_add_menu_items ( l, menu, vlp, subtype, sublayer, iter );
+    return vik_layer_interfaces[l->type]->sublayer_add_menu_items ( l, menu, vlp, subtype, sublayer, iter, vvp );
   return FALSE;
 }