X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/2bf635ef2201a91e4d9bb2654d0fca9693cc6c62..2eb89de4f0ea84ddecf6649d93305c45e3e016ab:/src/viklayer.c?ds=sidebyside

diff --git a/src/viklayer.c b/src/viklayer.c
index 522be1f8..926b9390 100644
--- a/src/viklayer.c
+++ b/src/viklayer.c
@@ -1,7 +1,8 @@
 /*
  * viking -- GPS Data and Topo Analyzer, Explorer, and Manager
  *
- * Copyright (C) 2003-2005, Evan Battaglia <gtoevan@gmx.net>
+ * Copyright (C) 2005, Alex Foobarian <foobarian@gmail.com>
+ * Copyright (C) 2003-2007, Evan Battaglia <gtoevan@gmx.net>
  *
  * 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
@@ -94,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] = {
@@ -393,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;
@@ -422,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;
 }
 
@@ -437,6 +467,20 @@ const gchar *vik_layer_sublayer_rename_request ( VikLayer *l, const gchar *newna
   return NULL;
 }
 
+const gchar* vik_layer_sublayer_tooltip ( VikLayer *l, gint subtype, gpointer sublayer )
+{
+  if ( vik_layer_interfaces[l->type]->sublayer_tooltip )
+    return vik_layer_interfaces[l->type]->sublayer_tooltip ( l, subtype, sublayer );
+  return NULL;
+}
+
+const gchar* vik_layer_layer_tooltip ( VikLayer *l )
+{
+  if ( vik_layer_interfaces[l->type]->layer_tooltip )
+    return vik_layer_interfaces[l->type]->layer_tooltip ( l );
+  return NULL;
+}
+
 GdkPixbuf *vik_layer_load_icon ( gint type )
 {
   g_assert ( type < VIK_LAYER_NUM_TYPES );