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

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

revision 72 by harbaum, Thu Aug 20 18:54:06 2009 UTC revision 73 by harbaum, Sun Aug 23 19:38:15 2009 UTC
# Line 110  struct _OsmGpsMapPrivate Line 110  struct _OsmGpsMapPrivate
110  #endif  #endif
111    
112  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
113      //the osd controls      //the osd controls (if present)
114      struct {      osm_gps_map_osd_t *osd;
         GdkPixmap *backup;  
         cairo_surface_t *overlay;  
         gint backup_x, backup_y;  
         OsmGpsMapOsdGpsCallback cb;  
         gpointer data;  
     } osd;  
115  #endif  #endif
116    
117      //additional images or tracks added to the map      //additional images or tracks added to the map
118      GSList *tracks;      GSList *tracks;
119      GSList *images;      GSList *images;
# Line 1423  osm_gps_map_purge_cache (OsmGpsMap *map) Line 1417  osm_gps_map_purge_cache (OsmGpsMap *map)
1417     g_hash_table_foreach_remove(priv->tile_cache, osm_gps_map_purge_cache_check, priv);     g_hash_table_foreach_remove(priv->tile_cache, osm_gps_map_purge_cache_check, priv);
1418  }  }
1419    
 #ifdef ENABLE_OSD  
 /* position and extent of bounding box */  
 #define OSD_X      (10)  
 #define OSD_Y      (10)  
   
 #define OSD_COLOR            0.5, 0.5, 1  
 #define OSD_COLOR_DISABLED   0.8, 0.8, 0.8  
   
 /* parameters of the direction shape */  
 #ifndef OSM_GPS_MAP_OSD_DIAMETER  
 #define D_RAD  (30)         // diameter of dpad  
 #else  
 #define D_RAD  (OSM_GPS_MAP_OSD_DIAMETER)  
 #endif  
 #define D_TIP  (4*D_RAD/5)  // distance of arrow tip from dpad center  
 #define D_LEN  (D_RAD/4)    // length of arrow  
 #define D_WID  (D_LEN)      // width of arrow  
   
 /* parameters of the "zoom" pad */  
 #define Z_STEP   (D_RAD/4)  // distance between dpad and zoom  
 #define Z_RAD    (D_RAD/2)  // radius of "caps" of zoom bar  
   
 /* shadow also depends on control size */  
 #define OSD_SHADOW (D_RAD/6)  
   
 /* total width and height of controls incl. shadow */  
 #define OSD_W    (2*D_RAD + OSD_SHADOW)  
 #define OSD_H    (2*D_RAD + Z_STEP + 2*Z_RAD + OSD_SHADOW)  
   
 #define OSD_LBL_SHADOW (OSD_SHADOW/2)  
   
 #define Z_TOP    (2 * D_RAD + Z_STEP)  
 #define Z_MID    (Z_TOP + Z_RAD)  
 #define Z_BOT    (Z_MID + Z_RAD)  
 #define Z_LEFT   (Z_RAD)  
 #define Z_RIGHT  (2 * D_RAD - Z_RAD)  
   
 /* create the cairo shape used for the zoom buttons */  
 static void  
 osm_gps_map_osd_zoom_shape(cairo_t *cr, gint x, gint y) {  
     cairo_move_to (cr, x+Z_LEFT,    y+Z_TOP);  
     cairo_line_to (cr, x+Z_RIGHT,   y+Z_TOP);  
     cairo_arc     (cr, x+Z_RIGHT,   y+Z_MID, Z_RAD, -M_PI/2,  M_PI/2);  
     cairo_line_to (cr, x+Z_LEFT,    y+Z_BOT);  
     cairo_arc     (cr, x+Z_LEFT,    y+Z_MID, Z_RAD,  M_PI/2, -M_PI/2);  
 }  
   
 /* create the cairo shape used for the dpad */  
 static void  
 osm_gps_map_osd_dpad_shape(cairo_t *cr, gint x, gint y) {  
     cairo_arc (cr, x+D_RAD, y+D_RAD, D_RAD, 0, 2 * M_PI);  
 }  
   
 static gboolean  
 osm_gps_map_in_circle(gint x, gint y, gint cx, gint cy, gint rad)  
 {  
     return( pow(cx - x, 2) + pow(cy - y, 2) < rad * rad);  
 }  
   
 /* check whether x/y is within the dpad */  
 static osd_button_t  
 osm_gps_map_osd_check_dpad(gint x, gint y)  
 {  
     /* within entire dpad circle */  
     if( osm_gps_map_in_circle(x, y, OSD_X + D_RAD, OSD_Y + D_RAD, D_RAD))  
     {  
         /* convert into position relative to dpads centre */  
         x -= (OSD_X + D_RAD);  
         y -= (OSD_Y + D_RAD);  
   
         /* check for dpad center goes here! */  
         if( osm_gps_map_in_circle(x, y, 0, 0, D_RAD/3))  
             return OSD_GPS;  
   
         if( y < 0 && abs(x) < abs(y))  
             return OSD_UP;  
   
         if( y > 0 && abs(x) < abs(y))  
             return OSD_DOWN;  
   
         if( x < 0 && abs(y) < abs(x))  
             return OSD_LEFT;  
   
         if( x > 0 && abs(y) < abs(x))  
             return OSD_RIGHT;  
   
         return OSD_BG;  
     }  
     return OSD_NONE;  
 }  
   
 /* check whether x/y is within the zoom pads */  
 static osd_button_t  
 osm_gps_map_osd_check_zoom(gint x, gint y) {  
     if( x > OSD_X && x < (OSD_X + OSD_W) && y > Z_TOP && y < (OSD_Y+Z_BOT)) {  
   
         /* within circle around (-) label */  
         if( osm_gps_map_in_circle(x, y, OSD_X + Z_LEFT, OSD_Y + Z_MID, Z_RAD))  
             return OSD_OUT;  
   
         /* between center of (-) button and center of entire zoom control area */  
         if(x > OSD_LEFT && x < OSD_X + D_RAD)  
             return OSD_OUT;  
   
         /* within circle around (+) label */  
         if( osm_gps_map_in_circle(x, y, OSD_X + Z_RIGHT, OSD_Y + Z_MID, Z_RAD))  
             return OSD_IN;  
   
         /* between center of (+) button and center of entire zoom control area */  
         if(x < OSD_RIGHT && x > OSD_X + D_RAD)  
             return OSD_IN;  
     }  
   
     return OSD_NONE;  
 }  
   
 osd_button_t  
 osm_gps_map_osd_check(gint x, gint y) {  
     osd_button_t but = OSD_NONE;  
   
     /* first do a rough test for the OSD area. */  
     /* this is just to avoid an unnecessary detailed test */  
     if(x > OSD_X && x < OSD_X + OSD_W &&  
        y > OSD_Y && y < OSD_Y + OSD_H) {  
         but = osm_gps_map_osd_check_dpad(x, y);  
   
         if(but == OSD_NONE)  
             but = osm_gps_map_osd_check_zoom(x, y);  
     }  
   
     return but;  
 }  
   
 static void  
 osm_gps_map_osd_shape_shadow(cairo_t *cr) {  
     cairo_set_source_rgba (cr, 0, 0, 0, 0.2);  
     cairo_fill (cr);  
     cairo_stroke (cr);  
 }  
   
 static void  
 osm_gps_map_osd_shape(cairo_t *cr) {  
     cairo_set_source_rgb (cr, 1, 1, 1);  
     cairo_fill_preserve (cr);  
     cairo_set_source_rgb (cr, OSD_COLOR);  
     cairo_set_line_width (cr, 1);  
     cairo_stroke (cr);  
 }  
   
 static void  
 osm_gps_map_osd_dpad_labels(cairo_t *cr, gint x, gint y) {  
     /* move reference to dpad center */  
     x += D_RAD;  
     y += D_RAD;  
   
     const static gint offset[][3][2] = {  
         /* left arrow/triangle */  
         { { -D_TIP+D_LEN, -D_WID }, { -D_LEN, D_WID }, { +D_LEN, D_WID } },  
         /* right arrow/triangle */  
         { { +D_TIP-D_LEN, -D_WID }, { +D_LEN, D_WID }, { -D_LEN, D_WID } },  
         /* top arrow/triangle */  
         { { -D_WID, -D_TIP+D_LEN }, { D_WID, -D_LEN }, { D_WID, +D_LEN } },  
         /* bottom arrow/triangle */  
         { { -D_WID, +D_TIP-D_LEN }, { D_WID, +D_LEN }, { D_WID, -D_LEN } }  
     };  
   
     int i;  
     for(i=0;i<4;i++) {  
         cairo_move_to (cr, x + offset[i][0][0], y + offset[i][0][1]);  
         cairo_rel_line_to (cr, offset[i][1][0], offset[i][1][1]);  
         cairo_rel_line_to (cr, offset[i][2][0], offset[i][2][1]);  
     }  
 }  
   
 /* draw the sattelite dish icon in the center of the dpad */  
 #define GPS_V0  (D_RAD/8)  
 #define GPS_V1  (D_RAD/10)  
 #define GPS_V2  (D_RAD/5)  
   
 /* draw a satellite receiver dish */  
 static void  
 osm_gps_map_osd_dpad_gps(cairo_t *cr, gint x, gint y) {  
     /* move reference to dpad center */  
     x += D_RAD;  
     y += D_RAD + GPS_V0;  
   
     cairo_move_to (cr, x-GPS_V0, y+GPS_V0);  
     cairo_rel_line_to (cr, +GPS_V0, -GPS_V0);  
     cairo_rel_line_to (cr, +GPS_V0, +GPS_V0);  
     cairo_close_path (cr);  
   
     cairo_move_to (cr, x+GPS_V1-GPS_V2, y-2*GPS_V2);  
     cairo_curve_to (cr, x-GPS_V2, y, x+GPS_V1, y+GPS_V1, x+GPS_V1+GPS_V2, y);  
     cairo_close_path (cr);  
   
     x += GPS_V1;  
     cairo_move_to (cr, x, y-GPS_V2);  
     cairo_rel_line_to (cr, +GPS_V1, -GPS_V1);  
 }  
   
 #define Z_LEN  (2*Z_RAD/3)  
   
 static void  
 osm_gps_map_osd_zoom_labels(cairo_t *cr, gint x, gint y) {  
     cairo_move_to (cr, x + Z_LEFT  - Z_LEN, y + Z_MID);  
     cairo_line_to (cr, x + Z_LEFT  + Z_LEN, y + Z_MID);  
   
     cairo_move_to (cr, x + Z_RIGHT,         y + Z_MID - Z_LEN);  
     cairo_line_to (cr, x + Z_RIGHT,         y + Z_MID + Z_LEN);  
     cairo_move_to (cr, x + Z_RIGHT - Z_LEN, y + Z_MID);  
     cairo_line_to (cr, x + Z_RIGHT + Z_LEN, y + Z_MID);  
 }  
   
 static void  
 osm_gps_map_osd_labels(cairo_t *cr, gint width, gboolean enabled) {  
     if(enabled)  cairo_set_source_rgb (cr, OSD_COLOR);  
     else         cairo_set_source_rgb (cr, OSD_COLOR_DISABLED);  
     cairo_set_line_width (cr, width);  
     cairo_stroke (cr);  
 }  
   
 static void  
 osm_gps_map_osd_labels_shadow(cairo_t *cr, gint width, gboolean enabled) {  
     cairo_set_source_rgba (cr, 0, 0, 0, enabled?0.3:0.15);  
     cairo_set_line_width (cr, width);  
     cairo_stroke (cr);  
 }  
   
 static void  
 osm_gps_map_osd_render(OsmGpsMapPrivate *priv) {  
   
     /* first fill with transparency */  
     cairo_t *cr = cairo_create(priv->osd.overlay);  
     cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);  
     cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);  
     cairo_paint(cr);  
   
     cairo_set_operator(cr, CAIRO_OPERATOR_OVER);  
   
     /* --------- draw zoom and dpad shape shadow ----------- */  
     gint x = 0, y = 0;  
   
     osm_gps_map_osd_zoom_shape(cr, x + OSD_SHADOW, y + OSD_SHADOW);  
     osm_gps_map_osd_shape_shadow(cr);  
     osm_gps_map_osd_dpad_shape(cr, x + OSD_SHADOW, y + OSD_SHADOW);  
     osm_gps_map_osd_shape_shadow(cr);  
   
     /* --------- draw zoom and dpad shape ----------- */  
   
     osm_gps_map_osd_zoom_shape(cr, x, y);  
     osm_gps_map_osd_shape(cr);  
     osm_gps_map_osd_dpad_shape(cr, x, y);  
     osm_gps_map_osd_shape(cr);  
   
     /* --------- draw zoom and dpad labels --------- */  
   
     osm_gps_map_osd_zoom_labels(cr, x + OSD_LBL_SHADOW, y + OSD_LBL_SHADOW);  
     osm_gps_map_osd_dpad_labels(cr, x + OSD_LBL_SHADOW, y + OSD_LBL_SHADOW);  
     osm_gps_map_osd_labels_shadow(cr, Z_RAD/3, TRUE);  
     osm_gps_map_osd_dpad_gps(cr, x + OSD_LBL_SHADOW, y + OSD_LBL_SHADOW);  
     osm_gps_map_osd_labels_shadow(cr, Z_RAD/6, priv->osd.cb != NULL);  
   
     osm_gps_map_osd_zoom_labels(cr, x, y);  
     osm_gps_map_osd_dpad_labels(cr, x, y);  
     osm_gps_map_osd_labels(cr, Z_RAD/3, TRUE);  
     osm_gps_map_osd_dpad_gps(cr, x, y);  
     osm_gps_map_osd_labels(cr, Z_RAD/6, priv->osd.cb != NULL);  
   
     cairo_destroy(cr);  
 }  
   
 static void  
 osm_gps_map_osd_draw_controls (OsmGpsMap *map, gint xoffset, gint yoffset)  
 {  
     OsmGpsMapPrivate *priv = map->priv;  
   
     /* backup previous contents */  
     if(!priv->osd.backup)  
         priv->osd.backup = gdk_pixmap_new(priv->pixmap, OSD_W+2, OSD_H+2, -1);  
   
     gint x = OSD_X + EXTRA_BORDER + xoffset;  
     gint y = OSD_Y + EXTRA_BORDER + yoffset;  
   
     /* create backup of background */  
     gdk_draw_drawable(priv->osd.backup,  
         GTK_WIDGET(map)->style->fg_gc[GTK_WIDGET_STATE(GTK_WIDGET(map))],  
                       priv->pixmap, x-1, y-1, 0, 0, OSD_W+2, OSD_H+2);  
   
     priv->osd.backup_x = x-1;  
     priv->osd.backup_y = y-1;  
   
   
 #ifdef USE_CAIRO  
     /* OSD itself uses some off-screen rendering, so check if the */  
     /* offscreen buffer is present and create it if not */  
     if(!priv->osd.overlay) {  
         /* create overlay ... */  
         priv->osd.overlay =  
             cairo_image_surface_create(CAIRO_FORMAT_ARGB32, OSD_W, OSD_H);  
         /* ... and render it */  
         osm_gps_map_osd_render(priv);  
     }  
   
     // now draw this onto the original context  
     cairo_t *cr = gdk_cairo_create(priv->pixmap);  
     cairo_set_source_surface(cr, priv->osd.overlay, x, y);  
     cairo_paint(cr);  
     cairo_destroy(cr);  
   
 #else  
 #warning "OSD control display lacks a non-cairo implementation!"  
 #endif  
 }  
   
 static void  
 osm_gps_map_osd_restore (OsmGpsMap *map)  
 {  
     OsmGpsMapPrivate *priv = map->priv;  
   
     /* restore backup of previous contents */  
     if(priv->osd.backup) {  
         /* create backup of background */  
         gdk_draw_drawable(priv->pixmap,  
             GTK_WIDGET(map)->style->fg_gc[GTK_WIDGET_STATE(GTK_WIDGET(map))],  
                       priv->osd.backup, 0, 0,  
                       priv->osd.backup_x, priv->osd.backup_y, OSD_W+2, OSD_H+2);  
     }  
 }  
   
 #endif  
   
