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

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

revision 202 by harbaum, Sat Nov 21 20:13:13 2009 UTC revision 231 by harbaum, Mon Dec 7 16:14:50 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          gboolean imperial, mode;    // display distance imperial/metric
86            int click_sep;
87      } nav;      } nav;
88  #endif  #endif
89    
# Line 135  typedef struct { Line 136  typedef struct {
136    
137  #define CLOSE_BUTTON_RADIUS   (BALLOON_CORNER_RADIUS)  #define CLOSE_BUTTON_RADIUS   (BALLOON_CORNER_RADIUS)
138    
 #if 0  
 #define FIN   printf("entering function %s\n", __func__);  
 #define FOUT  printf("leaving function %s\n", __func__);  
 #else  
 #define FIN   ;  
 #define FOUT  ;  
 #endif  
   
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
142  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,
143         gboolean bottom, int px, int py, int px0, int px1) {         gboolean bottom, int px, int py, int px0, int px1) {
144    
     FIN;  
   
145      cairo_move_to (cr, x0, y0 + BALLOON_CORNER_RADIUS);      cairo_move_to (cr, x0, y0 + BALLOON_CORNER_RADIUS);
146      cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,      cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,
147                 BALLOON_CORNER_RADIUS, -M_PI, -M_PI/2);                 BALLOON_CORNER_RADIUS, -M_PI, -M_PI/2);
# Line 179  osm_gps_map_draw_balloon_shape (cairo_t Line 170  osm_gps_map_draw_balloon_shape (cairo_t
170                 BALLOON_CORNER_RADIUS, M_PI/2, M_PI);                 BALLOON_CORNER_RADIUS, M_PI/2, M_PI);
171    
172      cairo_close_path (cr);      cairo_close_path (cr);
   
     FOUT;  
173  }  }
174    
175  static void  static void
176  osd_render_balloon(osm_gps_map_osd_t *osd) {  osd_render_balloon(osm_gps_map_osd_t *osd) {
     FIN;  
   
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)      if(!priv->balloon.surface)
# Line 301  osd_render_balloon(osm_gps_map_osd_t *os Line 288  osd_render_balloon(osm_gps_map_osd_t *os
288      }      }
289    
290      cairo_destroy(cr);      cairo_destroy(cr);
   
     FOUT;  
291  }  }
292    
293  /* return true if balloon is being displayed and if */  /* return true if balloon is being displayed and if */
# Line 310  osd_render_balloon(osm_gps_map_osd_t *os Line 295  osd_render_balloon(osm_gps_map_osd_t *os
295  static gboolean  static gboolean
296  osd_balloon_check(osm_gps_map_osd_t *osd, gboolean click, gboolean down, gint x, gint y)  osd_balloon_check(osm_gps_map_osd_t *osd, gboolean click, gboolean down, gint x, gint y)
297  {  {
     FIN;  
   
298      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
299    
300      if(!priv->balloon.surface)      if(!priv->balloon.surface)
# Line 361  osd_balloon_check(osm_gps_map_osd_t *osd Line 344  osd_balloon_check(osm_gps_map_osd_t *osd
344              priv->balloon.cb(&event, priv->balloon.data);              priv->balloon.cb(&event, priv->balloon.data);
345          }          }
346      }      }
     FOUT;  
