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 233 by harbaum, Wed Dec 9 19:45:36 2009 UTC
# Line 82  typedef struct { Line 82  typedef struct {
82          cairo_surface_t *surface;          cairo_surface_t *surface;
83          float lat, lon;          float lat, lon;
84          char *name;          char *name;
85            gboolean imperial, mode;    // display distance imperial/metric
86            int click_sep;
87      } nav;      } nav;
88  #endif  #endif
89    
# Line 134  typedef struct { Line 136  typedef struct {
136    
137  #define CLOSE_BUTTON_RADIUS   (BALLOON_CORNER_RADIUS)  #define CLOSE_BUTTON_RADIUS   (BALLOON_CORNER_RADIUS)
138    
   
139  /* 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 175  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 235  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 265  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 282  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 301  osd_balloon_check(osm_gps_map_osd_t *osd Line 312  osd_balloon_check(osm_gps_map_osd_t *osd
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      /* 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? */
316      /* button down event */      if(click) {
     if(!is_in && !down && !priv->balloon.just_created) {  
         /* the user actually clicked outside the balloon */  
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 594  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 704  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 716  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 764  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 930  osd_source_check(osm_gps_map_osd_t *osd, Line 967  osd_source_check(osm_gps_map_osd_t *osd,
967    
968                      osd_render_source_sel(osd, TRUE);                      osd_render_source_sel(osd, TRUE);
969                      osm_gps_map_repaint(OSM_GPS_MAP(osd->widget));                      osm_gps_map_repaint(OSM_GPS_MAP(osd->widget));
970                        osm_gps_map_redraw(OSM_GPS_MAP(osd->widget));
971                  }                  }
972              }              }
973    
974              /* return "clicked in OSD background" to prevent further */              /* return "clicked in OSD background" to prevent further */
975              /* processing by application */              /* processing by application */
976              return OSD_BG;              return OSD_BG;
# Line 943  osd_source_check(osm_gps_map_osd_t *osd, Line 981  osd_source_check(osm_gps_map_osd_t *osd,
981  }  }
982  #endif // OSD_SOURCE_SEL  #endif // OSD_SOURCE_SEL
983    
 static osd_button_t  
 osd_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y) {  
     osd_button_t but = OSD_NONE;  
   
 #ifdef OSD_BALLOON  
     if(down) {  
         /* needed to handle balloons that are created at click */  
         osd_priv_t *priv = (osd_priv_t*)osd->priv;  
         priv->balloon.just_created = FALSE;  
     }  
 #endif  
   
 #ifdef OSD_SOURCE_SEL  
     /* the source selection area is handles internally */  
     but = osd_source_check(osd, down, x, y);  
 #endif  
   
     if(but == OSD_NONE) {  
         gint mx = x - OSD_X;  
         gint my = y - OSD_Y;  
   
         if(OSD_X < 0)  
             mx -= (osd->widget->allocation.width - OSD_W);  
   
         if(OSD_Y < 0)  
             my -= (osd->widget->allocation.height - OSD_H);  
   
         /* first do a rough test for the OSD area. */  
         /* this is just to avoid an unnecessary detailed test */  
         if(mx > 0 && mx < OSD_W && my > 0 && my < OSD_H) {  
 #ifndef OSD_NO_DPAD  
             but = osd_check_dpad(mx, my);  
 #endif  
         }  
   
         if(but == OSD_NONE)  
             but = osd_check_zoom(mx, my);  
     }  
   
 #ifdef OSD_BALLOON  
     if(but == OSD_NONE) {  
         /* check if user clicked into balloon */  
         if(osd_balloon_check(osd, down, x, y))  
             but = OSD_BG;  
     }  
 #endif  
   
     return but;  
 }  
   