1420  static gboolean  static gboolean
1421  osm_gps_map_map_redraw (OsmGpsMap *map)  osm_gps_map_map_redraw (OsmGpsMap *map)
1422  {  {
# Line 1787  osm_gps_map_map_redraw (OsmGpsMap *map) Line 1450  osm_gps_map_map_redraw (OsmGpsMap *map)
1450  #ifdef ENABLE_BALLOON  #ifdef ENABLE_BALLOON
1451      osm_gps_map_draw_balloon_int(map);      osm_gps_map_draw_balloon_int(map);
1452  #endif  #endif
1453    
1454  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
1455      osm_gps_map_osd_draw_controls(map, 0, 0);      if(priv->osd)
1456            priv->osd->draw(priv->osd, EXTRA_BORDER, EXTRA_BORDER);
1457  #endif  #endif
1458    
1459      //osm_gps_map_osd_speed(map, 1.5);      //osm_gps_map_osd_speed(map, 1.5);
# Line 1828  osm_gps_map_init (OsmGpsMap *object) Line 1493  osm_gps_map_init (OsmGpsMap *object)
1493  #endif  #endif
1494    
1495  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
1496      priv->osd.backup = NULL;      priv->osd = NULL;
     priv->osd.overlay = NULL;  
     priv->osd.cb = NULL;  
1497  #endif  #endif
1498    
1499      priv->tracks = NULL;      priv->tracks = NULL;
# Line 1997  osm_gps_map_dispose (GObject *object) Line 1660  osm_gps_map_dispose (GObject *object)
1660  #endif  #endif
1661    
1662  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
1663      if (priv->osd.backup)      if(priv->osd)
1664          g_object_unref(priv->osd.backup);          priv->osd->free(priv->osd);
   
     if (priv->osd.overlay)  
          cairo_surface_destroy(priv->osd.overlay);  
1665  #endif  #endif
1666    
1667      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);      G_OBJECT_CLASS (osm_gps_map_parent_class)->dispose (object);
# Line 2234  osm_gps_map_button_press (GtkWidget *wid Line 1894  osm_gps_map_button_press (GtkWidget *wid
1894      #define SCROLL_STEP 10      #define SCROLL_STEP 10
1895    
1896      /* pressed inside OSD control? */      /* pressed inside OSD control? */
1897      osd_button_t but = osm_gps_map_osd_check(event->x, event->y);      if(priv->osd) {
1898      if(but != OSD_NONE)          osd_button_t but = priv->osd->check(event->x, event->y);
1899      {          if(but != OSD_NONE)
1900          priv->drag_counter = -1;          {
1901                priv->drag_counter = -1;
1902          switch(but) {  
1903          case OSD_GPS:              switch(but) {
1904              priv->osd.cb(priv->osd.data);              case OSD_UP:
1905              break;                  priv->map_y -= GTK_WIDGET(widget)->allocation.height/SCROLL_STEP;
1906                    priv->center_coord_set = FALSE;
1907          case OSD_UP:                  break;
             priv->map_y -= GTK_WIDGET(widget)->allocation.height/SCROLL_STEP;  
             priv->center_coord_set = FALSE;  
             break;  
   
         case OSD_DOWN:  
             priv->map_y += GTK_WIDGET(widget)->allocation.height/SCROLL_STEP;  
             priv->center_coord_set = FALSE;  
             break;  
   
         case OSD_LEFT:  
             priv->map_x -= GTK_WIDGET(widget)->allocation.width/SCROLL_STEP;  
             priv->center_coord_set = FALSE;  
             break;  
   
         case OSD_RIGHT:  
             priv->map_x += GTK_WIDGET(widget)->allocation.width/SCROLL_STEP;  
             priv->center_coord_set = FALSE;  
             break;  
   
         case OSD_IN:  
             osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);  
             break;  
1908    
1909          case OSD_OUT:              case OSD_DOWN:
1910              osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);                  priv->map_y += GTK_WIDGET(widget)->allocation.height/SCROLL_STEP;
1911              break;                  priv->center_coord_set = FALSE;
1912                    break;
1913    
1914          default:              case OSD_LEFT:
1915              break;                  priv->map_x -= GTK_WIDGET(widget)->allocation.width/SCROLL_STEP;
1916                    priv->center_coord_set = FALSE;
1917                    break;
1918    
1919                case OSD_RIGHT:
1920                    priv->map_x += GTK_WIDGET(widget)->allocation.width/SCROLL_STEP;
1921                    priv->center_coord_set = FALSE;
1922                    break;
1923    
1924                case OSD_IN:
1925                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom+1);
1926                    break;
1927    
1928                case OSD_OUT:
1929                    osm_gps_map_set_zoom(OSM_GPS_MAP(widget), priv->map_zoom-1);
1930                    break;
1931    
1932                default:
1933                    /* all custom buttons are forwarded to the application */
1934                    if(priv->osd->cb)
1935                        priv->osd->cb(but, priv->osd->data);
1936                    break;
1937                }
1938    
1939                osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));
1940    
1941                return FALSE;
1942          }          }
   
         osm_gps_map_map_redraw_idle(OSM_GPS_MAP(widget));  
   
         return FALSE;  
