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

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

revision 124 by harbaum, Thu Sep 24 14:09:53 2009 UTC revision 226 by harbaum, Wed Dec 2 20:05:52 2009 UTC
# Line 82  typedef struct { Line 82  typedef struct {
82          cairo_surface_t *surface;          cairo_surface_t *surface;
83          float lat, lon;          float lat, lon;
84          char *name;          char *name;
85            gboolean imperial, mode;    // display distance imperial/metric
86            int click_sep;
87      } nav;      } nav;
88  #endif  #endif
89    
# Line 134  typedef struct { Line 136  typedef struct {
136    
137  #define CLOSE_BUTTON_RADIUS   (BALLOON_CORNER_RADIUS)  #define CLOSE_BUTTON_RADIUS   (BALLOON_CORNER_RADIUS)
138    
139    #if 0
140    #define FIN   printf("entering function %s\n", __func__);
141    #define FOUT  printf("leaving function %s\n", __func__);
142    #else
143    #define FIN   ;
144    #define FOUT  ;
145    #endif
146    
147  /* draw the bubble shape. this is used twice, once for the shape and once */  /* draw the bubble shape. this is used twice, once for the shape and once */
148  /* for the shadow */  /* for the shadow */
# Line 141  static void Line 150  static void
150  osm_gps_map_draw_balloon_shape (cairo_t *cr, int x0, int y0, int x1, int y1,  osm_gps_map_draw_balloon_shape (cairo_t *cr, int x0, int y0, int x1, int y1,
151         gboolean bottom, int px, int py, int px0, int px1) {         gboolean bottom, int px, int py, int px0, int px1) {
152    
153        FIN;
154    
155      cairo_move_to (cr, x0, y0 + BALLOON_CORNER_RADIUS);      cairo_move_to (cr, x0, y0 + BALLOON_CORNER_RADIUS);
156      cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,      cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,
157                 BALLOON_CORNER_RADIUS, -M_PI, -M_PI/2);                 BALLOON_CORNER_RADIUS, -M_PI, -M_PI/2);
# Line 169  osm_gps_map_draw_balloon_shape (cairo_t Line 180  osm_gps_map_draw_balloon_shape (cairo_t
180                 BALLOON_CORNER_RADIUS, M_PI/2, M_PI);                 BALLOON_CORNER_RADIUS, M_PI/2, M_PI);
181    
182      cairo_close_path (cr);      cairo_close_path (cr);
183    
184        FOUT;
185  }  }
186    
187  static void  static void
188  osd_render_balloon(osm_gps_map_osd_t *osd) {  osd_render_balloon(osm_gps_map_osd_t *osd) {
189        FIN;
190    
191      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
192    
193        if(!priv->balloon.surface)
194            return;
195    
196      /* get zoom */      /* get zoom */
197      gint zoom;      gint zoom;
198      g_object_get(OSM_GPS_MAP(osd->widget), "zoom", &zoom, NULL);      g_object_get(OSM_GPS_MAP(osd->widget), "zoom", &zoom, NULL);
# Line 235  osd_render_balloon(osm_gps_map_osd_t *os Line 253  osd_render_balloon(osm_gps_map_osd_t *os
253      priv->balloon.rect.w = x1 - x0 - 2*BALLOON_BORDER;      priv->balloon.rect.w = x1 - x0 - 2*BALLOON_BORDER;
254      priv->balloon.rect.h = y1 - y0 - 2*BALLOON_BORDER;      priv->balloon.rect.h = y1 - y0 - 2*BALLOON_BORDER;
255    
256        g_assert(priv->balloon.surface);
257      cairo_t *cr = cairo_create(priv->balloon.surface);      cairo_t *cr = cairo_create(priv->balloon.surface);
258      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
259      cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.0);      cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.0);
# Line 265  osd_render_balloon(osm_gps_map_osd_t *os Line 284  osd_render_balloon(osm_gps_map_osd_t *os
284      cairo_stroke (cr);      cairo_stroke (cr);
285    
286      if (priv->balloon.cb) {      if (priv->balloon.cb) {
287            osm_gps_map_balloon_event_t event;
288    
289          /* clip in case application tries to draw in */          /* clip in case application tries to draw in */
290              /* exceed of the balloon */              /* exceed of the balloon */
291          cairo_rectangle (cr, priv->balloon.rect.x, priv->balloon.rect.y,          cairo_rectangle (cr, priv->balloon.rect.x, priv->balloon.rect.y,
292                           priv->balloon.rect.w, priv->balloon.rect.h);                           priv->balloon.rect.w, priv->balloon.rect.h);
293          cairo_clip (cr);          cairo_clip (cr);
294          cairo_new_path (cr);  /* current path is not          cairo_new_path (cr);  /* current path is not consumed by cairo_clip */
295                                   consumed by cairo_clip() */  
296            /* request the application to draw the balloon contents */
297            event.type = OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW;
298            event.data.draw.rect = &priv->balloon.rect;
299            event.data.draw.cr = cr;
300    
301          priv->balloon.cb(cr, &priv->balloon.rect, priv->balloon.data);          priv->balloon.cb(&event, priv->balloon.data);
302      }      }
303    
304      cairo_destroy(cr);      cairo_destroy(cr);
305    
306        FOUT;
307  }  }
308    
309  /* return true if balloon is being displayed and if */  /* return true if balloon is being displayed and if */
310  /* the given coordinate is within this balloon */  /* the given coordinate is within this balloon */
311  static gboolean  static gboolean
312  osd_balloon_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y)  osd_balloon_check(osm_gps_map_osd_t *osd, gboolean click, gboolean down, gint x, gint y)
313  {  {
314        FIN;
315    
316      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
317    
318      if(!priv->balloon.surface)      if(!priv->balloon.surface)
# Line 301  osd_balloon_check(osm_gps_map_osd_t *osd Line 330  osd_balloon_check(osm_gps_map_osd_t *osd
330          (x > xs) && (x < xs + priv->balloon.rect.w) &&          (x > xs) && (x < xs + priv->balloon.rect.w) &&
331          (y > ys) && (y < ys + priv->balloon.rect.h);          (y > ys) && (y < ys + priv->balloon.rect.h);
332    
333      /* handle the fact that the balloon may have been created by the */      /* is this a real click or is the application just checking for something? */
334      /* button down event */      if(click) {
     if(!is_in && !down && !priv->balloon.just_created) {  
         /* the user actually clicked outside the balloon */  
335    
336          /* close the balloon! */          /* handle the fact that the balloon may have been created by the */
337          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(osd->widget));          /* button down event */
338      }          if(!is_in && !down && !priv->balloon.just_created) {
339                /* the user actually clicked outside the balloon */
340    
341                /* close the balloon! */
342                osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(osd->widget));
343    
344                /* and inform application about this */
345                if(priv->balloon.cb) {
346                    osm_gps_map_balloon_event_t event;
347                    event.type = OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED;
348                    priv->balloon.cb(&event, priv->balloon.data);
349                }
350    
351            }
352    
353            if(is_in && priv->balloon.cb) {
354                osm_gps_map_balloon_event_t event;
355    
356                /* notify application of click */
357                event.type = OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK;
358                event.data.click.x = x - xs;
359                event.data.click.y = y - ys;
360                event.data.click.down = down;
361    
362                priv->balloon.cb(&event, priv->balloon.data);
363            }
364        }
365        FOUT;
366      return is_in;      return is_in;
367  }  }
368    
369  void osm_gps_map_osd_clear_balloon (OsmGpsMap *map) {  void osm_gps_map_osd_clear_balloon (OsmGpsMap *map) {
370        FIN;
371    
372      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
373    
374      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
# Line 329  void osm_gps_map_osd_clear_balloon (OsmG Line 384  void osm_gps_map_osd_clear_balloon (OsmG
384          priv->balloon.lon = OSM_GPS_MAP_INVALID;          priv->balloon.lon = OSM_GPS_MAP_INVALID;
385      }      }
386      osm_gps_map_redraw(map);      osm_gps_map_redraw(map);
387        FOUT;
388  }  }
389    
390  void  void
391  osm_gps_map_osd_draw_balloon (OsmGpsMap *map, float latitude, float longitude,  osm_gps_map_osd_draw_balloon (OsmGpsMap *map, float latitude, float longitude,
392                                OsmGpsMapBalloonCallback cb, gpointer data) {                                OsmGpsMapBalloonCallback cb, gpointer data) {
393        FIN;
394      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
395    
396      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
# Line 360  osm_gps_map_osd_draw_balloon (OsmGpsMap Line 417  osm_gps_map_osd_draw_balloon (OsmGpsMap
417      osd_render_balloon(osd);      osd_render_balloon(osd);
418    
419      osm_gps_map_redraw(map);      osm_gps_map_redraw(map);
420        FOUT;
421  }  }
422    
423  #endif // OSD_BALLOON  #endif // OSD_BALLOON
# Line 504  osd_shape(cairo_t *cr) { Line 562  osd_shape(cairo_t *cr) {
562  static gboolean  static gboolean
563  osm_gps_map_in_circle(gint x, gint y, gint cx, gint cy, gint rad)  osm_gps_map_in_circle(gint x, gint y, gint cx, gint cy, gint rad)
564  {  {
565        FIN;
566      return( pow(cx - x, 2) + pow(cy - y, 2) < rad * rad);      return( pow(cx - x, 2) + pow(cy - y, 2) < rad * rad);
567  }  }
568    
# Line 594  osd_check_zoom(gint x, gint y) { Line 653  osd_check_zoom(gint x, gint y) {
653  /* internal value to draw the arrow on the "puller" */  /* internal value to draw the arrow on the "puller" */
654  #define OSD_S_D0  (OSD_S_RAD/2)  #define OSD_S_D0  (OSD_S_RAD/2)
655  #ifndef OSD_FONT_SIZE  #ifndef OSD_FONT_SIZE
656  #define OSD_FONT_SIZE 16.0  #define OSD_FONT_SIZE (16.0)
657  #endif  #endif
658  #define OSD_TEXT_BORDER   (OSD_FONT_SIZE/2)  #define OSD_TEXT_BORDER   (OSD_FONT_SIZE/2)
659  #define OSD_TEXT_SKIP     (OSD_FONT_SIZE/8)  #define OSD_TEXT_SKIP     (OSD_FONT_SIZE/8)
# Line 702  osd_source_content(osm_gps_map_osd_t *os Line 761  osd_source_content(osm_gps_map_osd_t *os
761    
762  static void  static void
763  osd_render_source_sel(osm_gps_map_osd_t *osd, gboolean force_rerender) {  osd_render_source_sel(osm_gps_map_osd_t *osd, gboolean force_rerender) {
764        FIN;
765    
766      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
767    
768      if(priv->source_sel.rendered && !force_rerender)      if(!priv->source_sel.surface ||
769           (priv->source_sel.rendered && !force_rerender))
770          return;          return;
771    
772      priv->source_sel.rendered = TRUE;      priv->source_sel.rendered = TRUE;
# Line 716  osd_render_source_sel(osm_gps_map_osd_t Line 778  osd_render_source_sel(osm_gps_map_osd_t
778  #endif  #endif
779    
780      /* draw source selector */      /* draw source selector */
781        g_assert(priv->source_sel.surface);
782      cairo_t *cr = cairo_create(priv->source_sel.surface);      cairo_t *cr = cairo_create(priv->source_sel.surface);
783      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
784      cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);      cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);
# Line 748  osd_render_source_sel(osm_gps_map_osd_t Line 811  osd_render_source_sel(osm_gps_map_osd_t
811      cairo_stroke (cr);      cairo_stroke (cr);
812    
813      cairo_destroy(cr);      cairo_destroy(cr);
814        FOUT;
815  }  }
816    
817  /* re-allocate the buffer used to draw the menu. This is used */  /* re-allocate the buffer used to draw the menu. This is used */
818  /* to collapse/expand the buffer */  /* to collapse/expand the buffer */
819  static void  static void
820  osd_source_reallocate(osm_gps_map_osd_t *osd) {  osd_source_reallocate(osm_gps_map_osd_t *osd) {
821        FIN;
822      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
823    
824      /* re-allocate offscreen bitmap */      /* re-allocate offscreen bitmap */
# Line 764  osd_source_reallocate(osm_gps_map_osd_t Line 829  osd_source_reallocate(osm_gps_map_osd_t
829          cairo_text_extents_t extents;          cairo_text_extents_t extents;
830    
831          /* determine content size */          /* determine content size */
832            g_assert(priv->source_sel.surface);
833          cairo_t *cr = cairo_create(priv->source_sel.surface);          cairo_t *cr = cairo_create(priv->source_sel.surface);
834          cairo_select_font_face (cr, "Sans",          cairo_select_font_face (cr, "Sans",
835                                  CAIRO_FONT_SLANT_NORMAL,                                  CAIRO_FONT_SLANT_NORMAL,
# Line 794  osd_source_reallocate(osm_gps_map_osd_t Line 860  osd_source_reallocate(osm_gps_map_osd_t
860          cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w+2, h+2);          cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w+2, h+2);
861    
862      osd_render_source_sel(osd, TRUE);      osd_render_source_sel(osd, TRUE);
863        FOUT;
864  }  }
865    
866  #define OSD_HZ      15  #define OSD_HZ      15
867  #define OSD_TIME    500  #define OSD_TIME    500
868    
869  static gboolean osd_source_animate(gpointer data) {  static gboolean osd_source_animate(gpointer data) {
870        FIN;
871      osm_gps_map_osd_t *osd = (osm_gps_map_osd_t*)data;      osm_gps_map_osd_t *osd = (osm_gps_map_osd_t*)data;
872      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
873      int diff = OSD_S_EXP_W - OSD_S_W - OSD_S_X;      int diff = OSD_S_EXP_W - OSD_S_W - OSD_S_X;
# Line 838  static gboolean osd_source_animate(gpoin Line 906  static gboolean osd_source_animate(gpoin
906      if(done)      if(done)
907          priv->source_sel.handler_id = 0;          priv->source_sel.handler_id = 0;
908    
909        FOUT;
910      return !done;      return !done;
911  }  }
912    
# Line 845  static gboolean osd_source_animate(gpoin Line 914  static gboolean osd_source_animate(gpoin
914  static void  static void
915  osd_source_toggle(osm_gps_map_osd_t *osd)  osd_source_toggle(osm_gps_map_osd_t *osd)
916  {  {
917        FIN;
918      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
919    
920      /* ignore clicks while animation is running */      /* ignore clicks while animation is running */
# Line 870  osd_source_toggle(osm_gps_map_osd_t *osd Line 940  osd_source_toggle(osm_gps_map_osd_t *osd
940      /* start timer to handle animation */      /* start timer to handle animation */
941      priv->source_sel.handler_id = gtk_timeout_add(OSD_TIME/OSD_HZ,      priv->source_sel.handler_id = gtk_timeout_add(OSD_TIME/OSD_HZ,
942                                                    osd_source_animate, osd);                                                    osd_source_animate, osd);
943        FOUT;
944  }  }
945    
946  /* check if the user clicked inside the source selection area */  /* check if the user clicked inside the source selection area */
947  static osd_button_t  static osd_button_t
948  osd_source_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y) {  osd_source_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y) {
949        FIN;
950      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
951    
952      if(!priv->source_sel.expanded)      if(!priv->source_sel.expanded)
# Line 932  osd_source_check(osm_gps_map_osd_t *osd, Line 1004  osd_source_check(osm_gps_map_osd_t *osd,
1004                      osm_gps_map_repaint(OSM_GPS_MAP(osd->widget));                      osm_gps_map_repaint(OSM_GPS_MAP(osd->widget));
1005                  }                  }
1006              }              }
1007    
1008              /* return "clicked in OSD background" to prevent further */              /* return "clicked in OSD background" to prevent further */
1009              /* processing by application */              /* processing by application */
1010              return OSD_BG;              return OSD_BG;
1011          }          }
1012      }      }
1013    
1014        FOUT;
1015      return OSD_NONE;      return OSD_NONE;
1016  }  }
1017  #endif // OSD_SOURCE_SEL  #endif // OSD_SOURCE_SEL
1018    
 static osd_button_t  
 osd_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y) {  
     osd_button_t but = OSD_NONE;  
   
 #ifdef OSD_BALLOON  
     if(down) {  
         /* needed to handle balloons that are created at click */  
         osd_priv_t *priv = (osd_priv_t*)osd->priv;  
         priv->balloon.just_created = FALSE;  
     }  
 #endif  
   
 #ifdef OSD_SOURCE_SEL  
     /* the source selection area is handles internally */  
     but = osd_source_check(osd, down, x, y);  
 #endif  
   
     if(but == OSD_NONE) {  
         gint mx = x - OSD_X;  
         gint my = y - OSD_Y;  
   
         if(OSD_X < 0)  
             mx -= (osd->widget->allocation.width - OSD_W);  
   
         if(OSD_Y < 0)  
             my -= (osd->widget->allocation.height - OSD_H);  
   
         /* first do a rough test for the OSD area. */  
         /* this is just to avoid an unnecessary detailed test */  
         if(mx > 0 && mx < OSD_W && my > 0 && my < OSD_H) {  
 #ifndef OSD_NO_DPAD  
             but = osd_check_dpad(mx, my);  
 #endif  
         }  
   
         if(but == OSD_NONE)  
             but = osd_check_zoom(mx, my);  
     }  
   
 #ifdef OSD_BALLOON  
     if(but == OSD_NONE) {  
         /* check if user clicked into balloon */  
         if(osd_balloon_check(osd, down, x, y))  
             but = OSD_BG;  
     }  
 #endif  
   
     return but;  
 }  
   
