Diff of /trunk/src/map-tool.c

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

revision 123 by harbaum, Wed Sep 23 11:23:45 2009 UTC revision 152 by harbaum, Mon Nov 2 10:53:01 2009 UTC
# Line 22  Line 22 
22   * http://topo.geofabrik.de/trail/${z}/${x}/${y}.png   8-15   * http://topo.geofabrik.de/trail/${z}/${x}/${y}.png   8-15
23   */   */
24    
25    /*
26     * TODO:
27     * - draw caches only once
28     * - prefer duplicates from selected files
29     * - make semi-transparent caches selectable
30     */
31    
32  #include "gpxview.h"  #include "gpxview.h"
33  #include "converter.h"  #include "converter.h"
34  #include <math.h>    // for isnan  #include <math.h>    // for isnan
# Line 80  static const char *get_proxy_uri(appdata Line 87  static const char *get_proxy_uri(appdata
87    
88  static void  static void
89  cb_map_gps(osd_button_t but, map_context_t *context) {  cb_map_gps(osd_button_t but, map_context_t *context) {
90    
91    if(but == OSD_GPS) {    if(but == OSD_GPS) {
92      pos_t *refpos = get_pos(context->appdata);      pos_t *refpos = get_pos(context->appdata);
93      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
# Line 108  static int dist2pixel(map_context_t *con Line 116  static int dist2pixel(map_context_t *con
116    
117  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
118    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
119      static gboolean goto_is_enabled = FALSE;
120    
121    /* get reference position ... */    /* get reference position ... */
122    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
123    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
124    
125    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
126    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),    if(ok != goto_is_enabled) {
127                   OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
128                    OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
129        goto_is_enabled = ok;
130      }
131    
132    if(ok) {    if(ok) {
133      float heading = NAN;      float heading = NAN;
# Line 130  static gboolean map_gps_update(gpointer Line 142  static gboolean map_gps_update(gpointer
142          radius = dist2pixel(context, eph/1000, refpos->lat);          radius = dist2pixel(context, eph/1000, refpos->lat);
143      }      }
144    
145        /* TODO: in order to save energy: only draw if state actually changed */
146    
147      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
148      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
149                           refpos->lat, refpos->lon, heading);                           refpos->lat, refpos->lon, heading);
# Line 139  static gboolean map_gps_update(gpointer Line 153  static gboolean map_gps_update(gpointer
153    return TRUE;    return TRUE;
154  }  }
155    
156    static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
157      GdkPixbuf *icon = icon_get(semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE,
158                                 cache->type);
159    
160      /* check if there's also an overwritten coordinate */
161      if(cache->notes && cache->notes->override) {
162        GdkPixbuf *over = icon_get(ICON_MISC, 1);
163    
164        osm_gps_map_add_image(OSM_GPS_MAP(map),
165              cache->notes->pos.lat, cache->notes->pos.lon, icon);
166    
167        osm_gps_map_add_image(OSM_GPS_MAP(map),
168              cache->notes->pos.lat, cache->notes->pos.lon, over);
169      } else {
170        if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon))
171          osm_gps_map_add_image(OSM_GPS_MAP(map),
172                                cache->pos.lat, cache->pos.lon, icon);
173      }
174    }
175    
176    static void map_draw_gpx(appdata_t *appdata,
177                             GtkWidget *map, gpx_t *gpx,
178                             cache_t *nav, gboolean semi) {
179      if(!gpx->notes_loaded) {
180        notes_load_all(appdata, gpx);
181        gpx->notes_loaded = TRUE;
182      }
183    
184      cache_t *cache = gpx->cache;
185      while(cache) {
186        /* if nav is given draw all other caches semitransparent. */
187        /* if nav is not given do what semi sais */
188        map_draw_cache(map, cache, nav?(cache != nav):semi);
189        cache = cache->next;
190      }
191    }
192    
193    /* draw geocaches and set window title */
194    static void map_setup(map_context_t *context) {
195      char *name = NULL;
196    
197      int cache_num = gpx_total_caches_global(context->appdata->gpx);
198    
199      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
200        g_free(context->caches_displayed);
201        context->caches_displayed = NULL;
202        context->cache_list_len = 0;
203      }
204    
205      /* allocate buffer */
206      if(cache_num) {
207        context->cache_list_len = cache_num;
208        context->caches_displayed = g_new0(cache_display_t, cache_num);
209        printf("allocated space to handle %d map icons\n", cache_num);
210      }
211    
212      if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
213        if(context->state != MAP_ALL) {
214          printf("map_setup(ALL)\n");
215    
216    #ifdef OSD_NAV
217          /* no navigation in this mode */
218          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
219    #endif
220    
221          /* clear all existing cache images */
222          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
223    
224          /* draw all geocaches and none is semi-transparent */
225          gpx_t *gpx = context->appdata->gpx;
226          while(gpx) {
227            map_draw_gpx(context->appdata, context->widget, gpx, NULL, FALSE);
228            gpx = gpx->next;
229          }
230          name = g_strdup(_("all"));
231          context->state = MAP_ALL;
232        }
233      } else if(!context->appdata->cur_cache) {
234        if(context->state != MAP_GPX) {
235          printf("map_setup(GPX)\n");
236    
237    #ifdef OSD_NAV
238          /* no navigation in this mode */
239          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
240    #endif
241    
242          /* clear all existing ccahe images */
243          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
244    
245          /* draw all geocaches and all other gpx files are semi-transparent */
246          gpx_t *gpx = context->appdata->gpx;
247          while(gpx) {
248            map_draw_gpx(context->appdata, context->widget, gpx, NULL,
249                         gpx != context->appdata->cur_gpx);
250            gpx = gpx->next;
251          }
252    
253          name = g_strdup(context->appdata->cur_gpx->name);
254          context->state = MAP_GPX;
255        }
256      } else {
257        cache_t *cache = context->appdata->cur_cache;
258    
259        printf("map_setp(CACHE)\n");
260    
261        /* no balloons in this mode */
262        context->balloon = NULL;
263        osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
264    
265        /* clear all existing ccahe images */
266        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
267    
268        /* draw all geocaches and all but selected one are semi-transparent */
269        gpx_t *gpx = context->appdata->gpx;
270        while(gpx) {
271          map_draw_gpx(context->appdata, context->widget, gpx, cache, FALSE);
272          gpx = gpx->next;
273        }
274    
275        name = g_strdup(cache->name);
276        context->state = MAP_CACHE;
277    
278        /* navigation in this mode! */
279        pos_t cpos = gpx_cache_pos(cache);
280    
281    #ifdef OSD_NAV
282        osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
283                                  context->appdata->imperial,
284                                  cpos.lat, cpos.lon, cache->name);
285    #else
286    #warning OSD_NAV not defined!
287    #endif
288      }
289    
290      if(name) {
291        char *title = g_strdup_printf(_("Map - %s"), name);
292        g_free(name);
293    
294        gtk_window_set_title(GTK_WINDOW(context->window), title);
295    
296        g_free(title);
297      } else
298        printf("map_setup(keep)\n");
299    }
300    
301  static gboolean on_map_configure(GtkWidget *widget,  static gboolean on_map_configure(GtkWidget *widget,
302                                   GdkEventConfigure *event,                                   GdkEventConfigure *event,
303                                   map_context_t *context) {                                   map_context_t *context) {
304    
305    if(!context->map_complete) {    /* for some reason there's a configure event with 1/1 */
306      /* on diablo. We just ignore this! */
307    
308      printf("on_map_configure %d %d\n",
309             widget->allocation.width,
310             widget->allocation.height);
311    
312      if(!context->map_complete &&
313         (widget->allocation.width > 100) &&
314         (widget->allocation.height > 100)) {
315    
316        /* setup cache state */
317        map_setup(context);
318    
319      /* set default values if they are invalid */      /* set default values if they are invalid */
320      if(!context->appdata->map.zoom ||      if(!context->appdata->map.zoom ||
# Line 153  static gboolean on_map_configure(GtkWidg Line 324  static gboolean on_map_configure(GtkWidg
324    
325        pos_t *refpos = get_pos(context->appdata);        pos_t *refpos = get_pos(context->appdata);
326        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
327            printf("use refpos\n");
328    
329          /* use gps position if present */          /* use gps position if present */
330          context->appdata->map.pos = *refpos;          context->appdata->map.pos = *refpos;
331          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
332        } else {        } else {
333            printf("use zero pos\n");
334    
335          /* use world map otherwise */          /* use world map otherwise */
336          context->appdata->map.pos.lat = 0.0;          context->appdata->map.pos.lat = 0.0;
337          context->appdata->map.pos.lon = 0.0;          context->appdata->map.pos.lon = 0.0;
# Line 165  static gboolean on_map_configure(GtkWidg Line 340  static gboolean on_map_configure(GtkWidg
340      }      }
341    
342      /* jump to initial position */      /* jump to initial position */
343        printf("osm_gps_map_set_mapcenter(%f,%f,%d)\n",
344               context->appdata->map.pos.lat,
345               context->appdata->map.pos.lon,
346               context->appdata->map.zoom);
347    
348      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
349                                context->appdata->map.pos.lat,                                context->appdata->map.pos.lat,
350                                context->appdata->map.pos.lon,                                context->appdata->map.pos.lon,
# Line 175  static gboolean on_map_configure(GtkWidg Line 355  static gboolean on_map_configure(GtkWidg
355    return FALSE;    return FALSE;
356  }  }
357    
 static void map_draw_cache(GtkWidget *map, cache_t *cache) {  
   GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  
   
   /* check if there's also an overwritten coordinate */  
   if(cache->notes && cache->notes->override) {  
     GdkPixbuf *over = icon_get(ICON_MISC, 1);  
   
     osm_gps_map_add_image(OSM_GPS_MAP(map),  
           cache->notes->pos.lat, cache->notes->pos.lon, icon);  
   
     osm_gps_map_add_image(OSM_GPS_MAP(map),  
           cache->notes->pos.lat, cache->notes->pos.lon, over);  
   } else  
     osm_gps_map_add_image(OSM_GPS_MAP(map),  
                           cache->pos.lat, cache->pos.lon, icon);  
   
 }  
   
 static void map_draw_gpx(appdata_t *appdata, GtkWidget *map, gpx_t *gpx) {  
   if(!gpx->notes_loaded) {  
     notes_load_all(appdata, gpx);  
     gpx->notes_loaded = TRUE;  
   }  
   
   cache_t *cache = gpx->cache;  
   while(cache) {  
     map_draw_cache(map, cache);  
     cache = cache->next;  
   }  
 }  
   
358  static void  static void
359  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
360                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
361    
362    while(cache) {    while(cache) {
363      pos_t cpos = gpx_cache_pos(cache);      pos_t cpos = gpx_cache_pos(cache);
364    
# Line 229  static cache_t *map_closest(map_context_ Line 379  static cache_t *map_closest(map_context_
379    cache_t *result = NULL;    cache_t *result = NULL;
380    float distance = NAN;    float distance = NAN;
381    
 #ifdef USE_MAEMO  
382    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
 #endif  
383      /* search all geocaches */      /* search all geocaches */
384      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
385      while(gpx) {      while(gpx) {
386        map_cachelist_nearest(gpx->cache, pos, &result, &distance);        map_cachelist_nearest(gpx->cache, pos, &result, &distance);
387        gpx = gpx->next;        gpx = gpx->next;
388      }      }
 #ifdef USE_MAEMO  
389    } else if(context->appdata->cur_gpx) {    } else if(context->appdata->cur_gpx) {
390      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
391                            pos, &result, &distance);                            pos, &result, &distance);
392    } else    } else
393      result = context->appdata->cur_gpx->cache;      result = context->appdata->cur_gpx->cache;
 #endif  
