Diff of /trunk/src/osm-gps-map.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 105 by harbaum, Wed Sep 9 19:57:45 2009 UTC revision 114 by harbaum, Wed Sep 16 20:04:38 2009 UTC
# Line 118  struct _OsmGpsMapPrivate Line 118  struct _OsmGpsMapPrivate
118      float gps_heading;      float gps_heading;
119      gboolean gps_valid;      gboolean gps_valid;
120    
 #ifdef ENABLE_BALLOON  
     //a balloon with additional info  
     struct {  
         coord_t *coo;  
         gboolean valid;  
         OsmGpsMapRect_t rect;  
         OsmGpsMapBalloonCallback cb;  
         gpointer data;  
     } balloon;  
 #endif  
   
121  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
122      //the osd controls (if present)      //the osd controls (if present)
123      osm_gps_map_osd_t *osd;      osm_gps_map_osd_t *osd;
# Line 692  osm_gps_map_draw_gps_point (OsmGpsMap *m Line 681  osm_gps_map_draw_gps_point (OsmGpsMap *m
681      }      }
682  }  }
683    
 #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  
   
684  static void  static void
685  osm_gps_map_blit_tile(OsmGpsMap *map, GdkPixbuf *pixbuf, int offset_x, int offset_y)  osm_gps_map_blit_tile(OsmGpsMap *map, GdkPixbuf *pixbuf, int offset_x, int offset_y)
686  {  {
# Line 1478  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1255  osm_gps_map_map_redraw (OsmGpsMap *map)
1255      if (priv->osd->busy(priv->osd))      if (priv->osd->busy(priv->osd))
1256          return FALSE;          return FALSE;
1257    
1258    #ifdef DRAG_DEBUG
1259        printf("trying redraw\n");
1260    #endif
1261    
1262      /* the motion_notify handler uses priv->pixmap to redraw the area; if we      /* the motion_notify handler uses priv->pixmap to redraw the area; if we
1263       * change it while we are dragging, we will end up showing it in the wrong       * change it while we are dragging, we will end up showing it in the wrong
1264       * place. This could be fixed by carefully recompute the coordinates, but       * place. This could be fixed by carefully recompute the coordinates, but
# Line 1485  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1266  osm_gps_map_map_redraw (OsmGpsMap *map)
1266      if (priv->dragging)      if (priv->dragging)
1267          return FALSE;          return FALSE;
1268    
1269        /* undo all offsets that may have happened when dragging */
1270        priv->drag_mouse_dx = 0;
1271        priv->drag_mouse_dy = 0;
1272    
1273      priv->redraw_cycle++;      priv->redraw_cycle++;
1274    
1275      /* draw white background to initialise pixmap */      /* draw white background to initialise pixmap */
# Line 1501  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1286  osm_gps_map_map_redraw (OsmGpsMap *map)
1286      osm_gps_map_print_tracks(map);      osm_gps_map_print_tracks(map);
1287      osm_gps_map_draw_gps_point(map);      osm_gps_map_draw_gps_point(map);
1288      osm_gps_map_print_images(map);      osm_gps_map_print_images(map);
1289  #ifdef ENABLE_BALLOON  
1290      osm_gps_map_draw_balloon_int(map);  #ifdef ENABLE_OSD
1291        /* OSD may contain a coordinate/scale, so we may have to re-render it */
1292        if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
1293            priv->osd->render (priv->osd);
1294  #endif  #endif
1295    
     //osm_gps_map_osd_speed(map, 1.5);  
1296      osm_gps_map_purge_cache(map);      osm_gps_map_purge_cache(map);
1297      gtk_widget_queue_draw (GTK_WIDGET (map));      gtk_widget_queue_draw (GTK_WIDGET (map));
1298    
# Line 1616  osm_gps_map_init (OsmGpsMap *object) Line 1403  osm_gps_map_init (OsmGpsMap *object)
1403      priv->gps_valid = FALSE;      priv->gps_valid = FALSE;
1404      priv->gps_heading = OSM_GPS_MAP_INVALID;      priv->gps_heading = OSM_GPS_MAP_INVALID;
1405    
 #ifdef ENABLE_BALLOON  
     priv->balloon.coo = g_new0(coord_t, 1);  
     priv->balloon.valid = FALSE;  
     priv->balloon.cb = NULL;  
 #endif  
   
1406  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
1407      priv->osd = NULL;      priv->osd = NULL;
1408  #endif  #endif
# Line 1767  osm_gps_map_dispose (GObject *object) Line 1548  osm_gps_map_dispose (GObject *object)
1548    
1549      g_free(priv->gps);      g_free(priv->gps);
1550    
 #ifdef ENABLE_BALLOON  
     g_free(priv->balloon.coo);  
 #endif  
   
1551  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
1552      if(priv->osd)      if(priv->osd)
1553          priv->osd->free(priv->osd);          priv->osd->free(priv->osd);
# Line 2017  osm_gps_map_button_press (GtkWidget *wid Line 1794  osm_gps_map_button_press (GtkWidget *wid
1794  {  {
1795      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
1796    
 #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  
   
1797  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
1798      /* pressed inside OSD control? */      /* pressed inside OSD control? */
1799      if(priv->osd) {      if(priv->osd) {
1800          osd_button_t but = priv->osd->check(priv->osd, event->x, event->y);          osd_button_t but =
1801                priv->osd->check(priv->osd, TRUE, event->x, event->y);
1802    
1803          if(but != OSD_NONE)          if(but != OSD_NONE)
1804          {          {
1805              int step = GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;              int step =
1806                    GTK_WIDGET(widget)->allocation.width/OSM_GPS_MAP_SCROLL_STEP;
1807              priv->drag_counter = -1;              priv->drag_counter = -1;
1808    
1809              switch(but) {              switch(but) {
# Line 2100  osm_gps_map_button_release (GtkWidget *w Line 1869  osm_gps_map_button_release (GtkWidget *w
1869  {  {
1870      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);      OsmGpsMapPrivate *priv = OSM_GPS_MAP_PRIVATE(widget);
1871    
 #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  
   
1872      if (priv->dragging)      if (priv->dragging)
1873      {      {
1874          priv->dragging = FALSE;          priv->dragging = FALSE;
# Line 2126  osm_gps_map_button_release (GtkWidget *w Line 1883  osm_gps_map_button_release (GtkWidget *w
1883    
1884          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));          osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1885      }      }
1886    #ifdef ENABLE_OSD
1887        /* pressed inside OSD control? */
1888        else if(priv->osd)
1889            priv->osd->check(priv->osd, FALSE, event->x, event->y);
1890    #endif
1891    
1892    
1893    #ifdef DRAG_DEBUG
1894        printf("dragging done\n");
1895    #endif
1896    
     priv->drag_mouse_dx = 0;  
     priv->drag_mouse_dy = 0;  
1897      priv->drag_counter = -1;      priv->drag_counter = -1;
1898    
1899      return FALSE;      return FALSE;
# Line 2242  osm_gps_map_expose (GtkWidget *widget, G Line 2007  osm_gps_map_expose (GtkWidget *widget, G
2007      GdkDrawable *drawable = widget->window;      GdkDrawable *drawable = widget->window;
2008  #endif  #endif
2009    
2010      if (!priv->dragging && event)  #ifdef DRAG_DEBUG
2011        printf("expose, map %d/%d\n", priv->map_x, priv->map_y);
2012    #endif
2013    
2014        if (!priv->drag_mouse_dx && !priv->drag_mouse_dy && event)
2015      {      {
2016    #ifdef DRAG_DEBUG
2017            printf("  dragging = %d, event = %p\n", priv->dragging, event);
2018    #endif
2019    
2020          gdk_draw_drawable (drawable,          gdk_draw_drawable (drawable,
2021                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2022                             priv->pixmap,                             priv->pixmap,
# Line 2253  osm_gps_map_expose (GtkWidget *widget, G Line 2026  osm_gps_map_expose (GtkWidget *widget, G
2026      }      }
2027      else      else
2028      {      {
2029    #ifdef DRAG_DEBUG
2030            printf("  drag_mouse %d/%d\n",
2031                   priv->drag_mouse_dx - EXTRA_BORDER,
2032                   priv->drag_mouse_dy - EXTRA_BORDER);
2033    #endif
2034    
2035          gdk_draw_drawable (drawable,          gdk_draw_drawable (drawable,
2036                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],                             widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
2037                             priv->pixmap,                             priv->pixmap,
# Line 2999  osm_gps_map_geographic_to_screen (OsmGps Line 2778  osm_gps_map_geographic_to_screen (OsmGps
2778      priv = map->priv;      priv = map->priv;
2779    
2780      if (pixel_x)      if (pixel_x)
2781          *pixel_x = lon2pixel(priv->map_zoom, deg2rad(longitude)) - priv->map_x;          *pixel_x = lon2pixel(priv->map_zoom, deg2rad(longitude)) -
2782                priv->map_x + priv->drag_mouse_dx;
2783      if (pixel_y)      if (pixel_y)
2784          *pixel_y = lat2pixel(priv->map_zoom, deg2rad(latitude)) - priv->map_y;          *pixel_y = lat2pixel(priv->map_zoom, deg2rad(latitude)) -
2785                priv->map_y + priv->drag_mouse_dy;
2786  }  }
2787    
2788  void  void
# Line 3016  osm_gps_map_scroll (OsmGpsMap *map, gint Line 2797  osm_gps_map_scroll (OsmGpsMap *map, gint
2797      priv->map_x += dx;      priv->map_x += dx;
2798      priv->map_y += dy;      priv->map_y += dy;
2799    
2800    #ifdef ENABLE_OSD
2801        /* OSD may contain a coordinate, so we may have to re-render it */
2802        if(priv->osd && OSM_IS_GPS_MAP (priv->osd->widget))
2803            priv->osd->render (priv->osd);
2804    #endif
2805    
2806      osm_gps_map_map_redraw_idle (map);      osm_gps_map_map_redraw_idle (map);
2807  }  }
2808    
# Line 3030  osm_gps_map_get_scale(OsmGpsMap *map) Line 2817  osm_gps_map_get_scale(OsmGpsMap *map)
2817      return osm_gps_map_get_scale_at_point(priv->map_zoom, priv->center_rlat, priv->center_rlon);      return osm_gps_map_get_scale_at_point(priv->map_zoom, priv->center_rlat, priv->center_rlon);
2818  }  }
2819    
 #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  
   
2820  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
2821    
2822  void  void
Legend:
Removed from v.105  
changed lines
  Added in v.114