#include <stdlib.h>
#include "viking.h"
-#define DATA_NONE 0
-#define DATA_LAYER 1
-#define DATA_SUBLAYER 2
-
typedef struct {
gpointer clipboard;
- guint8 type;
+ gint pid;
+ VikClipboardDataType type;
gint subtype;
guint16 layer_type;
+ guint len;
+ guint8 data[0];
} vik_clipboard_t;
static GtkTargetEntry target_table[] = {
static void clip_get ( GtkClipboard *c, GtkSelectionData *selection_data, guint info, gpointer p )
{
vik_clipboard_t *vc = p;
- // g_print("clip_get\n");
if (info==0) {
- gtk_selection_data_set ( selection_data, selection_data->target, 8, (void *)vc, sizeof(*vc) );
+ // g_print("clip_get: vc = %p, size = %d\n", vc, sizeof(*vc) + vc->len);
+ gtk_selection_data_set ( selection_data, selection_data->target, 8, (void *)vc, sizeof(*vc) + vc->len );
}
if (info==1) {
- if (vc->type == DATA_LAYER) {
+ if (vc->type == VIK_CLIPBOARD_DATA_LAYER) {
gtk_selection_data_set_text ( selection_data, VIK_LAYER(vc->clipboard)->name, -1 );
}
}
static void clip_clear ( GtkClipboard *c, gpointer p )
{
- vik_clipboard_t *vc = p;
- // g_print("clip_clear\n");
-
- if ( vc->clipboard && vc->type == DATA_LAYER )
- g_object_unref ( G_OBJECT(vc->clipboard) );
- else if ( vc->clipboard && vc->type == DATA_SUBLAYER )
- if ( vik_layer_get_interface(vc->layer_type)->free_copied_item )
- vik_layer_get_interface(vc->layer_type)->free_copied_item(vc->subtype,vc->clipboard);
- vc->clipboard = NULL;
- vc->type = DATA_NONE;
+ g_free(p);
}
VikLayersPanel *vlp = p;
vik_clipboard_t *vc;
if (sd->length == -1) {
- g_print("receive failed\n");
+ g_warning ( "paste failed" );
return;
}
// g_print("clip receive: target = %s, type = %s\n", gdk_atom_name(sd->target), gdk_atom_name(sd->type));
g_assert(!strcmp(gdk_atom_name(sd->target), target_table[0].target));
- g_assert(sd->length == sizeof(*vc));
vc = (vik_clipboard_t *)sd->data;
+ // g_print(" sd->data = %p, sd->length = %d, vc->len = %d\n", sd->data, sd->length, vc->len);
+
+ if (sd->length != sizeof(*vc) + vc->len) {
+ g_warning ( "wrong clipboard data size" );
+ return;
+ }
- if ( vc->clipboard && vc->type == DATA_LAYER )
+ if ( vc->type == VIK_CLIPBOARD_DATA_LAYER )
{
- /* oooh, _private_ ... so sue me, there's no other way to do this. */
- if ( G_OBJECT(vc->clipboard)->ref_count == 1 )
- { /* optimization -- if layer has been deleted, don't copy the layer. */
- g_object_ref ( G_OBJECT(vc->clipboard) );
- vik_layers_panel_add_layer ( vlp, VIK_LAYER(vc->clipboard) );
- }
- else
- {
- VikLayer *new_layer = vik_layer_copy ( VIK_LAYER(vc->clipboard), vik_layers_panel_get_viewport(vlp) );
- if ( new_layer )
- {
- vik_layers_panel_add_layer ( vlp, new_layer );
- }
- }
+ VikLayer *new_layer = vik_layer_unmarshall ( vc->data, vc->len, vik_layers_panel_get_viewport(vlp) );
+ vik_layers_panel_add_layer ( vlp, new_layer );
}
- else if ( vc->clipboard && vc->type == DATA_SUBLAYER )
+ else if ( vc->type == VIK_CLIPBOARD_DATA_SUBLAYER )
{
VikLayer *sel = vik_layers_panel_get_selected ( vlp );
if ( sel && sel->type == vc->layer_type)
{
if ( vik_layer_get_interface(vc->layer_type)->paste_item )
- vik_layer_get_interface(vc->layer_type)->paste_item ( sel, vc->subtype, vc->clipboard );
+ vik_layer_get_interface(vc->layer_type)->paste_item ( sel, vc->subtype, vc->data, vc->len);
}
else
a_dialog_error_msg_extra ( VIK_GTK_WINDOW_FROM_WIDGET(GTK_WIDGET(vlp)), "The clipboard contains sublayer data for a %s layers. You must select a layer of this type to paste the clipboard data.", vik_layer_get_interface(vc->layer_type)->name );
}
g_free(s);
- if (i<len) {
+ /* did we get to the end without actually finding a coordinate? */
+ if (i<len && lat >= -90.0 && lat <= 90.0 && lon >= -180.0 && lon <= 180.0) {
coord->lat = lat;
coord->lon = lon;
return TRUE;
- } else {
- return FALSE;
}
+ return FALSE;
}
static void clip_add_wp(VikLayersPanel *vlp, struct LatLon *coord)
static void clip_receive_html ( GtkClipboard *c, GtkSelectionData *sd, gpointer p )
{
VikLayersPanel *vlp = p;
- gint r, w;
+ guint r, w;
GError *err = NULL;
gchar *s, *span;
gint tag = 0, i;
}
/* - copying from Mozilla seems to give html in UTF-16. */
- if (!(s = g_convert ( sd->data, sd->length, "UTF-8", "UTF-16", &r, &w, &err))) {
+ if (!(s = g_convert ( (gchar *)sd->data, sd->length, "UTF-8", "UTF-16", &r, &w, &err))) {
return;
}
// g_print("html is %d bytes long: %s\n", sd->length, s);
/*
* make a copy of selected object and associate ourselves with the clipboard
*/
-void a_clipboard_copy ( VikLayersPanel *vlp )
+void a_clipboard_copy_selected ( VikLayersPanel *vlp )
{
VikLayer *sel = vik_layers_panel_get_selected ( vlp );
GtkTreeIter iter;
- vik_clipboard_t *vc = g_malloc(sizeof(*vc));
- GtkClipboard *c = gtk_clipboard_get ( GDK_SELECTION_CLIPBOARD );
+ VikClipboardDataType type;
+ guint16 layer_type = 0;
+ gint subtype = 0;
+ guint8 *data = NULL;
+ guint len;
if ( ! sel )
return;
vik_treeview_get_selected_iter ( sel->vt, &iter );
- if ( vik_treeview_item_get_type ( sel->vt, &iter ) == VIK_TREEVIEW_TYPE_SUBLAYER )
- {
- vc->layer_type = sel->type;
- if ( vik_layer_get_interface(vc->layer_type)->copy_item && (vc->clipboard = vik_layer_get_interface(vc->layer_type)->
- copy_item(sel,vc->subtype=vik_treeview_item_get_data(sel->vt,&iter),vik_treeview_item_get_pointer(sel->vt,&iter)) ))
- vc->type = DATA_SUBLAYER;
- else
- return; /* selected sublayer is uncopyable */
+ if ( vik_treeview_item_get_type ( sel->vt, &iter ) == VIK_TREEVIEW_TYPE_SUBLAYER ) {
+ type = VIK_CLIPBOARD_DATA_SUBLAYER;
+ layer_type = sel->type;
+ if ( vik_layer_get_interface(layer_type)->copy_item) {
+ subtype = vik_treeview_item_get_data(sel->vt, &iter);
+ vik_layer_get_interface(layer_type)->copy_item(sel, subtype, vik_treeview_item_get_pointer(sel->vt, &iter), &data, &len );
+ }
}
else
{
- vc->clipboard = sel;
- g_object_ref ( G_OBJECT(sel) );
- vc->type = DATA_LAYER;
+ type = VIK_CLIPBOARD_DATA_LAYER;
+ vik_layer_marshall ( sel, &data, &len );
}
+
+ if (data)
+ a_clipboard_copy( type, layer_type, subtype, len, data);
+
+}
+
+void a_clipboard_copy( VikClipboardDataType type, guint16 layer_type, gint subtype, guint len, guint8 * data)
+{
+ vik_clipboard_t * vc = g_malloc(sizeof(*vc) + len);
+ GtkClipboard *c = gtk_clipboard_get ( GDK_SELECTION_CLIPBOARD );
+
+ vc->type = type;
+ vc->layer_type = layer_type;
+ vc->subtype = subtype;
+ vc->len = len;
+ memcpy(vc->data, data, len);
+ g_free(data);
+ vc->pid = getpid();
gtk_clipboard_set_with_data ( c, target_table, G_N_ELEMENTS(target_table), clip_get, clip_clear, vc );
}
projects / andy / viking.git / blobdiff