394    
395    return result;    return result;
396  }  }
# Line 262  pos_t coord2pos(coord_t coo) { Line 408  pos_t coord2pos(coord_t coo) {
408  static gboolean  static gboolean
409  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
410                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
411    
412    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
413    
414    /* check if we actually clicked parts of the OSD */    /* check if we actually clicked parts of the OSD */
415    if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)    if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)
416      return FALSE;      return FALSE;
417    
418    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
# Line 300  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 447  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
447                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
448    
449    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
450      g_assert(image_surface);
451    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
452    
453    // Draw the image on the new Context    // Draw the image on the new Context
# Line 319  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 467  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
467  #endif  #endif
468    
469  static void  static void
470  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
471    cache_t *cache = (cache_t*)data;    printf("balloon event: ");
   
 #if 0  
   /* draw pink background to check clipping */  
   cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);  
   cairo_set_source_rgba (cr, 1, 0, 0, 0.3);  
   cairo_fill_preserve (cr);  
   cairo_set_line_width (cr, 0);  
   cairo_stroke (cr);  
 #endif  
   
   /* leave a little border top and left */  
   gint x = rect->x, y = rect->y;  
   
   /* draw the cache type icon ... */  
   GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  
   cairo_draw_pixbuf(cr, icon, x, y);  