1019  #ifndef OSD_NO_DPAD  #ifndef OSD_NO_DPAD
1020  static void  static void
1021  osd_dpad_labels(cairo_t *cr, gint x, gint y) {  osd_dpad_labels(cairo_t *cr, gint x, gint y) {
# Line 1066  osd_zoom_labels(cairo_t *cr, gint x, gin Line 1089  osd_zoom_labels(cairo_t *cr, gint x, gin
1089  #ifdef OSD_COORDINATES  #ifdef OSD_COORDINATES
1090    
1091  #ifndef OSD_COORDINATES_FONT_SIZE  #ifndef OSD_COORDINATES_FONT_SIZE
1092  #define OSD_COORDINATES_FONT_SIZE 12  #define OSD_COORDINATES_FONT_SIZE (12.0)
1093  #endif  #endif
1094    
1095  #define OSD_COORDINATES_OFFSET (OSD_COORDINATES_FONT_SIZE/6)  #define OSD_COORDINATES_OFFSET (OSD_COORDINATES_FONT_SIZE/6)
1096    
1097  #define OSD_COORDINATES_W  (8*OSD_COORDINATES_FONT_SIZE+2*OSD_COORDINATES_OFFSET)  #define OSD_COORDINATES_W  (8*OSD_COORDINATES_FONT_SIZE+2*OSD_COORDINATES_OFFSET)
1098  #define OSD_COORDINATES_H  (2*OSD_COORDINATES_FONT_SIZE+2*OSD_COORDINATES_OFFSET)  #define OSD_COORDINATES_H  (2*OSD_COORDINATES_FONT_SIZE+2*OSD_COORDINATES_OFFSET+OSD_COORDINATES_FONT_SIZE/4)
1099    
1100  /* these can be overwritten with versions that support */  /* these can be overwritten with versions that support */
1101  /* localization */  /* localization */
# Line 1133  static char Line 1156  static char
1156  /* render a string at the given screen position */  /* render a string at the given screen position */
1157  static int  static int
1158  osd_render_centered_text(cairo_t *cr, int y, int width, char *text) {  osd_render_centered_text(cairo_t *cr, int y, int width, char *text) {
1159      char *p = g_strdup(text);      FIN;
1160    
1161        if(!text) return y;
1162    
1163        char *p = g_malloc(strlen(text)+4);  // space for "...\n"
1164        strcpy(p, text);
1165    
1166      cairo_text_extents_t extents;      cairo_text_extents_t extents;
1167        memset(&extents, 0, sizeof(cairo_text_extents_t));
1168      cairo_text_extents (cr, p, &extents);      cairo_text_extents (cr, p, &extents);
1169        g_assert(extents.width != 0.0);
1170    
1171      /* check if text needs to be truncated */      /* check if text needs to be truncated */
1172      int len = strlen(text)-2;      int trunc_at = strlen(text);
1173      while(extents.width > width) {      while(extents.width > width) {
1174          len--;  
1175          strcpy(p+len, "...");          /* cut off all utf8 multibyte remains so the actual */
1176            /* truncation only deals with one byte */
1177            while((p[trunc_at-1] & 0xc0) == 0x80) {
1178                trunc_at--;
1179                g_assert(trunc_at > 0);
1180            }
1181    
1182            trunc_at--;
1183            g_assert(trunc_at > 0);
1184    
1185            strcpy(p+trunc_at, "...");
1186          cairo_text_extents (cr, p, &extents);          cairo_text_extents (cr, p, &extents);
1187      }      }
1188    
# Line 1157  osd_render_centered_text(cairo_t *cr, in Line 1198  osd_render_centered_text(cairo_t *cr, in
1198    
1199      g_free(p);      g_free(p);
1200    
1201      /* skip + 1/4 line */      /* skip + 1/5 line */
1202      return y + 5*OSD_COORDINATES_FONT_SIZE/4;      FOUT;
1203        return y + 6*OSD_COORDINATES_FONT_SIZE/5;
1204  }  }
1205    
1206  static void  static void
1207  osd_render_coordinates(osm_gps_map_osd_t *osd)  osd_render_coordinates(osm_gps_map_osd_t *osd)
1208  {  {
1209        FIN;
1210      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1211    
1212        if(!priv->coordinates.surface)
1213            return;
1214    
1215      /* get current map position */      /* get current map position */
1216      gfloat lat, lon;      gfloat lat, lon;
1217      g_object_get(osd->widget, "latitude", &lat, "longitude", &lon, NULL);      g_object_get(osd->widget, "latitude", &lat, "longitude", &lon, NULL);
# Line 1181  osd_render_coordinates(osm_gps_map_osd_t Line 1227  osd_render_coordinates(osm_gps_map_osd_t
1227      priv->coordinates.lon = lon;      priv->coordinates.lon = lon;
1228    
1229      /* first fill with transparency */      /* first fill with transparency */
1230    
1231        g_assert(priv->coordinates.surface);
1232      cairo_t *cr = cairo_create(priv->coordinates.surface);      cairo_t *cr = cairo_create(priv->coordinates.surface);
1233      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1234      //    cairo_set_source_rgba(cr, 1.0, 1.0, 1.0, 0.5);      //    cairo_set_source_rgba(cr, 1.0, 1.0, 1.0, 0.5);
# Line 1204  osd_render_coordinates(osm_gps_map_osd_t Line 1252  osd_render_coordinates(osm_gps_map_osd_t
1252      g_free(longitude);      g_free(longitude);
1253    
1254      cairo_destroy(cr);      cairo_destroy(cr);
1255        FOUT;
1256  }  }
1257  #endif  // OSD_COORDINATES  #endif  // OSD_COORDINATES
1258    
1259  #ifdef OSD_NAV  #ifdef OSD_NAV
1260  #define OSD_NAV_W  (8*OSD_COORDINATES_FONT_SIZE+2*OSD_COORDINATES_OFFSET)  #define OSD_NAV_W  (8*OSD_COORDINATES_FONT_SIZE+2*OSD_COORDINATES_OFFSET)
1261  #define OSD_NAV_H  (100)  #define OSD_NAV_H  (11*OSD_COORDINATES_FONT_SIZE)
1262    
1263    /* http://mathforum.org/library/drmath/view/55417.html */
1264    static float get_bearing(float lat1, float lon1, float lat2, float lon2) {
1265      return atan2( sin(lon2 - lon1) * cos(lat2),
1266                    cos(lat1) * sin(lat2) -
1267                    sin(lat1) * cos(lat2) * cos(lon2 - lon1));
1268    }
1269    
1270    /* http://mathforum.org/library/drmath/view/51722.html */
1271    static float get_distance(float lat1, float lon1, float lat2, float lon2) {
1272      float aob = acos(cos(lat1) * cos(lat2) * cos(lon2 - lon1) +
1273                       sin(lat1) * sin(lat2));
1274    
1275      //  return(aob * 3959.0);   /* great circle radius in miles */
1276    
1277      return(aob * 6371000.0);     /* great circle radius in meters */
1278    }
1279    
1280  static void  static void
1281  osd_render_nav(osm_gps_map_osd_t *osd)  osd_render_nav(osm_gps_map_osd_t *osd)
1282  {  {
1283        FIN;
1284      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1285    
1286      if(!priv->nav.surface || isnan(priv->nav.lat) || isnan(priv->nav.lon))      if(!priv->nav.surface || isnan(priv->nav.lat) || isnan(priv->nav.lon))
1287          return;          return;
1288    
1289      /* first fill with transparency */      /* first fill with transparency */
1290        g_assert(priv->nav.surface);
1291      cairo_t *cr = cairo_create(priv->nav.surface);      cairo_t *cr = cairo_create(priv->nav.surface);
1292      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1293      cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.2);      cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);
1294      cairo_paint(cr);      cairo_paint(cr);
1295      cairo_set_operator(cr, CAIRO_OPERATOR_OVER);      cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
1296    
# Line 1238  osd_render_nav(osm_gps_map_osd_t *osd) Line 1306  osd_render_nav(osm_gps_map_osd_t *osd)
1306      y = osd_render_centered_text(cr, y, OSD_NAV_W, priv->nav.name);      y = osd_render_centered_text(cr, y, OSD_NAV_W, priv->nav.name);
1307      y = osd_render_centered_text(cr, y, OSD_NAV_W, latitude);      y = osd_render_centered_text(cr, y, OSD_NAV_W, latitude);
1308      y = osd_render_centered_text(cr, y, OSD_NAV_W, longitude);      y = osd_render_centered_text(cr, y, OSD_NAV_W, longitude);
1309    
1310      g_free(latitude);      g_free(latitude);
1311      g_free(longitude);      g_free(longitude);
1312    
1313        /* everything below this is the compass. we need to know this */
1314        /* to differ between coordinate clicks and compass clicks */
1315        priv->nav.click_sep = y;
1316    
1317        /* draw the compass */
1318        int radius = (OSD_NAV_H - y - 5*OSD_COORDINATES_FONT_SIZE/4)/2;
1319        if(radius > OSD_NAV_W/2)
1320            radius = OSD_NAV_W/2;
1321    
1322        int x = OSD_NAV_W/2+1;
1323        y += radius;
1324    
1325        cairo_stroke (cr);
1326    
1327        /* draw background */
1328        cairo_arc(cr, x, y, radius, 0,  2*M_PI);
1329        cairo_set_source_rgba (cr, 1, 1, 1, 0.5);
1330        cairo_fill_preserve (cr);
1331        cairo_set_source_rgb (cr, 0, 0, 0);
1332        cairo_set_line_width (cr, 1);
1333        cairo_stroke (cr);
1334    
1335        /* draw pointer */
1336    #define ARROW_WIDTH     0.3
1337    #define ARROW_LENGTH    0.7
1338    
1339        coord_t mpos, *pos = osm_gps_map_get_gps (OSM_GPS_MAP(osd->widget));
1340        if(priv->nav.mode) {
1341            gfloat lat, lon;
1342            g_object_get(osd->widget, "latitude", &lat, "longitude", &lon, NULL);
1343            mpos.rlat = deg2rad(lat);
1344            mpos.rlon = deg2rad(lon);
1345            pos = &mpos;
1346        }
1347    
1348        if(pos) {
1349            float arot = get_bearing(pos->rlat, pos->rlon,
1350                         deg2rad(priv->nav.lat), deg2rad(priv->nav.lon));
1351    
1352            cairo_move_to(cr,
1353                          x + radius *  ARROW_LENGTH *  sin(arot),
1354                          y + radius *  ARROW_LENGTH * -cos(arot));
1355    
1356            cairo_line_to(cr,
1357                          x + radius * -ARROW_LENGTH *  sin(arot+ARROW_WIDTH),
1358                          y + radius * -ARROW_LENGTH * -cos(arot+ARROW_WIDTH));
1359    
1360            cairo_line_to(cr,
1361                          x + radius * -0.5 * ARROW_LENGTH *  sin(arot),
1362                          y + radius * -0.5 * ARROW_LENGTH * -cos(arot));
1363    
1364            cairo_line_to(cr,
1365                          x + radius * -ARROW_LENGTH *  sin(arot-ARROW_WIDTH),
1366                          y + radius * -ARROW_LENGTH * -cos(arot-ARROW_WIDTH));
1367    
1368            cairo_close_path(cr);
1369            if(priv->nav.mode)
1370                cairo_set_source_rgb (cr, 0, 0, 0);
1371            else
1372                cairo_set_source_rgb (cr, 0, 0, 0.8);
1373    
1374            cairo_fill (cr);
1375    
1376            y += radius + OSD_COORDINATES_FONT_SIZE/4;
1377    
1378            float dist = get_distance(pos->rlat, pos->rlon,
1379                            deg2rad(priv->nav.lat), deg2rad(priv->nav.lon));
1380    
1381            char *dist_str = NULL;
1382            if(!priv->nav.imperial) {
1383                /* metric is easy ... */
1384                if(dist<1000)
1385                    dist_str = g_strdup_printf("%u m", (int)dist);
1386                else
1387                    dist_str = g_strdup_printf("%.1f km", dist/1000);
1388            } else {
1389                /* and now the hard part: scale for useful imperial values :-( */
1390                /* try to convert to feet, 1ft == 0.3048 m */
1391    
1392                if(dist/(3*0.3048) >= 1760.0)      /* more than 1760 yard? */
1393                    dist_str = g_strdup_printf("%.1f mi", dist/(0.3048*3*1760.0));
1394                else if(dist/0.3048 >= 100)        /* more than 100 feet? */
1395                    dist_str = g_strdup_printf("%.1f yd", dist/(0.3048*3));
1396                else
1397                    dist_str = g_strdup_printf("%.0f ft", dist/0.3048);
1398            }
1399    
1400            y = osd_render_centered_text(cr, y, OSD_NAV_W, dist_str);
1401            g_free(dist_str);
1402        }
1403    
1404      cairo_destroy(cr);      cairo_destroy(cr);
1405        FOUT;
1406    }
1407    
1408    /* check if the user clicked inside the source selection area */
1409    static osd_button_t
1410    osd_nav_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y) {
1411        FIN;
1412        osd_priv_t *priv = (osd_priv_t*)osd->priv;
1413    
1414        if(!priv->nav.surface || down)
1415            return OSD_NONE;
1416    
1417        x -= OSD_X;
1418        if(OSD_X < 0)
1419            x -= (osd->widget->allocation.width - OSD_NAV_W);
1420    
1421        y -= (osd->widget->allocation.height - OSD_NAV_H)/2;
1422    
1423        if(x >= 0 && y >= 0 && x <= OSD_NAV_W && y <= OSD_NAV_H) {
1424            if(y < priv->nav.click_sep)
1425                osm_gps_map_set_center(OSM_GPS_MAP(osd->widget),
1426                                       priv->nav.lat, priv->nav.lon);
1427            else {
1428                priv->nav.mode = !priv->nav.mode;
1429                osm_gps_map_redraw(OSM_GPS_MAP(osd->widget));
1430            }
1431        }
1432    
1433        FOUT;
1434        return OSD_NONE;
1435  }  }
1436    
1437  void osm_gps_map_osd_clear_nav (OsmGpsMap *map) {  void osm_gps_map_osd_clear_nav (OsmGpsMap *map) {
1438        FIN;
1439      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
1440    
1441      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
# Line 1262  void osm_gps_map_osd_clear_nav (OsmGpsMa Line 1452  void osm_gps_map_osd_clear_nav (OsmGpsMa
1452          if(priv->nav.name) g_free(priv->nav.name);          if(priv->nav.name) g_free(priv->nav.name);
1453      }      }
1454      osm_gps_map_redraw(map);      osm_gps_map_redraw(map);
1455        FOUT;
1456  }  }
1457    
1458  void  void
1459  osm_gps_map_osd_draw_nav (OsmGpsMap *map, float latitude, float longitude,  osm_gps_map_osd_draw_nav (OsmGpsMap *map, gboolean imperial,
1460                            char *name) {                            float latitude, float longitude, char *name) {
1461        FIN;
1462      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
1463    
1464      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
# Line 1285  osm_gps_map_osd_draw_nav (OsmGpsMap *map Line 1477  osm_gps_map_osd_draw_nav (OsmGpsMap *map
1477      priv->nav.lat = latitude;      priv->nav.lat = latitude;
1478      priv->nav.lon = longitude;      priv->nav.lon = longitude;
1479      priv->nav.name = g_strdup(name);      priv->nav.name = g_strdup(name);
1480        priv->nav.imperial = imperial;
1481    
1482      osd_render_nav(osd);      osd_render_nav(osd);
1483    
1484      osm_gps_map_redraw(map);      osm_gps_map_redraw(map);
1485        FOUT;
1486  }  }
1487    
1488  #endif // OSD_NAV  #endif // OSD_NAV
1489    
1490    static osd_button_t
1491    osd_check_int(osm_gps_map_osd_t *osd, gboolean click, gboolean down, gint x, gint y) {
1492        FIN;
1493        osd_button_t but = OSD_NONE;
1494    
1495    #ifdef OSD_BALLOON
1496        if(down) {
1497            /* needed to handle balloons that are created at click */
1498            osd_priv_t *priv = (osd_priv_t*)osd->priv;
1499            priv->balloon.just_created = FALSE;
1500        }
1501    #endif
1502    
1503    #ifdef OSD_SOURCE_SEL
1504        /* the source selection area is handles internally */
1505        but = osd_source_check(osd, down, x, y);
1506    #endif
1507    
1508    #ifdef OSD_NAV
1509        if(but == OSD_NONE) {
1510            /* the source selection area is handles internally */
1511            but = osd_nav_check(osd, down, x, y);
1512        }
1513    #endif
1514    
1515        if(but == OSD_NONE) {
1516            gint mx = x - OSD_X;
1517            gint my = y - OSD_Y;
1518    
1519            if(OSD_X < 0)
1520                mx -= (osd->widget->allocation.width - OSD_W);
1521    
1522            if(OSD_Y < 0)
1523                my -= (osd->widget->allocation.height - OSD_H);
1524    
1525            /* first do a rough test for the OSD area. */
1526            /* this is just to avoid an unnecessary detailed test */
1527            if(mx > 0 && mx < OSD_W && my > 0 && my < OSD_H) {
1528    #ifndef OSD_NO_DPAD
1529                but = osd_check_dpad(mx, my);
1530    #endif
1531            }
1532    
1533            if(but == OSD_NONE)
1534                but = osd_check_zoom(mx, my);
1535        }
1536    
1537    #ifdef OSD_BALLOON
1538        if(but == OSD_NONE) {
1539            /* check if user clicked into balloon */
1540            if(osd_balloon_check(osd, click, down, x, y))
1541                but = OSD_BG;
1542        }
1543    #endif
1544    
1545        FOUT;
1546        return but;
1547    }
1548    
1549    
1550  #ifdef OSD_CROSSHAIR  #ifdef OSD_CROSSHAIR
1551    
# Line 1307  osm_gps_map_osd_draw_nav (OsmGpsMap *map Line 1560  osm_gps_map_osd_draw_nav (OsmGpsMap *map
1560    
1561  static void  static void
1562  osd_render_crosshair_shape(cairo_t *cr) {  osd_render_crosshair_shape(cairo_t *cr) {
1563        FIN;
1564      cairo_arc (cr, OSD_CROSSHAIR_W/2, OSD_CROSSHAIR_H/2,      cairo_arc (cr, OSD_CROSSHAIR_W/2, OSD_CROSSHAIR_H/2,
1565                 OSD_CROSSHAIR_RADIUS, 0,  2*M_PI);                 OSD_CROSSHAIR_RADIUS, 0,  2*M_PI);
1566    
# Line 1325  osd_render_crosshair_shape(cairo_t *cr) Line 1579  osd_render_crosshair_shape(cairo_t *cr)
1579      cairo_rel_line_to (cr, 0, OSD_CROSSHAIR_TICK);      cairo_rel_line_to (cr, 0, OSD_CROSSHAIR_TICK);
1580    
1581      cairo_stroke (cr);      cairo_stroke (cr);
1582        FOUT;
1583  }  }
1584    
1585  static void  static void
1586  osd_render_crosshair(osm_gps_map_osd_t *osd)  osd_render_crosshair(osm_gps_map_osd_t *osd)
1587  {  {
1588        FIN;
1589      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1590    
1591      if(priv->crosshair.rendered)      if(!priv->crosshair.surface || priv->crosshair.rendered)
1592          return;          return;
1593    
1594      priv->crosshair.rendered = TRUE;      priv->crosshair.rendered = TRUE;
1595    
1596      /* first fill with transparency */      /* first fill with transparency */
1597        g_assert(priv->crosshair.surface);
1598      cairo_t *cr = cairo_create(priv->crosshair.surface);      cairo_t *cr = cairo_create(priv->crosshair.surface);
1599      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1600      cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.0);      cairo_set_source_rgba(cr, 0.0, 0.0, 0.0, 0.0);
# Line 1355  osd_render_crosshair(osm_gps_map_osd_t * Line 1612  osd_render_crosshair(osm_gps_map_osd_t *
1612      osd_render_crosshair_shape(cr);      osd_render_crosshair_shape(cr);
1613    
1614      cairo_destroy(cr);      cairo_destroy(cr);
1615        FOUT;
1616  }  }
1617  #endif  #endif
1618    
1619  #ifdef OSD_SCALE  #ifdef OSD_SCALE
1620    
1621  #ifndef OSD_SCALE_FONT_SIZE  #ifndef OSD_SCALE_FONT_SIZE
1622  #define OSD_SCALE_FONT_SIZE 12  #define OSD_SCALE_FONT_SIZE (12.0)
1623  #endif  #endif
1624  #define OSD_SCALE_W   (10*OSD_SCALE_FONT_SIZE)  #define OSD_SCALE_W   (10*OSD_SCALE_FONT_SIZE)
1625  #define OSD_SCALE_H   (5*OSD_SCALE_FONT_SIZE/2)  #define OSD_SCALE_H   (5*OSD_SCALE_FONT_SIZE/2)
# Line 1376  osd_render_crosshair(osm_gps_map_osd_t * Line 1634  osd_render_crosshair(osm_gps_map_osd_t *
1634  static void  static void
1635  osd_render_scale(osm_gps_map_osd_t *osd)  osd_render_scale(osm_gps_map_osd_t *osd)
1636  {  {
1637        FIN;
1638      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1639    
1640        if(!priv->scale.surface)
1641            return;
1642    
1643      /* this only needs to be rendered if the zoom has changed */      /* this only needs to be rendered if the zoom has changed */
1644      gint zoom;      gint zoom;
1645      g_object_get(OSM_GPS_MAP(osd->widget), "zoom", &zoom, NULL);      g_object_get(OSM_GPS_MAP(osd->widget), "zoom", &zoom, NULL);
# Line 1389  osd_render_scale(osm_gps_map_osd_t *osd) Line 1651  osd_render_scale(osm_gps_map_osd_t *osd)
1651      float m_per_pix = osm_gps_map_get_scale(OSM_GPS_MAP(osd->widget));      float m_per_pix = osm_gps_map_get_scale(OSM_GPS_MAP(osd->widget));
1652    
1653      /* first fill with transparency */      /* first fill with transparency */
1654        g_assert(priv->scale.surface);
1655      cairo_t *cr = cairo_create(priv->scale.surface);      cairo_t *cr = cairo_create(priv->scale.surface);
1656      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1657      cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);      cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);
# Line 1499  osd_render_scale(osm_gps_map_osd_t *osd) Line 1762  osd_render_scale(osm_gps_map_osd_t *osd)
1762      cairo_stroke(cr);      cairo_stroke(cr);
1763    
1764      cairo_destroy(cr);      cairo_destroy(cr);
1765        FOUT;
1766  }  }
1767  #endif  #endif
1768    
1769  static void  static void
1770  osd_render_controls(osm_gps_map_osd_t *osd)  osd_render_controls(osm_gps_map_osd_t *osd)
1771  {  {
1772        FIN;
1773      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1774    
1775        if(!priv->controls.surface)
1776            return;
1777    
1778      if(priv->controls.rendered      if(priv->controls.rendered
1779  #ifdef OSD_GPS_BUTTON  #ifdef OSD_GPS_BUTTON
1780         && (priv->controls.gps_enabled == (osd->cb != NULL))         && (priv->controls.gps_enabled == (osd->cb != NULL))
# Line 1526  osd_render_controls(osm_gps_map_osd_t *o Line 1794  osd_render_controls(osm_gps_map_osd_t *o
1794  #endif  #endif
1795    
1796      /* first fill with transparency */      /* first fill with transparency */
1797        g_assert(priv->controls.surface);
1798      cairo_t *cr = cairo_create(priv->controls.surface);      cairo_t *cr = cairo_create(priv->controls.surface);
1799      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1800      cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);      cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);
# Line 1778  osd_draw(osm_gps_map_osd_t *osd, GdkDraw Line 2047  osd_draw(osm_gps_map_osd_t *osd, GdkDraw
2047  #endif  #endif
2048    
2049      cairo_destroy(cr);      cairo_destroy(cr);
2050        FOUT;
2051  }  }
2052    
2053  static void  static void
2054  osd_free(osm_gps_map_osd_t *osd)  osd_free(osm_gps_map_osd_t *osd)
2055  {  {
2056        FIN;
2057      osd_priv_t *priv = (osd_priv_t *)(osd->priv);      osd_priv_t *priv = (osd_priv_t *)(osd->priv);
2058    
2059      if (priv->controls.surface)      if (priv->controls.surface)
# Line 1821  osd_free(osm_gps_map_osd_t *osd) Line 2092  osd_free(osm_gps_map_osd_t *osd)
2092           cairo_surface_destroy(priv->balloon.surface);           cairo_surface_destroy(priv->balloon.surface);
2093  #endif  #endif
2094    
2095        printf("freeing priv\n");
2096      g_free(priv);      g_free(priv);
2097        FOUT;
2098  }  }
2099    
2100  static gboolean  static gboolean
2101  osd_busy(osm_gps_map_osd_t *osd)  osd_busy(osm_gps_map_osd_t *osd)
2102  {  {
2103        FIN;
2104  #ifdef OSD_SOURCE_SEL  #ifdef OSD_SOURCE_SEL
2105      osd_priv_t *priv = (osd_priv_t *)(osd->priv);      osd_priv_t *priv = (osd_priv_t *)(osd->priv);
2106      return (priv->source_sel.handler_id != 0);      return (priv->source_sel.handler_id != 0);
# Line 1835  osd_busy(osm_gps_map_osd_t *osd) Line 2109  osd_busy(osm_gps_map_osd_t *osd)
2109  #endif  #endif
2110  }  }
2111    
2112    static osd_button_t
2113    osd_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y) {
2114        FIN;
2115        return osd_check_int(osd, TRUE, down, x, y);
2116    }
2117    
2118  static osm_gps_map_osd_t osd_classic = {  static osm_gps_map_osd_t osd_classic = {
2119      .widget     = NULL,      .widget     = NULL,
2120    
# Line 1854  static osm_gps_map_osd_t osd_classic = { Line 2134  static osm_gps_map_osd_t osd_classic = {
2134  void  void
2135  osm_gps_map_osd_classic_init(OsmGpsMap *map)  osm_gps_map_osd_classic_init(OsmGpsMap *map)
2136  {  {
2137        FIN;
2138      osd_priv_t *priv = osd_classic.priv = g_new0(osd_priv_t, 1);      osd_priv_t *priv = osd_classic.priv = g_new0(osd_priv_t, 1);
2139        printf("alloc new osd priv\n");
2140    
2141  #ifdef OSD_BALLOON  #ifdef OSD_BALLOON
2142      priv->balloon.lat = OSM_GPS_MAP_INVALID;      priv->balloon.lat = OSM_GPS_MAP_INVALID;
# Line 1864  osm_gps_map_osd_classic_init(OsmGpsMap * Line 2146  osm_gps_map_osd_classic_init(OsmGpsMap *
2146      osd_classic.priv = priv;      osd_classic.priv = priv;
2147    
2148      osm_gps_map_register_osd(map, &osd_classic);      osm_gps_map_register_osd(map, &osd_classic);
2149        FOUT;
2150  }  }
2151    
2152  #ifdef OSD_GPS_BUTTON  #ifdef OSD_GPS_BUTTON
# Line 1871  osm_gps_map_osd_classic_init(OsmGpsMap * Line 2154  osm_gps_map_osd_classic_init(OsmGpsMap *
2154  /* but instead are to be used by the main application */  /* but instead are to be used by the main application */
2155  void osm_gps_map_osd_enable_gps (OsmGpsMap *map, OsmGpsMapOsdCallback cb,  void osm_gps_map_osd_enable_gps (OsmGpsMap *map, OsmGpsMapOsdCallback cb,
2156                                   gpointer data) {                                   gpointer data) {
2157        FIN;
2158      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
2159      g_return_if_fail (osd);      g_return_if_fail (osd);
2160    
# Line 1882  void osm_gps_map_osd_enable_gps (OsmGpsM Line 2166  void osm_gps_map_osd_enable_gps (OsmGpsM
2166      osd->render(osd);      osd->render(osd);
2167    
2168      osm_gps_map_redraw(map);      osm_gps_map_redraw(map);
2169        FOUT;
2170  }  }
2171  #endif  #endif
2172    
2173  osd_button_t  osd_button_t
2174  osm_gps_map_osd_check(OsmGpsMap *map, gint x, gint y) {  osm_gps_map_osd_check(OsmGpsMap *map, gint x, gint y) {
2175        FIN;
2176      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
2177      g_return_val_if_fail (osd, OSD_NONE);      g_return_val_if_fail (osd, OSD_NONE);
2178    
2179      return osd_check(osd, TRUE, x, y);      return osd_check_int(osd, FALSE, TRUE, x, y);
2180  }  }
Legend:
Removed from v.124  
changed lines
  Added in v.226