347      return is_in;      return is_in;
348  }  }
349    
350  void osm_gps_map_osd_clear_balloon (OsmGpsMap *map) {  void osm_gps_map_osd_clear_balloon (OsmGpsMap *map) {
     FIN;  
   
351      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
352    
353      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 383  void osm_gps_map_osd_clear_balloon (OsmG Line 363  void osm_gps_map_osd_clear_balloon (OsmG
363          priv->balloon.lon = OSM_GPS_MAP_INVALID;          priv->balloon.lon = OSM_GPS_MAP_INVALID;
364      }      }
365      osm_gps_map_redraw(map);      osm_gps_map_redraw(map);
     FOUT;  
366  }  }
367    
368  void  void
369  osm_gps_map_osd_draw_balloon (OsmGpsMap *map, float latitude, float longitude,  osm_gps_map_osd_draw_balloon (OsmGpsMap *map, float latitude, float longitude,
370                                OsmGpsMapBalloonCallback cb, gpointer data) {                                OsmGpsMapBalloonCallback cb, gpointer data) {
     FIN;  
371      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
372    
373      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 416  osm_gps_map_osd_draw_balloon (OsmGpsMap Line 394  osm_gps_map_osd_draw_balloon (OsmGpsMap
394      osd_render_balloon(osd);      osd_render_balloon(osd);
395    
396      osm_gps_map_redraw(map);      osm_gps_map_redraw(map);
     FOUT;  
397  }  }
398    
399  #endif // OSD_BALLOON  #endif // OSD_BALLOON
# Line 561  osd_shape(cairo_t *cr) { Line 538  osd_shape(cairo_t *cr) {
538  static gboolean  static gboolean
539  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)
540  {  {
     FIN;  
541      return( pow(cx - x, 2) + pow(cy - y, 2) < rad * rad);      return( pow(cx - x, 2) + pow(cy - y, 2) < rad * rad);
542  }  }
543    
# Line 760  osd_source_content(osm_gps_map_osd_t *os Line 736  osd_source_content(osm_gps_map_osd_t *os
736    
737  static void  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) {
     FIN;  
   
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.surface ||      if(!priv->source_sel.surface ||
# Line 810  osd_render_source_sel(osm_gps_map_osd_t Line 784  osd_render_source_sel(osm_gps_map_osd_t
784      cairo_stroke (cr);      cairo_stroke (cr);
785    
786      cairo_destroy(cr);      cairo_destroy(cr);
     FOUT;  
787  }  }
788    
789  /* re-allocate the buffer used to draw the menu. This is used */  /* re-allocate the buffer used to draw the menu. This is used */
790  /* to collapse/expand the buffer */  /* to collapse/expand the buffer */
791  static void  static void
792  osd_source_reallocate(osm_gps_map_osd_t *osd) {  osd_source_reallocate(osm_gps_map_osd_t *osd) {
     FIN;  
793      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
794    
795      /* re-allocate offscreen bitmap */      /* re-allocate offscreen bitmap */
# Line 859  osd_source_reallocate(osm_gps_map_osd_t Line 831  osd_source_reallocate(osm_gps_map_osd_t
831          cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w+2, h+2);          cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w+2, h+2);
832    
833      osd_render_source_sel(osd, TRUE);      osd_render_source_sel(osd, TRUE);
     FOUT;  
834  }  }
835    
836  #define OSD_HZ      15  #define OSD_HZ      15
837  #define OSD_TIME    500  #define OSD_TIME    500
838    
839  static gboolean osd_source_animate(gpointer data) {  static gboolean osd_source_animate(gpointer data) {
     FIN;  
840      osm_gps_map_osd_t *osd = (osm_gps_map_osd_t*)data;      osm_gps_map_osd_t *osd = (osm_gps_map_osd_t*)data;
841      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
842      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 905  static gboolean osd_source_animate(gpoin Line 875  static gboolean osd_source_animate(gpoin
875      if(done)      if(done)
876          priv->source_sel.handler_id = 0;          priv->source_sel.handler_id = 0;
877    
     FOUT;  
878      return !done;      return !done;
879  }  }
880    
# Line 913  static gboolean osd_source_animate(gpoin Line 882  static gboolean osd_source_animate(gpoin
882  static void  static void
883  osd_source_toggle(osm_gps_map_osd_t *osd)  osd_source_toggle(osm_gps_map_osd_t *osd)
884  {  {
     FIN;  
885      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
886    
887      /* ignore clicks while animation is running */      /* ignore clicks while animation is running */
# Line 939  osd_source_toggle(osm_gps_map_osd_t *osd Line 907  osd_source_toggle(osm_gps_map_osd_t *osd
907      /* start timer to handle animation */      /* start timer to handle animation */
908      priv->source_sel.handler_id = gtk_timeout_add(OSD_TIME/OSD_HZ,      priv->source_sel.handler_id = gtk_timeout_add(OSD_TIME/OSD_HZ,
909                                                    osd_source_animate, osd);                                                    osd_source_animate, osd);
     FOUT;  
910  }  }
911    
912  /* check if the user clicked inside the source selection area */  /* check if the user clicked inside the source selection area */
913  static osd_button_t  static osd_button_t
914  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) {
     FIN;  
915      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
916    
917      if(!priv->source_sel.expanded)      if(!priv->source_sel.expanded)
# Line 1010  osd_source_check(osm_gps_map_osd_t *osd, Line 976  osd_source_check(osm_gps_map_osd_t *osd,
976          }          }
977      }      }
978    
     FOUT;  
