Diff of /trunk/src/map-tool.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 151 by harbaum, Fri Oct 30 20:09:13 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      if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
198        if(context->state != MAP_ALL) {
199          printf("map_setup(ALL)\n");
200    
201    #ifdef OSD_NAV
202          /* no navigation in this mode */
203          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
204    #endif
205    
206          /* clear all existing cache images */
207          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
208    
209          /* draw all geocaches and none is semi-transparent */
210          gpx_t *gpx = context->appdata->gpx;
211          while(gpx) {
212            map_draw_gpx(context->appdata, context->widget, gpx, NULL, FALSE);
213            gpx = gpx->next;
214          }
215          name = g_strdup(_("all"));
216          context->state = MAP_ALL;
217        }
218      } else if(!context->appdata->cur_cache) {
219        if(context->state != MAP_GPX) {
220          printf("map_setup(GPX)\n");
221    
222    #ifdef OSD_NAV
223          /* no navigation in this mode */
224          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
225    #endif
226    
227          /* clear all existing ccahe images */
228          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
229    
230          /* draw all geocaches and all other gpx files are semi-transparent */
231          gpx_t *gpx = context->appdata->gpx;
232          while(gpx) {
233            map_draw_gpx(context->appdata, context->widget, gpx, NULL,
234                         gpx != context->appdata->cur_gpx);
235            gpx = gpx->next;
236          }
237    
238          name = g_strdup(context->appdata->cur_gpx->name);
239          context->state = MAP_GPX;
240        }
241      } else {
242        cache_t *cache = context->appdata->cur_cache;
243    
244        printf("map_setp(CACHE)\n");
245    
246        /* no balloons in this mode */
247        context->balloon = NULL;
248        osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
249    
250        /* clear all existing ccahe images */
251        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
252    
253        /* draw all geocaches and all but selected one are semi-transparent */
254        gpx_t *gpx = context->appdata->gpx;
255        while(gpx) {
256          map_draw_gpx(context->appdata, context->widget, gpx, cache, FALSE);
257          gpx = gpx->next;
258        }
259    
260        name = g_strdup(cache->name);
261        context->state = MAP_CACHE;
262    
263        /* navigation in this mode! */
264        pos_t cpos = gpx_cache_pos(cache);
265    
266    #ifdef OSD_NAV
267        osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
268                                  context->appdata->imperial,
269                                  cpos.lat, cpos.lon, cache->name);
270    #else
271    #warning OSD_NAV not defined!
272    #endif
273      }
274    
275      if(name) {
276        char *title = g_strdup_printf(_("Map - %s"), name);
277        g_free(name);
278    
279        gtk_window_set_title(GTK_WINDOW(context->window), title);
280    
281        g_free(title);
282      } else
283        printf("map_setup(keep)\n");
284    }
285    
286  static gboolean on_map_configure(GtkWidget *widget,  static gboolean on_map_configure(GtkWidget *widget,
287                                   GdkEventConfigure *event,                                   GdkEventConfigure *event,
288                                   map_context_t *context) {                                   map_context_t *context) {
289    
290    if(!context->map_complete) {    /* for some reason there's a configure event with 1/1 */
291      /* on diablo. We just ignore this! */
292    
293      printf("on_map_configure %d %d\n",
294             widget->allocation.width,
295             widget->allocation.height);
296    
297      if(!context->map_complete &&
298         (widget->allocation.width > 100) &&
299         (widget->allocation.height > 100)) {
300    
301        /* setup cache state */
302        map_setup(context);
303    
304      /* set default values if they are invalid */      /* set default values if they are invalid */
305      if(!context->appdata->map.zoom ||      if(!context->appdata->map.zoom ||
# Line 153  static gboolean on_map_configure(GtkWidg Line 309  static gboolean on_map_configure(GtkWidg
309    
310        pos_t *refpos = get_pos(context->appdata);        pos_t *refpos = get_pos(context->appdata);
311        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
312            printf("use refpos\n");
313    
314          /* use gps position if present */          /* use gps position if present */
315          context->appdata->map.pos = *refpos;          context->appdata->map.pos = *refpos;
316          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
317        } else {        } else {
318            printf("use zero pos\n");
319    
320          /* use world map otherwise */          /* use world map otherwise */
321          context->appdata->map.pos.lat = 0.0;          context->appdata->map.pos.lat = 0.0;
322          context->appdata->map.pos.lon = 0.0;          context->appdata->map.pos.lon = 0.0;
# Line 165  static gboolean on_map_configure(GtkWidg Line 325  static gboolean on_map_configure(GtkWidg
325      }      }
326    
327      /* jump to initial position */      /* jump to initial position */
328        printf("osm_gps_map_set_mapcenter(%f,%f,%d)\n",
329               context->appdata->map.pos.lat,
330               context->appdata->map.pos.lon,
331               context->appdata->map.zoom);
332    
333      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
334                                context->appdata->map.pos.lat,                                context->appdata->map.pos.lat,
335                                context->appdata->map.pos.lon,                                context->appdata->map.pos.lon,
# Line 175  static gboolean on_map_configure(GtkWidg Line 340  static gboolean on_map_configure(GtkWidg
340    return FALSE;    return FALSE;
341  }  }
342    
 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;  
   }  
 }  
   
