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 147 by harbaum, Wed Oct 28 11:50:37 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;    // display distance imperial/metric
86      } nav;      } nav;
87  #endif  #endif
88    
# Line 134  typedef struct { Line 135  typedef struct {
135    
136  #define CLOSE_BUTTON_RADIUS   (BALLOON_CORNER_RADIUS)  #define CLOSE_BUTTON_RADIUS   (BALLOON_CORNER_RADIUS)
137    
138    #define FIN   printf("entering function %s\n", __func__);
139    #define FOUT  printf("leaving function %s\n", __func__);
140    
141  /* 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 */
142  /* for the shadow */  /* for the shadow */
# Line 141  static void Line 144  static void
144  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,
145         gboolean bottom, int px, int py, int px0, int px1) {         gboolean bottom, int px, int py, int px0, int px1) {
146    
147        FIN;
148    
149      cairo_move_to (cr, x0, y0 + BALLOON_CORNER_RADIUS);      cairo_move_to (cr, x0, y0 + BALLOON_CORNER_RADIUS);
150      cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,      cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,
151                 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 174  osm_gps_map_draw_balloon_shape (cairo_t
174                 BALLOON_CORNER_RADIUS, M_PI/2, M_PI);                 BALLOON_CORNER_RADIUS, M_PI/2, M_PI);
175    
176      cairo_close_path (cr);      cairo_close_path (cr);
177    
178        FOUT;
179  }  }
180    
181  static void  static void
182  osd_render_balloon(osm_gps_map_osd_t *osd) {  osd_render_balloon(osm_gps_map_osd_t *osd) {
183        FIN;
184    
185      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
186    
187      /* get zoom */      /* get zoom */
# Line 265  osd_render_balloon(osm_gps_map_osd_t *os Line 274  osd_render_balloon(osm_gps_map_osd_t *os
274      cairo_stroke (cr);      cairo_stroke (cr);
275    
276      if (priv->balloon.cb) {      if (priv->balloon.cb) {
277            osm_gps_map_balloon_event_t event;
278    
279          /* clip in case application tries to draw in */          /* clip in case application tries to draw in */
280              /* exceed of the balloon */              /* exceed of the balloon */
281          cairo_rectangle (cr, priv->balloon.rect.x, priv->balloon.rect.y,          cairo_rectangle (cr, priv->balloon.rect.x, priv->balloon.rect.y,
282                           priv->balloon.rect.w, priv->balloon.rect.h);                           priv->balloon.rect.w, priv->balloon.rect.h);
283          cairo_clip (cr);          cairo_clip (cr);
284          cairo_new_path (cr);  /* current path is not          cairo_new_path (cr);  /* current path is not consumed by cairo_clip */
285                                   consumed by cairo_clip() */  
286            /* request the application to draw the balloon contents */
287            event.type = OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW;
288            event.data.draw.rect = &priv->balloon.rect;
289            event.data.draw.cr = cr;
290    
291          priv->balloon.cb(cr, &priv->balloon.rect, priv->balloon.data);          priv->balloon.cb(&event, priv->balloon.data);
292      }      }
293    
294      cairo_destroy(cr);      cairo_destroy(cr);
295    
296        FOUT;
297  }  }
298    
299  /* return true if balloon is being displayed and if */  /* return true if balloon is being displayed and if */
300  /* the given coordinate is within this balloon */  /* the given coordinate is within this balloon */
301  static gboolean  static gboolean
302  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)
303  {  {
304        FIN;
305    
306      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
307    
308      if(!priv->balloon.surface)      if(!priv->balloon.surface)
# Line 301  osd_balloon_check(osm_gps_map_osd_t *osd Line 320  osd_balloon_check(osm_gps_map_osd_t *osd
320          (x > xs) && (x < xs + priv->balloon.rect.w) &&          (x > xs) && (x < xs + priv->balloon.rect.w) &&
321          (y > ys) && (y < ys + priv->balloon.rect.h);          (y > ys) && (y < ys + priv->balloon.rect.h);
322    
323      /* 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? */
324      /* button down event */      if(click) {
     if(!is_in && !down && !priv->balloon.just_created) {  
         /* the user actually clicked outside the balloon */  
325    
326          /* close the balloon! */          /* handle the fact that the balloon may have been created by the */
327          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(osd->widget));          /* button down event */
328      }          if(!is_in && !down && !priv->balloon.just_created) {
329                /* the user actually clicked outside the balloon */
330    
331                /* close the balloon! */
332                osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(osd->widget));
333    
334                /* and inform application about this */
335                if(priv->balloon.cb) {
336                    osm_gps_map_balloon_event_t event;
337                    event.type = OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED;
338                    priv->balloon.cb(&event, priv->balloon.data);
339                }
340    
341            }
342    
343            if(is_in && priv->balloon.cb) {
344                osm_gps_map_balloon_event_t event;
345    
346                /* notify application of click */
347                event.type = OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK;
348                event.data.click.x = x - xs;
349                event.data.click.y = y - ys;
350                event.data.click.down = down;
351    
352                priv->balloon.cb(&event, priv->balloon.data);
353            }
354        }
355        FOUT;
356      return is_in;      return is_in;
357  }  }
358    
359  void osm_gps_map_osd_clear_balloon (OsmGpsMap *map) {  void osm_gps_map_osd_clear_balloon (OsmGpsMap *map) {
360        FIN;
361    
362      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
363    
364      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 374  void osm_gps_map_osd_clear_balloon (OsmG
374          priv->balloon.lon = OSM_GPS_MAP_INVALID;          priv->balloon.lon = OSM_GPS_MAP_INVALID;
375      }      }
376      osm_gps_map_redraw(map);      osm_gps_map_redraw(map);
377        FOUT;
378  }  }
379    
380  void  void
381  osm_gps_map_osd_draw_balloon (OsmGpsMap *map, float latitude, float longitude,  osm_gps_map_osd_draw_balloon (OsmGpsMap *map, float latitude, float longitude,
382                                OsmGpsMapBalloonCallback cb, gpointer data) {                                OsmGpsMapBalloonCallback cb, gpointer data) {
383        FIN;
384      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
385    
386      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 407  osm_gps_map_osd_draw_balloon (OsmGpsMap
407      osd_render_balloon(osd);      osd_render_balloon(osd);
408    
409      osm_gps_map_redraw(map);      osm_gps_map_redraw(map);
410        FOUT;
411  }  }
412    
413  #endif // OSD_BALLOON  #endif // OSD_BALLOON
# Line 504  osd_shape(cairo_t *cr) { Line 552  osd_shape(cairo_t *cr) {
552  static gboolean  static gboolean
553  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)
554  {  {
555        FIN;
556      return( pow(cx - x, 2) + pow(cy - y, 2) < rad * rad);      return( pow(cx - x, 2) + pow(cy - y, 2) < rad * rad);
557  }  }
558    
# Line 594  osd_check_zoom(gint x, gint y) { Line 643  osd_check_zoom(gint x, gint y) {
643  /* internal value to draw the arrow on the "puller" */  /* internal value to draw the arrow on the "puller" */
644  #define OSD_S_D0  (OSD_S_RAD/2)  #define OSD_S_D0  (OSD_S_RAD/2)
645  #ifndef OSD_FONT_SIZE  #ifndef OSD_FONT_SIZE
646  #define OSD_FONT_SIZE 16.0  #define OSD_FONT_SIZE (16.0)
647  #endif  #endif
648  #define OSD_TEXT_BORDER   (OSD_FONT_SIZE/2)  #define OSD_TEXT_BORDER   (OSD_FONT_SIZE/2)
649  #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 751  osd_source_content(osm_gps_map_osd_t *os
751    
752  static void  static void
753  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) {
754        FIN;
755    
756      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
757    
758      if(priv->source_sel.rendered && !force_rerender)      if(priv->source_sel.rendered && !force_rerender)
# Line 748  osd_render_source_sel(osm_gps_map_osd_t Line 799  osd_render_source_sel(osm_gps_map_osd_t
799      cairo_stroke (cr);      cairo_stroke (cr);
800    
801      cairo_destroy(cr);      cairo_destroy(cr);
802        FOUT;
803  }  }
804    
805  /* re-allocate the buffer used to draw the menu. This is used */  /* re-allocate the buffer used to draw the menu. This is used */
806  /* to collapse/expand the buffer */  /* to collapse/expand the buffer */
807  static void  static void
808  osd_source_reallocate(osm_gps_map_osd_t *osd) {  osd_source_reallocate(osm_gps_map_osd_t *osd) {
809        FIN;
810      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
811    
812      /* re-allocate offscreen bitmap */      /* re-allocate offscreen bitmap */
# Line 794  osd_source_reallocate(osm_gps_map_osd_t Line 847  osd_source_reallocate(osm_gps_map_osd_t
847          cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w+2, h+2);          cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w+2, h+2);
848    
849      osd_render_source_sel(osd, TRUE);      osd_render_source_sel(osd, TRUE);
850        FOUT;
851  }  }
852    
853  #define OSD_HZ      15  #define OSD_HZ      15
854  #define OSD_TIME    500  #define OSD_TIME    500
855    
856  static gboolean osd_source_animate(gpointer data) {  static gboolean osd_source_animate(gpointer data) {
857        FIN;
858      osm_gps_map_osd_t *osd = (osm_gps_map_osd_t*)data;      osm_gps_map_osd_t *osd = (osm_gps_map_osd_t*)data;
859      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
860      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 893  static gboolean osd_source_animate(gpoin
893      if(done)      if(done)
894          priv->source_sel.handler_id = 0;          priv->source_sel.handler_id = 0;
895    
896        FOUT;
897      return !done;      return !done;
898  }  }
899    
# Line 845  static gboolean osd_source_animate(gpoin Line 901  static gboolean osd_source_animate(gpoin
901  static void  static void
902  osd_source_toggle(osm_gps_map_osd_t *osd)  osd_source_toggle(osm_gps_map_osd_t *osd)
903  {  {
904        FIN;
905      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
906    
907      /* ignore clicks while animation is running */      /* ignore clicks while animation is running */
# Line 870  osd_source_toggle(osm_gps_map_osd_t *osd Line 927  osd_source_toggle(osm_gps_map_osd_t *osd
927      /* start timer to handle animation */      /* start timer to handle animation */
928      priv->source_sel.handler_id = gtk_timeout_add(OSD_TIME/OSD_HZ,      priv->source_sel.handler_id = gtk_timeout_add(OSD_TIME/OSD_HZ,
929                                                    osd_source_animate, osd);                                                    osd_source_animate, osd);
930        FOUT;
931  }  }
932    
933  /* check if the user clicked inside the source selection area */  /* check if the user clicked inside the source selection area */
934  static osd_button_t  static osd_button_t
935  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) {
936        FIN;
937      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
938    
939      if(!priv->source_sel.expanded)      if(!priv->source_sel.expanded)
# Line 932  osd_source_check(osm_gps_map_osd_t *osd, Line 991  osd_source_check(osm_gps_map_osd_t *osd,
991                      osm_gps_map_repaint(OSM_GPS_MAP(osd->widget));                      osm_gps_map_repaint(OSM_GPS_MAP(osd->widget));
992                  }                  }
993              }              }
994    
995              /* return "clicked in OSD background" to prevent further */              /* return "clicked in OSD background" to prevent further */
996              /* processing by application */              /* processing by application */
997              return OSD_BG;              return OSD_BG;
998          }          }
999      }      }
1000    
1001        FOUT;
1002      return OSD_NONE;      return OSD_NONE;
1003  }  }
1004  #endif // OSD_SOURCE_SEL  #endif // OSD_SOURCE_SEL
1005    
1006  static osd_button_t  static osd_button_t
1007  osd_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y) {  osd_check_int(osm_gps_map_osd_t *osd, gboolean click, gboolean down, gint x, gint y) {
1008        FIN;
1009      osd_button_t but = OSD_NONE;      osd_button_t but = OSD_NONE;
1010    
1011  #ifdef OSD_BALLOON  #ifdef OSD_BALLOON
# Line 985  osd_check(osm_gps_map_osd_t *osd, gboole Line 1046  osd_check(osm_gps_map_osd_t *osd, gboole
1046  #ifdef OSD_BALLOON  #ifdef OSD_BALLOON
1047      if(but == OSD_NONE) {      if(but == OSD_NONE) {
1048          /* check if user clicked into balloon */          /* check if user clicked into balloon */
1049          if(osd_balloon_check(osd, down, x, y))          if(osd_balloon_check(osd, click, down, x, y))
1050              but = OSD_BG;              but = OSD_BG;
1051      }      }
1052  #endif  #endif
1053    
1054        FOUT;
1055      return but;      return but;
1056  }  }
1057    
# Line 1066  osd_zoom_labels(cairo_t *cr, gint x, gin Line 1128  osd_zoom_labels(cairo_t *cr, gint x, gin
1128  #ifdef OSD_COORDINATES  #ifdef OSD_COORDINATES
1129    
1130  #ifndef OSD_COORDINATES_FONT_SIZE  #ifndef OSD_COORDINATES_FONT_SIZE
1131  #define OSD_COORDINATES_FONT_SIZE 12  #define OSD_COORDINATES_FONT_SIZE (12.0)
1132  #endif  #endif
1133    
1134  #define OSD_COORDINATES_OFFSET (OSD_COORDINATES_FONT_SIZE/6)  #define OSD_COORDINATES_OFFSET (OSD_COORDINATES_FONT_SIZE/6)
1135    
1136  #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)
1137  #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)
1138    
1139  /* these can be overwritten with versions that support */  /* these can be overwritten with versions that support */
1140  /* localization */  /* localization */
# Line 1133  static char Line 1195  static char
1195  /* render a string at the given screen position */  /* render a string at the given screen position */
1196  static int  static int
1197  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) {
1198      char *p = g_strdup(text);      FIN;
1199    
1200        printf("params: %p %d %d %p\n", cr, y, width, text); // XXX
1201    
1202        if(!text) return y;
1203    
1204        printf("text given: %s\n", text); // XXX
1205    
1206        char *p = g_malloc(strlen(text)+4);  // space for "...\n"
1207        strcpy(p, text);
1208    
1209      cairo_text_extents_t extents;      cairo_text_extents_t extents;
1210    
1211        memset(&extents, 0, sizeof(cairo_text_extents_t));
1212      cairo_text_extents (cr, p, &extents);      cairo_text_extents (cr, p, &extents);
1213        printf("initial extents.width = %f\n", extents.width);  // XXX
1214    
1215      /* check if text needs to be truncated */      /* check if text needs to be truncated */
1216      int len = strlen(text)-2;      int trunc_at = strlen(text)-1;
1217      while(extents.width > width) {      while(extents.width > width) {
1218          len--;          g_assert(trunc_at > 0);
1219          strcpy(p+len, "...");  
1220            printf("trunc at %d\n", trunc_at);  // XXX
1221    
1222            trunc_at--;
1223            strcpy(p+trunc_at, "...");
1224            printf("getting extents for \"%s\"\n", p);  // XXX
1225    
1226            memset(&extents, 0, sizeof(cairo_text_extents_t));
1227          cairo_text_extents (cr, p, &extents);          cairo_text_extents (cr, p, &extents);
1228            printf("extents.width = %f > %d\n", extents.width, width);  // XXX
1229      }      }
1230    
1231        printf("painting\n"); // XXX
1232    
1233      cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);      cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
1234      cairo_set_line_width (cr, OSD_COORDINATES_FONT_SIZE/6);      cairo_set_line_width (cr, OSD_COORDINATES_FONT_SIZE/6);
1235      cairo_move_to (cr, (width - extents.width)/2, y - extents.y_bearing);      cairo_move_to (cr, (width - extents.width)/2, y - extents.y_bearing);
# Line 1157  osd_render_centered_text(cairo_t *cr, in Line 1242  osd_render_centered_text(cairo_t *cr, in
1242    
1243      g_free(p);      g_free(p);
1244    
1245      /* skip + 1/4 line */      /* skip + 1/5 line */
1246      return y + 5*OSD_COORDINATES_FONT_SIZE/4;      FOUT;
1247        return y + 6*OSD_COORDINATES_FONT_SIZE/5;
1248  }  }
1249    
1250  static void  static void
1251  osd_render_coordinates(osm_gps_map_osd_t *osd)  osd_render_coordinates(osm_gps_map_osd_t *osd)
1252  {  {
1253        FIN;
1254      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1255    
1256      /* get current map position */      /* get current map position */
# Line 1204  osd_render_coordinates(osm_gps_map_osd_t Line 1291  osd_render_coordinates(osm_gps_map_osd_t
1291      g_free(longitude);      g_free(longitude);
1292    
1293      cairo_destroy(cr);      cairo_destroy(cr);
1294        FOUT;
1295  }  }
1296  #endif  // OSD_COORDINATES  #endif  // OSD_COORDINATES
1297    
1298  #ifdef OSD_NAV  #ifdef OSD_NAV
1299  #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)
1300  #define OSD_NAV_H  (100)  #define OSD_NAV_H  (11*OSD_COORDINATES_FONT_SIZE)
1301    
1302    /* http://mathforum.org/library/drmath/view/55417.html */
1303    static float get_bearing(float lat1, float lon1, float lat2, float lon2) {
1304      return atan2( sin(lon2 - lon1) * cos(lat2),
1305                    cos(lat1) * sin(lat2) -
1306                    sin(lat1) * cos(lat2) * cos(lon2 - lon1));
1307    }
1308    
1309    /* http://mathforum.org/library/drmath/view/51722.html */
1310    static float get_distance(float lat1, float lon1, float lat2, float lon2) {
1311      float aob = acos(cos(lat1) * cos(lat2) * cos(lon2 - lon1) +
1312                       sin(lat1) * sin(lat2));
1313    
1314      //  return(aob * 3959.0);   /* great circle radius in miles */
1315    
1316      return(aob * 6371000.0);     /* great circle radius in meters */
1317    }
1318    
1319  static void  static void
1320  osd_render_nav(osm_gps_map_osd_t *osd)  osd_render_nav(osm_gps_map_osd_t *osd)
1321  {  {
1322        FIN;
1323      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1324    
1325      if(!priv->nav.surface || isnan(priv->nav.lat) || isnan(priv->nav.lon))      if(!priv->nav.surface || isnan(priv->nav.lat) || isnan(priv->nav.lon))
# Line 1222  osd_render_nav(osm_gps_map_osd_t *osd) Line 1328  osd_render_nav(osm_gps_map_osd_t *osd)
1328      /* first fill with transparency */      /* first fill with transparency */
1329      cairo_t *cr = cairo_create(priv->nav.surface);      cairo_t *cr = cairo_create(priv->nav.surface);
1330      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1331      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);
1332      cairo_paint(cr);      cairo_paint(cr);
1333      cairo_set_operator(cr, CAIRO_OPERATOR_OVER);      cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
1334    
# Line 1242  osd_render_nav(osm_gps_map_osd_t *osd) Line 1348  osd_render_nav(osm_gps_map_osd_t *osd)
1348      g_free(latitude);      g_free(latitude);
1349      g_free(longitude);      g_free(longitude);
1350    
1351        /* draw the compass */
1352        int radius = (OSD_NAV_H - y - 5*OSD_COORDINATES_FONT_SIZE/4)/2;
1353        if(radius > OSD_NAV_W/2)
1354            radius = OSD_NAV_W/2;
1355    
1356        int x = OSD_NAV_W/2+1;
1357        y += radius;
1358    
1359        cairo_stroke (cr);
1360    
1361        /* draw background */
1362        cairo_arc(cr, x, y, radius, 0,  2*M_PI);
1363        cairo_set_source_rgba (cr, 1, 1, 1, 0.5);
1364        cairo_fill_preserve (cr);
1365        cairo_set_source_rgb (cr, 0, 0, 0);
1366        cairo_set_line_width (cr, 1);
1367        cairo_stroke (cr);
1368    
1369        /* draw pointer */
1370    #define ARROW_WIDTH     0.3
1371    #define ARROW_LENGTH    0.7
1372    
1373        coord_t *gps = osm_gps_map_get_gps (OSM_GPS_MAP(osd->widget));
1374        if(gps) {
1375            float arot = get_bearing(gps->rlat, gps->rlon,
1376                         deg2rad(priv->nav.lat), deg2rad(priv->nav.lon));
1377    
1378            cairo_move_to(cr,
1379                          x + radius *  ARROW_LENGTH *  sin(arot),
1380                          y + radius *  ARROW_LENGTH * -cos(arot));
1381    
1382            cairo_line_to(cr,
1383                          x + radius * -ARROW_LENGTH *  sin(arot+ARROW_WIDTH),
1384                          y + radius * -ARROW_LENGTH * -cos(arot+ARROW_WIDTH));
1385    
1386            cairo_line_to(cr,
1387                          x + radius * -0.5 * ARROW_LENGTH *  sin(arot),
1388                          y + radius * -0.5 * ARROW_LENGTH * -cos(arot));
1389    
1390            cairo_line_to(cr,
1391                          x + radius * -ARROW_LENGTH *  sin(arot-ARROW_WIDTH),
1392                          y + radius * -ARROW_LENGTH * -cos(arot-ARROW_WIDTH));
1393    
1394            cairo_close_path(cr);
1395            cairo_set_source_rgb (cr, 0, 0, 0);
1396            cairo_fill (cr);
1397    
1398            y += radius + OSD_COORDINATES_FONT_SIZE/4;
1399    
1400            float dist = get_distance(gps->rlat, gps->rlon,
1401                            deg2rad(priv->nav.lat), deg2rad(priv->nav.lon));
1402    
1403            char *dist_str = NULL;
1404            if(!priv->nav.imperial) {
1405                /* metric is easy ... */
1406                if(dist<1000)
1407                    dist_str = g_strdup_printf("%u m", (int)dist);
1408                else
1409                    dist_str = g_strdup_printf("%.1f km", dist/1000);
1410            } else {
1411                /* and now the hard part: scale for useful imperial values :-( */
1412                /* try to convert to feet, 1ft == 0.3048 m */
1413    
1414                if(dist/(3*0.3048) >= 1760.0)      /* more than 1760 yard? */
1415                    dist_str = g_strdup_printf("%.1f mi", dist/(0.3048*3*1760.0));
1416                else if(dist/0.3048 >= 100)        /* more than 100 feet? */
1417                    dist_str = g_strdup_printf("%.1f yd", dist/(0.3048*3));
1418                else
1419                    dist_str = g_strdup_printf("%.0f ft", dist/0.3048);
1420            }
1421    
1422            y = osd_render_centered_text(cr, y, OSD_NAV_W, dist_str);
1423            g_free(dist_str);
1424        }
1425    
1426      cairo_destroy(cr);      cairo_destroy(cr);
1427        FOUT;
1428  }  }
1429    
1430  void osm_gps_map_osd_clear_nav (OsmGpsMap *map) {  void osm_gps_map_osd_clear_nav (OsmGpsMap *map) {
1431        FIN;
1432      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
1433    
1434      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 1445  void osm_gps_map_osd_clear_nav (OsmGpsMa
1445          if(priv->nav.name) g_free(priv->nav.name);          if(priv->nav.name) g_free(priv->nav.name);
1446      }      }
1447      osm_gps_map_redraw(map);      osm_gps_map_redraw(map);
1448        FOUT;
1449  }  }
1450    
1451  void  void
1452  osm_gps_map_osd_draw_nav (OsmGpsMap *map, float latitude, float longitude,  osm_gps_map_osd_draw_nav (OsmGpsMap *map, gboolean imperial,
1453                            char *name) {                            float latitude, float longitude, char *name) {
1454        FIN;
1455      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
1456    
1457      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 1470  osm_gps_map_osd_draw_nav (OsmGpsMap *map
1470      priv->nav.lat = latitude;      priv->nav.lat = latitude;
1471      priv->nav.lon = longitude;      priv->nav.lon = longitude;
1472      priv->nav.name = g_strdup(name);      priv->nav.name = g_strdup(name);
1473        priv->nav.imperial = imperial;
1474    
1475      osd_render_nav(osd);      osd_render_nav(osd);
1476    
1477      osm_gps_map_redraw(map);      osm_gps_map_redraw(map);
1478        FOUT;
1479  }  }
1480    
1481  #endif // OSD_NAV  #endif // OSD_NAV
# Line 1307  osm_gps_map_osd_draw_nav (OsmGpsMap *map Line 1494  osm_gps_map_osd_draw_nav (OsmGpsMap *map
1494    
1495  static void  static void
1496  osd_render_crosshair_shape(cairo_t *cr) {  osd_render_crosshair_shape(cairo_t *cr) {
1497        FIN;
1498      cairo_arc (cr, OSD_CROSSHAIR_W/2, OSD_CROSSHAIR_H/2,      cairo_arc (cr, OSD_CROSSHAIR_W/2, OSD_CROSSHAIR_H/2,
1499                 OSD_CROSSHAIR_RADIUS, 0,  2*M_PI);                 OSD_CROSSHAIR_RADIUS, 0,  2*M_PI);
1500    
# Line 1325  osd_render_crosshair_shape(cairo_t *cr) Line 1513  osd_render_crosshair_shape(cairo_t *cr)
1513      cairo_rel_line_to (cr, 0, OSD_CROSSHAIR_TICK);      cairo_rel_line_to (cr, 0, OSD_CROSSHAIR_TICK);
1514    
1515      cairo_stroke (cr);      cairo_stroke (cr);
1516        FOUT;
1517  }  }
1518    
1519  static void  static void
1520  osd_render_crosshair(osm_gps_map_osd_t *osd)  osd_render_crosshair(osm_gps_map_osd_t *osd)
1521  {  {
1522        FIN;
1523      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1524    
1525      if(priv->crosshair.rendered)      if(priv->crosshair.rendered)
# Line 1355  osd_render_crosshair(osm_gps_map_osd_t * Line 1545  osd_render_crosshair(osm_gps_map_osd_t *
1545      osd_render_crosshair_shape(cr);      osd_render_crosshair_shape(cr);
1546    
1547      cairo_destroy(cr);      cairo_destroy(cr);
1548        FOUT;
1549  }  }
1550  #endif  #endif
1551    
1552  #ifdef OSD_SCALE  #ifdef OSD_SCALE
1553    
1554  #ifndef OSD_SCALE_FONT_SIZE  #ifndef OSD_SCALE_FONT_SIZE
1555  #define OSD_SCALE_FONT_SIZE 12  #define OSD_SCALE_FONT_SIZE (12.0)
1556  #endif  #endif
1557  #define OSD_SCALE_W   (10*OSD_SCALE_FONT_SIZE)  #define OSD_SCALE_W   (10*OSD_SCALE_FONT_SIZE)
1558  #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 1567  osd_render_crosshair(osm_gps_map_osd_t *
1567  static void  static void
1568  osd_render_scale(osm_gps_map_osd_t *osd)  osd_render_scale(osm_gps_map_osd_t *osd)
1569  {  {
1570        FIN;
1571      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1572    
1573      /* this only needs to be rendered if the zoom has changed */      /* this only needs to be rendered if the zoom has changed */
# Line 1499  osd_render_scale(osm_gps_map_osd_t *osd) Line 1691  osd_render_scale(osm_gps_map_osd_t *osd)
1691      cairo_stroke(cr);      cairo_stroke(cr);
1692    
1693      cairo_destroy(cr);      cairo_destroy(cr);
1694        FOUT;
1695  }  }
1696  #endif  #endif
1697    
1698  static void  static void
1699  osd_render_controls(osm_gps_map_osd_t *osd)  osd_render_controls(osm_gps_map_osd_t *osd)
1700  {  {
1701        FIN;
1702      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1703    
1704      if(priv->controls.rendered      if(priv->controls.rendered
# Line 1778  osd_draw(osm_gps_map_osd_t *osd, GdkDraw Line 1972  osd_draw(osm_gps_map_osd_t *osd, GdkDraw
1972  #endif  #endif
1973    
1974      cairo_destroy(cr);      cairo_destroy(cr);
1975        FOUT;
1976  }  }
1977    
1978  static void  static void
1979  osd_free(osm_gps_map_osd_t *osd)  osd_free(osm_gps_map_osd_t *osd)
1980  {  {
1981        FIN;
1982      osd_priv_t *priv = (osd_priv_t *)(osd->priv);      osd_priv_t *priv = (osd_priv_t *)(osd->priv);
1983    
1984      if (priv->controls.surface)      if (priv->controls.surface)
# Line 1822  osd_free(osm_gps_map_osd_t *osd) Line 2018  osd_free(osm_gps_map_osd_t *osd)
2018  #endif  #endif
2019    
2020      g_free(priv);      g_free(priv);
2021        FOUT;
2022  }  }
2023    
2024  static gboolean  static gboolean
2025  osd_busy(osm_gps_map_osd_t *osd)  osd_busy(osm_gps_map_osd_t *osd)
2026  {  {
2027        FIN;
2028  #ifdef OSD_SOURCE_SEL  #ifdef OSD_SOURCE_SEL
2029      osd_priv_t *priv = (osd_priv_t *)(osd->priv);      osd_priv_t *priv = (osd_priv_t *)(osd->priv);
2030      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 2033  osd_busy(osm_gps_map_osd_t *osd)
2033  #endif  #endif
2034  }  }
2035    
2036    static osd_button_t
2037    osd_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y) {
2038        FIN;
2039        return osd_check_int(osd, TRUE, down, x, y);
2040    }
2041    
2042  static osm_gps_map_osd_t osd_classic = {  static osm_gps_map_osd_t osd_classic = {
2043      .widget     = NULL,      .widget     = NULL,
2044    
# Line 1854  static osm_gps_map_osd_t osd_classic = { Line 2058  static osm_gps_map_osd_t osd_classic = {
2058  void  void
2059  osm_gps_map_osd_classic_init(OsmGpsMap *map)  osm_gps_map_osd_classic_init(OsmGpsMap *map)
2060  {  {
2061        FIN;
2062      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);
2063    
2064  #ifdef OSD_BALLOON  #ifdef OSD_BALLOON
# Line 1864  osm_gps_map_osd_classic_init(OsmGpsMap * Line 2069  osm_gps_map_osd_classic_init(OsmGpsMap *
2069      osd_classic.priv = priv;      osd_classic.priv = priv;
2070    
2071      osm_gps_map_register_osd(map, &osd_classic);      osm_gps_map_register_osd(map, &osd_classic);
2072        FOUT;
2073  }  }
2074    
2075  #ifdef OSD_GPS_BUTTON  #ifdef OSD_GPS_BUTTON
# Line 1871  osm_gps_map_osd_classic_init(OsmGpsMap * Line 2077  osm_gps_map_osd_classic_init(OsmGpsMap *
2077  /* but instead are to be used by the main application */  /* but instead are to be used by the main application */
2078  void osm_gps_map_osd_enable_gps (OsmGpsMap *map, OsmGpsMapOsdCallback cb,  void osm_gps_map_osd_enable_gps (OsmGpsMap *map, OsmGpsMapOsdCallback cb,
2079                                   gpointer data) {                                   gpointer data) {
2080        FIN;
2081      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
2082      g_return_if_fail (osd);      g_return_if_fail (osd);
2083    
# Line 1882  void osm_gps_map_osd_enable_gps (OsmGpsM Line 2089  void osm_gps_map_osd_enable_gps (OsmGpsM
2089      osd->render(osd);      osd->render(osd);
2090    
2091      osm_gps_map_redraw(map);      osm_gps_map_redraw(map);
2092        FOUT;
2093  }  }
2094  #endif  #endif
2095    
2096  osd_button_t  osd_button_t
2097  osm_gps_map_osd_check(OsmGpsMap *map, gint x, gint y) {  osm_gps_map_osd_check(OsmGpsMap *map, gint x, gint y) {
2098        FIN;
2099      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
2100      g_return_val_if_fail (osd, OSD_NONE);      g_return_val_if_fail (osd, OSD_NONE);
2101    
2102      return osd_check(osd, TRUE, x, y);      return osd_check_int(osd, FALSE, TRUE, x, y);
2103  }  }
Legend:
Removed from v.124  
changed lines
  Added in v.147