472    
473    if(cache->notes && cache->notes->override) {    map_context_t *context = (map_context_t*)data;
474      GdkPixbuf *over = icon_get(ICON_MISC, 1);    cache_t *cache = context->balloon;
     cairo_draw_pixbuf(cr, over, x, y);  
   }  
475    
476    /* ... and right of it the waypoint id */    if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
477    cairo_text_extents_t extents;      printf("draw\n");
478    
479    if(cache->id) {  #if 0
480      cairo_select_font_face (cr, "Sans",      /* draw pink background to check clipping */
481                              CAIRO_FONT_SLANT_NORMAL,      cairo_rectangle (event->data.draw.cr,
482                              CAIRO_FONT_WEIGHT_BOLD);                       event->data.draw.rect->x-20, event->data.draw.rect->y-20,
483                         event->data.draw.rect->w+40, event->data.draw.rect->h+40);
484        cairo_set_source_rgba (event->data.draw.cr, 1, 0, 0, 0.3);
485        cairo_fill_preserve (event->data.draw.cr);
486        cairo_set_line_width (event->data.draw.cr, 0);
487        cairo_stroke (event->data.draw.cr);
488    #endif
489    
490        /* leave a little border top and left */
491        gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
492    
493        /* draw the cache type icon ... */
494        GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
495        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
496    
497        if(cache->notes && cache->notes->override) {
498          GdkPixbuf *over = icon_get(ICON_MISC, 1);
499          cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
500        }
501    
502        /* ... and right of it the waypoint id */
503        cairo_text_extents_t extents;
504    
505        if(cache->id) {
506          cairo_select_font_face (event->data.draw.cr, "Sans",
507                                  CAIRO_FONT_SLANT_NORMAL,
508                                  CAIRO_FONT_WEIGHT_BOLD);
509    
510  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
511      cairo_set_font_size (cr, 20.0);        cairo_set_font_size (event->data.draw.cr, 20.0);
512  #else  #else
513      cairo_set_font_size (cr, 36.0);        cairo_set_font_size (event->data.draw.cr, 36.0);
514  #endif  #endif
515    
516      cairo_text_extents (cr, cache->id, &extents);        cairo_text_extents (event->data.draw.cr, cache->id, &extents);
517    
518      /* display id right of icon vertically centered */        /* display id right of icon vertically centered */
519      x += gdk_pixbuf_get_width(icon) + 5;        x += gdk_pixbuf_get_width(icon) + 5;
520      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
521      cairo_move_to (cr, x, y);        cairo_move_to (event->data.draw.cr, x, y);
522      cairo_set_source_rgba (cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
523      cairo_show_text (cr, cache->id);        cairo_show_text (event->data.draw.cr, cache->id);
524      cairo_stroke (cr);        cairo_stroke (event->data.draw.cr);
525    
526      y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;        y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
527    } else      } else
528      y += gdk_pixbuf_get_height(icon);        y += gdk_pixbuf_get_height(icon);
529    
530    /* return to the left border and below icon/text */      /* return to the left border and below icon/text */
531    x = rect->x;      x = event->data.draw.rect->x;
532    
533    /* everything from here uses the same font */      /* everything from here uses the same font */
534    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
535                            CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
536  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
537    cairo_set_font_size (cr, 14.0);      cairo_set_font_size (event->data.draw.cr, 14.0);
538  #else  #else
539    cairo_set_font_size (cr, 22.0);      cairo_set_font_size (event->data.draw.cr, 22.0);
540  #endif  #endif
541    
542    if(cache->name) {      if(cache->name) {
543      /* draw cache name */        /* draw cache name */
544      cairo_text_extents (cr, cache->name, &extents);        cairo_text_extents (event->data.draw.cr, cache->name, &extents);
545      y += extents.height;        y += extents.height;
546      cairo_move_to (cr, x, y);        cairo_move_to (event->data.draw.cr, x, y);
547      cairo_set_source_rgba (cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
548      cairo_show_text (cr, cache->name);        cairo_show_text (event->data.draw.cr, cache->name);
549      cairo_stroke (cr);        cairo_stroke (event->data.draw.cr);
550    
551      /* return to the left border and below text */        /* return to the left border and below text */
552      y += LINE_SKIP;        y += LINE_SKIP;
553      x = rect->x;        x = event->data.draw.rect->x;
554    }      }
555    
556    if(cache->terrain) {      if(cache->terrain) {
557      /* draw cache rating */        /* draw cache rating */
558      const char *terrain = "Terrain:";        const char *terrain = "Terrain:";
559      icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
560      cairo_text_extents (cr, _(terrain), &extents);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
561      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
562    
563      /* draw "Terrain:" string */        /* draw "Terrain:" string */
564      cairo_move_to (cr, x, y);        cairo_move_to (event->data.draw.cr, x, y);
565      cairo_set_source_rgba (cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
566      cairo_show_text (cr, _(terrain));        cairo_show_text (event->data.draw.cr, _(terrain));
567      cairo_stroke (cr);        cairo_stroke (event->data.draw.cr);
568      x += extents.width + 2;        x += extents.width + 2;
569    
570      /* draw terrain stars */        /* draw terrain stars */
571      cairo_draw_pixbuf(cr, icon, x, y -        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -
572                        (gdk_pixbuf_get_height(icon) + extents.height)/2);                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
573    
574      x += gdk_pixbuf_get_width(icon) + LINE_SKIP;        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
575      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;
576    }      }
   
   if(cache->difficulty) {  
     const char *difficulty = "Difficulty:";  
     cairo_text_extents (cr, _(difficulty), &extents);  
     y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
   
     /* draw "Difficulty:" string */  
     cairo_move_to (cr, x, y);  
     cairo_set_source_rgba (cr, 0, 0, 0, 1);  
     cairo_show_text (cr, _(difficulty));  
     cairo_stroke (cr);  
     x += extents.width + 2;  
577    
578      icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));      if(cache->difficulty) {
579      cairo_draw_pixbuf(cr, icon, x, y -        const char *difficulty = "Difficulty:";
580          cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
581          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
582    
583          /* draw "Difficulty:" string */
584          cairo_move_to (event->data.draw.cr, x, y);
585          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
586          cairo_show_text (event->data.draw.cr, _(difficulty));
587          cairo_stroke (event->data.draw.cr);
588          x += extents.width + 2;
589    
590          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
591          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -
592                        (gdk_pixbuf_get_height(icon) + extents.height)/2);                        (gdk_pixbuf_get_height(icon) + extents.height)/2);
593        }
594      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
595        printf("click %s event at %d %d\n",
596               event->data.click.down?"down":"up",
597               event->data.click.x, event->data.click.y);
598    
599        /* make the main screen jump to that cache */
600        if(!event->data.click.down) {
601          if(context->appdata->cur_cache) {
602            printf("ERROR: no current cache should be visible!\n");
603          } else {
604            gpx_t *is_in = NULL;
605    
606            if(!context->appdata->cur_gpx) {
607              printf("click while in \"all\" view\n");
608    
609              /* we first need to figure out which gpx file this cache */
610              /* is in so we can open it first */
611              gpx_t *gpx = context->appdata->gpx;
612              while(gpx && !is_in) {
613                cache_t *cur = gpx->cache;
614                while(cur && !is_in) {
615                  if(cur == cache)
616                    is_in = gpx;
617                  cur = cur->next;
618                }
619                gpx = gpx->next;
620              }
621    
622              if(is_in)
623                gpxlist_goto_cachelist(context->appdata, is_in);
624    
625            } else
626              /* the simple case: there already is an open gpx file and */
627              /* we just jump into the "cache" view */
628              is_in = context->appdata->cur_gpx;
629    
630            if(is_in) {
631              printf("selecting %s in %s\n",
632                     cache->id,
633                     context->appdata->cur_gpx->name);
634    
635              cachelist_goto_cache(context->appdata, cache);
636    
637              /* give focus to main screen (important for maemo) */
638              printf("raising main window\n");
639              gtk_window_present(GTK_WINDOW(context->appdata->window));
640            }
641          }
642        }
643      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
644        printf("removed\n");
645        context->balloon = NULL;
646    }    }
647  }  }
648    
# Line 442  on_map_button_release_event(GtkWidget *w Line 651  on_map_button_release_event(GtkWidget *w
651                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
652    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
653    
654    if(context->press_on) {    /* in "MAP_CACHE" state only one cache is visible */
655      /* and the map is in navigation mode. the balloon is */
656      /* pretty useless there */
657      if(context->press_on && (context->state != MAP_CACHE)) {
658    
659      coord_t coo;      coord_t coo;
660      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
661    
# Line 456  on_map_button_release_event(GtkWidget *w Line 669  on_map_button_release_event(GtkWidget *w
669        float dist = gpx_pos_get_distance(pos, cpos, FALSE);        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
670        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
671    
672            context->balloon = nearest;
673          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
674                                       balloon_draw_cb, nearest);                                       balloon_cb, context);
   
         osm_gps_map_osd_draw_nav (map, cpos.lat, cpos.lon, nearest->name);  
   