343  static void  static void
344  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
345                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
346    
347    while(cache) {    while(cache) {
348      pos_t cpos = gpx_cache_pos(cache);      pos_t cpos = gpx_cache_pos(cache);
349    
# Line 258  pos_t coord2pos(coord_t coo) { Line 393  pos_t coord2pos(coord_t coo) {
393  static gboolean  static gboolean
394  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
395                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
396    
397    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
398    
399    /* check if we actually clicked parts of the OSD */    /* check if we actually clicked parts of the OSD */
400    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)
401      return FALSE;      return FALSE;
402    
403    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
# Line 315  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 451  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
451  #endif  #endif
452    
453  static void  static void
454  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
455    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  
456    
457    /* leave a little border top and left */    map_context_t *context = (map_context_t*)data;
458    gint x = rect->x, y = rect->y;    cache_t *cache = context->balloon;
   
   /* draw the cache type icon ... */  
   GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  
   cairo_draw_pixbuf(cr, icon, x, y);  
   
   if(cache->notes && cache->notes->override) {  
     GdkPixbuf *over = icon_get(ICON_MISC, 1);  
     cairo_draw_pixbuf(cr, over, x, y);  
   }  
459    
460    /* ... and right of it the waypoint id */    if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
461    cairo_text_extents_t extents;      printf("draw\n");
462    
463    if(cache->id) {  #if 0
464      cairo_select_font_face (cr, "Sans",      /* draw pink background to check clipping */
465                              CAIRO_FONT_SLANT_NORMAL,      cairo_rectangle (event->data.draw.cr,
466                              CAIRO_FONT_WEIGHT_BOLD);                       event->data.draw.rect->x-20, event->data.draw.rect->y-20,
467                         event->data.draw.rect->w+40, event->data.draw.rect->h+40);
468        cairo_set_source_rgba (event->data.draw.cr, 1, 0, 0, 0.3);
469        cairo_fill_preserve (event->data.draw.cr);
470        cairo_set_line_width (event->data.draw.cr, 0);
471        cairo_stroke (event->data.draw.cr);
472    #endif
473    
474        /* leave a little border top and left */
475        gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
476    
477        /* draw the cache type icon ... */
478        GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
479        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
480    
481        if(cache->notes && cache->notes->override) {
482          GdkPixbuf *over = icon_get(ICON_MISC, 1);
483          cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
484        }
485    
486        /* ... and right of it the waypoint id */
487        cairo_text_extents_t extents;
488    
489        if(cache->id) {
490          cairo_select_font_face (event->data.draw.cr, "Sans",
491                                  CAIRO_FONT_SLANT_NORMAL,
492                                  CAIRO_FONT_WEIGHT_BOLD);
493    
494  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
495      cairo_set_font_size (cr, 20.0);        cairo_set_font_size (event->data.draw.cr, 20.0);
496  #else  #else
497      cairo_set_font_size (cr, 36.0);        cairo_set_font_size (event->data.draw.cr, 36.0);
498  #endif  #endif
499    
500      cairo_text_extents (cr, cache->id, &extents);        cairo_text_extents (event->data.draw.cr, cache->id, &extents);
501    
502      /* display id right of icon vertically centered */        /* display id right of icon vertically centered */
503      x += gdk_pixbuf_get_width(icon) + 5;        x += gdk_pixbuf_get_width(icon) + 5;
504      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
505      cairo_move_to (cr, x, y);        cairo_move_to (event->data.draw.cr, x, y);
506      cairo_set_source_rgba (cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
507      cairo_show_text (cr, cache->id);        cairo_show_text (event->data.draw.cr, cache->id);
508      cairo_stroke (cr);        cairo_stroke (event->data.draw.cr);
509    
510      y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;        y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
511    } else      } else
512      y += gdk_pixbuf_get_height(icon);        y += gdk_pixbuf_get_height(icon);
513    
514    /* return to the left border and below icon/text */      /* return to the left border and below icon/text */
515    x = rect->x;      x = event->data.draw.rect->x;
516    
517    /* everything from here uses the same font */      /* everything from here uses the same font */
518    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
519                            CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
520  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
521    cairo_set_font_size (cr, 14.0);      cairo_set_font_size (event->data.draw.cr, 14.0);
522  #else  #else
523    cairo_set_font_size (cr, 22.0);      cairo_set_font_size (event->data.draw.cr, 22.0);
524  #endif  #endif
525    
526    if(cache->name) {      if(cache->name) {
527      /* draw cache name */        /* draw cache name */
528      cairo_text_extents (cr, cache->name, &extents);        cairo_text_extents (event->data.draw.cr, cache->name, &extents);
529      y += extents.height;        y += extents.height;
530      cairo_move_to (cr, x, y);        cairo_move_to (event->data.draw.cr, x, y);
531      cairo_set_source_rgba (cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
532      cairo_show_text (cr, cache->name);        cairo_show_text (event->data.draw.cr, cache->name);
533      cairo_stroke (cr);        cairo_stroke (event->data.draw.cr);
534    
535      /* return to the left border and below text */        /* return to the left border and below text */
536      y += LINE_SKIP;        y += LINE_SKIP;
537      x = rect->x;        x = event->data.draw.rect->x;
538    }      }
539    
540    if(cache->terrain) {      if(cache->terrain) {
541      /* draw cache rating */        /* draw cache rating */
542      const char *terrain = "Terrain:";        const char *terrain = "Terrain:";
543      icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
544      cairo_text_extents (cr, _(terrain), &extents);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
545      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
546    
547      /* draw "Terrain:" string */        /* draw "Terrain:" string */
548      cairo_move_to (cr, x, y);        cairo_move_to (event->data.draw.cr, x, y);
549      cairo_set_source_rgba (cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
550      cairo_show_text (cr, _(terrain));        cairo_show_text (event->data.draw.cr, _(terrain));
551      cairo_stroke (cr);        cairo_stroke (event->data.draw.cr);
552      x += extents.width + 2;        x += extents.width + 2;
553    
554      /* draw terrain stars */        /* draw terrain stars */
555      cairo_draw_pixbuf(cr, icon, x, y -        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -
556                        (gdk_pixbuf_get_height(icon) + extents.height)/2);                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
557    
558      x += gdk_pixbuf_get_width(icon) + LINE_SKIP;        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
559      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;
560    }      }
   
   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;  
561    
562      icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));      if(cache->difficulty) {
563      cairo_draw_pixbuf(cr, icon, x, y -        const char *difficulty = "Difficulty:";
564          cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
565          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
566    
567          /* draw "Difficulty:" string */
568          cairo_move_to (event->data.draw.cr, x, y);
569          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
570          cairo_show_text (event->data.draw.cr, _(difficulty));
571          cairo_stroke (event->data.draw.cr);
572          x += extents.width + 2;
573    
574          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
575          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -
576                        (gdk_pixbuf_get_height(icon) + extents.height)/2);                        (gdk_pixbuf_get_height(icon) + extents.height)/2);
577        }
578      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
579        printf("click %s event at %d %d\n",
580               event->data.click.down?"down":"up",
581               event->data.click.x, event->data.click.y);
582    
583        /* make the main screen jump to that cache */
584        if(!event->data.click.down) {
585          if(context->appdata->cur_cache) {
586            printf("ERROR: no current cache should be visible!\n");
587          } else {
588            gpx_t *is_in = NULL;
589    
590            if(!context->appdata->cur_gpx) {
591              printf("click while in \"all\" view\n");
592    
593              /* we first need to figure out which gpx file this cache */
594              /* is in so we can open it first */
595              gpx_t *gpx = context->appdata->gpx;
596              while(gpx && !is_in) {
597                cache_t *cur = gpx->cache;
598                while(cur && !is_in) {
599                  if(cur == cache)
600                    is_in = gpx;
601                  cur = cur->next;
602                }
603                gpx = gpx->next;
604              }
605    
606              if(is_in)
607                gpxlist_goto_cachelist(context->appdata, is_in);
608    
609            } else
610              /* the simple case: there already is an open gpx file and */
611              /* we just jump into the "cache" view */
612              is_in = context->appdata->cur_gpx;
613    
614            if(is_in) {
615              printf("selecting %s in %s\n",
616                     cache->id,
617                     context->appdata->cur_gpx->name);
618    
619              cachelist_goto_cache(context->appdata, cache);
620    
621              /* give focus to main screen (important for maemo) */
622              printf("raising main window\n");
623              gtk_window_present(GTK_WINDOW(context->appdata->window));
624            }
625          }
626        }
627      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
628        printf("removed\n");
629        context->balloon = NULL;
630    }    }
631  }  }
632    
# Line 456  on_map_button_release_event(GtkWidget *w Line 653  on_map_button_release_event(GtkWidget *w
653        float dist = gpx_pos_get_distance(pos, cpos, FALSE);        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
654        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
655    
656            context->balloon = nearest;
657          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
658                                       balloon_draw_cb, nearest);                                       balloon_cb, context);
659        }        }
660      }      }
661      context->press_on = NULL;      context->press_on = NULL;
# Line 475  on_map_button_release_event(GtkWidget *w Line 673  on_map_button_release_event(GtkWidget *w
673  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
674    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
675    
   printf("destroy map window\n");  
   
