--- trunk/src/map-tool.c	2009/10/12 20:27:55	133
+++ trunk/src/map-tool.c	2009/10/19 13:02:41	136
@@ -315,121 +315,138 @@
 #endif
 
 static void 
-balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {
-  cache_t *cache = (cache_t*)data;
+balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
+  map_context_t *context = (map_context_t*)data;
+  cache_t *cache = context->balloon;
 
-#if 0
-  /* draw pink background to check clipping */
-  cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);
-  cairo_set_source_rgba (cr, 1, 0, 0, 0.3);
-  cairo_fill_preserve (cr);
-  cairo_set_line_width (cr, 0);
-  cairo_stroke (cr);
-#endif
-
-  /* leave a little border top and left */
-  gint x = rect->x, y = rect->y;
-
-  /* draw the cache type icon ... */
-  GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
-  cairo_draw_pixbuf(cr, icon, x, y);
-
-  if(cache->notes && cache->notes->override) {
-    GdkPixbuf *over = icon_get(ICON_MISC, 1);
-    cairo_draw_pixbuf(cr, over, x, y);
-  }
+  printf("balloon event: ");
 
-  /* ... and right of it the waypoint id */
-  cairo_text_extents_t extents;
+  if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
+    printf("draw\n");
 
-  if(cache->id) {
-    cairo_select_font_face (cr, "Sans",
-			    CAIRO_FONT_SLANT_NORMAL,
-			    CAIRO_FONT_WEIGHT_BOLD);
-  
+#if 0
+    /* draw pink background to check clipping */
+    cairo_rectangle (event->data.draw.cr, 
+		     event->data.draw.rect->x-20, event->data.draw.rect->y-20, 
+		     event->data.draw.rect->w+40, event->data.draw.rect->h+40);
+    cairo_set_source_rgba (event->data.draw.cr, 1, 0, 0, 0.3);
+    cairo_fill_preserve (event->data.draw.cr);
+    cairo_set_line_width (event->data.draw.cr, 0);
+    cairo_stroke (event->data.draw.cr);
+#endif
+    
+    /* leave a little border top and left */
+    gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
+    
+    /* draw the cache type icon ... */
+    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
+    cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
+    
+    if(cache->notes && cache->notes->override) {
+      GdkPixbuf *over = icon_get(ICON_MISC, 1);
+      cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
+    }
+    
+    /* ... and right of it the waypoint id */
+    cairo_text_extents_t extents;
+    
+    if(cache->id) {
+      cairo_select_font_face (event->data.draw.cr, "Sans",
+			      CAIRO_FONT_SLANT_NORMAL,
+			      CAIRO_FONT_WEIGHT_BOLD);
+      
 #ifndef BIG_BALLOONS
-    cairo_set_font_size (cr, 20.0);
+      cairo_set_font_size (event->data.draw.cr, 20.0);
 #else
-    cairo_set_font_size (cr, 36.0);
+      cairo_set_font_size (event->data.draw.cr, 36.0);
 #endif
-
-    cairo_text_extents (cr, cache->id, &extents);
-
-    /* display id right of icon vertically centered */
-    x += gdk_pixbuf_get_width(icon) + 5;
-    y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
-    cairo_move_to (cr, x, y);
-    cairo_set_source_rgba (cr, 0, 0, 0, 1);
-    cairo_show_text (cr, cache->id);
-    cairo_stroke (cr);
-
-    y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
-  } else
-    y += gdk_pixbuf_get_height(icon);
-
-  /* return to the left border and below icon/text */
-  x = rect->x;
-
-  /* everything from here uses the same font */
-  cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
-  			  CAIRO_FONT_WEIGHT_NORMAL);
+      
+      cairo_text_extents (event->data.draw.cr, cache->id, &extents);
+      
+      /* display id right of icon vertically centered */
+      x += gdk_pixbuf_get_width(icon) + 5;
+      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
+      cairo_move_to (event->data.draw.cr, x, y);
+      cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
+      cairo_show_text (event->data.draw.cr, cache->id);
+      cairo_stroke (event->data.draw.cr);
+      
+      y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
+    } else
+      y += gdk_pixbuf_get_height(icon);
+    
+    /* return to the left border and below icon/text */
+    x = event->data.draw.rect->x;
+    
+    /* everything from here uses the same font */
+    cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
+			    CAIRO_FONT_WEIGHT_NORMAL);
 #ifndef BIG_BALLOONS