675        }        }
676      }      }
677      context->press_on = NULL;      context->press_on = NULL;
# Line 478  on_map_button_release_event(GtkWidget *w Line 689  on_map_button_release_event(GtkWidget *w
689  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
690    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
691    
   printf("destroy map window\n");  
   
692    /* save map parameters */    /* save map parameters */
693    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
694    gint zoom;    gint zoom;
# Line 501  static void on_window_destroy(GtkWidget Line 710  static void on_window_destroy(GtkWidget
710  #endif  #endif
711    
712    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
713      gps_unregister_callback(appdata, context->cb_id);
714    
715      if(context->caches_displayed) {
716        g_free(context->caches_displayed);
717        context->caches_displayed = NULL;
718      }
719    
720    g_free(context);    g_free(context);
721    appdata->map.context = NULL;    appdata->map.context = NULL;
# Line 525  on_window_realize(GtkWidget *widget, gpo Line 740  on_window_realize(GtkWidget *widget, gpo
740  }  }
741  #endif  #endif
742    
743    /* on maemo a window is either on top or completely invisible. this */
744    /* means that we only need to update the map window if its raised.  */
745    /* on ordinary desktops this is different and we always update */
746    
747    static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
748                             gpointer data) {
749      printf("map got focus\n");
750      map_setup((map_context_t*)data);
751      return FALSE;
752    }
753    
754    void map_update(appdata_t *appdata) {
755      printf("map_update\n");
756    #ifndef USE_MAEMO
757      if(appdata->map.context)
758        map_setup(appdata->map.context);
759    #endif
760    }
761    
762    /* callback called by the gps layer whenever gps state changes */
763    static void
764    gps_callback(struct gps_state *state, gpointer data) {
765      printf("map: gps callback\n");
766    }
767    
768  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
769    map_context_t *context = NULL;    map_context_t *context = NULL;
770    
771    /* if the map window already exists, just raise it */    /* if the map window already exists, just raise it */
772    if(appdata->map.context) {    if(appdata->map.context) {
773        printf("using existing map!\n");
774      gtk_window_present(GTK_WINDOW(appdata->map.context->window));      gtk_window_present(GTK_WINDOW(appdata->map.context->window));
775        map_setup(appdata->map.context);
776      return;      return;
777    }    }
778    
779    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
780    context->appdata = appdata;    context->appdata = appdata;
781    context->map_complete = FALSE;    context->map_complete = FALSE;
782      context->state = MAP_NONE;
783    
784    /* cleanup old (pre 0.8.7) path if it exists */    /* cleanup old (pre 0.8.7) path if it exists */
785    char *old_path = g_strdup_printf("%s/map/", appdata->image_path);    char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
# Line 579  void map(appdata_t *appdata) { Line 822  void map(appdata_t *appdata) {
822    g_free(path);    g_free(path);
823    
824    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
   
   char *name = NULL;  
 #ifdef USE_MAEMO  
   if(!appdata->cur_gpx && !appdata->cur_cache) {  
 #endif  
     /* draw all geocaches */  
     gpx_t *gpx = appdata->gpx;  
     while(gpx) {  
       map_draw_gpx(appdata, context->widget, gpx);  
       gpx = gpx->next;  
     }  
     name = g_strdup(_("all"));  
 #ifdef USE_MAEMO  
   } else if(!appdata->cur_cache) {  
     map_draw_gpx(appdata, context->widget, appdata->cur_gpx);  
     name = g_strdup(appdata->cur_gpx->name);  
   } else {  
     map_draw_cache(context->widget, appdata->cur_cache);  
     name = g_strdup(appdata->cur_cache->name);  
   }  
 #endif  
   
   char *title = g_strdup_printf(_("Map - %s"), name);  
   g_free(name);  
