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

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

revision 133 by harbaum, Mon Oct 12 20:27:55 2009 UTC revision 150 by harbaum, Thu Oct 29 20:25:11 2009 UTC
# Line 135  typedef struct { Line 135  typedef struct {
135    
136  #define CLOSE_BUTTON_RADIUS   (BALLOON_CORNER_RADIUS)  #define CLOSE_BUTTON_RADIUS   (BALLOON_CORNER_RADIUS)
137    
138    #if 0
139    #define FIN   printf("entering function %s\n", __func__);
140    #define FOUT  printf("leaving function %s\n", __func__);
141    #else
142    #define FIN   ;
143    #define FOUT  ;
144    #endif
145    
146  /* 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 */
147  /* for the shadow */  /* for the shadow */
# Line 142  static void Line 149  static void
149  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,
150         gboolean bottom, int px, int py, int px0, int px1) {         gboolean bottom, int px, int py, int px0, int px1) {
151    
152        FIN;
153    
154      cairo_move_to (cr, x0, y0 + BALLOON_CORNER_RADIUS);      cairo_move_to (cr, x0, y0 + BALLOON_CORNER_RADIUS);
155      cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,      cairo_arc (cr, x0 + BALLOON_CORNER_RADIUS, y0 + BALLOON_CORNER_RADIUS,
156                 BALLOON_CORNER_RADIUS, -M_PI, -M_PI/2);                 BALLOON_CORNER_RADIUS, -M_PI, -M_PI/2);
# Line 170  osm_gps_map_draw_balloon_shape (cairo_t Line 179  osm_gps_map_draw_balloon_shape (cairo_t
179                 BALLOON_CORNER_RADIUS, M_PI/2, M_PI);                 BALLOON_CORNER_RADIUS, M_PI/2, M_PI);
180    
181      cairo_close_path (cr);      cairo_close_path (cr);
182    
183        FOUT;
184  }  }
185    
186  static void  static void
187  osd_render_balloon(osm_gps_map_osd_t *osd) {  osd_render_balloon(osm_gps_map_osd_t *osd) {
188        FIN;
189    
190      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
191    
192        if(!priv->balloon.surface)
193            return;
194    
195      /* get zoom */      /* get zoom */
196      gint zoom;      gint zoom;
197      g_object_get(OSM_GPS_MAP(osd->widget), "zoom", &zoom, NULL);      g_object_get(OSM_GPS_MAP(osd->widget), "zoom", &zoom, NULL);
# Line 266  osd_render_balloon(osm_gps_map_osd_t *os Line 282  osd_render_balloon(osm_gps_map_osd_t *os
282      cairo_stroke (cr);      cairo_stroke (cr);
283    
284      if (priv->balloon.cb) {      if (priv->balloon.cb) {
285            osm_gps_map_balloon_event_t event;
286    
287          /* clip in case application tries to draw in */          /* clip in case application tries to draw in */
288              /* exceed of the balloon */              /* exceed of the balloon */
289          cairo_rectangle (cr, priv->balloon.rect.x, priv->balloon.rect.y,          cairo_rectangle (cr, priv->balloon.rect.x, priv->balloon.rect.y,
290                           priv->balloon.rect.w, priv->balloon.rect.h);                           priv->balloon.rect.w, priv->balloon.rect.h);
291          cairo_clip (cr);          cairo_clip (cr);
292          cairo_new_path (cr);  /* current path is not          cairo_new_path (cr);  /* current path is not consumed by cairo_clip */
293                                   consumed by cairo_clip() */  
294            /* request the application to draw the balloon contents */
295            event.type = OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW;
296            event.data.draw.rect = &priv->balloon.rect;
297            event.data.draw.cr = cr;
298    
299          priv->balloon.cb(cr, &priv->balloon.rect, priv->balloon.data);          priv->balloon.cb(&event, priv->balloon.data);
300      }      }
301    
302      cairo_destroy(cr);      cairo_destroy(cr);
303    
304        FOUT;
305  }  }
306    
307  /* return true if balloon is being displayed and if */  /* return true if balloon is being displayed and if */
308  /* the given coordinate is within this balloon */  /* the given coordinate is within this balloon */
309  static gboolean  static gboolean
310  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)
311  {  {
312        FIN;
313    
314      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
315    
316      if(!priv->balloon.surface)      if(!priv->balloon.surface)
# Line 302  osd_balloon_check(osm_gps_map_osd_t *osd Line 328  osd_balloon_check(osm_gps_map_osd_t *osd
328          (x > xs) && (x < xs + priv->balloon.rect.w) &&          (x > xs) && (x < xs + priv->balloon.rect.w) &&
329          (y > ys) && (y < ys + priv->balloon.rect.h);          (y > ys) && (y < ys + priv->balloon.rect.h);
330    
331      /* 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? */
332      /* button down event */      if(click) {
     if(!is_in && !down && !priv->balloon.just_created) {  
         /* the user actually clicked outside the balloon */  
333    
334          /* close the balloon! */          /* handle the fact that the balloon may have been created by the */
335          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(osd->widget));          /* button down event */
336      }          if(!is_in && !down && !priv->balloon.just_created) {
337                /* the user actually clicked outside the balloon */
338    
339                /* close the balloon! */
340                osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(osd->widget));
341    
342                /* and inform application about this */
343                if(priv->balloon.cb) {
344                    osm_gps_map_balloon_event_t event;
345                    event.type = OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED;
346                    priv->balloon.cb(&event, priv->balloon.data);
347                }
348    
349            }
350    
351            if(is_in && priv->balloon.cb) {
352                osm_gps_map_balloon_event_t event;
353    
354                /* notify application of click */
355                event.type = OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK;
356                event.data.click.x = x - xs;
357                event.data.click.y = y - ys;
358                event.data.click.down = down;
359    
360                priv->balloon.cb(&event, priv->balloon.data);
361            }
362        }
363        FOUT;
364      return is_in;      return is_in;
365  }  }
366    
367  void osm_gps_map_osd_clear_balloon (OsmGpsMap *map) {  void osm_gps_map_osd_clear_balloon (OsmGpsMap *map) {
368        FIN;
369    
370      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
371    
372      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 330  void osm_gps_map_osd_clear_balloon (OsmG Line 382  void osm_gps_map_osd_clear_balloon (OsmG
382          priv->balloon.lon = OSM_GPS_MAP_INVALID;          priv->balloon.lon = OSM_GPS_MAP_INVALID;
383      }      }
384      osm_gps_map_redraw(map);      osm_gps_map_redraw(map);
385        FOUT;
386  }  }
387    
388  void  void
389  osm_gps_map_osd_draw_balloon (OsmGpsMap *map, float latitude, float longitude,  osm_gps_map_osd_draw_balloon (OsmGpsMap *map, float latitude, float longitude,
390                                OsmGpsMapBalloonCallback cb, gpointer data) {                                OsmGpsMapBalloonCallback cb, gpointer data) {
391        FIN;
392      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
393    
394      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 361  osm_gps_map_osd_draw_balloon (OsmGpsMap Line 415  osm_gps_map_osd_draw_balloon (OsmGpsMap
415      osd_render_balloon(osd);      osd_render_balloon(osd);
416    
417      osm_gps_map_redraw(map);      osm_gps_map_redraw(map);
418        FOUT;
419  }  }
420    
421  #endif // OSD_BALLOON  #endif // OSD_BALLOON
# Line 505  osd_shape(cairo_t *cr) { Line 560  osd_shape(cairo_t *cr) {
560  static gboolean  static gboolean
561  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)
562  {  {
563        FIN;
564      return( pow(cx - x, 2) + pow(cy - y, 2) < rad * rad);      return( pow(cx - x, 2) + pow(cy - y, 2) < rad * rad);
565  }  }
566    
# Line 595  osd_check_zoom(gint x, gint y) { Line 651  osd_check_zoom(gint x, gint y) {
651  /* internal value to draw the arrow on the "puller" */  /* internal value to draw the arrow on the "puller" */
652  #define OSD_S_D0  (OSD_S_RAD/2)  #define OSD_S_D0  (OSD_S_RAD/2)
653  #ifndef OSD_FONT_SIZE  #ifndef OSD_FONT_SIZE
654  #define OSD_FONT_SIZE 16.0  #define OSD_FONT_SIZE (16.0)
655  #endif  #endif
656  #define OSD_TEXT_BORDER   (OSD_FONT_SIZE/2)  #define OSD_TEXT_BORDER   (OSD_FONT_SIZE/2)
657  #define OSD_TEXT_SKIP     (OSD_FONT_SIZE/8)  #define OSD_TEXT_SKIP     (OSD_FONT_SIZE/8)
# Line 703  osd_source_content(osm_gps_map_osd_t *os Line 759  osd_source_content(osm_gps_map_osd_t *os
759    
760  static void  static void
761  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) {
762        FIN;
763    
764      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
765    
766      if(priv->source_sel.rendered && !force_rerender)      if(!priv->source_sel.surface ||
767           (priv->source_sel.rendered && !force_rerender))
768          return;          return;
769    
770      priv->source_sel.rendered = TRUE;      priv->source_sel.rendered = TRUE;
# Line 749  osd_render_source_sel(osm_gps_map_osd_t Line 808  osd_render_source_sel(osm_gps_map_osd_t
808      cairo_stroke (cr);      cairo_stroke (cr);
809    
810      cairo_destroy(cr);      cairo_destroy(cr);
811        FOUT;
812  }  }
813    
814  /* re-allocate the buffer used to draw the menu. This is used */  /* re-allocate the buffer used to draw the menu. This is used */
815  /* to collapse/expand the buffer */  /* to collapse/expand the buffer */
816  static void  static void
817  osd_source_reallocate(osm_gps_map_osd_t *osd) {  osd_source_reallocate(osm_gps_map_osd_t *osd) {
818        FIN;
819      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
820    
821      /* re-allocate offscreen bitmap */      /* re-allocate offscreen bitmap */
# Line 795  osd_source_reallocate(osm_gps_map_osd_t Line 856  osd_source_reallocate(osm_gps_map_osd_t
856          cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w+2, h+2);          cairo_image_surface_create(CAIRO_FORMAT_ARGB32, w+2, h+2);
857    
858      osd_render_source_sel(osd, TRUE);      osd_render_source_sel(osd, TRUE);
859        FOUT;
860  }  }
861    
862  #define OSD_HZ      15  #define OSD_HZ      15
863  #define OSD_TIME    500  #define OSD_TIME    500
864    
865  static gboolean osd_source_animate(gpointer data) {  static gboolean osd_source_animate(gpointer data) {
866        FIN;
867      osm_gps_map_osd_t *osd = (osm_gps_map_osd_t*)data;      osm_gps_map_osd_t *osd = (osm_gps_map_osd_t*)data;
868      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
869      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 839  static gboolean osd_source_animate(gpoin Line 902  static gboolean osd_source_animate(gpoin
902      if(done)      if(done)
903          priv->source_sel.handler_id = 0;          priv->source_sel.handler_id = 0;
904    
905        FOUT;
906      return !done;      return !done;
907  }  }
908    
# Line 846  static gboolean osd_source_animate(gpoin Line 910  static gboolean osd_source_animate(gpoin
910  static void  static void
911  osd_source_toggle(osm_gps_map_osd_t *osd)  osd_source_toggle(osm_gps_map_osd_t *osd)
912  {  {
913        FIN;
914      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
915    
916      /* ignore clicks while animation is running */      /* ignore clicks while animation is running */
# Line 871  osd_source_toggle(osm_gps_map_osd_t *osd Line 936  osd_source_toggle(osm_gps_map_osd_t *osd
936      /* start timer to handle animation */      /* start timer to handle animation */
937      priv->source_sel.handler_id = gtk_timeout_add(OSD_TIME/OSD_HZ,      priv->source_sel.handler_id = gtk_timeout_add(OSD_TIME/OSD_HZ,
938                                                    osd_source_animate, osd);                                                    osd_source_animate, osd);
939        FOUT;
940  }  }
941    
942  /* check if the user clicked inside the source selection area */  /* check if the user clicked inside the source selection area */
943  static osd_button_t  static osd_button_t
944  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) {
945        FIN;
946      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
947    
948      if(!priv->source_sel.expanded)      if(!priv->source_sel.expanded)
# Line 933  osd_source_check(osm_gps_map_osd_t *osd, Line 1000  osd_source_check(osm_gps_map_osd_t *osd,
1000                      osm_gps_map_repaint(OSM_GPS_MAP(osd->widget));                      osm_gps_map_repaint(OSM_GPS_MAP(osd->widget));
1001                  }                  }
1002              }              }
1003    
1004              /* return "clicked in OSD background" to prevent further */              /* return "clicked in OSD background" to prevent further */
1005              /* processing by application */              /* processing by application */
1006              return OSD_BG;              return OSD_BG;
1007          }          }
1008      }      }
1009    
1010        FOUT;
1011      return OSD_NONE;      return OSD_NONE;
1012  }  }
1013  #endif // OSD_SOURCE_SEL  #endif // OSD_SOURCE_SEL
1014    
1015  static osd_button_t  static osd_button_t
1016  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) {
1017        FIN;
1018      osd_button_t but = OSD_NONE;      osd_button_t but = OSD_NONE;
1019    
1020  #ifdef OSD_BALLOON  #ifdef OSD_BALLOON
# Line 986  osd_check(osm_gps_map_osd_t *osd, gboole Line 1055  osd_check(osm_gps_map_osd_t *osd, gboole
1055  #ifdef OSD_BALLOON  #ifdef OSD_BALLOON
1056      if(but == OSD_NONE) {      if(but == OSD_NONE) {
1057          /* check if user clicked into balloon */          /* check if user clicked into balloon */
1058          if(osd_balloon_check(osd, down, x, y))          if(osd_balloon_check(osd, click, down, x, y))
1059              but = OSD_BG;              but = OSD_BG;
1060      }      }
1061  #endif  #endif
1062    
1063        FOUT;
1064      return but;      return but;
1065  }  }
1066    
# Line 1067  osd_zoom_labels(cairo_t *cr, gint x, gin Line 1137  osd_zoom_labels(cairo_t *cr, gint x, gin
1137  #ifdef OSD_COORDINATES  #ifdef OSD_COORDINATES
1138    
1139  #ifndef OSD_COORDINATES_FONT_SIZE  #ifndef OSD_COORDINATES_FONT_SIZE
1140  #define OSD_COORDINATES_FONT_SIZE 12  #define OSD_COORDINATES_FONT_SIZE (12.0)
1141  #endif  #endif
1142    
1143  #define OSD_COORDINATES_OFFSET (OSD_COORDINATES_FONT_SIZE/6)  #define OSD_COORDINATES_OFFSET (OSD_COORDINATES_FONT_SIZE/6)
# Line 1134  static char Line 1204  static char
1204  /* render a string at the given screen position */  /* render a string at the given screen position */
1205  static int  static int
1206  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) {
1207      char *p = g_strdup(text);      FIN;
1208    
1209        if(!text) return y;
1210    
1211        char *p = g_malloc(strlen(text)+4);  // space for "...\n"
1212        strcpy(p, text);
1213    
1214      cairo_text_extents_t extents;      cairo_text_extents_t extents;
1215      cairo_text_extents (cr, p, &extents);      cairo_text_extents (cr, p, &extents);
1216        g_assert(extents.width != 0.0);
1217    
1218      /* check if text needs to be truncated */      /* check if text needs to be truncated */
1219      int len = strlen(text)-2;      int trunc_at = strlen(text)-1;
1220      while(extents.width > width) {      while(extents.width > width) {
1221          len--;          g_assert(trunc_at > 0);
1222          strcpy(p+len, "...");  
1223            trunc_at--;
1224            strcpy(p+trunc_at, "...");
1225          cairo_text_extents (cr, p, &extents);          cairo_text_extents (cr, p, &extents);
1226      }      }
1227    
# Line 1158  osd_render_centered_text(cairo_t *cr, in Line 1237  osd_render_centered_text(cairo_t *cr, in
1237    
1238      g_free(p);      g_free(p);
1239    
1240      /* skip + 1/4 line */      /* skip + 1/5 line */
1241      return y + 5*OSD_COORDINATES_FONT_SIZE/4;      FOUT;
1242        return y + 6*OSD_COORDINATES_FONT_SIZE/5;
1243  }  }
1244    
1245  static void  static void
1246  osd_render_coordinates(osm_gps_map_osd_t *osd)  osd_render_coordinates(osm_gps_map_osd_t *osd)
1247  {  {
1248        FIN;
1249      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1250    
1251        if(!priv->coordinates.surface)
1252            return;
1253    
1254      /* get current map position */      /* get current map position */
1255      gfloat lat, lon;      gfloat lat, lon;
1256      g_object_get(osd->widget, "latitude", &lat, "longitude", &lon, NULL);      g_object_get(osd->widget, "latitude", &lat, "longitude", &lon, NULL);
# Line 1182  osd_render_coordinates(osm_gps_map_osd_t Line 1266  osd_render_coordinates(osm_gps_map_osd_t
1266      priv->coordinates.lon = lon;      priv->coordinates.lon = lon;
1267    
1268      /* first fill with transparency */      /* first fill with transparency */
1269    
1270      cairo_t *cr = cairo_create(priv->coordinates.surface);      cairo_t *cr = cairo_create(priv->coordinates.surface);
1271      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);      cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
1272      //    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 1205  osd_render_coordinates(osm_gps_map_osd_t Line 1290  osd_render_coordinates(osm_gps_map_osd_t
1290      g_free(longitude);      g_free(longitude);
1291    
1292      cairo_destroy(cr);      cairo_destroy(cr);
1293        FOUT;
1294  }  }
1295  #endif  // OSD_COORDINATES  #endif  // OSD_COORDINATES
1296    
# Line 1232  static float get_distance(float lat1, fl Line 1318  static float get_distance(float lat1, fl
1318  static void  static void
1319  osd_render_nav(osm_gps_map_osd_t *osd)  osd_render_nav(osm_gps_map_osd_t *osd)
1320  {  {
1321        FIN;
1322      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1323    
1324      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 1336  osd_render_nav(osm_gps_map_osd_t *osd) Line 1423  osd_render_nav(osm_gps_map_osd_t *osd)
1423      }      }
1424    
1425      cairo_destroy(cr);      cairo_destroy(cr);
1426        FOUT;
1427  }  }
1428    
1429  void osm_gps_map_osd_clear_nav (OsmGpsMap *map) {  void osm_gps_map_osd_clear_nav (OsmGpsMap *map) {
1430        FIN;
1431      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
1432    
1433      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 1355  void osm_gps_map_osd_clear_nav (OsmGpsMa Line 1444  void osm_gps_map_osd_clear_nav (OsmGpsMa
1444          if(priv->nav.name) g_free(priv->nav.name);          if(priv->nav.name) g_free(priv->nav.name);
1445      }      }
1446      osm_gps_map_redraw(map);      osm_gps_map_redraw(map);
1447        FOUT;
1448  }  }
1449    
1450  void  void
1451  osm_gps_map_osd_draw_nav (OsmGpsMap *map, gboolean imperial,  osm_gps_map_osd_draw_nav (OsmGpsMap *map, gboolean imperial,
1452                            float latitude, float longitude, char *name) {                            float latitude, float longitude, char *name) {
1453        FIN;
1454      g_return_if_fail (OSM_IS_GPS_MAP (map));      g_return_if_fail (OSM_IS_GPS_MAP (map));
1455    
1456      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 1383  osm_gps_map_osd_draw_nav (OsmGpsMap *map Line 1474  osm_gps_map_osd_draw_nav (OsmGpsMap *map
1474      osd_render_nav(osd);      osd_render_nav(osd);
1475    
1476      osm_gps_map_redraw(map);      osm_gps_map_redraw(map);
1477        FOUT;
1478  }  }
1479    
1480  #endif // OSD_NAV  #endif // OSD_NAV
# Line 1401  osm_gps_map_osd_draw_nav (OsmGpsMap *map Line 1493  osm_gps_map_osd_draw_nav (OsmGpsMap *map
1493    
1494  static void  static void
1495  osd_render_crosshair_shape(cairo_t *cr) {  osd_render_crosshair_shape(cairo_t *cr) {
1496        FIN;
1497      cairo_arc (cr, OSD_CROSSHAIR_W/2, OSD_CROSSHAIR_H/2,      cairo_arc (cr, OSD_CROSSHAIR_W/2, OSD_CROSSHAIR_H/2,
1498                 OSD_CROSSHAIR_RADIUS, 0,  2*M_PI);                 OSD_CROSSHAIR_RADIUS, 0,  2*M_PI);
1499    
# Line 1419  osd_render_crosshair_shape(cairo_t *cr) Line 1512  osd_render_crosshair_shape(cairo_t *cr)
1512      cairo_rel_line_to (cr, 0, OSD_CROSSHAIR_TICK);      cairo_rel_line_to (cr, 0, OSD_CROSSHAIR_TICK);
1513    
1514      cairo_stroke (cr);      cairo_stroke (cr);
1515        FOUT;
1516  }  }
1517    
1518  static void  static void
1519  osd_render_crosshair(osm_gps_map_osd_t *osd)  osd_render_crosshair(osm_gps_map_osd_t *osd)
1520  {  {
1521        FIN;
1522      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1523    
1524      if(priv->crosshair.rendered)      if(!priv->crosshair.surface || priv->crosshair.rendered)
1525          return;          return;
1526    
1527      priv->crosshair.rendered = TRUE;      priv->crosshair.rendered = TRUE;
# Line 1449  osd_render_crosshair(osm_gps_map_osd_t * Line 1544  osd_render_crosshair(osm_gps_map_osd_t *
1544      osd_render_crosshair_shape(cr);      osd_render_crosshair_shape(cr);
1545    
1546      cairo_destroy(cr);      cairo_destroy(cr);
1547        FOUT;
1548  }  }
1549  #endif  #endif
1550    
1551  #ifdef OSD_SCALE  #ifdef OSD_SCALE
1552    
1553  #ifndef OSD_SCALE_FONT_SIZE  #ifndef OSD_SCALE_FONT_SIZE
1554  #define OSD_SCALE_FONT_SIZE 12  #define OSD_SCALE_FONT_SIZE (12.0)
1555  #endif  #endif
1556  #define OSD_SCALE_W   (10*OSD_SCALE_FONT_SIZE)  #define OSD_SCALE_W   (10*OSD_SCALE_FONT_SIZE)
1557  #define OSD_SCALE_H   (5*OSD_SCALE_FONT_SIZE/2)  #define OSD_SCALE_H   (5*OSD_SCALE_FONT_SIZE/2)
# Line 1470  osd_render_crosshair(osm_gps_map_osd_t * Line 1566  osd_render_crosshair(osm_gps_map_osd_t *
1566  static void  static void
1567  osd_render_scale(osm_gps_map_osd_t *osd)  osd_render_scale(osm_gps_map_osd_t *osd)
1568  {  {
1569        FIN;
1570      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1571    
1572        if(!priv->scale.surface)
1573            return;
1574    
1575      /* this only needs to be rendered if the zoom has changed */      /* this only needs to be rendered if the zoom has changed */
1576      gint zoom;      gint zoom;
1577      g_object_get(OSM_GPS_MAP(osd->widget), "zoom", &zoom, NULL);      g_object_get(OSM_GPS_MAP(osd->widget), "zoom", &zoom, NULL);
# Line 1593  osd_render_scale(osm_gps_map_osd_t *osd) Line 1693  osd_render_scale(osm_gps_map_osd_t *osd)
1693      cairo_stroke(cr);      cairo_stroke(cr);
1694    
1695      cairo_destroy(cr);      cairo_destroy(cr);
1696        FOUT;
1697  }  }
1698  #endif  #endif
1699    
1700  static void  static void
1701  osd_render_controls(osm_gps_map_osd_t *osd)  osd_render_controls(osm_gps_map_osd_t *osd)
1702  {  {
1703        FIN;
1704      osd_priv_t *priv = (osd_priv_t*)osd->priv;      osd_priv_t *priv = (osd_priv_t*)osd->priv;
1705    
1706        if(!priv->controls.surface)
1707            return;
1708    
1709      if(priv->controls.rendered      if(priv->controls.rendered
1710  #ifdef OSD_GPS_BUTTON  #ifdef OSD_GPS_BUTTON
1711         && (priv->controls.gps_enabled == (osd->cb != NULL))         && (priv->controls.gps_enabled == (osd->cb != NULL))
# Line 1872  osd_draw(osm_gps_map_osd_t *osd, GdkDraw Line 1977  osd_draw(osm_gps_map_osd_t *osd, GdkDraw
1977  #endif  #endif
1978    
1979      cairo_destroy(cr);      cairo_destroy(cr);
1980        FOUT;
1981  }  }
1982    
1983  static void  static void
1984  osd_free(osm_gps_map_osd_t *osd)  osd_free(osm_gps_map_osd_t *osd)
1985  {  {
1986        FIN;
1987      osd_priv_t *priv = (osd_priv_t *)(osd->priv);      osd_priv_t *priv = (osd_priv_t *)(osd->priv);
1988    
1989      if (priv->controls.surface)      if (priv->controls.surface)
# Line 1916  osd_free(osm_gps_map_osd_t *osd) Line 2023  osd_free(osm_gps_map_osd_t *osd)
2023  #endif  #endif
2024    
2025      g_free(priv);      g_free(priv);
2026        FOUT;
2027  }  }
2028    
2029  static gboolean  static gboolean
2030  osd_busy(osm_gps_map_osd_t *osd)  osd_busy(osm_gps_map_osd_t *osd)
2031  {  {
2032        FIN;
2033  #ifdef OSD_SOURCE_SEL  #ifdef OSD_SOURCE_SEL
2034      osd_priv_t *priv = (osd_priv_t *)(osd->priv);      osd_priv_t *priv = (osd_priv_t *)(osd->priv);
2035      return (priv->source_sel.handler_id != 0);      return (priv->source_sel.handler_id != 0);
# Line 1929  osd_busy(osm_gps_map_osd_t *osd) Line 2038  osd_busy(osm_gps_map_osd_t *osd)
2038  #endif  #endif
2039  }  }
2040    
2041    static osd_button_t
2042    osd_check(osm_gps_map_osd_t *osd, gboolean down, gint x, gint y) {
2043        FIN;
2044        return osd_check_int(osd, TRUE, down, x, y);
2045    }
2046    
2047  static osm_gps_map_osd_t osd_classic = {  static osm_gps_map_osd_t osd_classic = {
2048      .widget     = NULL,      .widget     = NULL,
2049    
# Line 1948  static osm_gps_map_osd_t osd_classic = { Line 2063  static osm_gps_map_osd_t osd_classic = {
2063  void  void
2064  osm_gps_map_osd_classic_init(OsmGpsMap *map)  osm_gps_map_osd_classic_init(OsmGpsMap *map)
2065  {  {
2066        FIN;
2067      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);
2068    
2069  #ifdef OSD_BALLOON  #ifdef OSD_BALLOON
# Line 1958  osm_gps_map_osd_classic_init(OsmGpsMap * Line 2074  osm_gps_map_osd_classic_init(OsmGpsMap *
2074      osd_classic.priv = priv;      osd_classic.priv = priv;
2075    
2076      osm_gps_map_register_osd(map, &osd_classic);      osm_gps_map_register_osd(map, &osd_classic);
2077        FOUT;
2078  }  }
2079    
2080  #ifdef OSD_GPS_BUTTON  #ifdef OSD_GPS_BUTTON
# Line 1965  osm_gps_map_osd_classic_init(OsmGpsMap * Line 2082  osm_gps_map_osd_classic_init(OsmGpsMap *
2082  /* but instead are to be used by the main application */  /* but instead are to be used by the main application */
2083  void osm_gps_map_osd_enable_gps (OsmGpsMap *map, OsmGpsMapOsdCallback cb,  void osm_gps_map_osd_enable_gps (OsmGpsMap *map, OsmGpsMapOsdCallback cb,
2084                                   gpointer data) {                                   gpointer data) {
2085        FIN;
2086      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
2087      g_return_if_fail (osd);      g_return_if_fail (osd);
2088    
# Line 1976  void osm_gps_map_osd_enable_gps (OsmGpsM Line 2094  void osm_gps_map_osd_enable_gps (OsmGpsM
2094      osd->render(osd);      osd->render(osd);
2095    
2096      osm_gps_map_redraw(map);      osm_gps_map_redraw(map);
2097        FOUT;
2098  }  }
2099  #endif  #endif
2100    
2101  osd_button_t  osd_button_t
2102  osm_gps_map_osd_check(OsmGpsMap *map, gint x, gint y) {  osm_gps_map_osd_check(OsmGpsMap *map, gint x, gint y) {
2103        FIN;
2104      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);      osm_gps_map_osd_t *osd = osm_gps_map_osd_get(map);
2105      g_return_val_if_fail (osd, OSD_NONE);      g_return_val_if_fail (osd, OSD_NONE);
2106    
2107      return osd_check(osd, TRUE, x, y);      return osd_check_int(osd, FALSE, TRUE, x, y);
2108  }  }
Legend:
Removed from v.133  
changed lines
  Added in v.150