676    /* save map parameters */    /* save map parameters */
677    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
678    gint zoom;    gint zoom;
# Line 498  static void on_window_destroy(GtkWidget Line 694  static void on_window_destroy(GtkWidget
694  #endif  #endif
695    
696    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
697      gps_unregister_callback(appdata, context->cb_id);
698    
699    g_free(context);    g_free(context);
700    appdata->map.context = NULL;    appdata->map.context = NULL;
# Line 522  on_window_realize(GtkWidget *widget, gpo Line 719  on_window_realize(GtkWidget *widget, gpo
719  }  }
720  #endif  #endif
721    
722  /* draw geocaches and set window title */  /* on maemo a window is either on top or completely invisible. this */
723  static void map_setup(map_context_t *context) {  /* means that we only need to update the map window if its raised.  */
724    char *name = NULL;  /* on ordinary desktops this is different and we always update */
   
   if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {  
     if(context->state != MAP_ALL) {  
       printf("map_setp(ALL)\n");  
725    
       /* no navigation in this mode */  
       osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));  
   
       /* clear all existing ccahe images */  
       osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));  
   
       /* draw all geocaches */  
       gpx_t *gpx = context->appdata->gpx;  
       while(gpx) {  
         map_draw_gpx(context->appdata, context->widget, gpx);  
         gpx = gpx->next;  
       }  
       name = g_strdup(_("all"));  
       context->state = MAP_ALL;  
     }  
   } else if(!context->appdata->cur_cache) {  
     if(context->state != MAP_GPX) {  
       printf("map_setp(GPX)\n");  
   
       /* no navigation in this mode */  
       osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));  
   
       /* clear all existing ccahe images */  
       osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));  
   
       map_draw_gpx(context->appdata, context->widget,  
                    context->appdata->cur_gpx);  
       name = g_strdup(context->appdata->cur_gpx->name);  
       context->state = MAP_GPX;  
     }  
   } else {  
     cache_t *cache = context->appdata->cur_cache;  
   
     printf("map_setp(CACHE)\n");  
   
     /* no balloons in this mode */  
     osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));  
   
     /* clear all existing ccahe images */  
     osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));  
   
     map_draw_cache(context->widget, cache);  
     name = g_strdup(cache->name);  
     context->state = MAP_CACHE;  
   
     /* navigation in this mode! */  
     pos_t cpos = gpx_cache_pos(cache);  
     osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),  
                               context->appdata->imperial,  
                               cpos.lat, cpos.lon, cache->name);  
   }  
   
   if(name) {  
     char *title = g_strdup_printf(_("Map - %s"), name);  
     g_free(name);  
   
     gtk_window_set_title(GTK_WINDOW(context->window), title);  
   
     g_free(title);  
   } else  
     printf("map_setup(keep)\n");  
 }  
   
 /* on maemo a window is either on top or completely invisible. this means that */  
 /* we only need to update the map window if its raised. on ordinary desktops this */  
 /* is different and we always update */  
