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

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

revision 132 by harbaum, Thu Oct 1 08:09:00 2009 UTC revision 145 by harbaum, Tue Oct 27 12:17:57 2009 UTC
# Line 82  typedef struct { Line 82  typedef struct {
82          cairo_surface_t *surface;          cairo_surface_t *surface;
83          float lat, lon;          float lat, lon;
84          char *name;          char *name;
85            gboolean imperial;    // display distance imperial/metric
86      } nav;      } nav;
87  #endif  #endif
88    
# Line 134  typedef struct { Line 135  typedef struct {
135    
136  #define CLOSE_BUTTON_RADIUS   (BALLOON_CORNER_RADIUS)  #define CLOSE_BUTTON_RADIUS   (BALLOON_CORNER_RADIUS)
137    
138    #define FIN   printf("entering function %s\n", __func__);
139    #define FOUT  printf("leaving function %s\n", __func__);
140    
141  /* draw the bubble shape. this is used twice, once for the shape and once */  /* draw the bubble shape. this is used twice, once for the shape and once */
142  /* for the shadow */  /* for the shadow */
# Line 141  static void Line 144  static void
144  osm_gps_map_draw_balloon_shape (cairo_t *cr, int x0, int y0, int x1, int y1,  osm_gps_map_draw_balloon_shape (cairo_t *cr, int x0, int y0, int x1, int y1,
145         gboolean bottom, int px, int py, int px0, int px1) {         gboolean bottom, int px, int py, int px0, int px1) {
146    
147        FIN;
148    
149      cairo_move_to (cr, x0, y0 + BALLOON_CORNER_RADIUS);      cairo_move_to (cr, x0, y0 + BALLOON_CORNER_RADIUS);
150      cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,      cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,
151                 BALLOON_CORNER_RADIUS, -M_PI, -M_PI/2);                 BALLOON_CORNER_RADIUS, -M_PI, -M_PI/2);
# Line 169  osm_gps_map_draw_balloon_shape (cairo_t Line 174  osm_gps_map_draw_balloon_shape (cairo_t
174                 BALLOON_CORNER_RADIUS, M_PI/2, M_PI);                 BALLOON_CORNER_RADIUS, M_PI/2, M_PI);
175    
176      cairo_close_path (cr);      cairo_close_path (cr);
177    
178        FOUT;
179  }  }
180    
181  static void  static void
182  osd_render_balloon(osm_gps_map_osd_t *osd) {  osd_render_balloon(osm_gps_map_osd_t *osd) {
183        FIN;
184    
185      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
186    
187      /* get zoom */      /* get zoom */
# Line 265  osd_render_balloon(osm_gps_map_osd_t *os Line 274  osd_render_balloon(osm_gps_map_osd_t *os
274      cairo_stroke (cr);      cairo_stroke (cr);
275    
276      if (priv->balloon.cb) {      if (priv->balloon.cb) {
277            osm_gps_map_balloon_event_t event;
278    
279          /* clip in case application tries to draw in */          /* clip in case application tries to draw in */
280              /* exceed of the balloon */              /* exceed of the balloon */
281          cairo_rectangle (cr, priv->balloon.rect.x, priv->balloon.rect.y,          cairo_rectangle (cr, priv->balloon.rect.x, priv->balloon.rect.y,
282                           priv->balloon.rect.w, priv->balloon.rect.h);                           priv->balloon.rect.w, priv->balloon.rect.h);
283          cairo_clip (cr);          cairo_clip (cr);
284          cairo_new_path (cr);  /* current path is not          cairo_new_path (cr);  /* current path is not consumed by cairo_clip */
285                                   consumed by cairo_clip() */  
286            /* request the application to draw the balloon contents */
287            event.type = OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW;
288            event.data.draw.rect = &priv->balloon.rect;
289            event.data.draw.cr = cr;
290    
291          priv->balloon.cb(cr, &priv->balloon.rect, priv->balloon.data);          priv->balloon.cb(&event, priv->balloon.data);
292      }      }
293    
294      cairo_destroy(cr);      cairo_destroy(cr);
295    
296        FOUT;
297  }  }
298    
299  /* return true if balloon is being displayed and if */  /* return true if balloon is being displayed and if */
300  /* the given coordinate is within this balloon */  /* the given coordinate is within this balloon */
301  static gboolean  static gboolean
302  osd_balloon_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y)  osd_balloon_check(osm_gps_map_osd_t *osd, gboolean click, gboolean down, gint x, gint y)
303  {  {
304        FIN;
305    
306      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
307    
308      if(!priv->balloon.surface)      if(!priv->balloon.surface)
# Line 301  osd_balloon_check(osm_gps_map_osd_t *osd Line 320  osd_balloon_check(osm_gps_map_osd_t *osd
320          (x > xs) && (x < xs + priv->balloon.rect.w) &&          (x > xs) && (x < xs + priv->balloon.rect.w) &&
321          (y > ys) && (y < ys + priv->balloon.rect.h);          (y > ys) && (y < ys + priv->balloon.rect.h);
322    
323      /* handle the fact that the balloon may have been created by the */      /* is this a real click or is the application just checking for something? */
324      /* button down event */      if(click) {
     if(!is_in && !down && !priv->balloon.just_created) {  
         /* the user actually clicked outside the balloon */  
325    
326          /* close the balloon! */          /* handle the fact that the balloon may have been created by the */
327          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(osd->widget));          /* button down event */
328      }          if(!is_in && !down && !priv->balloon.just_created) {
329                /* the user actually clicked outside the balloon */
330    
331                /* close the balloon! */
332                osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(osd->widget));
333    
334                /* and inform application about this */
335                if(priv->balloon.cb) {
336                    osm_gps_map_balloon_event_t event;
337                    event.type = OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED;
338                    priv->balloon.cb(&event, priv->balloon.data);
339                }
340    
341            }
342    
343            if(is_in && priv->balloon.cb) {
344                osm_gps_map_balloon_event_t event;
345    
346                /* notify application of click */
347                event.type = OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK;
348                event.data.click.x = x - xs;
349                event.data.click.y = y - ys;
350                event.data.click.down = down;
351    
352                priv->balloon.cb(&event, priv->balloon.data);
353            }
354        }
355        FOUT;
356      return is_in;      return is_in;
357  }  }
358    
359  void osm_gps_map_osd_clear_balloon (OsmGpsMap *map) {  void osm_gps_map_osd_clear_balloon (OsmGpsMap *map) {
360        FIN;
361    
362      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
363    
364      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
# Line 329  void osm_gps_map_osd_clear_balloon (OsmG Line 374  void osm_gps_map_osd_clear_balloon (OsmG
374          priv->balloon.lon = OSM_GPS_MAP_INVALID;          priv->balloon.lon = OSM_GPS_MAP_INVALID;
375      }      }
376      osm_gps_map_redraw(map);      osm_gps_map_redraw(map);
377        FOUT;
378  }  }
379    
380  void  void
381  osm_gps_map_osd_draw_balloon (OsmGpsMap *map, float latitude, float longitude,  osm_gps_map_osd_draw_balloon (OsmGpsMap *map, float latitude, float longitude,
382                                OsmGpsMapBalloonCallback cb, gpointer data) {                                OsmGpsMapBalloonCallback cb, gpointer data) {
383        FIN;
384      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
385    
386      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
# Line 360  osm_gps_map_osd_draw_balloon (OsmGpsMap Line 407  osm_gps_map_osd_draw_balloon (OsmGpsMap
407      osd_render_balloon(osd);      osd_render_balloon(osd);
408    
409      osm_gps_map_redraw(map);      osm_gps_map_redraw(map);
410        FOUT;
411  }  }
412    
413  #endif // OSD_BALLOON  #endif // OSD_BALLOON
# Line 504  osd_shape(cairo_t *cr) { Line 552  osd_shape(cairo_t *cr) {
552  static gboolean  static gboolean
553  osm_gps_map_in_circle(gint x, gint y, gint cx, gint cy, gint rad)  osm_gps_map_in_circle(gint x, gint y, gint cx, gint cy, gint rad)
554  {  {
555        FIN;
556      return( pow(cx - x, 2) + pow(cy - y, 2) < rad * rad);      return( pow(cx - x, 2) + pow(cy - y, 2) < rad * rad);
557  }  }
558    
# Line 702  osd_source_content(osm_gps_map_osd_t *os Line 751  osd_source_content(osm_gps_map_osd_t *os
751    
752  static void  static void
753  osd_render_source_sel(osm_gps_map_osd_t *osd, gboolean force_rerender) {  osd_render_source_sel(osm_gps_map_osd_t *osd, gboolean force_rerender) {
754        FIN;
755    
756      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
757    
758      if(priv->source_sel.rendered && !force_rerender)      if(priv->source_sel.rendered && !force_rerender)
# Line 748  osd_render_source_sel(osm_gps_map_osd_t Line 799  osd_render_source_sel(osm_gps_map_osd_t
799      cairo_stroke (cr);      cairo_stroke (cr);
800    
801      cairo_destroy(cr);      cairo_destroy(cr);
802        FOUT;
803  }  }
804    
805  /* re-allocate the buffer used to draw the menu. This is used */  /* re-allocate the buffer used to draw the menu. This is used */
806  /* to collapse/expand the buffer */  /* to collapse/expand the buffer */
807  static void  static void
808  osd_source_reallocate(osm_gps_map_osd_t *osd) {  osd_source_reallocate(osm_gps_map_osd_t *osd) {
809        FIN;
810      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
811    
812      /* re-allocate offscreen bitmap */      /* re-allocate offscreen bitmap */
# Line 794  osd_source_reallocate(osm_gps_map_osd_t Line 847  osd_source_reallocate(osm_gps_map_osd_t
847          cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w+2, h+2);          cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w+2, h+2);
848    
849      osd_render_source_sel(osd, TRUE);      osd_render_source_sel(osd, TRUE);
850        FOUT;
851  }  }
852    
853  #define OSD_HZ      15  #define OSD_HZ      15
854  #define OSD_TIME    500  #define OSD_TIME    500
855    
856  static gboolean osd_source_animate(gpointer data) {  static gboolean osd_source_animate(gpointer data) {
857        FIN;
858      osm_gps_map_osd_t *osd = (osm_gps_map_osd_t*)data;      osm_gps_map_osd_t *osd = (osm_gps_map_osd_t*)data;
859      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
860      int diff = OSD_S_EXP_W - OSD_S_W - OSD_S_X;      int diff = OSD_S_EXP_W - OSD_S_W - OSD_S_X;
# Line 838  static gboolean osd_source_animate(gpoin Line 893  static gboolean osd_source_animate(gpoin
893      if(done)      if(done)
894          priv->source_sel.handler_id = 0;          priv->source_sel.handler_id = 0;
895    
896        FOUT;
897      return !done;      return !done;
898  }  }
899    
# Line 845  static gboolean osd_source_animate(gpoin Line 901  static gboolean osd_source_animate(gpoin
901  static void  static void
902  osd_source_toggle(osm_gps_map_osd_t *osd)  osd_source_toggle(osm_gps_map_osd_t *osd)
903  {  {
904        FIN;
905      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
906    
907      /* ignore clicks while animation is running */      /* ignore clicks while animation is running */
# Line 870  osd_source_toggle(osm_gps_map_osd_t *osd Line 927  osd_source_toggle(osm_gps_map_osd_t *osd
927      /* start timer to handle animation */      /* start timer to handle animation */
928      priv->source_sel.handler_id = gtk_timeout_add(OSD_TIME/OSD_HZ,      priv->source_sel.handler_id = gtk_timeout_add(OSD_TIME/OSD_HZ,
929                                                    osd_source_animate, osd);                                                    osd_source_animate, osd);
930        FOUT;
931  }  }
932    
933  /* check if the user clicked inside the source selection area */  /* check if the user clicked inside the source selection area */
934  static osd_button_t  static osd_button_t
935  osd_source_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y) {  osd_source_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y) {
936        FIN;
937      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
938    
939      if(!priv->source_sel.expanded)      if(!priv->source_sel.expanded)
# Line 932  osd_source_check(osm_gps_map_osd_t *osd, Line 991  osd_source_check(osm_gps_map_osd_t *osd,
991                      osm_gps_map_repaint(OSM_GPS_MAP(osd->widget));                      osm_gps_map_repaint(OSM_GPS_MAP(osd->widget));
992                  }                  }
993              }              }
994    
995              /* return "clicked in OSD background" to prevent further */              /* return "clicked in OSD background" to prevent further */
996              /* processing by application */              /* processing by application */
997              return OSD_BG;              return OSD_BG;
998          }          }
999      }      }
1000    
1001        FOUT;
1002      return OSD_NONE;      return OSD_NONE;
1003  }  }
1004  #endif // OSD_SOURCE_SEL  #endif // OSD_SOURCE_SEL
1005    
1006  static osd_button_t  static osd_button_t
1007  osd_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y) {  osd_check_int(osm_gps_map_osd_t *osd, gboolean click, gboolean down, gint x, gint y) {
1008        FIN;
1009      osd_button_t but = OSD_NONE;      osd_button_t but = OSD_NONE;
1010    
1011  #ifdef OSD_BALLOON  #ifdef OSD_BALLOON
# Line 985  osd_check(osm_gps_map_osd_t *osd, gboole Line 1046  osd_check(osm_gps_map_osd_t *osd, gboole
1046  #ifdef OSD_BALLOON  #ifdef OSD_BALLOON
1047      if(but == OSD_NONE) {      if(but == OSD_NONE) {
1048          /* check if user clicked into balloon */          /* check if user clicked into balloon */
1049          if(osd_balloon_check(osd, down, x, y))          if(osd_balloon_check(osd, click, down, x, y))
1050              but = OSD_BG;              but = OSD_BG;
1051      }      }
1052  #endif  #endif
1053    
1054        FOUT;
1055      return but;      return but;
1056  }  }
1057    
# Line 1133  static char Line 1195  static char
1195  /* render a string at the given screen position */  /* render a string at the given screen position */
1196  static int  static int
1197  osd_render_centered_text(cairo_t *cr, int y, int width, char *text) {  osd_render_centered_text(cairo_t *cr, int y, int width, char *text) {
1198      char *p = g_strdup(text);      FIN;
1199    
1200        printf("params: %p %d %d %p\n", cr, y, width, text); // XXX
1201    
1202        if(!text) return y;
1203    
1204        printf("text given: %s\n", text); // XXX
1205    
1206        char *p = g_malloc(strlen(text)+4);  // space for "...\n"
1207        strcpy(p, text);
1208    
1209      cairo_text_extents_t extents;      cairo_text_extents_t extents;
1210        printf("getting extents for \"%s\"\n", p);  // XXX
1211      cairo_text_extents (cr, p, &extents);      cairo_text_extents (cr, p, &extents);
1212        printf("initial extents.width = %f\n", extents.width);  // XXX
1213    
1214      /* check if text needs to be truncated */      /* check if text needs to be truncated */
1215      int len = strlen(text)-2;      int trunc_at = strlen(text)-1;
1216      while(extents.width > width) {      while(extents.width > width) {
1217          len--;          g_assert(trunc_at > 0);
1218          strcpy(p+len, "...");  
1219            printf("trunc at %d\n", trunc_at);  // XXX
1220            printf("extents.width = %f > %d\n", extents.width, width);  // XXX
1221    
1222            trunc_at--;
1223            strcpy(p+trunc_at, "...");
1224            printf("getting extents for \"%s\"\n", p);  // XXX
1225          cairo_text_extents (cr, p, &extents);          cairo_text_extents (cr, p, &extents);
1226      }      }
1227    
1228        printf("painting\n"); // XXX
1229    
1230      cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);      cairo_set_source_rgb(cr, 1.0, 1.0, 1.0);
1231      cairo_set_line_width (cr, OSD_COORDINATES_FONT_SIZE/6);      cairo_set_line_width (cr, OSD_COORDINATES_FONT_SIZE/6);
1232      cairo_move_to (cr, (width - extents.width)/2, y - extents.y_bearing);      cairo_move_to (cr, (width - extents.width)/2, y - extents.y_bearing);
# Line 1157  osd_render_centered_text(cairo_t *cr, in Line 1239  osd_render_centered_text(cairo_t *cr, in
1239    
1240      g_free(p);      g_free(p);
1241    
1242      /* skip + 1/4 line */      /* skip + 1/5 line */
1243      return y + 5*OSD_COORDINATES_FONT_SIZE/4;      FOUT;
1244        return y + 6*OSD_COORDINATES_FONT_SIZE/5;
1245  }  }
1246    
1247  static void  static void
1248  osd_render_coordinates(osm_gps_map_osd_t *osd)  osd_render_coordinates(osm_gps_map_osd_t *osd)
1249  {  {
1250        FIN;
1251      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1252    
1253      /* get current map position */      /* get current map position */
# Line 1204  osd_render_coordinates(osm_gps_map_osd_t Line 1288  osd_render_coordinates(osm_gps_map_osd_t
1288      g_free(longitude);      g_free(longitude);
1289    
1290      cairo_destroy(cr);      cairo_destroy(cr);
1291        FOUT;
1292  }  }
1293  #endif  // OSD_COORDINATES  #endif  // OSD_COORDINATES
1294    
1295  #ifdef OSD_NAV  #ifdef OSD_NAV
1296  #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)
1297  #define OSD_NAV_H  (130)  #define OSD_NAV_H  (11*OSD_COORDINATES_FONT_SIZE)
1298    
1299  /* http://mathforum.org/library/drmath/view/55417.html */  /* http://mathforum.org/library/drmath/view/55417.html */
1300  static float get_bearing(float lat1, float lon1, float lat2, float lon2) {  static float get_bearing(float lat1, float lon1, float lat2, float lon2) {
# Line 1231  static float get_distance(float lat1, fl Line 1316  static float get_distance(float lat1, fl
1316  static void  static void
1317  osd_render_nav(osm_gps_map_osd_t *osd)  osd_render_nav(osm_gps_map_osd_t *osd)
1318  {  {
1319        FIN;
1320      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1321    
1322      if(!priv->nav.surface || isnan(priv->nav.lat) || isnan(priv->nav.lon))      if(!priv->nav.surface || isnan(priv->nav.lat) || isnan(priv->nav.lon))
# Line 1312  osd_render_nav(osm_gps_map_osd_t *osd) Line 1398  osd_render_nav(osm_gps_map_osd_t *osd)
1398                          deg2rad(priv->nav.lat), deg2rad(priv->nav.lon));                          deg2rad(priv->nav.lat), deg2rad(priv->nav.lon));
1399    
1400          char *dist_str = NULL;          char *dist_str = NULL;
1401          if(dist<1000)          if(!priv->nav.imperial) {
1402              dist_str = g_strdup_printf("%u m", (int)dist);              /* metric is easy ... */
1403          else              if(dist<1000)
1404              dist_str = g_strdup_printf("%.1f km", dist/1000);                  dist_str = g_strdup_printf("%u m", (int)dist);
1405                else
1406                    dist_str = g_strdup_printf("%.1f km", dist/1000);
1407            } else {
1408                /* and now the hard part: scale for useful imperial values :-( */
1409                /* try to convert to feet, 1ft == 0.3048 m */
1410    
1411                if(dist/(3*0.3048) >= 1760.0)      /* more than 1760 yard? */
1412                    dist_str = g_strdup_printf("%.1f mi", dist/(0.3048*3*1760.0));
1413                else if(dist/0.3048 >= 100)        /* more than 100 feet? */
1414                    dist_str = g_strdup_printf("%.1f yd", dist/(0.3048*3));
1415                else
1416                    dist_str = g_strdup_printf("%.0f ft", dist/0.3048);
1417            }
1418    
1419          y = osd_render_centered_text(cr, y, OSD_NAV_W, dist_str);          y = osd_render_centered_text(cr, y, OSD_NAV_W, dist_str);
1420          g_free(dist_str);          g_free(dist_str);
1421      }      }
1422    
1423      cairo_destroy(cr);      cairo_destroy(cr);
1424        FOUT;
1425  }  }
1426    
1427  void osm_gps_map_osd_clear_nav (OsmGpsMap *map) {  void osm_gps_map_osd_clear_nav (OsmGpsMap *map) {
1428        FIN;
1429      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
1430    
1431      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 1341  void osm_gps_map_osd_clear_nav (OsmGpsMa Line 1442  void osm_gps_map_osd_clear_nav (OsmGpsMa
1442          if(priv->nav.name) g_free(priv->nav.name);          if(priv->nav.name) g_free(priv->nav.name);
1443      }      }
1444      osm_gps_map_redraw(map);      osm_gps_map_redraw(map);
1445        FOUT;
1446  }  }
1447    
1448  void  void
1449  osm_gps_map_osd_draw_nav (OsmGpsMap *map, float latitude, float longitude,  osm_gps_map_osd_draw_nav (OsmGpsMap *map, gboolean imperial,
1450                            char *name) {                            float latitude, float longitude, char *name) {
1451        FIN;
1452      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
1453    
1454      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 1364  osm_gps_map_osd_draw_nav (OsmGpsMap *map Line 1467  osm_gps_map_osd_draw_nav (OsmGpsMap *map
1467      priv->nav.lat = latitude;      priv->nav.lat = latitude;
1468      priv->nav.lon = longitude;      priv->nav.lon = longitude;
1469      priv->nav.name = g_strdup(name);      priv->nav.name = g_strdup(name);
1470        priv->nav.imperial = imperial;
1471    
1472      osd_render_nav(osd);      osd_render_nav(osd);
1473    
1474      osm_gps_map_redraw(map);      osm_gps_map_redraw(map);
1475        FOUT;
1476  }  }
1477    
1478  #endif // OSD_NAV  #endif // OSD_NAV
# Line 1386  osm_gps_map_osd_draw_nav (OsmGpsMap *map Line 1491  osm_gps_map_osd_draw_nav (OsmGpsMap *map
1491    
1492  static void  static void
1493  osd_render_crosshair_shape(cairo_t *cr) {  osd_render_crosshair_shape(cairo_t *cr) {
1494        FIN;
1495      cairo_arc (cr, OSD_CROSSHAIR_W/2, OSD_CROSSHAIR_H/2,      cairo_arc (cr, OSD_CROSSHAIR_W/2, OSD_CROSSHAIR_H/2,
1496                 OSD_CROSSHAIR_RADIUS, 0,  2*M_PI);                 OSD_CROSSHAIR_RADIUS, 0,  2*M_PI);
1497    
# Line 1404  osd_render_crosshair_shape(cairo_t *cr) Line 1510  osd_render_crosshair_shape(cairo_t *cr)
1510      cairo_rel_line_to (cr, 0, OSD_CROSSHAIR_TICK);      cairo_rel_line_to (cr, 0, OSD_CROSSHAIR_TICK);
1511    
1512      cairo_stroke (cr);      cairo_stroke (cr);
1513        FOUT;
1514  }  }
1515    
1516  static void  static void
1517  osd_render_crosshair(osm_gps_map_osd_t *osd)  osd_render_crosshair(osm_gps_map_osd_t *osd)
1518  {  {
1519        FIN;
1520      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1521    
1522      if(priv->crosshair.rendered)      if(priv->crosshair.rendered)
# Line 1434  osd_render_crosshair(osm_gps_map_osd_t * Line 1542  osd_render_crosshair(osm_gps_map_osd_t *
1542      osd_render_crosshair_shape(cr);      osd_render_crosshair_shape(cr);
1543    
1544      cairo_destroy(cr);      cairo_destroy(cr);
1545        FOUT;
1546  }  }
1547  #endif  #endif
1548    
# Line 1455  osd_render_crosshair(osm_gps_map_osd_t * Line 1564  osd_render_crosshair(osm_gps_map_osd_t *
1564  static void  static void
1565  osd_render_scale(osm_gps_map_osd_t *osd)  osd_render_scale(osm_gps_map_osd_t *osd)
1566  {  {
1567        FIN;
1568      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1569    
1570      /* this only needs to be rendered if the zoom has changed */      /* this only needs to be rendered if the zoom has changed */
# Line 1578  osd_render_scale(osm_gps_map_osd_t *osd) Line 1688  osd_render_scale(osm_gps_map_osd_t *osd)
1688      cairo_stroke(cr);      cairo_stroke(cr);
1689    
1690      cairo_destroy(cr);      cairo_destroy(cr);
1691        FOUT;
1692  }  }
1693  #endif  #endif
1694    
1695  static void  static void
1696  osd_render_controls(osm_gps_map_osd_t *osd)  osd_render_controls(osm_gps_map_osd_t *osd)
1697  {  {
1698        FIN;
1699      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1700    
1701      if(priv->controls.rendered      if(priv->controls.rendered
# Line 1857  osd_draw(osm_gps_map_osd_t *osd, GdkDraw Line 1969  osd_draw(osm_gps_map_osd_t *osd, GdkDraw
1969  #endif  #endif
1970    
1971      cairo_destroy(cr);      cairo_destroy(cr);
1972        FOUT;
1973  }  }
1974    
1975  static void  static void
1976  osd_free(osm_gps_map_osd_t *osd)  osd_free(osm_gps_map_osd_t *osd)
1977  {  {
1978        FIN;
1979      osd_priv_t *priv = (osd_priv_t *)(osd->priv);      osd_priv_t *priv = (osd_priv_t *)(osd->priv);
1980    
1981      if (priv->controls.surface)      if (priv->controls.surface)
# Line 1901  osd_free(osm_gps_map_osd_t *osd) Line 2015  osd_free(osm_gps_map_osd_t *osd)
2015  #endif  #endif
2016    
2017      g_free(priv);      g_free(priv);
2018        FOUT;
2019  }  }
2020    
2021  static gboolean  static gboolean
2022  osd_busy(osm_gps_map_osd_t *osd)  osd_busy(osm_gps_map_osd_t *osd)
2023  {  {
2024        FIN;
2025  #ifdef OSD_SOURCE_SEL  #ifdef OSD_SOURCE_SEL
2026      osd_priv_t *priv = (osd_priv_t *)(osd->priv);      osd_priv_t *priv = (osd_priv_t *)(osd->priv);
2027      return (priv->source_sel.handler_id != 0);      return (priv->source_sel.handler_id != 0);
# Line 1914  osd_busy(osm_gps_map_osd_t *osd) Line 2030  osd_busy(osm_gps_map_osd_t *osd)
2030  #endif  #endif
2031  }  }
2032    
2033    static osd_button_t
2034    osd_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y) {
2035        FIN;
2036        return osd_check_int(osd, TRUE, down, x, y);
2037    }
2038    
2039  static osm_gps_map_osd_t osd_classic = {  static osm_gps_map_osd_t osd_classic = {
2040      .widget     = NULL,      .widget     = NULL,
2041    
# Line 1933  static osm_gps_map_osd_t osd_classic = { Line 2055  static osm_gps_map_osd_t osd_classic = {
2055  void  void
2056  osm_gps_map_osd_classic_init(OsmGpsMap *map)  osm_gps_map_osd_classic_init(OsmGpsMap *map)
2057  {  {
2058        FIN;
2059      osd_priv_t *priv = osd_classic.priv = g_new0(osd_priv_t, 1);      osd_priv_t *priv = osd_classic.priv = g_new0(osd_priv_t, 1);
2060    
2061  #ifdef OSD_BALLOON  #ifdef OSD_BALLOON
# Line 1943  osm_gps_map_osd_classic_init(OsmGpsMap * Line 2066  osm_gps_map_osd_classic_init(OsmGpsMap *
2066      osd_classic.priv = priv;      osd_classic.priv = priv;
2067    
2068      osm_gps_map_register_osd(map, &osd_classic);      osm_gps_map_register_osd(map, &osd_classic);
2069        FOUT;
2070  }  }
2071    
2072  #ifdef OSD_GPS_BUTTON  #ifdef OSD_GPS_BUTTON
# Line 1950  osm_gps_map_osd_classic_init(OsmGpsMap * Line 2074  osm_gps_map_osd_classic_init(OsmGpsMap *
2074  /* but instead are to be used by the main application */  /* but instead are to be used by the main application */
2075  void osm_gps_map_osd_enable_gps (OsmGpsMap *map, OsmGpsMapOsdCallback cb,  void osm_gps_map_osd_enable_gps (OsmGpsMap *map, OsmGpsMapOsdCallback cb,
2076                                   gpointer data) {                                   gpointer data) {
2077        FIN;
2078      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
2079      g_return_if_fail (osd);      g_return_if_fail (osd);
2080    
# Line 1961  void osm_gps_map_osd_enable_gps (OsmGpsM Line 2086  void osm_gps_map_osd_enable_gps (OsmGpsM
2086      osd->render(osd);      osd->render(osd);
2087    
2088      osm_gps_map_redraw(map);      osm_gps_map_redraw(map);
2089        FOUT;
2090  }  }
2091  #endif  #endif
2092    
2093  osd_button_t  osd_button_t
2094  osm_gps_map_osd_check(OsmGpsMap *map, gint x, gint y) {  osm_gps_map_osd_check(OsmGpsMap *map, gint x, gint y) {
2095        FIN;
2096      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
2097      g_return_val_if_fail (osd, OSD_NONE);      g_return_val_if_fail (osd, OSD_NONE);
2098    
2099      return osd_check(osd, TRUE, x, y);      return osd_check_int(osd, FALSE, TRUE, x, y);
2100  }  }
Legend:
Removed from v.132  
changed lines
  Added in v.145