X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/70a23263f2aea090c9134e379601e72131797af2..96bcc8cbfb8bc23d7f86bc5aed9606f589eda69f:/src/vikaggregatelayer.c?ds=sidebyside diff --git a/src/vikaggregatelayer.c b/src/vikaggregatelayer.c index 828c1e16..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,12 +125,73 @@ 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 () @@ -133,8 +204,8 @@ VikAggregateLayer *vik_aggregate_layer_new () void vik_aggregate_layer_insert_layer ( VikAggregateLayer *val, VikLayer *l, GtkTreeIter *replace_iter ) { - GList *theone = g_list_find ( val->children, vik_treeview_item_get_pointer ( VIK_LAYER(val)->vt, replace_iter ) ); GtkTreeIter iter; + if ( VIK_LAYER(val)->realized ) { vik_treeview_insert_layer ( VIK_LAYER(val)->vt, &(VIK_LAYER(val)->iter), &iter, l->name, val, l, l->type, l->type, replace_iter ); @@ -145,9 +216,13 @@ void vik_aggregate_layer_insert_layer ( VikAggregateLayer *val, VikLayer *l, Gtk if ( val->children == NULL ) vik_treeview_expand ( VIK_LAYER(val)->vt, &(VIK_LAYER(val)->iter) ); } - val->children = g_list_insert ( val->children, l, g_list_position(val->children,theone)+1 ); - + if (replace_iter) { + GList *theone = g_list_find ( val->children, vik_treeview_item_get_pointer ( VIK_LAYER(val)->vt, replace_iter ) ); + val->children = g_list_insert ( val->children, l, g_list_position(val->children,theone)+1 ); + } else { + val->children = g_list_append ( val->children, l ); + } g_signal_connect_swapped ( G_OBJECT(l), "update", G_CALLBACK(vik_layer_emit_update), val ); } @@ -264,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 ) { @@ -298,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,13 +431,23 @@ static void aggregate_layer_drag_drop_request ( VikAggregateLayer *val_src, VikA { VikTreeview *vt = VIK_LAYER(val_src)->vt; VikLayer *vl = vik_treeview_item_get_pointer(vt, src_item_iter); - /* - * FIXME: _layer_delete unrefs the given layer, causing it to be destroyed. - * However, _add_layer doesn't increase the ref count, so regardless of order - * without the explicit g_object_ref this wouldn't work. - */ - g_object_ref(vl); + 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); - vik_aggregate_layer_add_layer(val_dest, vl); + + if (target_exists) { + vik_aggregate_layer_insert_layer(val_dest, vl, &dest_iter); + } else { + vik_aggregate_layer_insert_layer(val_dest, vl, NULL); /* append */ + } + g_free(dp); }