726  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
727                           gpointer data) {                           gpointer data) {
728    printf("map got focus\n");    printf("map got focus\n");
# Line 604  static gboolean on_focus_in(GtkWidget *w Line 731  static gboolean on_focus_in(GtkWidget *w
731  }  }
732    
733  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
734      printf("map_update\n");
735  #ifndef USE_MAEMO  #ifndef USE_MAEMO
736    if(appdata->map.context)    if(appdata->map.context)
737      map_setup(appdata->map.context);      map_setup(appdata->map.context);
738  #endif  #endif
739  }  }
740    
741    /* callback called by the gps layer whenever gps state changes */
742    static void
743    gps_callback(struct gps_state *state, gpointer data) {
744      printf("map: gps callback\n");
745    }
746    
747  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
748    map_context_t *context = NULL;    map_context_t *context = NULL;
749    
# Line 682  void map(appdata_t *appdata) { Line 816  void map(appdata_t *appdata) {
816    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
817  #endif  #endif
818    
   /* setup cache state */  
   map_setup(context);  
   
819  #ifndef USE_MAEMO  #ifndef USE_MAEMO
820    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
821  #endif  #endif
# Line 703  void map(appdata_t *appdata) { Line 834  void map(appdata_t *appdata) {
834    
835    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
836    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
837      context->cb_id = gps_register_callback(appdata, gps_callback, context);
838    
839  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
840    /* prevent some of the main screen things */    /* prevent some of the main screen things */
Legend:
Removed from v.133  
changed lines
  Added in v.151