1943      }      }
1944  #endif  #endif
1945    
# Line 2379  osm_gps_map_motion_notify (GtkWidget *wi Line 2040  osm_gps_map_motion_notify (GtkWidget *wi
2040      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;      priv->drag_mouse_dy = y - priv->drag_start_mouse_y;
2041    
2042  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
2043      /* undo OSD */      if(priv->osd) {
2044      osm_gps_map_osd_restore (OSM_GPS_MAP(widget));          /* undo OSD */
2045            priv->osd->restore (priv->osd);
2046      /* draw new OSD */  
2047      osm_gps_map_osd_draw_controls (OSM_GPS_MAP(widget),          /* draw new OSD */
2048                                     -priv->drag_mouse_dx,          priv->osd->draw (priv->osd,
2049                                     -priv->drag_mouse_dy);                           EXTRA_BORDER - priv->drag_mouse_dx,
2050                             EXTRA_BORDER - priv->drag_mouse_dy);
2051        }
2052  #endif  #endif
2053    
2054      osm_gps_map_expose (widget, NULL);      osm_gps_map_expose (widget, NULL);
2055    
2056    
# Line 2409  osm_gps_map_configure (GtkWidget *widget Line 2072  osm_gps_map_configure (GtkWidget *widget
2072                                     widget->allocation.height + EXTRA_BORDER * 2,                                     widget->allocation.height + EXTRA_BORDER * 2,
2073                                     -1);                                     -1);
2074    
2075    #ifdef ENABLE_OSD
2076        /* the osd needs some references to map internal objects */
2077        if(priv->osd)
2078        {
2079            priv->osd->pixmap = priv->pixmap;
2080            priv->osd->widget = widget;
2081        }
2082    #endif
2083    
2084      /* and gc, used for clipping (I think......) */      /* and gc, used for clipping (I think......) */
2085      if(priv->gc_map)      if(priv->gc_map)
2086          g_object_unref(priv->gc_map);          g_object_unref(priv->gc_map);
# Line 3296  osm_gps_map_clear_balloon (OsmGpsMap *ma Line 2968  osm_gps_map_clear_balloon (OsmGpsMap *ma
2968  #endif  #endif
2969    
2970  #ifdef ENABLE_OSD  #ifdef ENABLE_OSD
2971  void osm_gps_map_osd_enable_gps (OsmGpsMap *map, OsmGpsMapOsdGpsCallback cb, gpointer data) {  
2972    void
2973    osm_gps_map_redraw (OsmGpsMap *map)
2974    {
2975        osm_gps_map_map_redraw_idle(map);
2976    }
2977    
2978    osm_gps_map_osd_t *osm_gps_map_osd_get(OsmGpsMap *map) {
2979        g_return_val_if_fail (OSM_IS_GPS_MAP (map), NULL);
2980        return map->priv->osd;
2981    }
2982    
2983    void osm_gps_map_register_osd(OsmGpsMap *map, osm_gps_map_osd_t *osd) {
2984      OsmGpsMapPrivate *priv;      OsmGpsMapPrivate *priv;
2985    
2986      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
     priv = map->priv;  
   
     priv->osd.cb = cb;  
     priv->osd.data = data;  
2987    
2988      /* this may have changed the state of the gps button */      priv = map->priv;
2989      /* we thus re-render the overlay */      g_return_if_fail (!priv->osd);
     osm_gps_map_osd_render(priv);  
2990    
2991      osm_gps_map_map_redraw_idle(map);      priv->osd = osd;
2992  }  }
2993    
2994  #endif  #endif
Legend:
Removed from v.72  
changed lines
  Added in v.73