979      return OSD_NONE;      return OSD_NONE;
980  }  }
981  #endif // OSD_SOURCE_SEL  #endif // OSD_SOURCE_SEL
# Line 1155  static char Line 1120  static char
1120  /* render a string at the given screen position */  /* render a string at the given screen position */
1121  static int  static int
1122  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) {
     FIN;  
   
1123      if(!text) return y;      if(!text) return y;
1124    
1125      char *p = g_malloc(strlen(text)+4);  // space for "...\n"      char *p = g_malloc(strlen(text)+4);  // space for "...\n"
# Line 1198  osd_render_centered_text(cairo_t *cr, in Line 1161  osd_render_centered_text(cairo_t *cr, in
1161      g_free(p);      g_free(p);
1162    
1163      /* skip + 1/5 line */      /* skip + 1/5 line */
     FOUT;  
1164      return y + 6*OSD_COORDINATES_FONT_SIZE/5;      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  {  {
     FIN;  
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)      if(!priv->coordinates.surface)
# Line 1251  osd_render_coordinates(osm_gps_map_osd_t Line 1212  osd_render_coordinates(osm_gps_map_osd_t
1212      g_free(longitude);      g_free(longitude);
1213    
1214      cairo_destroy(cr);      cairo_destroy(cr);
     FOUT;  
1215  }  }
1216  #endif  // OSD_COORDINATES  #endif  // OSD_COORDINATES
1217    
# Line 1279  static float get_distance(float lat1, fl Line 1239  static float get_distance(float lat1, fl
1239  static void  static void
1240  osd_render_nav(osm_gps_map_osd_t *osd)  osd_render_nav(osm_gps_map_osd_t *osd)
1241  {  {
     FIN;  
1242      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1243    
1244      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 1305  osd_render_nav(osm_gps_map_osd_t *osd) Line 1264  osd_render_nav(osm_gps_map_osd_t *osd)
1264      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);
1265      y = osd_render_centered_text(cr, y, OSD_NAV_W, latitude);      y = osd_render_centered_text(cr, y, OSD_NAV_W, latitude);
1266      y = osd_render_centered_text(cr, y, OSD_NAV_W, longitude);      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 */      /* draw the compass */
1276      int radius = (OSD_NAV_H - y - 5*OSD_COORDINATES_FONT_SIZE/4)/2;      int radius = (OSD_NAV_H - y - 5*OSD_COORDINATES_FONT_SIZE/4)/2;
1277      if(radius > OSD_NAV_W/2)      if(radius > OSD_NAV_W/2)
# Line 1331  osd_render_nav(osm_gps_map_osd_t *osd) Line 1294  osd_render_nav(osm_gps_map_osd_t *osd)
1294  #define ARROW_WIDTH     0.3  #define ARROW_WIDTH     0.3
1295  #define ARROW_LENGTH    0.7  #define ARROW_LENGTH    0.7
1296    
1297      coord_t *gps = osm_gps_map_get_gps (OSM_GPS_MAP(osd->widget));      coord_t mpos, *pos = osm_gps_map_get_gps (OSM_GPS_MAP(osd->widget));
1298      if(gps) {      if(priv->nav.mode) {
1299          float arot = get_bearing(gps->rlat, gps->rlon,          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));                       deg2rad(priv->nav.lat), deg2rad(priv->nav.lon));
1309    
1310          cairo_move_to(cr,          cairo_move_to(cr,
# Line 1353  osd_render_nav(osm_gps_map_osd_t *osd) Line 1324  osd_render_nav(osm_gps_map_osd_t *osd)
1324                        y + radius * -ARROW_LENGTH * -cos(arot-ARROW_WIDTH));                        y + radius * -ARROW_LENGTH * -cos(arot-ARROW_WIDTH));
1325    
1326          cairo_close_path(cr);          cairo_close_path(cr);
1327          cairo_set_source_rgb (cr, 0, 0, 0);          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);          cairo_fill (cr);
1333    
1334          y += radius + OSD_COORDINATES_FONT_SIZE/4;          y += radius + OSD_COORDINATES_FONT_SIZE/4;
1335    
1336          float dist = get_distance(gps->rlat, gps->rlon,          float dist = get_distance(pos->rlat, pos->rlon,
1337                          deg2rad(priv->nav.lat), deg2rad(priv->nav.lon));                          deg2rad(priv->nav.lat), deg2rad(priv->nav.lon));
1338    
1339          char *dist_str = NULL;          char *dist_str = NULL;
# Line 1385  osd_render_nav(osm_gps_map_osd_t *osd) Line 1360  osd_render_nav(osm_gps_map_osd_t *osd)
1360      }      }
1361    
1362      cairo_destroy(cr);      cairo_destroy(cr);
     FOUT;  