-  cairo_set_font_size (cr, 14.0);
+    cairo_set_font_size (event->data.draw.cr, 14.0);
 #else
-  cairo_set_font_size (cr, 22.0);
+    cairo_set_font_size (event->data.draw.cr, 22.0);
 #endif
-
-  if(cache->name) {
-    /* draw cache name */
-    cairo_text_extents (cr, cache->name, &extents);
-    y += extents.height;
-    cairo_move_to (cr, x, y);
-    cairo_set_source_rgba (cr, 0, 0, 0, 1);
-    cairo_show_text (cr, cache->name);
-    cairo_stroke (cr);
-  
-    /* return to the left border and below text */
-    y += LINE_SKIP;
-    x = rect->x;
-  }
-
-  if(cache->terrain) {
-    /* draw cache rating */
-    const char *terrain = "Terrain:"; 
-    icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
-    cairo_text_extents (cr, _(terrain), &extents);
-    y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
-
-    /* draw "Terrain:" string */
-    cairo_move_to (cr, x, y);
-    cairo_set_source_rgba (cr, 0, 0, 0, 1);
-    cairo_show_text (cr, _(terrain));
-    cairo_stroke (cr);
-    x += extents.width + 2;
-  
-    /* draw terrain stars */
-    cairo_draw_pixbuf(cr, icon, x, y - 
-		      (gdk_pixbuf_get_height(icon) + extents.height)/2);
-
-    x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
+    
+    if(cache->name) {
+      /* draw cache name */
+      cairo_text_extents (event->data.draw.cr, cache->name, &extents);
+      y += extents.height;
+      cairo_move_to (event->data.draw.cr, x, y);
+      cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
+      cairo_show_text (event->data.draw.cr, cache->name);
+      cairo_stroke (event->data.draw.cr);
+      
+      /* return to the left border and below text */
+      y += LINE_SKIP;
+      x = event->data.draw.rect->x;
+    }
+    
+    if(cache->terrain) {
+      /* draw cache rating */
+      const char *terrain = "Terrain:"; 
+      icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
+      cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
+      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
+      
+      /* draw "Terrain:" string */
+      cairo_move_to (event->data.draw.cr, x, y);
+      cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
+      cairo_show_text (event->data.draw.cr, _(terrain));
+      cairo_stroke (event->data.draw.cr);
+      x += extents.width + 2;
+      
+      /* draw terrain stars */
+      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y - 
+			(gdk_pixbuf_get_height(icon) + extents.height)/2);
+      
+      x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
     y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;
-  }
-
-  if(cache->difficulty) {
-    const char *difficulty = "Difficulty:"; 
-    cairo_text_extents (cr, _(difficulty), &extents);
-    y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
-    
-    /* draw "Difficulty:" string */
-    cairo_move_to (cr, x, y);
-    cairo_set_source_rgba (cr, 0, 0, 0, 1);
-    cairo_show_text (cr, _(difficulty));
-    cairo_stroke (cr);
-    x += extents.width + 2;
+    }
     
-    icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
-    cairo_draw_pixbuf(cr, icon, x, y - 
+    if(cache->difficulty) {
+      const char *difficulty = "Difficulty:"; 
+      cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
+      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
+      
+      /* draw "Difficulty:" string */
+      cairo_move_to (event->data.draw.cr, x, y);
+      cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
+      cairo_show_text (event->data.draw.cr, _(difficulty));
+      cairo_stroke (event->data.draw.cr);
+      x += extents.width + 2;
+      
+      icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
+      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y - 
 		      (gdk_pixbuf_get_height(icon) + extents.height)/2);
+    }
+  } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
+    printf("click %s event at %d %d\n", 
+	   event->data.click.down?"down":"up",
+	   event->data.click.x, event->data.click.y);
+
+  } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
+    printf("removed\n");
+    context->balloon = NULL;
   }
 }
 
@@ -456,8 +473,9 @@
       float dist = gpx_pos_get_distance(pos, cpos, FALSE);
       if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
 	
+	context->balloon = nearest;
 	osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
-				     balloon_draw_cb, nearest);
+				     balloon_cb, context);
       }
     }
     context->press_on = NULL;
@@ -566,6 +584,7 @@
     printf("map_setp(CACHE)\n");
     
     /* no balloons in this mode */
+    context->balloon = NULL;
     osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
     
     /* clear all existing ccahe images */