--- trunk/src/osm-gps-map.c	2009/09/07 13:20:37	98
+++ trunk/src/osm-gps-map.c	2009/10/01 08:09:00	132
@@ -118,17 +118,6 @@
     float gps_heading;
     gboolean gps_valid;
 
-#ifdef ENABLE_BALLOON
-    //a balloon with additional info
-    struct {
-        coord_t *coo;
-        gboolean valid;
-        OsmGpsMapRect_t rect;
-        OsmGpsMapBalloonCallback cb;
-        gpointer data;
-    } balloon;
-#endif
-
 #ifdef ENABLE_OSD
     //the osd controls (if present)
     osm_gps_map_osd_t *osd;
@@ -160,6 +149,7 @@
     int drag_start_mouse_y;
     int drag_start_map_x;
     int drag_start_map_y;
+    guint drag_expose;
 
     //for customizing the redering of the gps track
     int ui_gps_track_width;
@@ -692,218 +682,6 @@
     }
 } 
 
-#ifdef ENABLE_BALLOON
-/* most visual effects are hardcoded by now, but may be made */
-/* available via properties later */
-#ifndef BALLOON_AREA_WIDTH
-#define BALLOON_AREA_WIDTH           290
-#endif
-#ifndef BALLOON_AREA_HEIGHT
-#define BALLOON_AREA_HEIGHT           75
-#endif
-#ifndef BALLOON_CORNER_RADIUS
-#define BALLOON_CORNER_RADIUS         10
-#endif
-
-#define BALLOON_BORDER               (BALLOON_CORNER_RADIUS/2)
-#define BALLOON_WIDTH                (BALLOON_AREA_WIDTH + 2 * BALLOON_BORDER)
-#define BALLOON_HEIGHT               (BALLOON_AREA_HEIGHT + 2 * BALLOON_BORDER)
-#define BALLOON_TRANSPARENCY         0.8
-#define POINTER_HEIGHT                20
-#define POINTER_FOOT_WIDTH            20
-#define POINTER_OFFSET               (BALLOON_CORNER_RADIUS*3/4)
-#define BALLOON_SHADOW               (BALLOON_CORNER_RADIUS/2)
-#define BALLOON_SHADOW_TRANSPARENCY  0.2
-
-#define CLOSE_BUTTON_RADIUS   (BALLOON_CORNER_RADIUS)
-
-
-/* draw the bubble shape. this is used twice, once for the shape and once */
-/* for the shadow */
-static void 
-osm_gps_map_draw_balloon_shape (cairo_t *cr, int x0, int y0, int x1, int y1, 
-       gboolean bottom, int px, int py, int px0, int px1) {
-
-    cairo_move_to (cr, x0, y0 + BALLOON_CORNER_RADIUS);
-    cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,
-               BALLOON_CORNER_RADIUS, -M_PI, -M_PI/2);
-    if(!bottom) {
-        /* insert top pointer */
-        cairo_line_to (cr, px1, y0);
-        cairo_line_to (cr, px, py);
-        cairo_line_to (cr, px0, y0);
-    }
-        
-    cairo_line_to (cr, x1 - BALLOON_CORNER_RADIUS, y0);
-    cairo_arc (cr, x1 - BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,
-               BALLOON_CORNER_RADIUS, -M_PI/2, 0);
-    cairo_line_to (cr, x1 , y1 - BALLOON_CORNER_RADIUS);
-    cairo_arc (cr, x1 - BALLOON_CORNER_RADIUS, y1 - BALLOON_CORNER_RADIUS,
-               BALLOON_CORNER_RADIUS, 0, M_PI/2);
-    if(bottom) {
-        /* insert bottom pointer */
-        cairo_line_to (cr, px0, y1);
-        cairo_line_to (cr, px, py);
-        cairo_line_to (cr, px1, y1);
-    }
-        
-    cairo_line_to (cr, x0 + BALLOON_CORNER_RADIUS, y1);
-    cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y1 - BALLOON_CORNER_RADIUS,
-               BALLOON_CORNER_RADIUS, M_PI/2, M_PI);
-
-    cairo_close_path (cr);
-}
-
-static void
-osm_gps_map_draw_balloon_int (OsmGpsMap *map)
-{
-    OsmGpsMapPrivate *priv = map->priv;
-
-    if (priv->balloon.valid) {
-
-        /* ------- convert given coordinate into screen position --------- */
-        int x0 = lon2pixel(priv->map_zoom, priv->balloon.coo->rlon) - 
-            priv->map_x + EXTRA_BORDER;
-        int y0 = lat2pixel(priv->map_zoom, priv->balloon.coo->rlat) - 
-            priv->map_y + EXTRA_BORDER;
-
-        /* check position of this relative to screen center to determine */
-        /* pointer direction ... */
-        int pointer_x = x0, pointer_x0, pointer_x1;
-        int pointer_y = y0;
-
-        /* ... and calculate position */
-        if((x0 - EXTRA_BORDER) > GTK_WIDGET(map)->allocation.width/2) {
-            x0 -= BALLOON_WIDTH - POINTER_OFFSET;
-            pointer_x0 = pointer_x - (BALLOON_CORNER_RADIUS - POINTER_OFFSET);
-            pointer_x1 = pointer_x0 - POINTER_FOOT_WIDTH;
-        } else {
-            x0 -= POINTER_OFFSET; 
-            pointer_x1 = pointer_x + (BALLOON_CORNER_RADIUS - POINTER_OFFSET);
-            pointer_x0 = pointer_x1 + POINTER_FOOT_WIDTH;
-        }
-        
-        gboolean bottom = FALSE;
-        if((y0 - EXTRA_BORDER) > GTK_WIDGET(map)->allocation.height/2) {
-            bottom = TRUE;
-            y0 -= BALLOON_HEIGHT + POINTER_HEIGHT;
-        } else
-            y0 += POINTER_HEIGHT;
-        
-        /* calculate bottom/right of box */
-        int x1 = x0 + BALLOON_WIDTH, y1 = y0 + BALLOON_HEIGHT;
-
-        /* save balloon screen coordinates for later use */
-        priv->balloon.rect.x = x0 + BALLOON_BORDER;
-        priv->balloon.rect.y = y0 + BALLOON_BORDER;
-        priv->balloon.rect.w = x1 - x0 - 2*BALLOON_BORDER;
-        priv->balloon.rect.h = y1 - y0 - 2*BALLOON_BORDER;
-
-#ifdef USE_CAIRO
-        cairo_t *cr = gdk_cairo_create(priv->pixmap);
-
-        /* --------- draw shadow --------------- */
-        osm_gps_map_draw_balloon_shape (cr, 
-                    x0 + BALLOON_SHADOW, y0 + BALLOON_SHADOW, 
-                    x1 + BALLOON_SHADOW, y1 + BALLOON_SHADOW,
-                    bottom, pointer_x, pointer_y, 
-                    pointer_x0 + BALLOON_SHADOW, pointer_x1 + BALLOON_SHADOW);
-
-        cairo_set_source_rgba (cr, 0, 0, 0, BALLOON_SHADOW_TRANSPARENCY);
-        cairo_fill_preserve (cr);
-        cairo_set_source_rgba (cr, 1, 0, 0, 1.0);
-        cairo_set_line_width (cr, 0);
-        cairo_stroke (cr);
-
-        /* --------- draw main shape ----------- */
-        osm_gps_map_draw_balloon_shape (cr, x0, y0, x1, y1,
-                    bottom, pointer_x, pointer_y, pointer_x0, pointer_x1);
-        
-        cairo_set_source_rgba (cr, 1, 1, 1, BALLOON_TRANSPARENCY);
-        cairo_fill_preserve (cr);
-        cairo_set_source_rgba (cr, 0, 0, 0, BALLOON_TRANSPARENCY);
-        cairo_set_line_width (cr, 1);
-        cairo_stroke (cr);
-
-
-        /* ---------- draw close button --------- */
-
-        int cx = x1 - BALLOON_BORDER - CLOSE_BUTTON_RADIUS;
-        int cy = y0 + BALLOON_BORDER + CLOSE_BUTTON_RADIUS;
-        int crad = CLOSE_BUTTON_RADIUS;
-
-        cairo_arc (cr, cx, cy, crad, 0, 2 * M_PI);
-        cairo_set_source_rgba (cr, 0.8, 0, 0, 1.0);
-        cairo_fill_preserve (cr);
-        cairo_set_source_rgba (cr, 0.3, 0, 0, 1.0);
-        cairo_set_line_width (cr, 2);
-        cairo_stroke(cr);
-        
-        cairo_set_source_rgba (cr, 1, 1, 1, 1.0);
-        cairo_set_line_width (cr, BALLOON_CORNER_RADIUS/3.3);
-        cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND);
-        cairo_move_to (cr, cx - crad/2, cy - crad/2);
-        cairo_line_to (cr, cx + crad/2, cy + crad/2);
-        cairo_stroke (cr);
-        cairo_move_to (cr, cx + crad/2, cy - crad/2);
-        cairo_line_to (cr, cx - crad/2, cy + crad/2);
-        cairo_stroke (cr);
-
-        if (priv->balloon.cb) {
-            /* clip in case application tries to draw in */
-            /* exceed of the balloon */
-            cairo_rectangle (cr, priv->balloon.rect.x, priv->balloon.rect.y, 
-                             priv->balloon.rect.w, priv->balloon.rect.h);
-            cairo_clip (cr);
-            cairo_new_path (cr);  /* current path is not
-                                     consumed by cairo_clip() */
-
-            priv->balloon.cb(cr, &priv->balloon.rect, priv->balloon.data);
-        }
-   
-        cairo_destroy(cr);
-
-        gtk_widget_queue_draw_area (GTK_WIDGET(map),
-                                    x0, y0, BALLOON_WIDTH,
-                                    BALLOON_HEIGHT + POINTER_HEIGHT);
-#else
-#warning "Balloon display lacks a non-cairo implementation!"
-#endif
-    }
-}
-
-/* the user clicked into the balloons main area. handle this */
-static void 
-osm_gps_map_handle_balloon_click(OsmGpsMap *map, gint x, gint y) 
-{
-    OsmGpsMapPrivate *priv = map->priv;
-
-    if (!priv->balloon.valid)
-        return;
-
-    /* check if the close button was clicked */
-    if ((x > priv->balloon.rect.w - 2*CLOSE_BUTTON_RADIUS) &&
-        (x < priv->balloon.rect.w) &&
-        (y > 0) && (y < 2*CLOSE_BUTTON_RADIUS)) {
-
-        priv->balloon.valid = FALSE;
-        osm_gps_map_map_redraw_idle(map);
-    }
-}
-
-/* return true if balloon is being displayed and if */
-/* the given coordinate is within this balloon */
-static gboolean 
-osm_gps_map_in_balloon(OsmGpsMapPrivate *priv, gint x, gint y) 
-{
-    return (priv->balloon.valid && 
-            (x > priv->balloon.rect.x) && 
-            (x < priv->balloon.rect.x + priv->balloon.rect.w) &&
-            (y > priv->balloon.rect.y) && 
-            (y < priv->balloon.rect.y + priv->balloon.rect.h));
-}
-#endif // ENABLE_BALLOON
-
 static void
 osm_gps_map_blit_tile(OsmGpsMap *map, GdkPixbuf *pixbuf, int offset_x, int offset_y)
 {
@@ -1478,6 +1256,10 @@
     if (priv->osd->busy(priv->osd))
         return FALSE;
 
+#ifdef DRAG_DEBUG
+    printf("trying redraw\n");
+#endif
+
     /* the motion_notify handler uses priv->pixmap to redraw the area; if we
      * change it while we are dragging, we will end up showing it in the wrong
      * place. This could be fixed by carefully recompute the coordinates, but
@@ -1485,6 +1267,10 @@
     if (priv->dragging)
         return FALSE;
 
+    /* undo all offsets that may have happened when dragging */
+    priv->drag_mouse_dx = 0;
+    priv->drag_mouse_dy = 0;
+
     priv->redraw_cycle++;
 
     /* draw white background to initialise pixmap */
@@ -1501,11 +1287,13 @@
     osm_gps_map_print_tracks(map);
     osm_gps_map_draw_gps_point(map);
     osm_gps_map_print_images(map);
-#ifdef ENABLE_BALLOON
-    osm_gps_map_draw_balloon_int(map);
+
+#ifdef ENABLE_OSD
+    /* OSD may contain a coordinate/scale, so we may have to re-render it */
+    if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
+        priv->osd->render (priv->osd);
 #endif
 
-    //osm_gps_map_osd_speed(map, 1.5);
     osm_gps_map_purge_cache(map);
     gtk_widget_queue_draw (GTK_WIDGET (map));
 
@@ -1616,12 +1404,6 @@
     priv->gps_valid = FALSE;
     priv->gps_heading = OSM_GPS_MAP_INVALID;
 
-#ifdef ENABLE_BALLOON
-    priv->balloon.coo = g_new0(coord_t, 1);
-    priv->balloon.valid = FALSE;
-    priv->balloon.cb = NULL;
-#endif
-
 #ifdef ENABLE_OSD
     priv->osd = NULL;
 #endif
@@ -1765,11 +1547,10 @@
     if (priv->idle_map_redraw != 0)
         g_source_remove (priv->idle_map_redraw);
 
-    g_free(priv->gps);
+    if (priv->drag_expose != 0)
+        g_source_remove (priv->drag_expose);
 
-#ifdef ENABLE_BALLOON
-    g_free(priv->balloon.coo);
-#endif
+    g_free(priv->gps);
 
 #ifdef ENABLE_OSD
     if(priv->osd)
@@ -2017,24 +1798,16 @@
 {
     OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
 
-#ifdef ENABLE_BALLOON
-    /* don't drag if the user clicked within the balloon */
-    if (osm_gps_map_in_balloon(priv, 
-                   event->x + EXTRA_BORDER, 
-                   event->y + EXTRA_BORDER))
-    {
-        priv->drag_counter = -1;
-        return FALSE;
-    }
-#endif
-
 #ifdef ENABLE_OSD
     /* pressed inside OSD control? */
     if(priv->osd) {
-        osd_button_t but = priv->osd->check(priv->osd, event->x, event->y);
+        osd_button_t but = 
+            priv->osd->check(priv->osd, TRUE, event->x, event->y);
+
         if(but != OSD_NONE)
         {
-            int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
+            int step = 
+                GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
             priv->drag_counter = -1;
             
             switch(but) {
@@ -2100,18 +1873,6 @@
 {
     OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
 
-#ifdef ENABLE_BALLOON
-    /* released inside the balloon? */
-    if (osm_gps_map_in_balloon(priv, 
-                   event->x + EXTRA_BORDER, 
-                   event->y + EXTRA_BORDER))
-    {
-        osm_gps_map_handle_balloon_click(OSM_GPS_MAP(widget), 
-             event->x - priv->balloon.rect.x + EXTRA_BORDER, 
-             event->y - priv->balloon.rect.y + EXTRA_BORDER);
-    }
-#endif
-
     if (priv->dragging)
     {
         priv->dragging = FALSE;
@@ -2126,9 +1887,16 @@
 
         osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
     }
+#ifdef ENABLE_OSD
+    /* pressed inside OSD control? */
+    else if(priv->osd) 
+        priv->osd->check(priv->osd, FALSE, event->x, event->y);
+#endif
+
+#ifdef DRAG_DEBUG
+    printf("dragging done\n");
+#endif
 
-    priv->drag_mouse_dx = 0;
-    priv->drag_mouse_dy = 0;
     priv->drag_counter = -1;
 
     return FALSE;
@@ -2138,6 +1906,16 @@
 osm_gps_map_expose (GtkWidget *widget, GdkEventExpose  *event);
 
 static gboolean
+osm_gps_map_map_expose (GtkWidget *widget)
+{
+    OsmGpsMapPrivate *priv = OSM_GPS_MAP(widget)->priv;
+
+    priv->drag_expose = 0;
+    osm_gps_map_expose (widget, NULL);
+    return FALSE;
+}
+
+static gboolean
 osm_gps_map_motion_notify (GtkWidget *widget, GdkEventMotion  *event)
 {
     int x, y;
@@ -2160,19 +1938,14 @@
     if (priv->drag_counter < 0) 
         return FALSE;
 
-    priv->drag_counter++;
-
-    // we havent dragged more than 6 pixels
-    if (priv->drag_counter < 6)
+    /* not yet dragged far enough? */
+    if(!priv->drag_counter &&
+       ( (x - priv->drag_start_mouse_x) * (x - priv->drag_start_mouse_x) + 
+         (y - priv->drag_start_mouse_y) * (y - priv->drag_start_mouse_y) <
+         10*10))
         return FALSE;
 
-#ifdef OSM_GPS_MAP_REFRESH
-    /* reduce update frequency on maemo to keep screen update fluid */
-    static guint32 last_time = 0;
-
-    if(event->time - last_time < (1000/OSM_GPS_MAP_REFRESH)) return FALSE;
-    last_time = event->time;
-#endif
+    priv->drag_counter++;
 
     priv->dragging = TRUE;
 
@@ -2182,7 +1955,10 @@
     priv->drag_mouse_dx = x - priv->drag_start_mouse_x;
     priv->drag_mouse_dy = y - priv->drag_start_mouse_y;
 
-    osm_gps_map_expose (widget, NULL);
+    /* instead of redrawing directly just add an idle function */
+    if (!priv->drag_expose)
+        priv->drag_expose = 
+            g_idle_add ((GSourceFunc)osm_gps_map_map_expose, widget);
 
     return FALSE;
 }
@@ -2242,8 +2018,16 @@
     GdkDrawable *drawable = widget->window;
 #endif
 
-    if (!priv->dragging && event)
+#ifdef DRAG_DEBUG
+    printf("expose, map %d/%d\n", priv->map_x, priv->map_y);
+#endif
+
+    if (!priv->drag_mouse_dx && !priv->drag_mouse_dy && event)
     {
+#ifdef DRAG_DEBUG
+        printf("  dragging = %d, event = %p\n", priv->dragging, event);
+#endif
+        
         gdk_draw_drawable (drawable,
                            widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
                            priv->pixmap,
@@ -2253,6 +2037,12 @@
     }
     else
     {
+#ifdef DRAG_DEBUG
+        printf("  drag_mouse %d/%d\n", 
+               priv->drag_mouse_dx - EXTRA_BORDER,
+               priv->drag_mouse_dy - EXTRA_BORDER);
+#endif
+
         gdk_draw_drawable (drawable,
                            widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
                            priv->pixmap,
@@ -2654,9 +2444,9 @@
         case OSM_GPS_MAP_SOURCE_NULL:
             return 18;
         case OSM_GPS_MAP_SOURCE_OPENSTREETMAP:
+        case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
             return OSM_MAX_ZOOM;
         case OSM_GPS_MAP_SOURCE_OPENSTREETMAP_RENDERER:
-        case OSM_GPS_MAP_SOURCE_OPENCYCLEMAP:
         case OSM_GPS_MAP_SOURCE_GOOGLE_STREET:
         case OSM_GPS_MAP_SOURCE_GOOGLE_HYBRID:
         case OSM_GPS_MAP_SOURCE_VIRTUAL_EARTH_STREET:
@@ -2999,9 +2789,11 @@
     priv = map->priv;
 
     if (pixel_x)
-        *pixel_x = lon2pixel(priv->map_zoom, deg2rad(longitude)) - priv->map_x;
+        *pixel_x = lon2pixel(priv->map_zoom, deg2rad(longitude)) - 
+            priv->map_x + priv->drag_mouse_dx;
     if (pixel_y)
-        *pixel_y = lat2pixel(priv->map_zoom, deg2rad(latitude)) - priv->map_y;
+        *pixel_y = lat2pixel(priv->map_zoom, deg2rad(latitude)) - 
+            priv->map_y + priv->drag_mouse_dy;
 }
 
 void
@@ -3016,6 +2808,12 @@
     priv->map_x += dx;
     priv->map_y += dy;
 
+#ifdef ENABLE_OSD
+    /* OSD may contain a coordinate, so we may have to re-render it */
+    if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
+        priv->osd->render (priv->osd);
+#endif
+
     osm_gps_map_map_redraw_idle (map);
 }
 
@@ -3030,44 +2828,6 @@
     return osm_gps_map_get_scale_at_point(priv->map_zoom, priv->center_rlat, priv->center_rlon);
 }
 
-#ifdef ENABLE_BALLOON
-void 
-osm_gps_map_draw_balloon (OsmGpsMap *map, float latitude, float longitude, 
-                          OsmGpsMapBalloonCallback cb, gpointer data)
-{
-    OsmGpsMapPrivate *priv;
-
-    /* remove and previously installed balloon */
-    osm_gps_map_clear_balloon (map);
-
-    g_return_if_fail (OSM_IS_GPS_MAP (map));
-    priv = map->priv;
-
-    priv->balloon.coo->rlat = deg2rad(latitude);
-    priv->balloon.coo->rlon = deg2rad(longitude);
-    priv->balloon.valid = TRUE;
-
-    priv->balloon.cb = cb;
-    priv->balloon.data = data;
-
-    // this redraws the map
-    osm_gps_map_map_redraw_idle(map);
-}
-
-void 
-osm_gps_map_clear_balloon (OsmGpsMap *map) 
-{
-    OsmGpsMapPrivate *priv;
-
-    g_return_if_fail (OSM_IS_GPS_MAP (map));
-    priv = map->priv;
-
-    priv->balloon.valid = FALSE;
-    
-    osm_gps_map_map_redraw_idle(map);
-}
-#endif
-
 #ifdef ENABLE_OSD
 
 void
@@ -3076,12 +2836,16 @@
     osm_gps_map_map_redraw_idle(map);
 }
 
-osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map) {
+osm_gps_map_osd_t *
+osm_gps_map_osd_get(OsmGpsMap *map) 
+{
     g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL);
     return map->priv->osd;
 }
 
-void osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd) {
+void 
+osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd) 
+{
     OsmGpsMapPrivate *priv;
 
     g_return_if_fail (OSM_IS_GPS_MAP (map));
@@ -3093,8 +2857,20 @@
 }
 
 void
-osm_gps_map_repaint (OsmGpsMap *map) {
+osm_gps_map_repaint (OsmGpsMap *map) 
+{
     osm_gps_map_expose (GTK_WIDGET(map), NULL);    
 }
 
+coord_t *
+osm_gps_map_get_gps (OsmGpsMap *map) 
+{
+    g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL);
+
+    if(!map->priv->gps_valid)
+        return NULL;
+    
+    return map->priv->gps;
+}
+
 #endif