1363  }  }
1364    
1365  /* check if the user clicked inside the source selection area */  /* check if the user clicked inside the source selection area */
1366  static osd_button_t  static osd_button_t
1367  osd_nav_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y) {  osd_nav_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y) {
     FIN;  
1368      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1369    
1370      if(!priv->nav.surface || down)      if(!priv->nav.surface || down)
# Line 1404  osd_nav_check(osm_gps_map_osd_t *osd, gb Line 1377  osd_nav_check(osm_gps_map_osd_t *osd, gb
1377      y -= (osd->widget->allocation.height - OSD_NAV_H)/2;      y -= (osd->widget->allocation.height - OSD_NAV_H)/2;
1378    
1379      if(x >= 0 && y >= 0 && x <= OSD_NAV_W && y <= OSD_NAV_H) {      if(x >= 0 && y >= 0 && x <= OSD_NAV_W && y <= OSD_NAV_H) {
1380          osm_gps_map_set_center(OSM_GPS_MAP(osd->widget),          if(y < priv->nav.click_sep)
1381                                 priv->nav.lat, priv->nav.lon);              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    
     FOUT;  
1389      return OSD_NONE;      return OSD_NONE;
1390  }  }
1391    
1392  void osm_gps_map_osd_clear_nav (OsmGpsMap *map) {  void osm_gps_map_osd_clear_nav (OsmGpsMap *map) {
     FIN;  
1393      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
1394    
1395      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 1430  void osm_gps_map_osd_clear_nav (OsmGpsMa Line 1406  void osm_gps_map_osd_clear_nav (OsmGpsMa
1406          if(priv->nav.name) g_free(priv->nav.name);          if(priv->nav.name) g_free(priv->nav.name);
1407      }      }
1408      osm_gps_map_redraw(map);      osm_gps_map_redraw(map);
     FOUT;  
1409  }  }
1410    
1411  void  void
1412  osm_gps_map_osd_draw_nav (OsmGpsMap *map, gboolean imperial,  osm_gps_map_osd_draw_nav (OsmGpsMap *map, gboolean imperial,
1413                            float latitude, float longitude, char *name) {                            float latitude, float longitude, char *name) {
     FIN;  
1414      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
1415    
1416      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 1460  osm_gps_map_osd_draw_nav (OsmGpsMap *map Line 1434  osm_gps_map_osd_draw_nav (OsmGpsMap *map
1434      osd_render_nav(osd);      osd_render_nav(osd);
1435    
1436      osm_gps_map_redraw(map);      osm_gps_map_redraw(map);
     FOUT;  
1437  }  }
1438    
1439  #endif // OSD_NAV  #endif // OSD_NAV
1440    
1441  static osd_button_t  static osd_button_t
1442  osd_check_int(osm_gps_map_osd_t *osd, gboolean click, gboolean down, gint x, gint y) {  osd_check_int(osm_gps_map_osd_t *osd, gboolean click, gboolean down, gint x, gint y) {
     FIN;  
1443      osd_button_t but = OSD_NONE;      osd_button_t but = OSD_NONE;
1444    
1445  #ifdef OSD_BALLOON  #ifdef OSD_BALLOON
# Line 1520  osd_check_int(osm_gps_map_osd_t *osd, gb Line 1492  osd_check_int(osm_gps_map_osd_t *osd, gb
1492      }      }
1493  #endif  #endif
1494    
     FOUT;  
1495      return but;      return but;
1496  }  }
1497    
# Line 1538  osd_check_int(osm_gps_map_osd_t *osd, gb Line 1509  osd_check_int(osm_gps_map_osd_t *osd, gb
1509    
1510  static void  static void
1511  osd_render_crosshair_shape(cairo_t *cr) {  osd_render_crosshair_shape(cairo_t *cr) {
     FIN;  
1512      cairo_arc (cr, OSD_CROSSHAIR_W/2, OSD_CROSSHAIR_H/2,      cairo_arc (cr, OSD_CROSSHAIR_W/2, OSD_CROSSHAIR_H/2,
1513                 OSD_CROSSHAIR_RADIUS, 0,  2*M_PI);                 OSD_CROSSHAIR_RADIUS, 0,  2*M_PI);
1514    
# Line 1557  osd_render_crosshair_shape(cairo_t *cr) Line 1527  osd_render_crosshair_shape(cairo_t *cr)
1527      cairo_rel_line_to (cr, 0, OSD_CROSSHAIR_TICK);      cairo_rel_line_to (cr, 0, OSD_CROSSHAIR_TICK);
1528    
1529      cairo_stroke (cr);      cairo_stroke (cr);
     FOUT;  
1530  }  }
1531    
1532  static void  static void
1533  osd_render_crosshair(osm_gps_map_osd_t *osd)  osd_render_crosshair(osm_gps_map_osd_t *osd)
1534  {  {
     FIN;  
1535      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1536    
1537      if(!priv->crosshair.surface || priv->crosshair.rendered)      if(!priv->crosshair.surface || priv->crosshair.rendered)
# Line 1590  osd_render_crosshair(osm_gps_map_osd_t * Line 1558  osd_render_crosshair(osm_gps_map_osd_t *
1558      osd_render_crosshair_shape(cr);      osd_render_crosshair_shape(cr);
1559    
1560      cairo_destroy(cr);      cairo_destroy(cr);
     FOUT;  
1561  }  }
1562  #endif  #endif
1563    
# Line 1612  osd_render_crosshair(osm_gps_map_osd_t * Line 1579  osd_render_crosshair(osm_gps_map_osd_t *
1579  static void  static void
1580  osd_render_scale(osm_gps_map_osd_t *osd)  osd_render_scale(osm_gps_map_osd_t *osd)
1581  {  {
     FIN;  
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)      if(!priv->scale.surface)
# Line 1740  osd_render_scale(osm_gps_map_osd_t *osd) Line 1706  osd_render_scale(osm_gps_map_osd_t *osd)
1706      cairo_stroke(cr);      cairo_stroke(cr);
1707    
1708      cairo_destroy(cr);      cairo_destroy(cr);
     FOUT;  
1709  }  }
1710  #endif  #endif
1711    
1712  static void  static void
1713  osd_render_controls(osm_gps_map_osd_t *osd)  osd_render_controls(osm_gps_map_osd_t *osd)
1714  {  {
     FIN;  
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)      if(!priv->controls.surface)
# Line 2025  osd_draw(osm_gps_map_osd_t *osd, GdkDraw Line 1989  osd_draw(osm_gps_map_osd_t *osd, GdkDraw
1989  #endif  #endif
1990    
1991      cairo_destroy(cr);      cairo_destroy(cr);
     FOUT;  
1992  }  }
1993    
1994  static void  static void
1995  osd_free(osm_gps_map_osd_t *osd)  osd_free(osm_gps_map_osd_t *osd)
1996  {  {
     FIN;  
1997      osd_priv_t *priv = (osd_priv_t *)(osd->priv);      osd_priv_t *priv = (osd_priv_t *)(osd->priv);
1998    
1999      if (priv->controls.surface)      if (priv->controls.surface)
# Line 2070  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);
     FOUT;  
2037  }  }
2038    
2039  static gboolean  static gboolean
2040  osd_busy(osm_gps_map_osd_t *osd)  osd_busy(osm_gps_map_osd_t *osd)
2041  {  {
     FIN;  
2042  #ifdef OSD_SOURCE_SEL  #ifdef OSD_SOURCE_SEL
2043      osd_priv_t *priv = (osd_priv_t *)(osd->priv);      osd_priv_t *priv = (osd_priv_t *)(osd->priv);
2044      return (priv->source_sel.handler_id != 0);      return (priv->source_sel.handler_id != 0);
# Line 2088  osd_busy(osm_gps_map_osd_t *osd) Line 2049  osd_busy(osm_gps_map_osd_t *osd)
2049    
2050  static osd_button_t  static osd_button_t
2051  osd_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y) {  osd_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y) {
     FIN;  
2052      return osd_check_int(osd, TRUE, down, x, y);      return osd_check_int(osd, TRUE, down, x, y);
2053  }  }
2054    
# Line 2111  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      FIN;      osd_priv_t *priv = g_new0(osd_priv_t, 1);
2075      osd_priv_t *priv = osd_classic.priv = g_new0(osd_priv_t, 1);      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);
     FOUT;  