825    
826  #ifdef USE_MAEMO  #ifdef USE_MAEMO
827  #ifdef USE_STACKABLE_WINDOW    /* we don't use a stackable window here on fremantle, since */
828    context->window = hildon_stackable_window_new();    /* this leaves the main window independent from the map and */
829    /* try to enable the zoom buttons. don't do this on x86 as it breaks */    /* the user can e.g. still navigate the main menu */
830    /* at runtime with cygwin x */    context->window = hildon_window_new();
831  #ifndef __i386__  
832    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
833    g_signal_connect(G_OBJECT(context->window), "realize",    g_signal_connect(G_OBJECT(context->window), "realize",
834                     G_CALLBACK(on_window_realize), NULL);                     G_CALLBACK(on_window_realize), NULL);
835  #endif // MAEMO_VERSION  #endif // MAEMO_VERSION
836  #else  #else
   context->window = hildon_window_new();  
 #endif  
 #else  
837    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
838  #endif  #endif
839    
   gtk_window_set_title(GTK_WINDOW(context->window), title);  
   
840  #ifndef USE_MAEMO  #ifndef USE_MAEMO
841    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
842  #endif  #endif
843    
844    g_free(title);    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
845                       G_CALLBACK(on_focus_in), context);
846    
847    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
848                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
# Line 639  void map(appdata_t *appdata) { Line 855  void map(appdata_t *appdata) {
855    
856    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
857    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
858      context->cb_id = gps_register_callback(appdata, gps_callback, context);
859    
860  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
861    /* prevent some of the main screen things */    /* prevent some of the main screen things */
Legend:
Removed from v.123  
changed lines
  Added in v.152