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

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

revision 114 by harbaum, Wed Sep 16 20:04:38 2009 UTC revision 231 by harbaum, Mon Dec 7 16:14:50 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 76  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, mode;    // display distance imperial/metric
86            int click_sep;
87        } nav;
88    #endif
89    
90  #ifdef OSD_COORDINATES  #ifdef OSD_COORDINATES
91      struct {      struct {
92          cairo_surface_t *surface;          cairo_surface_t *surface;
# Line 125  typedef struct { Line 136  typedef struct {
136    
137  #define CLOSE_BUTTON_RADIUS   (BALLOON_CORNER_RADIUS)  #define CLOSE_BUTTON_RADIUS   (BALLOON_CORNER_RADIUS)
138    
   
139  /* 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 */
140  /* for the shadow */  /* for the shadow */
141  static void  static void
# Line 166  static void Line 176  static void
176  osd_render_balloon(osm_gps_map_osd_t *osd) {  osd_render_balloon(osm_gps_map_osd_t *osd) {
177      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
178    
179        if(!priv->balloon.surface)
180            return;
181    
182      /* get zoom */      /* get zoom */
183      gint zoom;      gint zoom;
184      g_object_get(OSM_GPS_MAP(osd->widget), "zoom", &zoom, NULL);      g_object_get(OSM_GPS_MAP(osd->widget), "zoom", &zoom, NULL);
# Line 226  osd_render_balloon(osm_gps_map_osd_t *os Line 239  osd_render_balloon(osm_gps_map_osd_t *os
239      priv->balloon.rect.w = x1 - x0 - 2*BALLOON_BORDER;      priv->balloon.rect.w = x1 - x0 - 2*BALLOON_BORDER;
240      priv->balloon.rect.h = y1 - y0 - 2*BALLOON_BORDER;      priv->balloon.rect.h = y1 - y0 - 2*BALLOON_BORDER;
241    
242        g_assert(priv->balloon.surface);
243      cairo_t *cr = cairo_create(priv->balloon.surface);      cairo_t *cr = cairo_create(priv->balloon.surface);
244      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
245      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 256  osd_render_balloon(osm_gps_map_osd_t *os Line 270  osd_render_balloon(osm_gps_map_osd_t *os
270      cairo_stroke (cr);      cairo_stroke (cr);
271    
272      if (priv->balloon.cb) {      if (priv->balloon.cb) {
273            osm_gps_map_balloon_event_t event;
274    
275          /* clip in case application tries to draw in */          /* clip in case application tries to draw in */
276              /* exceed of the balloon */              /* exceed of the balloon */
277          cairo_rectangle (cr, priv->balloon.rect.x, priv->balloon.rect.y,          cairo_rectangle (cr, priv->balloon.rect.x, priv->balloon.rect.y,
278                           priv->balloon.rect.w, priv->balloon.rect.h);                           priv->balloon.rect.w, priv->balloon.rect.h);
279          cairo_clip (cr);          cairo_clip (cr);
280          cairo_new_path (cr);  /* current path is not          cairo_new_path (cr);  /* current path is not consumed by cairo_clip */
281                                   consumed by cairo_clip() */  
282            /* request the application to draw the balloon contents */
283            event.type = OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW;
284            event.data.draw.rect = &priv->balloon.rect;
285            event.data.draw.cr = cr;
286    
287          priv->balloon.cb(cr, &priv->balloon.rect, priv->balloon.data);          priv->balloon.cb(&event, priv->balloon.data);
288      }      }
289    
290      cairo_destroy(cr);      cairo_destroy(cr);
# Line 273  osd_render_balloon(osm_gps_map_osd_t *os Line 293  osd_render_balloon(osm_gps_map_osd_t *os
293  /* return true if balloon is being displayed and if */  /* return true if balloon is being displayed and if */
294  /* the given coordinate is within this balloon */  /* the given coordinate is within this balloon */
295  static gboolean  static gboolean
296  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)
297  {  {
298      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
299    
# Line 288  osd_balloon_check(osm_gps_map_osd_t *osd Line 308  osd_balloon_check(osm_gps_map_osd_t *osd
308      xs += priv->balloon.rect.x + priv->balloon.offset_x;      xs += priv->balloon.rect.x + priv->balloon.offset_x;
309      ys += priv->balloon.rect.y + priv->balloon.offset_y;      ys += priv->balloon.rect.y + priv->balloon.offset_y;
310    
     /* handle the fact that the balloon may have been created by the */  
     /* button down event */  
   
311      gboolean is_in =      gboolean is_in =
312          (x > xs) && (x < xs + priv->balloon.rect.w) &&          (x > xs) && (x < xs + priv->balloon.rect.w) &&
313          (y > ys) && (y < ys + priv->balloon.rect.h);          (y > ys) && (y < ys + priv->balloon.rect.h);
314    
315      if(!is_in && !down && !priv->balloon.just_created) {      /* is this a real click or is the application just checking for something? */
316          /* the user actually clicked outside the balloon */      if(click) {
317    
318          /* close the balloon! */          /* handle the fact that the balloon may have been created by the */
319          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(osd->widget));          /* button down event */
320      }          if(!is_in && !down && !priv->balloon.just_created) {
321                /* the user actually clicked outside the balloon */
322    
323                /* close the balloon! */
324                osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(osd->widget));
325    
326                /* and inform application about this */
327                if(priv->balloon.cb) {
328                    osm_gps_map_balloon_event_t event;
329                    event.type = OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED;
330                    priv->balloon.cb(&event, priv->balloon.data);
331                }
332    
333            }
334    
335            if(is_in && priv->balloon.cb) {
336                osm_gps_map_balloon_event_t event;
337    
338                /* notify application of click */
339                event.type = OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK;
340                event.data.click.x = x - xs;
341                event.data.click.y = y - ys;
342                event.data.click.down = down;
343    
344                priv->balloon.cb(&event, priv->balloon.data);
345            }
346        }
347      return is_in;      return is_in;
348  }  }
349    
# Line 586  osd_check_zoom(gint x, gint y) { Line 628  osd_check_zoom(gint x, gint y) {
628  /* internal value to draw the arrow on the "puller" */  /* internal value to draw the arrow on the "puller" */
629  #define OSD_S_D0  (OSD_S_RAD/2)  #define OSD_S_D0  (OSD_S_RAD/2)
630  #ifndef OSD_FONT_SIZE  #ifndef OSD_FONT_SIZE
631  #define OSD_FONT_SIZE 16.0  #define OSD_FONT_SIZE (16.0)
632  #endif  #endif
633  #define OSD_TEXT_BORDER   (OSD_FONT_SIZE/2)  #define OSD_TEXT_BORDER   (OSD_FONT_SIZE/2)
634  #define OSD_TEXT_SKIP     (OSD_FONT_SIZE/8)  #define OSD_TEXT_SKIP     (OSD_FONT_SIZE/8)
# Line 696  static void Line 738  static void
738  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) {
739      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
740    
741      if(priv->source_sel.rendered && !force_rerender)      if(!priv->source_sel.surface ||
742           (priv->source_sel.rendered && !force_rerender))
743          return;          return;
744    
745      priv->source_sel.rendered = TRUE;      priv->source_sel.rendered = TRUE;
# Line 708  osd_render_source_sel(osm_gps_map_osd_t Line 751  osd_render_source_sel(osm_gps_map_osd_t
751  #endif  #endif
752    
753      /* draw source selector */      /* draw source selector */
754        g_assert(priv->source_sel.surface);
755      cairo_t *cr = cairo_create(priv->source_sel.surface);      cairo_t *cr = cairo_create(priv->source_sel.surface);
756      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
757      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 756  osd_source_reallocate(osm_gps_map_osd_t Line 800  osd_source_reallocate(osm_gps_map_osd_t
800          cairo_text_extents_t extents;          cairo_text_extents_t extents;
801    
802          /* determine content size */          /* determine content size */
803            g_assert(priv->source_sel.surface);
804          cairo_t *cr = cairo_create(priv->source_sel.surface);          cairo_t *cr = cairo_create(priv->source_sel.surface);
805          cairo_select_font_face (cr, "Sans",          cairo_select_font_face (cr, "Sans",
806                                  CAIRO_FONT_SLANT_NORMAL,                                  CAIRO_FONT_SLANT_NORMAL,
# Line 924  osd_source_check(osm_gps_map_osd_t *osd, Line 969  osd_source_check(osm_gps_map_osd_t *osd,
969                      osm_gps_map_repaint(OSM_GPS_MAP(osd->widget));                      osm_gps_map_repaint(OSM_GPS_MAP(osd->widget));
970                  }                  }
971              }              }
972    
973              /* return "clicked in OSD background" to prevent further */              /* return "clicked in OSD background" to prevent further */
974              /* processing by application */              /* processing by application */
975              return OSD_BG;              return OSD_BG;
# Line 935  osd_source_check(osm_gps_map_osd_t *osd, Line 980  osd_source_check(osm_gps_map_osd_t *osd,
980  }  }
981  #endif // OSD_SOURCE_SEL  #endif // OSD_SOURCE_SEL
982    
 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) {  
         x -= OSD_X;  
         y -= OSD_Y;  
   
         if(OSD_X < 0)  
             x -= (osd->widget->allocation.width - OSD_W);  
   
         if(OSD_Y < 0)  
             y -= (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(x > 0 && x < OSD_W && y > 0 && y < OSD_H) {  
 #ifndef OSD_NO_DPAD  
             but = osd_check_dpad(x, y);  
 #endif  
         }  
   
         if(but == OSD_NONE)  
             but = osd_check_zoom(x, y);  
     }  
   
 #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;  
 }  
   