2089  }  }
2090    
2091  #ifdef OSD_GPS_BUTTON  #ifdef OSD_GPS_BUTTON
# Line 2130  osm_gps_map_osd_classic_init(OsmGpsMap * Line 2093  osm_gps_map_osd_classic_init(OsmGpsMap *
2093  /* but instead are to be used by the main application */  /* but instead are to be used by the main application */
2094  void osm_gps_map_osd_enable_gps (OsmGpsMap *map, OsmGpsMapOsdCallback cb,  void osm_gps_map_osd_enable_gps (OsmGpsMap *map, OsmGpsMapOsdCallback cb,
2095                                   gpointer data) {                                   gpointer data) {
     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_if_fail (osd);      g_return_if_fail (osd);
2098    
# Line 2142  void osm_gps_map_osd_enable_gps (OsmGpsM Line 2104  void osm_gps_map_osd_enable_gps (OsmGpsM
2104      osd->render(osd);      osd->render(osd);
2105    
2106      osm_gps_map_redraw(map);      osm_gps_map_redraw(map);
     FOUT;  
2107  }  }
2108  #endif  #endif
2109    
2110  osd_button_t  osd_button_t
2111  osm_gps_map_osd_check(OsmGpsMap *map, gint x, gint y) {  osm_gps_map_osd_check(OsmGpsMap *map, gint x, gint y) {
     FIN;  
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    
Legend:
Removed from v.202  
changed lines
  Added in v.231