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

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

revision 113 by harbaum, Wed Sep 16 13:45:10 2009 UTC revision 133 by harbaum, Mon Oct 12 20:27:55 2009 UTC
# Line 19  Line 19 
19    
20  #include "config.h"  #include "config.h"
21  #include <stdlib.h>  // abs  #include <stdlib.h>  // abs
22    #include <string.h>
23  #include <math.h>    // M_PI/cos()  #include <math.h>    // M_PI/cos()
24    
25  /* parameters that can be overwritten from the config file: */  /* parameters that can be overwritten from the config file: */
# Line 52  typedef struct { Line 53  typedef struct {
53          cairo_surface_t *surface;          cairo_surface_t *surface;
54          int orientation, offset_x, offset_y;          int orientation, offset_x, offset_y;
55    
56            gboolean just_created;
57          float lat, lon;          float lat, lon;
58          OsmGpsMapRect_t rect;          OsmGpsMapRect_t rect;
59    
# Line 75  typedef struct { Line 77  typedef struct {
77      } crosshair;      } crosshair;
78  #endif  #endif
79    
80    #ifdef OSD_NAV
81        struct {
82            cairo_surface_t *surface;
83            float lat, lon;
84            char *name;
85            gboolean imperial;    // display distance imperial/metric
86        } nav;
87    #endif
88    
89  #ifdef OSD_COORDINATES  #ifdef OSD_COORDINATES
90      struct {      struct {
91          cairo_surface_t *surface;          cairo_surface_t *surface;
# Line 272  osd_render_balloon(osm_gps_map_osd_t *os Line 283  osd_render_balloon(osm_gps_map_osd_t *os
283  /* return true if balloon is being displayed and if */  /* return true if balloon is being displayed and if */
284  /* the given coordinate is within this balloon */  /* the given coordinate is within this balloon */
285  static gboolean  static gboolean
286  osd_balloon_check(osm_gps_map_osd_t *osd, gint x, gint y)  osd_balloon_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y)
287  {  {
288      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
289    
# Line 287  osd_balloon_check(osm_gps_map_osd_t *osd Line 298  osd_balloon_check(osm_gps_map_osd_t *osd
298      xs += priv->balloon.rect.x + priv->balloon.offset_x;      xs += priv->balloon.rect.x + priv->balloon.offset_x;
299      ys += priv->balloon.rect.y + priv->balloon.offset_y;      ys += priv->balloon.rect.y + priv->balloon.offset_y;
300    
301      return (priv->balloon.surface &&      gboolean is_in =
302              (x > xs) && (x < xs + priv->balloon.rect.w) &&          (x > xs) && (x < xs + priv->balloon.rect.w) &&
303              (y > ys) && (y < ys + priv->balloon.rect.h));          (y > ys) && (y < ys + priv->balloon.rect.h);
304    
305        /* handle the fact that the balloon may have been created by the */
306        /* button down event */
307        if(!is_in && !down && !priv->balloon.just_created) {
308            /* the user actually clicked outside the balloon */
309    
310            /* close the balloon! */
311            osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(osd->widget));
312        }
313    
314        return is_in;
315  }  }
316    
317  void osm_gps_map_osd_clear_balloon (OsmGpsMap *map) {  void osm_gps_map_osd_clear_balloon (OsmGpsMap *map) {
# Line 301  void osm_gps_map_osd_clear_balloon (OsmG Line 323  void osm_gps_map_osd_clear_balloon (OsmG
323      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
324      g_return_if_fail (priv);      g_return_if_fail (priv);
325    
     printf("request to clear balloon\n");  
   
326      if(priv->balloon.surface) {      if(priv->balloon.surface) {
327          cairo_surface_destroy(priv->balloon.surface);          cairo_surface_destroy(priv->balloon.surface);
328          priv->balloon.surface = NULL;          priv->balloon.surface = NULL;
# Line 325  osm_gps_map_osd_draw_balloon (OsmGpsMap Line 345  osm_gps_map_osd_draw_balloon (OsmGpsMap
345    
346      osm_gps_map_osd_clear_balloon (map);      osm_gps_map_osd_clear_balloon (map);
347    
     printf("request to draw balloon at %f %f\n", latitude, longitude);  
   
348      /* allocate balloon surface */      /* allocate balloon surface */
349      priv->balloon.surface =      priv->balloon.surface =
350          cairo_image_surface_create(CAIRO_FORMAT_ARGB32,          cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
# Line 336  osm_gps_map_osd_draw_balloon (OsmGpsMap Line 354  osm_gps_map_osd_draw_balloon (OsmGpsMap
354      priv->balloon.lon = longitude;      priv->balloon.lon = longitude;
355      priv->balloon.cb = cb;      priv->balloon.cb = cb;
356      priv->balloon.data = data;      priv->balloon.data = data;
357        priv->balloon.just_created = TRUE;
358    
359      priv->balloon.orientation = -1;      priv->balloon.orientation = -1;
360    
# Line 856  osd_source_toggle(osm_gps_map_osd_t *osd Line 875  osd_source_toggle(osm_gps_map_osd_t *osd
875    
876  /* check if the user clicked inside the source selection area */  /* check if the user clicked inside the source selection area */
877  static osd_button_t  static osd_button_t
878  osd_source_check(osm_gps_map_osd_t *osd, gint x, gint y) {  osd_source_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y) {
879      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
880    
881      if(!priv->source_sel.expanded)      if(!priv->source_sel.expanded)
# Line 874  osd_source_check(osm_gps_map_osd_t *osd, Line 893  osd_source_check(osm_gps_map_osd_t *osd,
893          /* really within puller shape? */          /* really within puller shape? */
894          if(x > Z_RAD || osm_gps_map_in_circle(x, y, Z_RAD, Z_RAD, Z_RAD)) {          if(x > Z_RAD || osm_gps_map_in_circle(x, y, Z_RAD, Z_RAD, Z_RAD)) {
895              /* expand source selector */              /* expand source selector */
896              osd_source_toggle(osd);              if(down)
897                    osd_source_toggle(osd);
898    
899              /* tell upper layers that user clicked some background element */              /* tell upper layers that user clicked some background element */
900              /* of the OSD */              /* of the OSD */
# Line 900  osd_source_check(osm_gps_map_osd_t *osd, Line 920  osd_source_check(osm_gps_map_osd_t *osd,
920              y /= step;              y /= step;
921              y += 1;              y += 1;
922    
923              gint old = 0;              if(down) {
924              g_object_get(osd->widget, "map-source", &old, NULL);                  gint old = 0;
925                    g_object_get(osd->widget, "map-source", &old, NULL);
926              if(y > OSM_GPS_MAP_SOURCE_NULL &&  
927                 y <= OSM_GPS_MAP_SOURCE_LAST &&                  if(y > OSM_GPS_MAP_SOURCE_NULL &&
928                 old != y) {                     y <= OSM_GPS_MAP_SOURCE_LAST &&
929                  g_object_set(osd->widget, "map-source", y, NULL);                     old != y) {
930                        g_object_set(osd->widget, "map-source", y, NULL);
931                  osd_render_source_sel(osd, TRUE);  
932                  osm_gps_map_repaint(OSM_GPS_MAP(osd->widget));                      osd_render_source_sel(osd, TRUE);
933                        osm_gps_map_repaint(OSM_GPS_MAP(osd->widget));
934                    }
935              }              }
936    
937              /* return "clicked in OSD background" to prevent further */              /* return "clicked in OSD background" to prevent further */
# Line 923  osd_source_check(osm_gps_map_osd_t *osd, Line 945  osd_source_check(osm_gps_map_osd_t *osd,
945  #endif // OSD_SOURCE_SEL  #endif // OSD_SOURCE_SEL
946    
947  static osd_button_t  static osd_button_t
948  osd_check(osm_gps_map_osd_t *osd, gint x, gint y) {  osd_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y) {
949      osd_button_t but = OSD_NONE;      osd_button_t but = OSD_NONE;
950    
951  #ifdef OSD_BALLOON  #ifdef OSD_BALLOON
952      /* check if user clicked into balloon */      if(down) {
953      if(osd_balloon_check(osd, x, y))          /* needed to handle balloons that are created at click */
954          return OSD_BG;          osd_priv_t *priv = (osd_priv_t*)osd->priv;
955            priv->balloon.just_created = FALSE;
956        }
957  #endif  #endif
958    
959  #ifdef OSD_SOURCE_SEL  #ifdef OSD_SOURCE_SEL
960      /* the source selection area is handles internally */      /* the source selection area is handles internally */
961      but = osd_source_check(osd, x, y);      but = osd_source_check(osd, down, x, y);
     if(but != OSD_NONE)  
         return but;  
962  #endif  #endif
963    
964      x -= OSD_X;      if(but == OSD_NONE) {
965      y -= OSD_Y;          gint mx = x - OSD_X;
966            gint my = y - OSD_Y;
967      if(OSD_X < 0)  
968          x -= (osd->widget->allocation.width - OSD_W);          if(OSD_X < 0)
969                mx -= (osd->widget->allocation.width - OSD_W);
970      if(OSD_Y < 0)  
971          y -= (osd->widget->allocation.height - OSD_H);          if(OSD_Y < 0)
972                my -= (osd->widget->allocation.height - OSD_H);
973      /* first do a rough test for the OSD area. */  
974      /* this is just to avoid an unnecessary detailed test */          /* first do a rough test for the OSD area. */
975      if(x > 0 && x < OSD_W && y > 0 && y < OSD_H) {          /* this is just to avoid an unnecessary detailed test */
976            if(mx > 0 && mx < OSD_W && my > 0 && my < OSD_H) {
977  #ifndef OSD_NO_DPAD  #ifndef OSD_NO_DPAD
978          but = osd_check_dpad(x, y);              but = osd_check_dpad(mx, my);
979  #endif  #endif
980            }
981    
982          if(but == OSD_NONE)          if(but == OSD_NONE)
983              but = osd_check_zoom(x, y);              but = osd_check_zoom(mx, my);
984      }      }
985    
986    #ifdef OSD_BALLOON
987        if(but == OSD_NONE) {
988            /* check if user clicked into balloon */
989            if(osd_balloon_check(osd, down, x, y))
990                but = OSD_BG;
991        }
992    #endif
993    
994      return but;      return but;
995  }  }
996    
# Line 1041  osd_zoom_labels(cairo_t *cr, gint x, gin Line 1073  osd_zoom_labels(cairo_t *cr, gint x, gin
1073  #define OSD_COORDINATES_OFFSET (OSD_COORDINATES_FONT_SIZE/6)  #define OSD_COORDINATES_OFFSET (OSD_COORDINATES_FONT_SIZE/6)
1074    
1075  #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)
1076  #define OSD_COORDINATES_H  (2*OSD_COORDINATES_FONT_SIZE+OSD_COORDINATES_OFFSET)  #define OSD_COORDINATES_H  (2*OSD_COORDINATES_FONT_SIZE+2*OSD_COORDINATES_OFFSET+OSD_COORDINATES_FONT_SIZE/4)
1077    
1078  /* these can be overwritten with versions that support */  /* these can be overwritten with versions that support */
1079  /* localization */  /* localization */
# Line 1099  static char Line 1131  static char
1131                             c, (int)integral, fractional*60.0);                             c, (int)integral, fractional*60.0);
1132  }  }
1133    
1134    /* render a string at the given screen position */
1135    static int
1136    osd_render_centered_text(cairo_t *cr, int y, int width, char *text) {
1137        char *p = g_strdup(text);
1138        cairo_text_extents_t extents;
1139        cairo_text_extents (cr, p, &extents);
1140    
1141        /* check if text needs to be truncated */
1142        int len = strlen(text)-2;
1143        while(extents.width > width) {
1144            len--;
1145            strcpy(p+len, "...");
1146            cairo_text_extents (cr, p, &extents);
1147        }
1148    
1149        cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
1150        cairo_set_line_width (cr, OSD_COORDINATES_FONT_SIZE/6);
1151        cairo_move_to (cr, (width - extents.width)/2, y - extents.y_bearing);
1152        cairo_text_path (cr, p);
1153        cairo_stroke (cr);
1154    
1155        cairo_set_source_rgb(cr, 0.0, 0.0, 0.0);
1156        cairo_move_to (cr, (width - extents.width)/2, y - extents.y_bearing);
1157        cairo_show_text (cr, p);
1158    
1159        g_free(p);
1160    
1161        /* skip + 1/4 line */
1162        return y + 5*OSD_COORDINATES_FONT_SIZE/4;
1163    }
1164    
1165  static void  static void
1166  osd_render_coordinates(osm_gps_map_osd_t *osd)  osd_render_coordinates(osm_gps_map_osd_t *osd)
1167  {  {
# Line 1134  osd_render_coordinates(osm_gps_map_osd_t Line 1197  osd_render_coordinates(osm_gps_map_osd_t
1197      char *latitude = osd_latitude_str(lat);      char *latitude = osd_latitude_str(lat);
1198      char *longitude = osd_longitude_str(lon);      char *longitude = osd_longitude_str(lon);
1199    
1200      cairo_text_extents_t lat_extents, lon_extents;      int y = OSD_COORDINATES_OFFSET;
1201      cairo_text_extents (cr, latitude, &lat_extents);      y = osd_render_centered_text(cr, y, OSD_COORDINATES_W, latitude);
1202      cairo_text_extents (cr, longitude, &lon_extents);      y = osd_render_centered_text(cr, y, OSD_COORDINATES_W, longitude);
1203    
1204        g_free(latitude);
1205        g_free(longitude);
1206    
1207      cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);      cairo_destroy(cr);
1208      cairo_set_line_width (cr, OSD_COORDINATES_FONT_SIZE/6);  }
1209      cairo_move_to (cr,  #endif  // OSD_COORDINATES
                    (OSD_COORDINATES_W - lat_extents.width)/2,  
                    OSD_COORDINATES_OFFSET - lat_extents.y_bearing);  
     cairo_text_path (cr, latitude);  
     cairo_move_to (cr,  
                    (OSD_COORDINATES_W - lon_extents.width)/2,  
                    OSD_COORDINATES_OFFSET - lon_extents.y_bearing +  
                    OSD_COORDINATES_FONT_SIZE);  
     cairo_text_path (cr, longitude);  
     cairo_stroke (cr);  
1210    
1211      cairo_set_source_rgb(cr, 0.0, 0.0, 0.0);  #ifdef OSD_NAV
1212      cairo_move_to (cr,  #define OSD_NAV_W  (8*OSD_COORDINATES_FONT_SIZE+2*OSD_COORDINATES_OFFSET)
1213                     (OSD_COORDINATES_W - lat_extents.width)/2,  #define OSD_NAV_H  (11*OSD_COORDINATES_FONT_SIZE)
                    OSD_COORDINATES_OFFSET - lat_extents.y_bearing);  
     cairo_show_text (cr, latitude);  
     cairo_move_to (cr,  
                    (OSD_COORDINATES_W - lon_extents.width)/2,  
                    OSD_COORDINATES_OFFSET - lon_extents.y_bearing +  
                    OSD_COORDINATES_FONT_SIZE);  
     cairo_show_text (cr, longitude);  
1214    
1215    /* http://mathforum.org/library/drmath/view/55417.html */
1216    static float get_bearing(float lat1, float lon1, float lat2, float lon2) {
1217      return atan2( sin(lon2 - lon1) * cos(lat2),
1218                    cos(lat1) * sin(lat2) -
1219                    sin(lat1) * cos(lat2) * cos(lon2 - lon1));
1220    }
1221    
1222    /* http://mathforum.org/library/drmath/view/51722.html */
1223    static float get_distance(float lat1, float lon1, float lat2, float lon2) {
1224      float aob = acos(cos(lat1) * cos(lat2) * cos(lon2 - lon1) +
1225                       sin(lat1) * sin(lat2));
1226    
1227      //  return(aob * 3959.0);   /* great circle radius in miles */
1228    
1229      return(aob * 6371000.0);     /* great circle radius in meters */
1230    }
1231    
1232    static void
1233    osd_render_nav(osm_gps_map_osd_t *osd)
1234    {
1235        osd_priv_t *priv = (osd_priv_t*)osd->priv;
1236    
1237        if(!priv->nav.surface || isnan(priv->nav.lat) || isnan(priv->nav.lon))
1238            return;
1239    
1240        /* first fill with transparency */
1241        cairo_t *cr = cairo_create(priv->nav.surface);
1242        cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1243        cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);
1244        cairo_paint(cr);
1245        cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
1246    
1247        cairo_select_font_face (cr, "Sans",
1248                                CAIRO_FONT_SLANT_NORMAL,
1249                                CAIRO_FONT_WEIGHT_BOLD);
1250        cairo_set_font_size (cr, OSD_COORDINATES_FONT_SIZE);
1251    
1252        char *latitude = osd_latitude_str(priv->nav.lat);
1253        char *longitude = osd_longitude_str(priv->nav.lon);
1254    
1255        int y = OSD_COORDINATES_OFFSET;
1256        y = osd_render_centered_text(cr, y, OSD_NAV_W, priv->nav.name);
1257        y = osd_render_centered_text(cr, y, OSD_NAV_W, latitude);
1258        y = osd_render_centered_text(cr, y, OSD_NAV_W, longitude);
1259    
1260      g_free(latitude);      g_free(latitude);
1261      g_free(longitude);      g_free(longitude);
1262    
1263        /* draw the compass */
1264        int radius = (OSD_NAV_H - y - 5*OSD_COORDINATES_FONT_SIZE/4)/2;
1265        if(radius > OSD_NAV_W/2)
1266            radius = OSD_NAV_W/2;
1267    
1268        int x = OSD_NAV_W/2+1;
1269        y += radius;
1270    
1271        cairo_stroke (cr);
1272    
1273        /* draw background */
1274        cairo_arc(cr, x, y, radius, 0,  2*M_PI);
1275        cairo_set_source_rgba (cr, 1, 1, 1, 0.5);
1276        cairo_fill_preserve (cr);
1277        cairo_set_source_rgb (cr, 0, 0, 0);
1278        cairo_set_line_width (cr, 1);
1279        cairo_stroke (cr);
1280    
1281        /* draw pointer */
1282    #define ARROW_WIDTH     0.3
1283    #define ARROW_LENGTH    0.7
1284    
1285        coord_t *gps = osm_gps_map_get_gps (OSM_GPS_MAP(osd->widget));
1286        if(gps) {
1287            float arot = get_bearing(gps->rlat, gps->rlon,
1288                         deg2rad(priv->nav.lat), deg2rad(priv->nav.lon));
1289    
1290            cairo_move_to(cr,
1291                          x + radius *  ARROW_LENGTH *  sin(arot),
1292                          y + radius *  ARROW_LENGTH * -cos(arot));
1293    
1294            cairo_line_to(cr,
1295                          x + radius * -ARROW_LENGTH *  sin(arot+ARROW_WIDTH),
1296                          y + radius * -ARROW_LENGTH * -cos(arot+ARROW_WIDTH));
1297    
1298            cairo_line_to(cr,
1299                          x + radius * -0.5 * ARROW_LENGTH *  sin(arot),
1300                          y + radius * -0.5 * ARROW_LENGTH * -cos(arot));
1301    
1302            cairo_line_to(cr,
1303                          x + radius * -ARROW_LENGTH *  sin(arot-ARROW_WIDTH),
1304                          y + radius * -ARROW_LENGTH * -cos(arot-ARROW_WIDTH));
1305    
1306            cairo_close_path(cr);
1307            cairo_set_source_rgb (cr, 0, 0, 0);
1308            cairo_fill (cr);
1309    
1310            y += radius + OSD_COORDINATES_FONT_SIZE/4;
1311    
1312            float dist = get_distance(gps->rlat, gps->rlon,
1313                            deg2rad(priv->nav.lat), deg2rad(priv->nav.lon));
1314    
1315            char *dist_str = NULL;
1316            if(!priv->nav.imperial) {
1317                /* metric is easy ... */
1318                if(dist<1000)
1319                    dist_str = g_strdup_printf("%u m", (int)dist);
1320                else
1321                    dist_str = g_strdup_printf("%.1f km", dist/1000);
1322            } else {
1323                /* and now the hard part: scale for useful imperial values :-( */
1324                /* try to convert to feet, 1ft == 0.3048 m */
1325    
1326                if(dist/(3*0.3048) >= 1760.0)      /* more than 1760 yard? */
1327                    dist_str = g_strdup_printf("%.1f mi", dist/(0.3048*3*1760.0));
1328                else if(dist/0.3048 >= 100)        /* more than 100 feet? */
1329                    dist_str = g_strdup_printf("%.1f yd", dist/(0.3048*3));
1330                else
1331                    dist_str = g_strdup_printf("%.0f ft", dist/0.3048);
1332            }
1333    
1334            y = osd_render_centered_text(cr, y, OSD_NAV_W, dist_str);
1335            g_free(dist_str);
1336        }
1337    
1338      cairo_destroy(cr);      cairo_destroy(cr);
1339  }  }
1340  #endif  // OSD_COORDINATES  
1341    void osm_gps_map_osd_clear_nav (OsmGpsMap *map) {
1342        g_return_if_fail (OSM_IS_GPS_MAP (map));
1343    
1344        osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
1345        g_return_if_fail (osd);
1346    
1347        osd_priv_t *priv = (osd_priv_t*)osd->priv;
1348        g_return_if_fail (priv);
1349    
1350        if(priv->nav.surface) {
1351            cairo_surface_destroy(priv->nav.surface);
1352            priv->nav.surface = NULL;
1353            priv->nav.lat = OSM_GPS_MAP_INVALID;
1354            priv->nav.lon = OSM_GPS_MAP_INVALID;
1355            if(priv->nav.name) g_free(priv->nav.name);
1356        }
1357        osm_gps_map_redraw(map);
1358    }
1359    
1360    void
1361    osm_gps_map_osd_draw_nav (OsmGpsMap *map, gboolean imperial,
1362                              float latitude, float longitude, char *name) {
1363        g_return_if_fail (OSM_IS_GPS_MAP (map));
1364    
1365        osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
1366        g_return_if_fail (osd);
1367    
1368        osd_priv_t *priv = (osd_priv_t*)osd->priv;
1369        g_return_if_fail (priv);
1370    
1371        osm_gps_map_osd_clear_nav (map);
1372    
1373        /* allocate balloon surface */
1374        priv->nav.surface =
1375            cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
1376                                       OSD_NAV_W+2, OSD_NAV_H+2);
1377    
1378        priv->nav.lat = latitude;
1379        priv->nav.lon = longitude;
1380        priv->nav.name = g_strdup(name);
1381        priv->nav.imperial = imperial;
1382    
1383        osd_render_nav(osd);
1384    
1385        osm_gps_map_redraw(map);
1386    }
1387    
1388    #endif // OSD_NAV
1389    
1390    
1391  #ifdef OSD_CROSSHAIR  #ifdef OSD_CROSSHAIR
1392    
# Line 1496  osd_render(osm_gps_map_osd_t *osd) Line 1715  osd_render(osm_gps_map_osd_t *osd)
1715      osd_render_crosshair(osd);      osd_render_crosshair(osd);
1716  #endif  #endif
1717    
1718    #ifdef OSD_NAV
1719        osd_render_nav(osd);
1720    #endif
1721    
1722  #ifdef OSD_COORDINATES  #ifdef OSD_COORDINATES
1723      osd_render_coordinates(osd);      osd_render_coordinates(osd);
1724  #endif  #endif
# Line 1575  osd_draw(osm_gps_map_osd_t *osd, GdkDraw Line 1798  osd_draw(osm_gps_map_osd_t *osd, GdkDraw
1798      cairo_paint(cr);      cairo_paint(cr);
1799  #endif  #endif
1800    
1801    #ifdef OSD_NAV
1802        if(priv->nav.surface) {
1803            x =  OSD_X;
1804            if(x < 0) x += osd->widget->allocation.width - OSD_NAV_W;
1805            y = (osd->widget->allocation.height - OSD_NAV_H)/2;
1806    
1807            cairo_set_source_surface(cr, priv->nav.surface, x, y);
1808            cairo_paint(cr);
1809        }
1810    #endif
1811    
1812  #ifdef OSD_COORDINATES  #ifdef OSD_COORDINATES
1813      x = -OSD_X;      x = -OSD_X;
1814      y = -OSD_Y;      y = -OSD_Y;
# Line 1666  osd_free(osm_gps_map_osd_t *osd) Line 1900  osd_free(osm_gps_map_osd_t *osd)
1900           cairo_surface_destroy(priv->crosshair.surface);           cairo_surface_destroy(priv->crosshair.surface);
1901  #endif  #endif
1902    
1903    #ifdef OSD_NAV
1904        if (priv->nav.surface)
1905             cairo_surface_destroy(priv->nav.surface);
1906    #endif
1907    
1908  #ifdef OSD_COORDINATES  #ifdef OSD_COORDINATES
1909      if (priv->coordinates.surface)      if (priv->coordinates.surface)
1910           cairo_surface_destroy(priv->coordinates.surface);           cairo_surface_destroy(priv->coordinates.surface);
# Line 1745  osm_gps_map_osd_check(OsmGpsMap *map, gi Line 1984  osm_gps_map_osd_check(OsmGpsMap *map, gi
1984      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
1985      g_return_val_if_fail (osd, OSD_NONE);      g_return_val_if_fail (osd, OSD_NONE);
1986    
1987      return osd_check(osd, x, y);      return osd_check(osd, TRUE, x, y);
1988  }  }
Legend:
Removed from v.113  
changed lines
  Added in v.133