983  #ifndef OSD_NO_DPAD  #ifndef OSD_NO_DPAD
984  static void  static void
985  osd_dpad_labels(cairo_t *cr, gint x, gint y) {  osd_dpad_labels(cairo_t *cr, gint x, gint y) {
# Line 1058  osd_zoom_labels(cairo_t *cr, gint x, gin Line 1053  osd_zoom_labels(cairo_t *cr, gint x, gin
1053  #ifdef OSD_COORDINATES  #ifdef OSD_COORDINATES
1054    
1055  #ifndef OSD_COORDINATES_FONT_SIZE  #ifndef OSD_COORDINATES_FONT_SIZE
1056  #define OSD_COORDINATES_FONT_SIZE 12  #define OSD_COORDINATES_FONT_SIZE (12.0)
1057  #endif  #endif
1058    
1059  #define OSD_COORDINATES_OFFSET (OSD_COORDINATES_FONT_SIZE/6)  #define OSD_COORDINATES_OFFSET (OSD_COORDINATES_FONT_SIZE/6)
1060    
1061  #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)
1062  #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)
1063    
1064  /* these can be overwritten with versions that support */  /* these can be overwritten with versions that support */
1065  /* localization */  /* localization */
# Line 1122  static char Line 1117  static char
1117                             c, (int)integral, fractional*60.0);                             c, (int)integral, fractional*60.0);
1118  }  }
1119    
1120    /* render a string at the given screen position */
1121    static int
1122    osd_render_centered_text(cairo_t *cr, int y, int width, char *text) {
1123        if(!text) return y;
1124    
1125        char *p = g_malloc(strlen(text)+4);  // space for "...\n"
1126        strcpy(p, text);
1127    
1128        cairo_text_extents_t extents;
1129        memset(&extents, 0, sizeof(cairo_text_extents_t));
1130        cairo_text_extents (cr, p, &extents);
1131        g_assert(extents.width != 0.0);
1132    
1133        /* check if text needs to be truncated */
1134        int trunc_at = strlen(text);
1135        while(extents.width > width) {
1136    
1137            /* cut off all utf8 multibyte remains so the actual */
1138            /* truncation only deals with one byte */
1139            while((p[trunc_at-1] & 0xc0) == 0x80) {
1140                trunc_at--;
1141                g_assert(trunc_at > 0);
1142            }
1143    
1144            trunc_at--;
1145            g_assert(trunc_at > 0);
1146    
1147            strcpy(p+trunc_at, "...");
1148            cairo_text_extents (cr, p, &extents);
1149        }
1150    
1151        cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
1152        cairo_set_line_width (cr, OSD_COORDINATES_FONT_SIZE/6);
1153        cairo_move_to (cr, (width - extents.width)/2, y - extents.y_bearing);
1154        cairo_text_path (cr, p);
1155        cairo_stroke (cr);
1156    
1157        cairo_set_source_rgb(cr, 0.0, 0.0, 0.0);
1158        cairo_move_to (cr, (width - extents.width)/2, y - extents.y_bearing);
1159        cairo_show_text (cr, p);
1160    
1161        g_free(p);
1162    
1163        /* skip + 1/5 line */
1164        return y + 6*OSD_COORDINATES_FONT_SIZE/5;
1165    }
1166    
1167  static void  static void
1168  osd_render_coordinates(osm_gps_map_osd_t *osd)  osd_render_coordinates(osm_gps_map_osd_t *osd)
1169  {  {
1170      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1171    
1172        if(!priv->coordinates.surface)
1173            return;
1174    
1175      /* get current map position */      /* get current map position */
1176      gfloat lat, lon;      gfloat lat, lon;
1177      g_object_get(osd->widget, "latitude", &lat, "longitude", &lon, NULL);      g_object_get(osd->widget, "latitude", &lat, "longitude", &lon, NULL);
# Line 1142  osd_render_coordinates(osm_gps_map_osd_t Line 1187  osd_render_coordinates(osm_gps_map_osd_t
1187      priv->coordinates.lon = lon;      priv->coordinates.lon = lon;
1188    
1189      /* first fill with transparency */      /* first fill with transparency */
1190    
1191        g_assert(priv->coordinates.surface);
1192      cairo_t *cr = cairo_create(priv->coordinates.surface);      cairo_t *cr = cairo_create(priv->coordinates.surface);
1193      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1194      //    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 1157  osd_render_coordinates(osm_gps_map_osd_t Line 1204  osd_render_coordinates(osm_gps_map_osd_t
1204      char *latitude = osd_latitude_str(lat);      char *latitude = osd_latitude_str(lat);
1205      char *longitude = osd_longitude_str(lon);      char *longitude = osd_longitude_str(lon);
1206    
1207      cairo_text_extents_t lat_extents, lon_extents;      int y = OSD_COORDINATES_OFFSET;
1208      cairo_text_extents (cr, latitude, &lat_extents);      y = osd_render_centered_text(cr, y, OSD_COORDINATES_W, latitude);
1209      cairo_text_extents (cr, longitude, &lon_extents);      y = osd_render_centered_text(cr, y, OSD_COORDINATES_W, longitude);
1210    
1211        g_free(latitude);
1212        g_free(longitude);
1213    
1214      cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);      cairo_destroy(cr);
1215      cairo_set_line_width (cr, OSD_COORDINATES_FONT_SIZE/6);  }
1216      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);  
1217    
1218      cairo_set_source_rgb(cr, 0.0, 0.0, 0.0);  #ifdef OSD_NAV
1219      cairo_move_to (cr,  #define OSD_NAV_W  (8*OSD_COORDINATES_FONT_SIZE+2*OSD_COORDINATES_OFFSET)
1220                     (OSD_COORDINATES_W - lat_extents.width)/2,  #define OSD_NAV_H  (11*OSD_COORDINATES_FONT_SIZE)
1221                     OSD_COORDINATES_OFFSET - lat_extents.y_bearing);  
1222      cairo_show_text (cr, latitude);  /* http://mathforum.org/library/drmath/view/55417.html */
1223      cairo_move_to (cr,  static float get_bearing(float lat1, float lon1, float lat2, float lon2) {
1224                     (OSD_COORDINATES_W - lon_extents.width)/2,    return atan2( sin(lon2 - lon1) * cos(lat2),
1225                     OSD_COORDINATES_OFFSET - lon_extents.y_bearing +                  cos(lat1) * sin(lat2) -
1226                     OSD_COORDINATES_FONT_SIZE);                  sin(lat1) * cos(lat2) * cos(lon2 - lon1));
1227      cairo_show_text (cr, longitude);  }
1228    
1229    /* http://mathforum.org/library/drmath/view/51722.html */
1230    static float get_distance(float lat1, float lon1, float lat2, float lon2) {
1231      float aob = acos(cos(lat1) * cos(lat2) * cos(lon2 - lon1) +
1232                       sin(lat1) * sin(lat2));
1233    
1234      //  return(aob * 3959.0);   /* great circle radius in miles */
1235    
1236      return(aob * 6371000.0);     /* great circle radius in meters */
1237    }
1238    
1239    static void
1240    osd_render_nav(osm_gps_map_osd_t *osd)
1241    {
1242        osd_priv_t *priv = (osd_priv_t*)osd->priv;
1243    
1244        if(!priv->nav.surface || isnan(priv->nav.lat) || isnan(priv->nav.lon))
1245            return;
1246    
1247        /* first fill with transparency */
1248        g_assert(priv->nav.surface);
1249        cairo_t *cr = cairo_create(priv->nav.surface);
1250        cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1251        cairo_set_source_rgba(cr, 1.0, 0.0, 0.0, 0.0);
1252        cairo_paint(cr);
1253        cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
1254    
1255        cairo_select_font_face (cr, "Sans",
1256                                CAIRO_FONT_SLANT_NORMAL,
1257                                CAIRO_FONT_WEIGHT_BOLD);
1258        cairo_set_font_size (cr, OSD_COORDINATES_FONT_SIZE);
1259    
1260        char *latitude = osd_latitude_str(priv->nav.lat);
1261        char *longitude = osd_longitude_str(priv->nav.lon);
1262    
1263        int y = OSD_COORDINATES_OFFSET;
1264        y = osd_render_centered_text(cr, y, OSD_NAV_W, priv->nav.name);
1265        y = osd_render_centered_text(cr, y, OSD_NAV_W, latitude);
1266        y = osd_render_centered_text(cr, y, OSD_NAV_W, longitude);
1267    
1268      g_free(latitude);      g_free(latitude);
1269      g_free(longitude);      g_free(longitude);
1270    
1271        /* everything below this is the compass. we need to know this */
1272        /* to differ between coordinate clicks and compass clicks */
1273        priv->nav.click_sep = y;
1274    
1275        /* draw the compass */
1276        int radius = (OSD_NAV_H - y - 5*OSD_COORDINATES_FONT_SIZE/4)/2;
1277        if(radius > OSD_NAV_W/2)
1278            radius = OSD_NAV_W/2;
1279    
1280        int x = OSD_NAV_W/2+1;
1281        y += radius;
1282    
1283        cairo_stroke (cr);
1284    
1285        /* draw background */
1286        cairo_arc(cr, x, y, radius, 0,  2*M_PI);
1287        cairo_set_source_rgba (cr, 1, 1, 1, 0.5);
1288        cairo_fill_preserve (cr);
1289        cairo_set_source_rgb (cr, 0, 0, 0);
1290        cairo_set_line_width (cr, 1);
1291        cairo_stroke (cr);
1292    
1293        /* draw pointer */
1294    #define ARROW_WIDTH     0.3
1295    #define ARROW_LENGTH    0.7
1296    
1297        coord_t mpos, *pos = osm_gps_map_get_gps (OSM_GPS_MAP(osd->widget));
1298        if(priv->nav.mode) {
1299            gfloat lat, lon;
1300            g_object_get(osd->widget, "latitude", &lat, "longitude", &lon, NULL);
1301            mpos.rlat = deg2rad(lat);
1302            mpos.rlon = deg2rad(lon);
1303            pos = &mpos;
1304        }
1305    
1306        if(pos) {
1307            float arot = get_bearing(pos->rlat, pos->rlon,
1308                         deg2rad(priv->nav.lat), deg2rad(priv->nav.lon));
1309    
1310            cairo_move_to(cr,
1311                          x + radius *  ARROW_LENGTH *  sin(arot),
1312                          y + radius *  ARROW_LENGTH * -cos(arot));
1313    
1314            cairo_line_to(cr,
1315                          x + radius * -ARROW_LENGTH *  sin(arot+ARROW_WIDTH),
1316                          y + radius * -ARROW_LENGTH * -cos(arot+ARROW_WIDTH));
1317    
1318            cairo_line_to(cr,
1319                          x + radius * -0.5 * ARROW_LENGTH *  sin(arot),
1320                          y + radius * -0.5 * ARROW_LENGTH * -cos(arot));
1321    
1322            cairo_line_to(cr,
1323                          x + radius * -ARROW_LENGTH *  sin(arot-ARROW_WIDTH),
1324                          y + radius * -ARROW_LENGTH * -cos(arot-ARROW_WIDTH));
1325    
1326            cairo_close_path(cr);
1327            if(priv->nav.mode)
1328                cairo_set_source_rgb (cr, 0, 0, 0);
1329            else
1330                cairo_set_source_rgb (cr, 0, 0, 0.8);
1331    
1332            cairo_fill (cr);
1333    
1334            y += radius + OSD_COORDINATES_FONT_SIZE/4;
1335    
1336            float dist = get_distance(pos->rlat, pos->rlon,
1337                            deg2rad(priv->nav.lat), deg2rad(priv->nav.lon));
1338    
1339            char *dist_str = NULL;
1340            if(!priv->nav.imperial) {
1341                /* metric is easy ... */
1342                if(dist<1000)
1343                    dist_str = g_strdup_printf("%u m", (int)dist);
1344                else
1345                    dist_str = g_strdup_printf("%.1f km", dist/1000);
1346            } else {
1347                /* and now the hard part: scale for useful imperial values :-( */
1348                /* try to convert to feet, 1ft == 0.3048 m */
1349    
1350                if(dist/(3*0.3048) >= 1760.0)      /* more than 1760 yard? */
1351                    dist_str = g_strdup_printf("%.1f mi", dist/(0.3048*3*1760.0));
1352                else if(dist/0.3048 >= 100)        /* more than 100 feet? */
1353                    dist_str = g_strdup_printf("%.1f yd", dist/(0.3048*3));
1354                else
1355                    dist_str = g_strdup_printf("%.0f ft", dist/0.3048);
1356            }
1357    
1358            y = osd_render_centered_text(cr, y, OSD_NAV_W, dist_str);
1359            g_free(dist_str);
1360        }
1361    
1362      cairo_destroy(cr);      cairo_destroy(cr);
1363  }  }
1364  #endif  // OSD_COORDINATES  
1365    /* check if the user clicked inside the source selection area */
1366    static osd_button_t
1367    osd_nav_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y) {
1368        osd_priv_t *priv = (osd_priv_t*)osd->priv;
1369    
1370        if(!priv->nav.surface || down)
1371            return OSD_NONE;
1372    
1373        x -= OSD_X;
1374        if(OSD_X < 0)
1375            x -= (osd->widget->allocation.width - OSD_NAV_W);
1376    
1377        y -= (osd->widget->allocation.height - OSD_NAV_H)/2;
1378    
1379        if(x >= 0 && y >= 0 && x <= OSD_NAV_W && y <= OSD_NAV_H) {
1380            if(y < priv->nav.click_sep)
1381                osm_gps_map_set_center(OSM_GPS_MAP(osd->widget),
1382                                       priv->nav.lat, priv->nav.lon);
1383            else {
1384                priv->nav.mode = !priv->nav.mode;
1385                osm_gps_map_redraw(OSM_GPS_MAP(osd->widget));
1386            }
1387        }
1388    
1389        return OSD_NONE;
1390    }
1391    
1392    void osm_gps_map_osd_clear_nav (OsmGpsMap *map) {
1393        g_return_if_fail (OSM_IS_GPS_MAP (map));
1394    
1395        osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
1396        g_return_if_fail (osd);
1397    
1398        osd_priv_t *priv = (osd_priv_t*)osd->priv;
1399        g_return_if_fail (priv);
1400    
1401        if(priv->nav.surface) {
1402            cairo_surface_destroy(priv->nav.surface);
1403            priv->nav.surface = NULL;
1404            priv->nav.lat = OSM_GPS_MAP_INVALID;
1405            priv->nav.lon = OSM_GPS_MAP_INVALID;
1406            if(priv->nav.name) g_free(priv->nav.name);
1407        }
1408        osm_gps_map_redraw(map);
1409    }
1410    
1411    void
1412    osm_gps_map_osd_draw_nav (OsmGpsMap *map, gboolean imperial,
1413                              float latitude, float longitude, char *name) {
1414        g_return_if_fail (OSM_IS_GPS_MAP (map));
1415    
1416        osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
1417        g_return_if_fail (osd);
1418    
1419        osd_priv_t *priv = (osd_priv_t*)osd->priv;
1420        g_return_if_fail (priv);
1421    
1422        osm_gps_map_osd_clear_nav (map);
1423    
1424        /* allocate balloon surface */
1425        priv->nav.surface =
1426            cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
1427                                       OSD_NAV_W+2, OSD_NAV_H+2);
1428    
1429        priv->nav.lat = latitude;
1430        priv->nav.lon = longitude;
1431        priv->nav.name = g_strdup(name);
1432        priv->nav.imperial = imperial;
1433    
1434        osd_render_nav(osd);
1435    
1436        osm_gps_map_redraw(map);
1437    }
1438    
1439    #endif // OSD_NAV
1440    
1441    static osd_button_t
1442    osd_check_int(osm_gps_map_osd_t *osd, gboolean click, gboolean down, gint x, gint y) {
1443        osd_button_t but = OSD_NONE;
1444    
1445    #ifdef OSD_BALLOON
1446        if(down) {
1447            /* needed to handle balloons that are created at click */
1448            osd_priv_t *priv = (osd_priv_t*)osd->priv;
1449            priv->balloon.just_created = FALSE;
1450        }
1451    #endif
1452    
1453    #ifdef OSD_SOURCE_SEL
1454        /* the source selection area is handles internally */
1455        but = osd_source_check(osd, down, x, y);
1456    #endif
1457    
1458    #ifdef OSD_NAV
1459        if(but == OSD_NONE) {
1460            /* the source selection area is handles internally */
1461            but = osd_nav_check(osd, down, x, y);
1462        }
1463    #endif
1464    
1465        if(but == OSD_NONE) {
1466            gint mx = x - OSD_X;
1467            gint my = y - OSD_Y;
1468    
1469            if(OSD_X < 0)
1470                mx -= (osd->widget->allocation.width - OSD_W);
1471    
1472            if(OSD_Y < 0)
1473                my -= (osd->widget->allocation.height - OSD_H);
1474    
1475            /* first do a rough test for the OSD area. */
1476            /* this is just to avoid an unnecessary detailed test */
1477            if(mx > 0 && mx < OSD_W && my > 0 && my < OSD_H) {
1478    #ifndef OSD_NO_DPAD
1479                but = osd_check_dpad(mx, my);
1480    #endif
1481            }
1482    
1483            if(but == OSD_NONE)
1484                but = osd_check_zoom(mx, my);
1485        }
1486    
1487    #ifdef OSD_BALLOON
1488        if(but == OSD_NONE) {
1489            /* check if user clicked into balloon */
1490            if(osd_balloon_check(osd, click, down, x, y))
1491                but = OSD_BG;
1492        }
1493    #endif
1494    
1495        return but;
1496    }
1497    
1498    
1499  #ifdef OSD_CROSSHAIR  #ifdef OSD_CROSSHAIR
1500    
# Line 1230  osd_render_crosshair(osm_gps_map_osd_t * Line 1534  osd_render_crosshair(osm_gps_map_osd_t *
1534  {  {
1535      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1536    
1537      if(priv->crosshair.rendered)      if(!priv->crosshair.surface || priv->crosshair.rendered)
1538          return;          return;
1539    
1540      priv->crosshair.rendered = TRUE;      priv->crosshair.rendered = TRUE;
1541    
1542      /* first fill with transparency */      /* first fill with transparency */
1543        g_assert(priv->crosshair.surface);
1544      cairo_t *cr = cairo_create(priv->crosshair.surface);      cairo_t *cr = cairo_create(priv->crosshair.surface);
1545      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1546      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 1259  osd_render_crosshair(osm_gps_map_osd_t * Line 1564  osd_render_crosshair(osm_gps_map_osd_t *
1564  #ifdef OSD_SCALE  #ifdef OSD_SCALE
1565    
1566  #ifndef OSD_SCALE_FONT_SIZE  #ifndef OSD_SCALE_FONT_SIZE
1567  #define OSD_SCALE_FONT_SIZE 12  #define OSD_SCALE_FONT_SIZE (12.0)
1568  #endif  #endif
1569  #define OSD_SCALE_W   (10*OSD_SCALE_FONT_SIZE)  #define OSD_SCALE_W   (10*OSD_SCALE_FONT_SIZE)
1570  #define OSD_SCALE_H   (5*OSD_SCALE_FONT_SIZE/2)  #define OSD_SCALE_H   (5*OSD_SCALE_FONT_SIZE/2)
# Line 1276  osd_render_scale(osm_gps_map_osd_t *osd) Line 1581  osd_render_scale(osm_gps_map_osd_t *osd)
1581  {  {
1582      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1583    
1584        if(!priv->scale.surface)
1585            return;
1586    
1587      /* this only needs to be rendered if the zoom has changed */      /* this only needs to be rendered if the zoom has changed */
1588      gint zoom;      gint zoom;
1589      g_object_get(OSM_GPS_MAP(osd->widget), "zoom", &zoom, NULL);      g_object_get(OSM_GPS_MAP(osd->widget), "zoom", &zoom, NULL);
# Line 1287  osd_render_scale(osm_gps_map_osd_t *osd) Line 1595  osd_render_scale(osm_gps_map_osd_t *osd)
1595      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));
1596    
1597      /* first fill with transparency */      /* first fill with transparency */
1598        g_assert(priv->scale.surface);
1599      cairo_t *cr = cairo_create(priv->scale.surface);      cairo_t *cr = cairo_create(priv->scale.surface);
1600      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1601      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 1405  osd_render_controls(osm_gps_map_osd_t *o Line 1714  osd_render_controls(osm_gps_map_osd_t *o
1714  {  {
1715      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1716    
1717        if(!priv->controls.surface)
1718            return;
1719    
1720      if(priv->controls.rendered      if(priv->controls.rendered
1721  #ifdef OSD_GPS_BUTTON  #ifdef OSD_GPS_BUTTON
1722         && (priv->controls.gps_enabled == (osd->cb != NULL))         && (priv->controls.gps_enabled == (osd->cb != NULL))
# Line 1424  osd_render_controls(osm_gps_map_osd_t *o Line 1736  osd_render_controls(osm_gps_map_osd_t *o
1736  #endif  #endif
1737    
1738      /* first fill with transparency */      /* first fill with transparency */
1739        g_assert(priv->controls.surface);
1740      cairo_t *cr = cairo_create(priv->controls.surface);      cairo_t *cr = cairo_create(priv->controls.surface);
1741      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1742      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 1519  osd_render(osm_gps_map_osd_t *osd) Line 1832  osd_render(osm_gps_map_osd_t *osd)
1832      osd_render_crosshair(osd);      osd_render_crosshair(osd);
1833  #endif  #endif
1834    
1835    #ifdef OSD_NAV
1836        osd_render_nav(osd);
1837    #endif
1838    
1839  #ifdef OSD_COORDINATES  #ifdef OSD_COORDINATES
1840      osd_render_coordinates(osd);      osd_render_coordinates(osd);
1841  #endif  #endif
# Line 1598  osd_draw(osm_gps_map_osd_t *osd, GdkDraw Line 1915  osd_draw(osm_gps_map_osd_t *osd, GdkDraw
1915      cairo_paint(cr);      cairo_paint(cr);
1916  #endif  #endif
1917    
1918    #ifdef OSD_NAV
1919        if(priv->nav.surface) {
1920            x =  OSD_X;
1921            if(x < 0) x += osd->widget->allocation.width - OSD_NAV_W;
1922            y = (osd->widget->allocation.height - OSD_NAV_H)/2;
1923    
1924            cairo_set_source_surface(cr, priv->nav.surface, x, y);
1925            cairo_paint(cr);
1926        }
1927    #endif
1928    
1929  #ifdef OSD_COORDINATES  #ifdef OSD_COORDINATES
1930      x = -OSD_X;      x = -OSD_X;
1931      y = -OSD_Y;      y = -OSD_Y;
# Line 1689  osd_free(osm_gps_map_osd_t *osd) Line 2017  osd_free(osm_gps_map_osd_t *osd)
2017           cairo_surface_destroy(priv->crosshair.surface);           cairo_surface_destroy(priv->crosshair.surface);
2018  #endif  #endif
2019    
2020    #ifdef OSD_NAV
2021        if (priv->nav.surface)
2022             cairo_surface_destroy(priv->nav.surface);
2023    #endif
2024    
2025  #ifdef OSD_COORDINATES  #ifdef OSD_COORDINATES
2026      if (priv->coordinates.surface)      if (priv->coordinates.surface)
2027           cairo_surface_destroy(priv->coordinates.surface);           cairo_surface_destroy(priv->coordinates.surface);
# Line 1699  osd_free(osm_gps_map_osd_t *osd) Line 2032  osd_free(osm_gps_map_osd_t *osd)
2032           cairo_surface_destroy(priv->balloon.surface);           cairo_surface_destroy(priv->balloon.surface);
2033  #endif  #endif
2034    
2035        printf("freeing priv\n");
2036      g_free(priv);      g_free(priv);
2037  }  }
2038    
# Line 1713  osd_busy(osm_gps_map_osd_t *osd) Line 2047  osd_busy(osm_gps_map_osd_t *osd)
2047  #endif  #endif
2048  }  }
2049    
2050    static osd_button_t
2051    osd_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y) {
2052        return osd_check_int(osd, TRUE, down, x, y);
2053    }
2054    
2055  static osm_gps_map_osd_t osd_classic = {  static osm_gps_map_osd_t osd_classic = {
2056      .widget     = NULL,      .widget     = NULL,
2057    
# Line 1732  static osm_gps_map_osd_t osd_classic = { Line 2071  static osm_gps_map_osd_t osd_classic = {
2071  void  void
2072  osm_gps_map_osd_classic_init(OsmGpsMap *map)  osm_gps_map_osd_classic_init(OsmGpsMap *map)
2073  {  {
2074      osd_priv_t *priv = osd_classic.priv = g_new0(osd_priv_t, 1);      osd_priv_t *priv = g_new0(osd_priv_t, 1);
2075        printf("alloc new osd priv\n");
2076    
2077        /* reset entries to default value */
2078        osd_classic.widget = NULL;
2079        osd_classic.cb     = NULL;
2080        osd_classic.data   = NULL;
2081        osd_classic.priv   = priv;
2082    
2083  #ifdef OSD_BALLOON  #ifdef OSD_BALLOON
2084      priv->balloon.lat = OSM_GPS_MAP_INVALID;      priv->balloon.lat = OSM_GPS_MAP_INVALID;
2085      priv->balloon.lon = OSM_GPS_MAP_INVALID;      priv->balloon.lon = OSM_GPS_MAP_INVALID;
2086  #endif  #endif
2087    
     osd_classic.priv = priv;  
   
2088      osm_gps_map_register_osd(map, &osd_classic);      osm_gps_map_register_osd(map, &osd_classic);
2089  }  }
2090    
# Line 1768  osm_gps_map_osd_check(OsmGpsMap *map, gi Line 2112  osm_gps_map_osd_check(OsmGpsMap *map, gi
2112      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
2113      g_return_val_if_fail (osd, OSD_NONE);      g_return_val_if_fail (osd, OSD_NONE);
2114    
2115      return osd_check(osd, TRUE, x, y);      return osd_check_int(osd, FALSE, TRUE, x, y);
2116  }  }

Legend:
Removed from v.114  
changed lines
  Added in v.231