X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/e673b75ff77d913d18a629a7e16b1a1a8bd62b6a..96bcc8cbfb8bc23d7f86bc5aed9606f589eda69f:/src/vikaggregatelayer.c

diff --git a/src/vikaggregatelayer.c b/src/vikaggregatelayer.c
index 208a84bc..4b954b27 100644
--- a/src/vikaggregatelayer.c
+++ b/src/vikaggregatelayer.c
@@ -27,6 +27,8 @@
 #define DISCONNECT_UPDATE_SIGNAL(vl, val) g_signal_handlers_disconnect_matched(vl, G_SIGNAL_MATCH_DATA, 0, 0, 0, 0, val)
 
 static VikAggregateLayer *aggregate_layer_copy ( VikAggregateLayer *val, gpointer vp );
+static void aggregate_layer_marshall( VikAggregateLayer *val, guint8 **data, gint *len );
+static VikAggregateLayer *aggregate_layer_unmarshall( guint8 *data, gint len, VikViewport *vvp );
 static void aggregate_layer_change_coord_mode ( VikAggregateLayer *val, VikCoordMode mode );
 static void aggregate_layer_drag_drop_request ( VikAggregateLayer *val_src, VikAggregateLayer *val_dest, GtkTreeIter *src_item_iter, GtkTreePath *dest_path );
 
