From 09ec552655f3b32fb05d9bf360366722fdabd00f Mon Sep 17 00:00:00 2001
From: edgrif <edgrif>
Date: Tue, 16 Mar 2010 16:10:22 +0000
Subject: [PATCH] update from latest gnome foocanvas
---
foocanvas/zmap_source/configure.in.diff | 4 +-
.../libfoocanvas/foo-canvas-line.c.diff | 4 +-
.../libfoocanvas/foo-canvas-marshal.list.diff | 4 +-
.../libfoocanvas/foo-canvas-pixbuf.c.diff | 4 +-
.../libfoocanvas/foo-canvas-polygon.c.diff | 4 +-
.../foo-canvas-rect-ellipse.c.diff | 4 +-
.../libfoocanvas/foo-canvas-text.c.diff | 4 +-
.../libfoocanvas/foo-canvas-widget.c.diff | 4 +-
.../libfoocanvas/foo-canvas.c.diff | 62 +++++++++++--------
.../libfoocanvas/foo-canvas.h.diff | 4 +-
.../foozmap-canvas-floating-group.c.diff | 2 +-
.../foozmap-canvas-floating-group.h.diff | 2 +-
.../foozmap-canvas-line-glyph.c.diff | 2 +-
.../foozmap-canvas-line-glyph.h.diff | 2 +-
.../libfoocanvas/foozmap-canvas-text.c.diff | 21 +++----
.../libfoocanvas/foozmap-canvas-text.h.diff | 2 +-
.../libfoocanvas/libfoocanvas.h.diff | 4 +-
17 files changed, 71 insertions(+), 62 deletions(-)
diff --git a/foocanvas/zmap_source/configure.in.diff b/foocanvas/zmap_source/configure.in.diff
index e043aa751..ed8788281 100644
--- a/foocanvas/zmap_source/configure.in.diff
+++ b/foocanvas/zmap_source/configure.in.diff
@@ -1,5 +1,5 @@
---- ./tmp_merged_foocanvas/configure.in 2010-03-12 18:06:32.277000000 +0000
-+++ ./tmp_zmap_foocanvas/configure.in 2010-03-12 18:06:23.192000000 +0000
+--- ./tmp_merged_foocanvas/configure.in 2010-03-16 15:14:38.492000000 +0000
++++ ./tmp_zmap_foocanvas/configure.in 2010-03-16 15:14:36.984000000 +0000
@@ -3,7 +3,8 @@
AC_CONFIG_SRCDIR([libfoocanvas/foo-canvas.c])
diff --git a/foocanvas/zmap_source/libfoocanvas/foo-canvas-line.c.diff b/foocanvas/zmap_source/libfoocanvas/foo-canvas-line.c.diff
index ae68c4f72..8e8e7d3b8 100644
--- a/foocanvas/zmap_source/libfoocanvas/foo-canvas-line.c.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foo-canvas-line.c.diff
@@ -1,5 +1,5 @@
---- ./tmp_merged_foocanvas/libfoocanvas/foo-canvas-line.c 2010-03-12 18:06:31.372000000 +0000
-+++ ./tmp_zmap_foocanvas/libfoocanvas/foo-canvas-line.c 2010-03-12 18:06:22.501000000 +0000
+--- ./tmp_merged_foocanvas/libfoocanvas/foo-canvas-line.c 2010-03-16 15:14:38.354000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/foo-canvas-line.c 2010-03-16 15:14:36.889000000 +0000
@@ -1,3 +1,4 @@
+/* Last edited: Mar 4 15:11 2010 (edgrif) */
/*
diff --git a/foocanvas/zmap_source/libfoocanvas/foo-canvas-marshal.list.diff b/foocanvas/zmap_source/libfoocanvas/foo-canvas-marshal.list.diff
index 500dc4040..df303cf72 100644
--- a/foocanvas/zmap_source/libfoocanvas/foo-canvas-marshal.list.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foo-canvas-marshal.list.diff
@@ -1,5 +1,5 @@
---- ./tmp_merged_foocanvas/libfoocanvas/foo-canvas-marshal.list 2010-03-12 18:06:31.288000000 +0000
-+++ ./tmp_zmap_foocanvas/libfoocanvas/foo-canvas-marshal.list 2010-03-12 18:06:22.542000000 +0000
+--- ./tmp_merged_foocanvas/libfoocanvas/foo-canvas-marshal.list 2010-03-16 15:14:38.338000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/foo-canvas-marshal.list 2010-03-16 15:14:36.892000000 +0000
@@ -1,2 +1,3 @@
VOID:INT,INT,INT,INT
BOOLEAN:BOXED
diff --git a/foocanvas/zmap_source/libfoocanvas/foo-canvas-pixbuf.c.diff b/foocanvas/zmap_source/libfoocanvas/foo-canvas-pixbuf.c.diff
index ce38a8fd3..c14f697a1 100644
--- a/foocanvas/zmap_source/libfoocanvas/foo-canvas-pixbuf.c.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foo-canvas-pixbuf.c.diff
@@ -1,5 +1,5 @@
---- ./tmp_merged_foocanvas/libfoocanvas/foo-canvas-pixbuf.c 2010-03-12 18:06:31.512000000 +0000
-+++ ./tmp_zmap_foocanvas/libfoocanvas/foo-canvas-pixbuf.c 2010-03-12 18:06:22.584000000 +0000
+--- ./tmp_merged_foocanvas/libfoocanvas/foo-canvas-pixbuf.c 2010-03-16 15:14:38.375000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/foo-canvas-pixbuf.c 2010-03-16 15:14:36.898000000 +0000
@@ -1,3 +1,4 @@
+/* Last edited: Mar 4 15:19 2010 (edgrif) */
/* GNOME libraries - GdkPixbuf item for the GNOME canvas
diff --git a/foocanvas/zmap_source/libfoocanvas/foo-canvas-polygon.c.diff b/foocanvas/zmap_source/libfoocanvas/foo-canvas-polygon.c.diff
index b577dab52..9159b159a 100644
--- a/foocanvas/zmap_source/libfoocanvas/foo-canvas-polygon.c.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foo-canvas-polygon.c.diff
@@ -1,5 +1,5 @@
---- ./tmp_merged_foocanvas/libfoocanvas/foo-canvas-polygon.c 2010-03-12 18:06:31.393000000 +0000
-+++ ./tmp_zmap_foocanvas/libfoocanvas/foo-canvas-polygon.c 2010-03-12 18:06:22.627000000 +0000
+--- ./tmp_merged_foocanvas/libfoocanvas/foo-canvas-polygon.c 2010-03-16 15:14:38.358000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/foo-canvas-polygon.c 2010-03-16 15:14:36.903000000 +0000
@@ -1,3 +1,4 @@
+/* Last edited: Mar 4 15:18 2010 (edgrif) */
/*
diff --git a/foocanvas/zmap_source/libfoocanvas/foo-canvas-rect-ellipse.c.diff b/foocanvas/zmap_source/libfoocanvas/foo-canvas-rect-ellipse.c.diff
index e9587a156..a7d7bff93 100644
--- a/foocanvas/zmap_source/libfoocanvas/foo-canvas-rect-ellipse.c.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foo-canvas-rect-ellipse.c.diff
@@ -1,5 +1,5 @@
---- ./tmp_merged_foocanvas/libfoocanvas/foo-canvas-rect-ellipse.c 2010-03-12 18:06:31.431000000 +0000
-+++ ./tmp_zmap_foocanvas/libfoocanvas/foo-canvas-rect-ellipse.c 2010-03-12 18:06:22.671000000 +0000
+--- ./tmp_merged_foocanvas/libfoocanvas/foo-canvas-rect-ellipse.c 2010-03-16 15:14:38.364000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/foo-canvas-rect-ellipse.c 2010-03-16 15:14:36.910000000 +0000
@@ -1,3 +1,4 @@
+/* Last edited: Mar 4 15:21 2010 (edgrif) */
/*
diff --git a/foocanvas/zmap_source/libfoocanvas/foo-canvas-text.c.diff b/foocanvas/zmap_source/libfoocanvas/foo-canvas-text.c.diff
index 118f4c433..6ad575635 100644
--- a/foocanvas/zmap_source/libfoocanvas/foo-canvas-text.c.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foo-canvas-text.c.diff
@@ -1,5 +1,5 @@
---- ./tmp_merged_foocanvas/libfoocanvas/foo-canvas-text.c 2010-03-16 13:53:32.270000000 +0000
-+++ ./tmp_zmap_foocanvas/libfoocanvas/foo-canvas-text.c 2010-03-16 13:53:29.876000000 +0000
+--- ./tmp_merged_foocanvas/libfoocanvas/foo-canvas-text.c 2010-03-16 15:14:38.350000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/foo-canvas-text.c 2010-03-16 15:14:36.881000000 +0000
@@ -1,3 +1,4 @@
+/* Last edited: Mar 16 13:51 2010 (edgrif) */
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
diff --git a/foocanvas/zmap_source/libfoocanvas/foo-canvas-widget.c.diff b/foocanvas/zmap_source/libfoocanvas/foo-canvas-widget.c.diff
index c1d9a22c6..e6c4dfdab 100644
--- a/foocanvas/zmap_source/libfoocanvas/foo-canvas-widget.c.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foo-canvas-widget.c.diff
@@ -1,5 +1,5 @@
---- ./tmp_merged_foocanvas/libfoocanvas/foo-canvas-widget.c 2010-03-12 18:06:31.311000000 +0000
-+++ ./tmp_zmap_foocanvas/libfoocanvas/foo-canvas-widget.c 2010-03-12 18:06:22.758000000 +0000
+--- ./tmp_merged_foocanvas/libfoocanvas/foo-canvas-widget.c 2010-03-16 15:14:38.343000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/foo-canvas-widget.c 2010-03-16 15:14:36.916000000 +0000
@@ -1,3 +1,4 @@
+/* Last edited: Mar 4 15:53 2010 (edgrif) */
/*
diff --git a/foocanvas/zmap_source/libfoocanvas/foo-canvas.c.diff b/foocanvas/zmap_source/libfoocanvas/foo-canvas.c.diff
index ba158b064..4f12daab5 100644
--- a/foocanvas/zmap_source/libfoocanvas/foo-canvas.c.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foo-canvas.c.diff
@@ -1,5 +1,5 @@
---- ./tmp_merged_foocanvas/libfoocanvas/foo-canvas.c 2010-03-12 18:06:31.634000000 +0000
-+++ ./tmp_zmap_foocanvas/libfoocanvas/foo-canvas.c 2010-03-12 18:06:22.807000000 +0000
+--- ./tmp_merged_foocanvas/libfoocanvas/foo-canvas.c 2010-03-16 15:14:38.394000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/foo-canvas.c 2010-03-16 15:14:36.930000000 +0000
@@ -75,7 +75,7 @@
static void foo_canvas_request_update (FooCanvas *canvas);
@@ -260,16 +260,28 @@
canvas->pick_event.type = GDK_LEAVE_NOTIFY;
canvas->pick_event.crossing.x = 0;
-@@ -2195,6 +2327,8 @@
-
- g_return_if_fail (FOO_IS_CANVAS (widget));
+@@ -2193,14 +2325,18 @@
+ {
+ FooCanvas *canvas;
-+ g_signal_emit(G_OBJECT (canvas), canvas_signals[BEGIN_MAP], 0);
+- g_return_if_fail (FOO_IS_CANVAS (widget));
++ g_return_if_fail(FOO_IS_CANVAS (widget));
+
++ canvas = FOO_CANVAS(widget);
++
++ g_signal_emit(G_OBJECT (canvas), canvas_signals[BEGIN_MAP], 0);
+
/* Normal widget mapping stuff */
if (GTK_WIDGET_CLASS (canvas_parent_class)->map)
-@@ -2208,6 +2342,9 @@
+ (* GTK_WIDGET_CLASS (canvas_parent_class)->map) (widget);
+
+- canvas = FOO_CANVAS (widget);
++
+
+ /* Map items */
+
+@@ -2208,6 +2344,9 @@
!(canvas->root->object.flags & FOO_CANVAS_ITEM_MAPPED) &&
FOO_CANVAS_ITEM_GET_CLASS (canvas->root)->map)
(* FOO_CANVAS_ITEM_GET_CLASS (canvas->root)->map) (canvas->root);
@@ -279,7 +291,7 @@
}
/* Unmap handler for the canvas */
-@@ -2305,8 +2442,8 @@
+@@ -2305,8 +2444,8 @@
canvas_width = GTK_WIDGET (canvas)->allocation.width;
canvas_height = GTK_WIDGET (canvas)->allocation.height;
@@ -290,7 +302,7 @@
right_limit = scroll_width - canvas_width;
bottom_limit = scroll_height - canvas_height;
-@@ -2873,6 +3010,8 @@
+@@ -2873,6 +3012,8 @@
if (canvas->need_update) {
g_return_val_if_fail (!canvas->doing_update, FALSE);
@@ -299,7 +311,7 @@
canvas->doing_update = TRUE;
foo_canvas_item_invoke_update (canvas->root, 0, 0, 0);
-@@ -2881,6 +3020,8 @@
+@@ -2881,6 +3022,8 @@
canvas->doing_update = FALSE;
canvas->need_update = FALSE;
@@ -308,7 +320,7 @@
}
/* Hmmm. Would like to queue antiexposes if the update marked
-@@ -2901,6 +3042,10 @@
+@@ -2901,6 +3044,10 @@
/* Chain up to get exposes on child widgets */
GTK_WIDGET_CLASS (canvas_parent_class)->expose_event (widget, event);
@@ -319,7 +331,7 @@
return FALSE;
}
-@@ -2927,6 +3072,8 @@
+@@ -2927,6 +3074,8 @@
if (canvas->need_update) {
g_return_if_fail (!canvas->doing_update);
@@ -328,7 +340,7 @@
canvas->doing_update = TRUE;
foo_canvas_item_invoke_update (canvas->root, 0, 0, 0);
-@@ -2935,6 +3082,8 @@
+@@ -2935,6 +3084,8 @@
canvas->doing_update = FALSE;
canvas->need_update = FALSE;
@@ -337,7 +349,7 @@
}
/* Pick new current item */
-@@ -3029,7 +3178,7 @@
+@@ -3029,7 +3180,7 @@
(canvas->scroll_x2 == x2) && (canvas->scroll_y2 == y2)) {
return;
}
@@ -346,7 +358,7 @@
/*
* Set the new scrolling region. If possible, do not move the visible contents of the
* canvas.
-@@ -3109,10 +3258,30 @@
+@@ -3109,10 +3260,30 @@
*
* Sets the zooming factor of a canvas by specifying the number of pixels that
* correspond to one canvas unit.
@@ -377,7 +389,7 @@
GtkWidget *widget;
double cx, cy;
int x1, y1;
-@@ -3122,7 +3291,8 @@
+@@ -3122,7 +3293,8 @@
gint attributes_mask;
g_return_if_fail (FOO_IS_CANVAS (canvas));
@@ -387,7 +399,7 @@
widget = GTK_WIDGET (canvas);
-@@ -3130,14 +3300,15 @@
+@@ -3130,14 +3302,15 @@
center_y = widget->allocation.height / 2;
/* Find the coordinates of the screen center in units. */
@@ -408,7 +420,7 @@
if (!(canvas->root->object.flags & FOO_CANVAS_ITEM_NEED_DEEP_UPDATE)) {
canvas->root->object.flags |= FOO_CANVAS_ITEM_NEED_DEEP_UPDATE;
-@@ -3271,7 +3442,8 @@
+@@ -3271,7 +3444,8 @@
foo_canvas_w2c (canvas, x, y, &cx, &cy);
dist = foo_canvas_item_invoke_point (canvas->root, x, y, cx, cy, &item);
@@ -418,7 +430,7 @@
return item;
else
return NULL;
-@@ -3334,16 +3506,17 @@
+@@ -3334,16 +3508,17 @@
void
foo_canvas_w2c (FooCanvas *canvas, double wx, double wy, int *cx, int *cy)
{
@@ -440,7 +452,7 @@
}
/**
-@@ -3383,16 +3556,17 @@
+@@ -3383,16 +3558,17 @@
void
foo_canvas_w2c_d (FooCanvas *canvas, double wx, double wy, double *cx, double *cy)
{
@@ -462,7 +474,7 @@
}
-@@ -3409,16 +3583,17 @@
+@@ -3409,16 +3585,17 @@
void
foo_canvas_c2w (FooCanvas *canvas, int cx, int cy, double *wx, double *wy)
{
@@ -484,7 +496,7 @@
}
-@@ -3444,11 +3619,11 @@
+@@ -3444,11 +3621,11 @@
if (worldx)
*worldx = canvas->scroll_x1 + ((winx - canvas->zoom_xofs)
@@ -498,7 +510,7 @@
}
-@@ -3471,10 +3646,10 @@
+@@ -3471,10 +3648,10 @@
g_return_if_fail (FOO_IS_CANVAS (canvas));
if (winx)
@@ -511,7 +523,7 @@
}
-@@ -3997,3 +4172,11 @@
+@@ -3997,3 +4174,11 @@
FOO_TYPE_CANVAS_ITEM,
foo_canvas_item_accessible_factory_get_type ());
}
@@ -522,4 +534,4 @@
+ /* do nothing */
+}
+
-+/* Last edited: Mar 12 10:11 2010 (edgrif) */
++/* Last edited: Mar 16 14:19 2010 (edgrif) */
diff --git a/foocanvas/zmap_source/libfoocanvas/foo-canvas.h.diff b/foocanvas/zmap_source/libfoocanvas/foo-canvas.h.diff
index 5ac100ad6..842ddf953 100644
--- a/foocanvas/zmap_source/libfoocanvas/foo-canvas.h.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foo-canvas.h.diff
@@ -1,5 +1,5 @@
---- ./tmp_merged_foocanvas/libfoocanvas/foo-canvas.h 2010-03-12 18:06:31.253000000 +0000
-+++ ./tmp_zmap_foocanvas/libfoocanvas/foo-canvas.h 2010-03-12 18:06:22.850000000 +0000
+--- ./tmp_merged_foocanvas/libfoocanvas/foo-canvas.h 2010-03-16 15:14:38.334000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/foo-canvas.h 2010-03-16 15:14:36.936000000 +0000
@@ -1,3 +1,4 @@
+/* Last edited: Mar 8 10:28 2010 (edgrif) */
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: 8; c-basic-offset: 8 -*- */
diff --git a/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-floating-group.c.diff b/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-floating-group.c.diff
index 5f303e9dd..5d6fc4bf6 100644
--- a/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-floating-group.c.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-floating-group.c.diff
@@ -1,5 +1,5 @@
--- ./tmp_merged_foocanvas/libfoocanvas/foozmap-canvas-floating-group.c 1970-01-01 00:00:00.000000000 +0000
-+++ ./tmp_zmap_foocanvas/libfoocanvas/foozmap-canvas-floating-group.c 2010-03-12 18:06:22.892000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/foozmap-canvas-floating-group.c 2010-03-16 15:14:36.941000000 +0000
@@ -0,0 +1,449 @@
+/* File: foozmap-canvas-floating-group.c
+ * Author: Roy Storey (rds@sanger.ac.uk)
diff --git a/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-floating-group.h.diff b/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-floating-group.h.diff
index a6521fb15..f918090ea 100644
--- a/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-floating-group.h.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-floating-group.h.diff
@@ -1,5 +1,5 @@
--- ./tmp_merged_foocanvas/libfoocanvas/foozmap-canvas-floating-group.h 1970-01-01 00:00:00.000000000 +0000
-+++ ./tmp_zmap_foocanvas/libfoocanvas/foozmap-canvas-floating-group.h 2010-03-12 18:06:22.934000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/foozmap-canvas-floating-group.h 2010-03-16 15:14:36.945000000 +0000
@@ -0,0 +1,89 @@
+/* File: foozmap-canvas-floating-group.h
+ * Author: Roy Storey (rds@sanger.ac.uk)
diff --git a/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-line-glyph.c.diff b/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-line-glyph.c.diff
index 6a9550fc4..4ebbff36d 100644
--- a/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-line-glyph.c.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-line-glyph.c.diff
@@ -1,5 +1,5 @@
--- ./tmp_merged_foocanvas/libfoocanvas/foozmap-canvas-line-glyph.c 1970-01-01 00:00:00.000000000 +0000
-+++ ./tmp_zmap_foocanvas/libfoocanvas/foozmap-canvas-line-glyph.c 2010-03-12 18:06:22.977000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/foozmap-canvas-line-glyph.c 2010-03-16 15:14:36.952000000 +0000
@@ -0,0 +1,1480 @@
+/* Last edited: Oct 3 14:00 2006 (edgrif) */
+/*
diff --git a/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-line-glyph.h.diff b/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-line-glyph.h.diff
index 35d1edeec..01d402c3d 100644
--- a/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-line-glyph.h.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-line-glyph.h.diff
@@ -1,5 +1,5 @@
--- ./tmp_merged_foocanvas/libfoocanvas/foozmap-canvas-line-glyph.h 1970-01-01 00:00:00.000000000 +0000
-+++ ./tmp_zmap_foocanvas/libfoocanvas/foozmap-canvas-line-glyph.h 2010-03-12 18:06:23.019000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/foozmap-canvas-line-glyph.h 2010-03-16 15:14:36.960000000 +0000
@@ -0,0 +1,126 @@
+/* Last edited: Oct 3 14:00 2006 (edgrif) */
+/*
diff --git a/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-text.c.diff b/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-text.c.diff
index 478e6ef93..59654cbe5 100644
--- a/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-text.c.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-text.c.diff
@@ -1,6 +1,6 @@
--- ./tmp_merged_foocanvas/libfoocanvas/foozmap-canvas-text.c 1970-01-01 00:00:00.000000000 +0000
-+++ ./tmp_zmap_foocanvas/libfoocanvas/foozmap-canvas-text.c 2010-03-12 18:06:23.063000000 +0000
-@@ -0,0 +1,1356 @@
++++ ./tmp_zmap_foocanvas/libfoocanvas/foozmap-canvas-text.c 2010-03-16 15:14:36.967000000 +0000
+@@ -0,0 +1,1353 @@
+/* File: foozmap-canvas-text.c
+ * Author: Roy Storey (rds@sanger.ac.uk)
+ * Copyright (c) 2008: Genome Research Ltd.
@@ -30,7 +30,7 @@
+ *
+ * Exported functions: See XXXXXXXXXXXXX.h
+ * HISTORY:
-+ * Last edited: Mar 22 08:06 2008 (rds)
++ * Last edited: Mar 16 14:19 2010 (edgrif)
+ * Created: Fri Jan 25 12:01:12 2008 (rds)
+ * CVS info: $Id: foozmap-canvas-text.c 1.2 2010-03-12 18:21:36 edgrif Exp $
+ *-------------------------------------------------------------------
@@ -218,10 +218,9 @@
+ double *item_coords_out)
+{
+ FooCanvasZMapText *zmap;
-+ gboolean index_found;
++ gboolean index_found = FALSE ;
+
-+ if(FOO_IS_CANVAS_ZMAP_TEXT(item) &&
-+ (zmap = FOO_CANVAS_ZMAP_TEXT(item)))
++ if (FOO_IS_CANVAS_ZMAP_TEXT(item) && (zmap = FOO_CANVAS_ZMAP_TEXT(item)))
+ {
+ FooCanvasZMapTextPrivate *private_data;
+ FooCanvasGroup *parent_group;
@@ -250,18 +249,18 @@
+ row_idx = index % width;
+ row = (index - row_idx) / width;
+
-+ if(row_idx == 0)
++ if (row_idx == 0)
+ {
+ row--;
+ row_idx = draw_data->table.width;
+ }
+
-+ if(row_idx > draw_data->table.width)
++ if (row_idx > draw_data->table.width)
+ row_idx = draw_data->table.width;
+
+ row_idx--; /* zero based. */
+
-+ if(item_coords_out)
++ if (item_coords_out)
+ {
+ w = (draw_data->table.ch_width / draw_data->zx);
+ h = ((draw_data->table.ch_height + draw_data->table.spacing) / draw_data->zy);
@@ -275,10 +274,8 @@
+ index_found = TRUE;
+ }
+ }
-+ else
-+ index_found = FALSE;
+
-+ return index_found;
++ return index_found ;
+}
+
+int foo_canvas_item_world2text_index(FooCanvasItem *item, double x, double y)
diff --git a/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-text.h.diff b/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-text.h.diff
index e40d38ef6..ab8846356 100644
--- a/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-text.h.diff
+++ b/foocanvas/zmap_source/libfoocanvas/foozmap-canvas-text.h.diff
@@ -1,5 +1,5 @@
--- ./tmp_merged_foocanvas/libfoocanvas/foozmap-canvas-text.h 1970-01-01 00:00:00.000000000 +0000
-+++ ./tmp_zmap_foocanvas/libfoocanvas/foozmap-canvas-text.h 2010-03-12 18:06:23.109000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/foozmap-canvas-text.h 2010-03-16 15:14:36.975000000 +0000
@@ -0,0 +1,132 @@
+/* File: foozmap-canvas-text.h
+ * Author: Roy Storey (rds@sanger.ac.uk)
diff --git a/foocanvas/zmap_source/libfoocanvas/libfoocanvas.h.diff b/foocanvas/zmap_source/libfoocanvas/libfoocanvas.h.diff
index f1a6ce2d3..52e961072 100644
--- a/foocanvas/zmap_source/libfoocanvas/libfoocanvas.h.diff
+++ b/foocanvas/zmap_source/libfoocanvas/libfoocanvas.h.diff
@@ -1,5 +1,5 @@
---- ./tmp_merged_foocanvas/libfoocanvas/libfoocanvas.h 2010-03-12 18:06:31.295000000 +0000
-+++ ./tmp_zmap_foocanvas/libfoocanvas/libfoocanvas.h 2010-03-12 18:06:23.153000000 +0000
+--- ./tmp_merged_foocanvas/libfoocanvas/libfoocanvas.h 2010-03-16 15:14:38.339000000 +0000
++++ ./tmp_zmap_foocanvas/libfoocanvas/libfoocanvas.h 2010-03-16 15:14:36.978000000 +0000
@@ -1,3 +1,4 @@
+/* Last edited: Jan 24 09:17 2008 (rds) */
/*
--
GitLab