984  #ifndef OSD_NO_DPAD  #ifndef OSD_NO_DPAD
985  static void  static void
986  osd_dpad_labels(cairo_t *cr, gint x, gint y) {  osd_dpad_labels(cairo_t *cr, gint x, gint y) {
# Line 1066  osd_zoom_labels(cairo_t *cr, gint x, gin Line 1054  osd_zoom_labels(cairo_t *cr, gint x, gin
1054  #ifdef OSD_COORDINATES  #ifdef OSD_COORDINATES
1055    
1056  #ifndef OSD_COORDINATES_FONT_SIZE  #ifndef OSD_COORDINATES_FONT_SIZE
1057  #define OSD_COORDINATES_FONT_SIZE 12  #define OSD_COORDINATES_FONT_SIZE (12.0)
1058  #endif  #endif
1059    
1060  #define OSD_COORDINATES_OFFSET (OSD_COORDINATES_FONT_SIZE/6)  #define OSD_COORDINATES_OFFSET (OSD_COORDINATES_FONT_SIZE/6)
1061    
1062  #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)
1063  #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)
1064    
1065  /* these can be overwritten with versions that support */  /* these can be overwritten with versions that support */
1066  /* localization */  /* localization */
# Line 1133  static char Line 1121  static char
1121  /* render a string at the given screen position */  /* render a string at the given screen position */
1122  static int  static int
1123  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) {
1124      char *p = g_strdup(text);      if(!text) return y;
1125    
1126        char *p = g_malloc(strlen(text)+4);  // space for "...\n"
1127        strcpy(p, text);
1128    
1129      cairo_text_extents_t extents;      cairo_text_extents_t extents;
1130        memset(&extents, 0, sizeof(cairo_text_extents_t));
1131      cairo_text_extents (cr, p, &extents);      cairo_text_extents (cr, p, &extents);
1132        g_assert(extents.width != 0.0);
1133    
1134      /* check if text needs to be truncated */      /* check if text needs to be truncated */
1135      int len = strlen(text)-2;      int trunc_at = strlen(text);
1136      while(extents.width > width) {      while(extents.width > width) {
1137          len--;  
1138          strcpy(p+len, "...");          /* cut off all utf8 multibyte remains so the actual */
1139            /* truncation only deals with one byte */
1140            while((p[trunc_at-1] & 0xc0) == 0x80) {
1141                trunc_at--;
1142                g_assert(trunc_at > 0);
1143            }
1144    
1145            trunc_at--;
1146            g_assert(trunc_at > 0);
1147    
1148            strcpy(p+trunc_at, "...");
1149          cairo_text_extents (cr, p, &extents);          cairo_text_extents (cr, p, &extents);
1150      }      }
1151    
# Line 1157  osd_render_centered_text(cairo_t *cr, in Line 1161  osd_render_centered_text(cairo_t *cr, in
1161    
1162      g_free(p);      g_free(p);
1163    
1164      /* skip + 1/4 line */      /* skip + 1/5 line */
1165      return y + 5*OSD_COORDINATES_FONT_SIZE/4;      return y + 6*OSD_COORDINATES_FONT_SIZE/5;
1166  }  }
1167    
1168  static void  static void
# Line 1166  osd_render_coordinates(osm_gps_map_osd_t Line 1170  osd_render_coordinates(osm_gps_map_osd_t
1170  {  {
1171      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1172    
1173        if(!priv->coordinates.surface)
1174            return;
1175    
1176      /* get current map position */      /* get current map position */
1177      gfloat lat, lon;      gfloat lat, lon;
1178      g_object_get(osd->widget, "latitude", &lat, "longitude", &lon, NULL);      g_object_get(osd->widget, "latitude", &lat, "longitude", &lon, NULL);
# Line 1181  osd_render_coordinates(osm_gps_map_osd_t Line 1188  osd_render_coordinates(osm_gps_map_osd_t
1188      priv->coordinates.lon = lon;      priv->coordinates.lon = lon;
1189    
1190      /* first fill with transparency */      /* first fill with transparency */
1191    
1192        g_assert(priv->coordinates.surface);
1193      cairo_t *cr = cairo_create(priv->coordinates.surface);      cairo_t *cr = cairo_create(priv->coordinates.surface);
1194      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1195      //    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 1209  osd_render_coordinates(osm_gps_map_osd_t Line 1218  osd_render_coordinates(osm_gps_map_osd_t
1218    
1219  #ifdef OSD_NAV  #ifdef OSD_NAV
1220  #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)
1221  #define OSD_NAV_H  (100)  #define OSD_NAV_H  (11*OSD_COORDINATES_FONT_SIZE)
1222    
1223    /* http://mathforum.org/library/drmath/view/55417.html */
1224    static float get_bearing(float lat1, float lon1, float lat2, float lon2) {
1225      return atan2( sin(lon2 - lon1) * cos(lat2),
1226                    cos(lat1) * sin(lat2) -
1227                    sin(lat1) * cos(lat2) * cos(lon2 - lon1));
1228    }
1229    
1230    /* http://mathforum.org/library/drmath/view/51722.html */
1231    static float get_distance(float lat1, float lon1, float lat2, float lon2) {
1232      float aob = acos(cos(lat1) * cos(lat2) * cos(lon2 - lon1) +
1233                       sin(lat1) * sin(lat2));
1234    
1235      //  return(aob * 3959.0);   /* great circle radius in miles */
1236    
1237      return(aob * 6371000.0);     /* great circle radius in meters */
1238    }
1239    
1240  static void  static void
1241  osd_render_nav(osm_gps_map_osd_t *osd)  osd_render_nav(osm_gps_map_osd_t *osd)
# Line 1220  osd_render_nav(osm_gps_map_osd_t *osd) Line 1246  osd_render_nav(osm_gps_map_osd_t *osd)
1246          return;          return;
1247    
1248      /* first fill with transparency */      /* first fill with transparency */
1249        g_assert(priv->nav.surface);
1250      cairo_t *cr = cairo_create(priv->nav.surface);      cairo_t *cr = cairo_create(priv->nav.surface);
1251      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1252      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);
1253      cairo_paint(cr);      cairo_paint(cr);
1254      cairo_set_operator(cr, CAIRO_OPERATOR_OVER);      cairo_set_operator(cr, CAIRO_OPERATOR_OVER);
1255    
# Line 1238  osd_render_nav(osm_gps_map_osd_t *osd) Line 1265  osd_render_nav(osm_gps_map_osd_t *osd)
1265      y = osd_render_centered_text(cr, y, OSD_NAV_W, priv->nav.name);      y = osd_render_centered_text(cr, y, OSD_NAV_W, priv->nav.name);
1266      y = osd_render_centered_text(cr, y, OSD_NAV_W, latitude);      y = osd_render_centered_text(cr, y, OSD_NAV_W, latitude);
1267      y = osd_render_centered_text(cr, y, OSD_NAV_W, longitude);      y = osd_render_centered_text(cr, y, OSD_NAV_W, longitude);
1268    
1269      g_free(latitude);      g_free(latitude);
1270      g_free(longitude);      g_free(longitude);
1271    
1272        /* everything below this is the compass. we need to know this */
1273        /* to differ between coordinate clicks and compass clicks */
1274        priv->nav.click_sep = y;
1275    
1276        /* draw the compass */
1277        int radius = (OSD_NAV_H - y - 5*OSD_COORDINATES_FONT_SIZE/4)/2;
1278        if(radius > OSD_NAV_W/2)
1279            radius = OSD_NAV_W/2;
1280    
1281        int x = OSD_NAV_W/2+1;
1282        y += radius;
1283    
1284        cairo_stroke (cr);
1285    
1286        /* draw background */
1287        cairo_arc(cr, x, y, radius, 0,  2*M_PI);
1288        cairo_set_source_rgba (cr, 1, 1, 1, 0.5);
1289        cairo_fill_preserve (cr);
1290        cairo_set_source_rgb (cr, 0, 0, 0);
1291        cairo_set_line_width (cr, 1);
1292        cairo_stroke (cr);
1293    
1294        /* draw pointer */
1295    #define ARROW_WIDTH     0.3
1296    #define ARROW_LENGTH    0.7
1297    
1298        coord_t mpos, *pos = osm_gps_map_get_gps (OSM_GPS_MAP(osd->widget));
1299        if(priv->nav.mode) {
1300            gfloat lat, lon;
1301            g_object_get(osd->widget, "latitude", &lat, "longitude", &lon, NULL);
1302            mpos.rlat = deg2rad(lat);
1303            mpos.rlon = deg2rad(lon);
1304            pos = &mpos;
1305        }
1306    
1307        if(pos) {
1308            float arot = get_bearing(pos->rlat, pos->rlon,
1309                         deg2rad(priv->nav.lat), deg2rad(priv->nav.lon));
1310    
1311            cairo_move_to(cr,
1312                          x + radius *  ARROW_LENGTH *  sin(arot),
1313                          y + radius *  ARROW_LENGTH * -cos(arot));
1314    
1315            cairo_line_to(cr,
1316                          x + radius * -ARROW_LENGTH *  sin(arot+ARROW_WIDTH),
1317                          y + radius * -ARROW_LENGTH * -cos(arot+ARROW_WIDTH));
1318    
1319            cairo_line_to(cr,
1320                          x + radius * -0.5 * ARROW_LENGTH *  sin(arot),
1321                          y + radius * -0.5 * ARROW_LENGTH * -cos(arot));
1322    
1323            cairo_line_to(cr,
1324                          x + radius * -ARROW_LENGTH *  sin(arot-ARROW_WIDTH),
1325                          y + radius * -ARROW_LENGTH * -cos(arot-ARROW_WIDTH));
1326    
1327            cairo_close_path(cr);
1328            if(priv->nav.mode)
1329                cairo_set_source_rgb (cr, 0, 0, 0);
1330            else
1331                cairo_set_source_rgb (cr, 0, 0, 0.8);
1332    
1333            cairo_fill (cr);
1334    
1335            y += radius + OSD_COORDINATES_FONT_SIZE/4;
1336    
1337            float dist = get_distance(pos->rlat, pos->rlon,
1338                            deg2rad(priv->nav.lat), deg2rad(priv->nav.lon));
1339    
1340            char *dist_str = NULL;
1341            if(!priv->nav.imperial) {
1342                /* metric is easy ... */
1343                if(dist<1000)
1344                    dist_str = g_strdup_printf("%u m", (int)dist);
1345                else
1346                    dist_str = g_strdup_printf("%.1f km", dist/1000);
1347            } else {
1348                /* and now the hard part: scale for useful imperial values :-( */
1349                /* try to convert to feet, 1ft == 0.3048 m */
1350    
1351                if(dist/(3*0.3048) >= 1760.0)      /* more than 1760 yard? */
1352                    dist_str = g_strdup_printf("%.1f mi", dist/(0.3048*3*1760.0));
1353                else if(dist/0.3048 >= 100)        /* more than 100 feet? */
1354                    dist_str = g_strdup_printf("%.1f yd", dist/(0.3048*3));
1355                else
1356                    dist_str = g_strdup_printf("%.0f ft", dist/0.3048);
1357            }
1358    
1359            y = osd_render_centered_text(cr, y, OSD_NAV_W, dist_str);
1360            g_free(dist_str);
1361        }
1362    
1363      cairo_destroy(cr);      cairo_destroy(cr);
1364  }  }
1365    
1366    /* check if the user clicked inside the source selection area */
1367    static osd_button_t
1368    osd_nav_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y) {
1369        osd_priv_t *priv = (osd_priv_t*)osd->priv;
1370    
1371        if(!priv->nav.surface || down)
1372            return OSD_NONE;
1373    
1374        x -= OSD_X;
1375        if(OSD_X < 0)
1376            x -= (osd->widget->allocation.width - OSD_NAV_W);
1377    
1378        y -= (osd->widget->allocation.height - OSD_NAV_H)/2;
1379    
1380        if(x >= 0 && y >= 0 && x <= OSD_NAV_W && y <= OSD_NAV_H) {
1381            if(y < priv->nav.click_sep)
1382                osm_gps_map_set_center(OSM_GPS_MAP(osd->widget),
1383                                       priv->nav.lat, priv->nav.lon);
1384            else {
1385                priv->nav.mode = !priv->nav.mode;
1386                osm_gps_map_redraw(OSM_GPS_MAP(osd->widget));
1387            }
1388        }
1389    
1390        return OSD_NONE;
1391    }
1392    
1393  void osm_gps_map_osd_clear_nav (OsmGpsMap *map) {  void osm_gps_map_osd_clear_nav (OsmGpsMap *map) {
1394      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
1395    
# Line 1265  void osm_gps_map_osd_clear_nav (OsmGpsMa Line 1410  void osm_gps_map_osd_clear_nav (OsmGpsMa
1410  }  }
1411    
1412  void  void
1413  osm_gps_map_osd_draw_nav (OsmGpsMap *map, float latitude, float longitude,  osm_gps_map_osd_draw_nav (OsmGpsMap *map, gboolean imperial,
1414                            char *name) {                            float latitude, float longitude, char *name) {
1415      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
1416    
1417      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 1430  osm_gps_map_osd_draw_nav (OsmGpsMap *map
1430      priv->nav.lat = latitude;      priv->nav.lat = latitude;
1431      priv->nav.lon = longitude;      priv->nav.lon = longitude;
1432      priv->nav.name = g_strdup(name);      priv->nav.name = g_strdup(name);
1433        priv->nav.imperial = imperial;
1434    
1435      osd_render_nav(osd);      osd_render_nav(osd);
1436    
# Line 1293  osm_gps_map_osd_draw_nav (OsmGpsMap *map Line 1439  osm_gps_map_osd_draw_nav (OsmGpsMap *map
1439    
1440  #endif // OSD_NAV  #endif // OSD_NAV
1441    
1442    static osd_button_t
1443    osd_check_int(osm_gps_map_osd_t *osd, gboolean click, gboolean down, gint x, gint y) {
1444        osd_button_t but = OSD_NONE;
1445    
1446    #ifdef OSD_BALLOON
1447        if(down) {
1448            /* needed to handle balloons that are created at click */
1449            osd_priv_t *priv = (osd_priv_t*)osd->priv;
1450            priv->balloon.just_created = FALSE;
1451        }
1452    #endif
1453    
1454    #ifdef OSD_SOURCE_SEL
1455        /* the source selection area is handles internally */
1456        but = osd_source_check(osd, down, x, y);
1457    #endif
1458    
1459    #ifdef OSD_NAV
1460        if(but == OSD_NONE) {
1461            /* the source selection area is handles internally */
1462            but = osd_nav_check(osd, down, x, y);
1463        }
1464    #endif
1465    
1466        if(but == OSD_NONE) {
1467            gint mx = x - OSD_X;
1468            gint my = y - OSD_Y;
1469    
1470            if(OSD_X < 0)
1471                mx -= (osd->widget->allocation.width - OSD_W);
1472    
1473            if(OSD_Y < 0)
1474                my -= (osd->widget->allocation.height - OSD_H);
1475    
1476            /* first do a rough test for the OSD area. */
1477            /* this is just to avoid an unnecessary detailed test */
1478            if(mx > 0 && mx < OSD_W && my > 0 && my < OSD_H) {
1479    #ifndef OSD_NO_DPAD
1480                but = osd_check_dpad(mx, my);
1481    #endif
1482            }
1483    
1484            if(but == OSD_NONE)
1485                but = osd_check_zoom(mx, my);
1486        }
1487    
1488    #ifdef OSD_BALLOON
1489        if(but == OSD_NONE) {
1490            /* check if user clicked into balloon */
1491            if(osd_balloon_check(osd, click, down, x, y))
1492                but = OSD_BG;
1493        }
1494    #endif
1495    
1496        return but;
1497    }
1498    
1499    
1500  #ifdef OSD_CROSSHAIR  #ifdef OSD_CROSSHAIR
1501    
# Line 1332  osd_render_crosshair(osm_gps_map_osd_t * Line 1535  osd_render_crosshair(osm_gps_map_osd_t *
1535  {  {
1536      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1537    
1538      if(priv->crosshair.rendered)      if(!priv->crosshair.surface || priv->crosshair.rendered)
1539          return;          return;
1540    
1541      priv->crosshair.rendered = TRUE;      priv->crosshair.rendered = TRUE;
1542    
1543      /* first fill with transparency */      /* first fill with transparency */
1544        g_assert(priv->crosshair.surface);
1545      cairo_t *cr = cairo_create(priv->crosshair.surface);      cairo_t *cr = cairo_create(priv->crosshair.surface);
1546      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1547      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 1361  osd_render_crosshair(osm_gps_map_osd_t * Line 1565  osd_render_crosshair(osm_gps_map_osd_t *
1565  #ifdef OSD_SCALE  #ifdef OSD_SCALE
1566    
1567  #ifndef OSD_SCALE_FONT_SIZE  #ifndef OSD_SCALE_FONT_SIZE
1568  #define OSD_SCALE_FONT_SIZE 12  #define OSD_SCALE_FONT_SIZE (12.0)
1569  #endif  #endif
1570  #define OSD_SCALE_W   (10*OSD_SCALE_FONT_SIZE)  #define OSD_SCALE_W   (10*OSD_SCALE_FONT_SIZE)
1571  #define OSD_SCALE_H   (5*OSD_SCALE_FONT_SIZE/2)  #define OSD_SCALE_H   (5*OSD_SCALE_FONT_SIZE/2)
# Line 1378  osd_render_scale(osm_gps_map_osd_t *osd) Line 1582  osd_render_scale(osm_gps_map_osd_t *osd)
1582  {  {
1583      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1584    
1585        if(!priv->scale.surface)
1586            return;
1587    
1588      /* this only needs to be rendered if the zoom has changed */      /* this only needs to be rendered if the zoom has changed */
1589      gint zoom;      gint zoom;
1590      g_object_get(OSM_GPS_MAP(osd->widget), "zoom", &zoom, NULL);      g_object_get(OSM_GPS_MAP(osd->widget), "zoom", &zoom, NULL);
# Line 1389  osd_render_scale(osm_gps_map_osd_t *osd) Line 1596  osd_render_scale(osm_gps_map_osd_t *osd)
1596      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));
1597    
1598      /* first fill with transparency */      /* first fill with transparency */
1599        g_assert(priv->scale.surface);
1600      cairo_t *cr = cairo_create(priv->scale.surface);      cairo_t *cr = cairo_create(priv->scale.surface);
1601      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1602      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 1507  osd_render_controls(osm_gps_map_osd_t *o Line 1715  osd_render_controls(osm_gps_map_osd_t *o
1715  {  {
1716      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1717    
1718        if(!priv->controls.surface)
1719            return;
1720    
1721      if(priv->controls.rendered      if(priv->controls.rendered
1722  #ifdef OSD_GPS_BUTTON  #ifdef OSD_GPS_BUTTON
1723         && (priv->controls.gps_enabled == (osd->cb != NULL))         && (priv->controls.gps_enabled == (osd->cb != NULL))
# Line 1526  osd_render_controls(osm_gps_map_osd_t *o Line 1737  osd_render_controls(osm_gps_map_osd_t *o
1737  #endif  #endif
1738    
1739      /* first fill with transparency */      /* first fill with transparency */
1740        g_assert(priv->controls.surface);
1741      cairo_t *cr = cairo_create(priv->controls.surface);      cairo_t *cr = cairo_create(priv->controls.surface);
1742      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1743      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 1835  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 1854  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    
2076        /* reset entries to default value */
2077        osd_classic.widget = NULL;
2078        osd_classic.cb     = NULL;
2079        osd_classic.data   = NULL;
2080        osd_classic.priv   = priv;
2081    
2082  #ifdef OSD_BALLOON  #ifdef OSD_BALLOON
2083      priv->balloon.lat = OSM_GPS_MAP_INVALID;      priv->balloon.lat = OSM_GPS_MAP_INVALID;
2084      priv->balloon.lon = OSM_GPS_MAP_INVALID;      priv->balloon.lon = OSM_GPS_MAP_INVALID;
2085  #endif  #endif
2086    
     osd_classic.priv = priv;  
   
2087      osm_gps_map_register_osd(map, &osd_classic);      osm_gps_map_register_osd(map, &osd_classic);
2088  }  }
2089    
# Line 1890  osm_gps_map_osd_check(OsmGpsMap *map, gi Line 2111  osm_gps_map_osd_check(OsmGpsMap *map, gi
2111      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
2112      g_return_val_if_fail (osd, OSD_NONE);      g_return_val_if_fail (osd, OSD_NONE);
2113    
2114      return osd_check(osd, TRUE, x, y);      return osd_check_int(osd, FALSE, TRUE, x, y);
2115  }  }
Legend:
Removed from v.124  
changed lines
  Added in v.233