@@ -42,6 +44,8 @@ VikLayerInterface vik_aggregate_layer_interface = {
   NULL,
   0,
 
+  VIK_MENU_ITEM_ALL,
+
   (VikLayerFuncCreate)                  vik_aggregate_layer_create,
   (VikLayerFuncRealize)                 vik_aggregate_layer_realize,
   (VikLayerFuncPostRead)                NULL,
@@ -50,6 +54,9 @@ VikLayerInterface vik_aggregate_layer_interface = {
   (VikLayerFuncProperties)              NULL,
   (VikLayerFuncDraw)                    vik_aggregate_layer_draw,
   (VikLayerFuncChangeCoordMode)         aggregate_layer_change_coord_mode,
+  
+  (VikLayerFuncSetMenuItemsSelection)	NULL,
+  (VikLayerFuncGetMenuItemsSelection)	NULL,
 
   (VikLayerFuncAddMenuItems)            NULL,
   (VikLayerFuncSublayerAddMenuItems)    NULL,
@@ -58,6 +65,8 @@ VikLayerInterface vik_aggregate_layer_interface = {
   (VikLayerFuncSublayerToggleVisible)   NULL,
 
   (VikLayerFuncCopy)                    aggregate_layer_copy,
+  (VikLayerFuncMarshall)		aggregate_layer_marshall,
+  (VikLayerFuncUnmarshall)		aggregate_layer_unmarshall,
 
   (VikLayerFuncSetParam)                NULL,
   (VikLayerFuncGetParam)                NULL,
@@ -65,6 +74,7 @@ VikLayerInterface vik_aggregate_layer_interface = {
   (VikLayerFuncReadFileData)            NULL,
   (VikLayerFuncWriteFileData)           NULL,
 
+  (VikLayerFuncDeleteItem)              NULL,
   (VikLayerFuncCopyItem)                NULL,
   (VikLayerFuncPasteItem)               NULL,
   (VikLayerFuncFreeCopiedItem)          NULL,
@@ -115,14 +125,75 @@ static VikAggregateLayer *aggregate_layer_copy ( VikAggregateLayer *val, gpointe
   while ( child )
   {
     child_layer = vik_layer_copy ( VIK_LAYER(child->data), vp );
-    if ( child_layer )
+    if ( child_layer ) {
       rv->children = g_list_append ( rv->children, child_layer );
       g_signal_connect_swapped ( G_OBJECT(child_layer), "update", G_CALLBACK(vik_layer_emit_update), rv );
+    }
     child = child->next;
   }
   return rv;
 }
 
+static void aggregate_layer_marshall( VikAggregateLayer *val, guint8 **data, gint *datalen )
+{
+  GList *child = val->children;
+  VikLayer *child_layer;
+  guint8 *ld; 
+  gint ll;
+  GByteArray* b = g_byte_array_new ();
+  gint len;
+
+#define alm_append(obj, sz) 	\
+  len = (sz);    		\
+  g_byte_array_append ( b, (guint8 *)&len, sizeof(len) );	\
+  g_byte_array_append ( b, (guint8 *)(obj), len );
+
+  vik_layer_marshall_params(VIK_LAYER(val), &ld, &ll);
+  alm_append(ld, ll);
+  g_free(ld);
+
+  while (child) {
+    child_layer = VIK_LAYER(child->data);
+    vik_layer_marshall ( child_layer, &ld, &ll );
+    if (ld) {
+      alm_append(ld, ll);
+      g_free(ld);
+    }
+    child = child->next;
+  }
+  *data = b->data;
+  *datalen = b->len;
+  g_byte_array_free(b, FALSE);
+#undef alm_append
+}
+
+static VikAggregateLayer *aggregate_layer_unmarshall( guint8 *data, gint len, VikViewport *vvp )
+{
+#define alm_size (*(gint *)data)
+#define alm_next \
+  len -= sizeof(gint) + alm_size; \
+  data += sizeof(gint) + alm_size;
+  
+  VikAggregateLayer *rv = vik_aggregate_layer_new();
+  VikLayer *child_layer;
+
+  vik_layer_unmarshall_params ( VIK_LAYER(rv), data+sizeof(gint), alm_size, vvp );
+  alm_next;
+
+  while (len>0) {
+    child_layer = vik_layer_unmarshall ( data + sizeof(gint), alm_size, vvp );
+    if (child_layer) {
+      rv->children = g_list_append ( rv->children, child_layer );
+      g_signal_connect_swapped ( G_OBJECT(child_layer), "update", G_CALLBACK(vik_layer_emit_update), rv );
+    }
+    alm_next;
+  }
+  //  g_print("aggregate_layer_unmarshall ended with len=%d\n", len);
+  return rv;
+#undef alm_size
+#undef alm_next
+}
+
 VikAggregateLayer *vik_aggregate_layer_new ()
 {
   VikAggregateLayer *val = VIK_AGGREGATE_LAYER ( g_object_new ( VIK_AGGREGATE_LAYER_TYPE, NULL ) );
@@ -268,6 +339,7 @@ gboolean vik_aggregate_layer_delete ( VikAggregateLayer *val, GtkTreeIter *iter
   return was_visible;
 }
 
+#if 0
 /* returns 0 == we're good, 1 == didn't find any layers, 2 == got rejected */
 guint vik_aggregate_layer_tool ( VikAggregateLayer *val, guint16 layer_type, VikToolInterfaceFunc tool_func, GdkEventButton *event, VikViewport *vvp )
 {
@@ -302,6 +374,7 @@ guint vik_aggregate_layer_tool ( VikAggregateLayer *val, guint16 layer_type, Vik
   }
   return found_rej ? 2 : 1; /* no one wanted to accept the tool call in this layer */
 }
+#endif 
 
 VikLayer *vik_aggregate_layer_get_top_visible_layer_of_type ( VikAggregateLayer *val, gint type )
 {
@@ -354,27 +427,27 @@ gboolean vik_aggregate_layer_is_empty ( VikAggregateLayer *val )
   return TRUE;
 }
 
-static void aggregate_layer_remove ( VikAggregateLayer *val, GtkTreeIter *iter )
-{
-  VikLayer *l = VIK_LAYER( vik_treeview_item_get_pointer ( VIK_LAYER(val)->vt, iter ) );
-  vik_treeview_item_delete ( VIK_LAYER(val)->vt, iter );
-  val->children = g_list_remove ( val->children, l );
-}
-
 static void aggregate_layer_drag_drop_request ( VikAggregateLayer *val_src, VikAggregateLayer *val_dest, GtkTreeIter *src_item_iter, GtkTreePath *dest_path )
 {
   VikTreeview *vt = VIK_LAYER(val_src)->vt;
   VikLayer *vl = vik_treeview_item_get_pointer(vt, src_item_iter);
-  gchar *ps;
   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_aggregate_layer_delete unrefs, but we don't want that here.
+   * we're still using the layer. */
+  g_object_ref ( vl );
+  vik_aggregate_layer_delete(val_src, src_item_iter);
 
-  ps = gtk_tree_path_to_string(dest_path);
-  if (vik_treeview_get_iter_from_path_str(vt, &dest_iter, ps)) {
+  if (target_exists) {
     vik_aggregate_layer_insert_layer(val_dest, vl, &dest_iter);
   } else {
     vik_aggregate_layer_insert_layer(val_dest, vl, NULL); /* append */
   }
-  aggregate_layer_remove(val_src, src_item_iter);
-  g_free(ps);
+  g_free(dp);
 }