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

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

revision 98 by harbaum, Mon Sep 7 13:20:37 2009 UTC revision 189 by harbaum, Tue Nov 17 09:07:17 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 48  static const char *get_proxy_uri(appdata Line 55  static const char *get_proxy_uri(appdata
55    /* use environment settings if preset */    /* use environment settings if preset */
56    const char *proxy = g_getenv("http_proxy");    const char *proxy = g_getenv("http_proxy");
57    if(proxy) {    if(proxy) {
58      printf("http_proxy: %s\n", proxy);      printf("map http proxy from env: %s\n", proxy);
59      return proxy;      return proxy;
60    }    }
61    
# Line 69  static const char *get_proxy_uri(appdata Line 76  static const char *get_proxy_uri(appdata
76    
77        snprintf(proxy_buffer, sizeof(proxy_buffer),        snprintf(proxy_buffer, sizeof(proxy_buffer),
78                 "http://%s:%u", host, port);                 "http://%s:%u", host, port);
79          printf("map http proxy from gconf: %s\n ", proxy_buffer);
80    
81        g_free(host);        g_free(host);
82      }      }
# Line 80  static const char *get_proxy_uri(appdata Line 88  static const char *get_proxy_uri(appdata
88    
89  static void  static void
90  cb_map_gps(osd_button_t but, map_context_t *context) {  cb_map_gps(osd_button_t but, map_context_t *context) {
91    
92    if(but == OSD_GPS) {    if(but == OSD_GPS) {
93      pos_t *refpos = get_pos(context->appdata);      pos_t *refpos = get_pos(context->appdata);
94      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 117  static int dist2pixel(map_context_t *con
117    
118  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
119    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
120      static gboolean goto_is_enabled = FALSE;
121    
122    /* get reference position ... */    /* get reference position ... */
123    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
124    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
125    
126    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
127    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),    if(ok != goto_is_enabled) {
128                   OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
129                    OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
130        goto_is_enabled = ok;
131      }
132    
133    if(ok) {    if(ok) {
134      float heading = NAN;      float heading = NAN;
# Line 130  static gboolean map_gps_update(gpointer Line 143  static gboolean map_gps_update(gpointer
143          radius = dist2pixel(context, eph/1000, refpos->lat);          radius = dist2pixel(context, eph/1000, refpos->lat);
144      }      }
145    
146        /* TODO: in order to save energy: only draw if state actually changed */
147    
148      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
149      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
150                           refpos->lat, refpos->lon, heading);                           refpos->lat, refpos->lon, heading);
# Line 139  static gboolean map_gps_update(gpointer Line 154  static gboolean map_gps_update(gpointer
154    return TRUE;    return TRUE;
155  }  }
156    
157    static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
158      int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;
159    
160      GdkPixbuf *icon = icon_get(type, cache->type);
161    
162      /* check if there's also an overwritten coordinate */
163      if(cache->notes && cache->notes->override) {
164        GdkPixbuf *over = icon_get(type, 11);
165    
166        osm_gps_map_add_image(OSM_GPS_MAP(map),
167              cache->notes->pos.lat, cache->notes->pos.lon, icon);
168    
169        osm_gps_map_add_image(OSM_GPS_MAP(map),
170              cache->notes->pos.lat, cache->notes->pos.lon, over);
171      } else {
172        if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon))
173          osm_gps_map_add_image(OSM_GPS_MAP(map),
174                                cache->pos.lat, cache->pos.lon, icon);
175      }
176    }
177    
178    static void map_draw_gpx(appdata_t *appdata, cache_display_t *caches,
179                             GtkWidget *map, gpx_t *gpx,
180                             cache_t *nav, gboolean semi) {
181      if(!gpx->notes_loaded) {
182        notes_load_all(appdata, gpx);
183        gpx->notes_loaded = TRUE;
184      }
185    
186      cache_t *cache = gpx->cache;
187      while(cache) {
188        /* search if we have that cache already in our list/displayed */
189        int i=0;
190        while(caches[i].id && (strcmp(caches[i].id, cache->id) != 0))
191          i++;
192    
193        if(!caches[i].id) {
194          /* if nav is given draw all other caches semitransparent. */
195          /* if nav is not given do what semi sais */
196          map_draw_cache(map, cache, nav?(cache != nav):semi);
197          caches[i].id = cache->id;
198        }
199    
200        cache = cache->next;
201      }
202    }
203    
204    /* draw geocaches and set window title */
205    static void map_setup(map_context_t *context) {
206      char *name = NULL;
207    
208      int cache_num = gpx_total_caches_global(context->appdata->gpx);
209    
210      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
211        //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
212        //     cache_num, context->cache_list_len);
213        g_free(context->caches_displayed);
214        context->caches_displayed = NULL;
215        context->cache_list_len = 0;
216      }
217    
218      /* allocate buffer */
219      if(cache_num && !context->caches_displayed) {
220        context->cache_list_len = cache_num;
221        context->caches_displayed = g_new0(cache_display_t, cache_num+1);
222        printf("allocated space to handle %d map icons\n", cache_num);
223      }
224    
225      if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
226        if(context->state != MAP_ALL) {
227          printf("map_setup(ALL)\n");
228    
229    #ifdef OSD_NAV
230          /* no navigation in this mode */
231          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
232    #endif
233    
234          /* clear all existing cache images */
235          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
236          memset(context->caches_displayed, 0,
237                 (cache_num+1) * sizeof(cache_display_t));
238    
239          /* draw all geocaches and none is semi-transparent */
240          gpx_t *gpx = context->appdata->gpx;
241          while(gpx) {
242            map_draw_gpx(context->appdata, context->caches_displayed,
243                         context->widget, gpx, NULL, FALSE);
244            gpx = gpx->next;
245          }
246    
247          {
248            int i=0;
249            while(context->caches_displayed[i].id) i++;
250            printf("number of caches actually displayed: %d\n", i);
251          }
252    
253          name = g_strdup(_("all"));
254          context->state = MAP_ALL;
255        }
256      } else if(!context->appdata->cur_cache) {
257        if(context->state != MAP_GPX) {
258          printf("map_setup(GPX)\n");
259    
260    #ifdef OSD_NAV
261          /* no navigation in this mode */
262          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
263    #endif
264    
265          /* clear all existing ccahe images */
266          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
267          memset(context->caches_displayed, 0,
268                 (cache_num+1) * sizeof(cache_display_t));
269    
270          /* draw all geocaches and all other gpx files are semi-transparent */
271          map_draw_gpx(context->appdata, context->caches_displayed,
272                       context->widget, context->appdata->cur_gpx, NULL, FALSE);
273    
274          gpx_t *gpx = context->appdata->gpx;
275          while(gpx) {
276            if(gpx != context->appdata->cur_gpx)
277              map_draw_gpx(context->appdata, context->caches_displayed,
278                           context->widget, gpx, NULL, TRUE);
279    
280            gpx = gpx->next;
281          }
282    
283          name = g_strdup(context->appdata->cur_gpx->name);
284          context->state = MAP_GPX;
285        }
286      } else {
287        cache_t *cache = context->appdata->cur_cache;
288    
289        printf("map_setup(CACHE)\n");
290    
291        /* no balloons in this mode */
292        context->balloon = NULL;
293        osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
294    
295        /* clear all existing ccahe images */
296        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
297        memset(context->caches_displayed, 0,
298               (cache_num+1) * sizeof(cache_display_t));
299    
300        /* draw all geocaches and all but selected one are semi-transparent */
301        gpx_t *gpx = context->appdata->gpx;
302        while(gpx) {
303          map_draw_gpx(context->appdata, context->caches_displayed,
304                       context->widget, gpx, cache, FALSE);
305          gpx = gpx->next;
306        }
307    
308        name = g_strdup(cache->name);
309        context->state = MAP_CACHE;
310    
311        /* navigation in this mode! */
312        pos_t cpos = gpx_cache_pos(cache);
313    
314    #ifdef OSD_NAV
315        osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
316                                  context->appdata->imperial,
317                                  cpos.lat, cpos.lon, cache->name);
318    #else
319    #warning OSD_NAV not defined!
320    #endif
321      }
322    
323      if(name) {
324        char *title = g_strdup_printf(_("Map - %s"), name);
325        g_free(name);
326    
327        gtk_window_set_title(GTK_WINDOW(context->window), title);
328    
329        g_free(title);
330      } else
331        printf("map_setup(keep)\n");
332    }
333    
334  static gboolean on_map_configure(GtkWidget *widget,  static gboolean on_map_configure(GtkWidget *widget,
335                                   GdkEventConfigure *event,                                   GdkEventConfigure *event,
336                                   map_context_t *context) {                                   map_context_t *context) {
337    
338    if(!context->map_complete) {    /* for some reason there's a configure event with 1/1 */
339      /* on diablo. We just ignore this! */
340    
341      printf("on_map_configure %d %d\n",
342             widget->allocation.width,
343             widget->allocation.height);
344    
345      if(!context->map_complete &&
346         (widget->allocation.width > 100) &&
347         (widget->allocation.height > 100)) {
348    
349        /* setup cache state */
350        map_setup(context);
351    
352      /* set default values if they are invalid */      /* set default values if they are invalid */
353      if(!context->appdata->map.zoom ||      if(!context->appdata->map.zoom ||
# Line 153  static gboolean on_map_configure(GtkWidg Line 357  static gboolean on_map_configure(GtkWidg
357    
358        pos_t *refpos = get_pos(context->appdata);        pos_t *refpos = get_pos(context->appdata);
359        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
360            printf("use refpos\n");
361    
362          /* use gps position if present */          /* use gps position if present */
363          context->appdata->map.pos = *refpos;          context->appdata->map.pos = *refpos;
364          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
365        } else {        } else {
366            printf("use zero pos\n");
367    
368          /* use world map otherwise */          /* use world map otherwise */
369          context->appdata->map.pos.lat = 0.0;          context->appdata->map.pos.lat = 0.0;
370          context->appdata->map.pos.lon = 0.0;          context->appdata->map.pos.lon = 0.0;
# Line 165  static gboolean on_map_configure(GtkWidg Line 373  static gboolean on_map_configure(GtkWidg
373      }      }
374    
375      /* jump to initial position */      /* jump to initial position */
376        printf("osm_gps_map_set_mapcenter(%f,%f,%d)\n",
377               context->appdata->map.pos.lat,
378               context->appdata->map.pos.lon,
379               context->appdata->map.zoom);
380    
381      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
382                                context->appdata->map.pos.lat,                                context->appdata->map.pos.lat,
383                                context->appdata->map.pos.lon,                                context->appdata->map.pos.lon,
# Line 175  static gboolean on_map_configure(GtkWidg Line 388  static gboolean on_map_configure(GtkWidg
388    return FALSE;    return FALSE;
389  }  }
390    
 static void map_draw_cachelist(GtkWidget *map, cache_t *cache) {  
   while(cache) {  
     GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  
   
     osm_gps_map_add_image(OSM_GPS_MAP(map),  
                           cache->pos.lat, cache->pos.lon, icon);  
   
     cache = cache->next;  
   }  
 }  
   
391  static void  static void
392  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
393                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
394    
395    while(cache) {    while(cache) {
396        pos_t cpos = gpx_cache_pos(cache);
397    
398      float dist =      float dist =
399        pow(cache->pos.lat - pos->lat, 2) +        pow(cpos.lat - pos->lat, 2) +
400        pow(cache->pos.lon - pos->lon, 2);        pow(cpos.lon - pos->lon, 2);
401    
402      if(!(dist > *distance)) {      if(!(dist > *distance)) {
403        *result = cache;        *result = cache;
# Line 207  static cache_t *map_closest(map_context_ Line 412  static cache_t *map_closest(map_context_
412    cache_t *result = NULL;    cache_t *result = NULL;
413    float distance = NAN;    float distance = NAN;
414    
415  #ifdef USE_MAEMO    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
   if(!context->appdata->cur_gpx) {  
 #endif  
416      /* search all geocaches */      /* search all geocaches */
417      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
418      while(gpx) {      while(gpx) {
419        map_cachelist_nearest(gpx->cache, pos, &result, &distance);        map_cachelist_nearest(gpx->cache, pos, &result, &distance);
420        gpx = gpx->next;        gpx = gpx->next;
421      }      }
422  #ifdef USE_MAEMO    } else if(context->appdata->cur_gpx) {
   } else {  
423      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
424                            pos, &result, &distance);                            pos, &result, &distance);
425    }    } else
426  #endif      result = context->appdata->cur_gpx->cache;
427    
428    return result;    return result;
429  }  }
# Line 239  pos_t coord2pos(coord_t coo) { Line 441  pos_t coord2pos(coord_t coo) {
441  static gboolean  static gboolean
442  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
443                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
444    
445    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
446    
447    /* check if we actually clicked parts of the OSD */    /* check if we actually clicked parts of the OSD */
448    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)
449      return FALSE;      return FALSE;
450    
451    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
# Line 256  on_map_button_press_event(GtkWidget *wid Line 459  on_map_button_press_event(GtkWidget *wid
459    
460    cache_t *nearest = map_closest(context, &pos);    cache_t *nearest = map_closest(context, &pos);
461    if(nearest) {    if(nearest) {
462      float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);      pos_t cpos = gpx_cache_pos(nearest);
463      if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)  
464        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
465        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ)
466        context->press_on = nearest;        context->press_on = nearest;
467    }    }
468    
# Line 275  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 480  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
480                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
481    
482    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
483      g_assert(image_surface);
484    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
485    
486    // Draw the image on the new Context    // Draw the image on the new Context
# Line 288  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 494  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
494  }  }
495    
496  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
497    #define ICON_SIZE  ICON_CACHE_TYPE
498  #define LINE_SKIP  7  #define LINE_SKIP  7
499  #else  #else
500    #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
501  #define LINE_SKIP  12  #define LINE_SKIP  12
502  #endif  #endif
503    
504  static void  static void
505  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
506    cache_t *cache = (cache_t*)data;    printf("balloon event: ");
507    
508      map_context_t *context = (map_context_t*)data;
509      cache_t *cache = context->balloon;
510    
511      if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
512        printf("draw\n");
513    
514  #if 0  #if 0
515    /* draw pink background to check clipping */      /* draw pink background to check clipping */
516    cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);      cairo_rectangle (event->data.draw.cr,
517    cairo_set_source_rgba (cr, 1, 0, 0, 0.3);                       event->data.draw.rect->x-20, event->data.draw.rect->y-20,
518    cairo_fill_preserve (cr);                       event->data.draw.rect->w+40, event->data.draw.rect->h+40);
519    cairo_set_line_width (cr, 0);      cairo_set_source_rgba (event->data.draw.cr, 1, 0, 0, 0.3);
520    cairo_stroke (cr);      cairo_fill_preserve (event->data.draw.cr);
521  #endif      cairo_set_line_width (event->data.draw.cr, 0);
522        cairo_stroke (event->data.draw.cr);
523    /* leave a little border top and left */  #endif
524    gint x = rect->x, y = rect->y;  
525        /* leave a little border top and left */
526    /* draw the cache type icon ... */      gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
527    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  
528    cairo_draw_pixbuf(cr, icon, x, y);      /* draw the cache type icon ... */
529        GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
530    /* ... and right of it the waypoint id */      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
531    cairo_text_extents_t extents;  
532        if(cache->notes && cache->notes->override) {
533    if(cache->id) {        GdkPixbuf *over = icon_get(ICON_SIZE, 11);
534      cairo_select_font_face (cr, "Sans",        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
535                              CAIRO_FONT_SLANT_NORMAL,      }
536                              CAIRO_FONT_WEIGHT_BOLD);  
537        /* ... and right of it the waypoint id */
538        cairo_text_extents_t extents;
539    
540        if(cache->id) {
541          cairo_select_font_face (event->data.draw.cr, "Sans",
542                                  CAIRO_FONT_SLANT_NORMAL,
543                                  CAIRO_FONT_WEIGHT_BOLD);
544    
545    #ifndef BIG_BALLOONS
546          cairo_set_font_size (event->data.draw.cr, 20.0);
547    #else
548          cairo_set_font_size (event->data.draw.cr, 36.0);
549    #endif
550    
551          cairo_text_extents (event->data.draw.cr, cache->id, &extents);
552    
553          /* display id right of icon vertically centered */
554          x += gdk_pixbuf_get_width(icon) + 5;
555          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
556          cairo_move_to (event->data.draw.cr, x, y);
557          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
558          cairo_show_text (event->data.draw.cr, cache->id);
559          cairo_stroke (event->data.draw.cr);
560    
561          y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
562        } else
563          y += gdk_pixbuf_get_height(icon);
564    
565        /* return to the left border and below icon/text */
566        x = event->data.draw.rect->x;
567    
568        /* everything from here uses the same font */
569        cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
570                                CAIRO_FONT_WEIGHT_NORMAL);
571  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
572      cairo_set_font_size (cr, 20.0);  #define FONT_SIZE 14.0
573  #else  #else
574      cairo_set_font_size (cr, 36.0);  #define FONT_SIZE 22.0
575  #endif  #endif
576    
577      cairo_text_extents (cr, cache->id, &extents);      cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
578    
579        if(cache->name) {
580          /* draw cache name */
581          cairo_text_extents (event->data.draw.cr, cache->name, &extents);
582          y += extents.height;
583          cairo_move_to (event->data.draw.cr, x, y);
584          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
585          cairo_show_text (event->data.draw.cr, cache->name);
586          cairo_stroke (event->data.draw.cr);
587    
588          /* return to the left border and below text */
589          y += LINE_SKIP;
590          x = event->data.draw.rect->x;
591        }
592    
593        if(cache->terrain) {
594          int text_y = 0, icon_y = 0;
595    
596      /* display id right of icon vertically centered */        /* draw cache rating */
597      x += gdk_pixbuf_get_width(icon) + 5;        const char *terrain = "Terrain:";
598      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
599      cairo_move_to (cr, x, y);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
     cairo_set_source_rgba (cr, 0, 0, 0, 1);  
     cairo_show_text (cr, cache->id);  
     cairo_stroke (cr);  
600    
601      y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;        if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
602    } else          text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
603      y += gdk_pixbuf_get_height(icon);        else
604            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
605    
606    /* return to the left border and below icon/text */        /* draw "Terrain:" string */
607    x = rect->x;        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
608          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
609          cairo_show_text (event->data.draw.cr, _(terrain));
610          cairo_stroke (event->data.draw.cr);
611          x += extents.width + 2;
612    
613          /* draw terrain stars */
614          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
615    
616          x += gdk_pixbuf_get_width(icon) + LINE_SKIP - 2;
617        }
618    
619        if(cache->difficulty) {
620          int text_y = 0, icon_y = 0;
621    
622    /* everything from here uses the same font */        const char *difficulty = "Difficulty:";
623    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
624                            CAIRO_FONT_WEIGHT_NORMAL);        cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
625  #ifndef BIG_BALLOONS  
626    cairo_set_font_size (cr, 14.0);        if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
627  #else          text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
628    cairo_set_font_size (cr, 22.0);        else
629  #endif          icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
630    
631    if(cache->name) {        /* draw "Difficulty:" string */
632      /* draw cache name */        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
633      cairo_text_extents (cr, cache->name, &extents);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
634      y += extents.height;        cairo_show_text (event->data.draw.cr, _(difficulty));
635      cairo_move_to (cr, x, y);        cairo_stroke (event->data.draw.cr);
636      cairo_set_source_rgba (cr, 0, 0, 0, 1);        x += extents.width + 2;
637      cairo_show_text (cr, cache->name);  
638      cairo_stroke (cr);        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
639        }
640      /* return to the left border and below text */    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
641      y += LINE_SKIP;      printf("click %s event at %d %d\n",
642      x = rect->x;             event->data.click.down?"down":"up",
643    }             event->data.click.x, event->data.click.y);
644    
645    if(cache->terrain) {      /* make the main screen jump to that cache */
646      /* draw cache rating */      if(!event->data.click.down) {
647      const char *terrain = "Terrain:";        if(context->appdata->cur_cache) {
648      icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));          printf("ERROR: no current cache should be visible!\n");
649      cairo_text_extents (cr, _(terrain), &extents);        } else {
650      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;          gpx_t *is_in = NULL;
651    
652      /* draw "Terrain:" string */          if(!context->appdata->cur_gpx) {
653      cairo_move_to (cr, x, y);            printf("click while in \"all\" view\n");
654      cairo_set_source_rgba (cr, 0, 0, 0, 1);  
655      cairo_show_text (cr, _(terrain));            /* we first need to figure out which gpx file this cache */
656      cairo_stroke (cr);            /* is in so we can open it first */
657      x += extents.width + 2;            gpx_t *gpx = context->appdata->gpx;
658              while(gpx && !is_in) {
659      /* draw terrain stars */              cache_t *cur = gpx->cache;
660      cairo_draw_pixbuf(cr, icon, x, y -              while(cur && !is_in) {
661                        (gdk_pixbuf_get_height(icon) + extents.height)/2);                if(cur == cache)
662                    is_in = gpx;
663      x += gdk_pixbuf_get_width(icon) + LINE_SKIP;                cur = cur->next;
664      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;              }
665    }              gpx = gpx->next;
666              }
667    if(cache->difficulty) {  
668      const char *difficulty = "Difficulty:";            if(is_in)
669      cairo_text_extents (cr, _(difficulty), &extents);              gpxlist_goto_cachelist(context->appdata, is_in);
670      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
671            } else
672      /* draw "Difficulty:" string */            /* the simple case: there already is an open gpx file and */
673      cairo_move_to (cr, x, y);            /* we just jump into the "cache" view */
674      cairo_set_source_rgba (cr, 0, 0, 0, 1);            is_in = context->appdata->cur_gpx;
675      cairo_show_text (cr, _(difficulty));  
676      cairo_stroke (cr);          if(is_in) {
677      x += extents.width + 2;            printf("selecting %s in %s\n",
678                     cache->id,
679      icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));                   context->appdata->cur_gpx->name);
680      cairo_draw_pixbuf(cr, icon, x, y -  
681                        (gdk_pixbuf_get_height(icon) + extents.height)/2);            cachelist_goto_cache(context->appdata, cache);
682    
683              /* give focus to main screen (important for maemo) */
684              printf("raising main window\n");
685              gtk_window_present(GTK_WINDOW(context->appdata->window));
686            }
687          }
688        }
689      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
690        printf("removed\n");
691        context->balloon = NULL;
692    }    }
693  }  }
694    
# Line 412  on_map_button_release_event(GtkWidget *w Line 697  on_map_button_release_event(GtkWidget *w
697                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
698    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
699    
700    if(context->press_on) {    /* in "MAP_CACHE" state only one cache is visible */
701      /* and the map is in navigation mode. the balloon is */
702      /* pretty useless there */
703      if(context->press_on && (context->state != MAP_CACHE)) {
704    
705      coord_t coo;      coord_t coo;
706      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
707    
# Line 421  on_map_button_release_event(GtkWidget *w Line 710  on_map_button_release_event(GtkWidget *w
710    
711      cache_t *nearest = map_closest(context, &pos);      cache_t *nearest = map_closest(context, &pos);
712      if(nearest && nearest == context->press_on) {      if(nearest && nearest == context->press_on) {
713        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);        pos_t cpos = gpx_cache_pos(nearest);
714        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {  
715          float dist = gpx_pos_get_distance(pos, cpos, FALSE);
716          if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
717    
718          osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,          context->balloon = nearest;
719                                   balloon_draw_cb, nearest);          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
720                                         balloon_cb, context);
721        }        }
722      }      }
723      context->press_on = NULL;      context->press_on = NULL;
# Line 443  on_map_button_release_event(GtkWidget *w Line 735  on_map_button_release_event(GtkWidget *w
735  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
736    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
737    
   printf("destroy map window\n");  
   
738    /* save map parameters */    /* save map parameters */
739    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
740    gint zoom;    gint zoom;
# Line 466  static void on_window_destroy(GtkWidget Line 756  static void on_window_destroy(GtkWidget
756  #endif  #endif
757    
758    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
759      gps_unregister_callback(appdata, context->cb_id);
760    
761      if(context->caches_displayed) {
762        g_free(context->caches_displayed);
763        context->caches_displayed = NULL;
764      }
765    
766    g_free(context);    g_free(context);
767    appdata->map.context = NULL;    appdata->map.context = NULL;
# Line 490  on_window_realize(GtkWidget *widget, gpo Line 786  on_window_realize(GtkWidget *widget, gpo
786  }  }
787  #endif  #endif
788    
789    /* on maemo a window is either on top or completely invisible. this */
790    /* means that we only need to update the map window if its raised.  */
791    /* on ordinary desktops this is different and we always update */
792    
793    static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
794                             gpointer data) {
795      map_context_t *context = (map_context_t*)data;
796    
797      printf("map got focus\n");
798    
799    #ifdef USE_MAEMO
800      /* re-enable refresh of map */
801      if(!context->handler_id)
802        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
803    #endif
804    
805      map_setup(context);
806      return FALSE;
807    }
808    
809    #ifdef USE_MAEMO
810    static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
811                             gpointer data) {
812      map_context_t *context = (map_context_t*)data;
813    
814      printf("map lost focus\n");
815      gtk_timeout_remove(context->handler_id);
816      context->handler_id = 0;
817    
818      return FALSE;
819    }
820    #endif
821    
822    void map_update(appdata_t *appdata) {
823      printf("map_update\n");
824    #ifndef USE_MAEMO
825      if(appdata->map.context)
826        map_setup(appdata->map.context);
827    #endif
828    }
829    
830    /* callback called by the gps layer whenever gps state changes */
831    static void
832    gps_callback(struct gps_state *state, gpointer data) {
833      printf("map: gps callback\n");
834    }
835    
836  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
837    map_context_t *context = NULL;    map_context_t *context = NULL;
838    
839    /* if the map window already exists, just raise it */    /* if the map window already exists, just raise it */
840    if(appdata->map.context) {    if(appdata->map.context) {
841        printf("using existing map!\n");
842      gtk_window_present(GTK_WINDOW(appdata->map.context->window));      gtk_window_present(GTK_WINDOW(appdata->map.context->window));
843        map_setup(appdata->map.context);
844      return;      return;
845    }    }
846    
847    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
848    context->appdata = appdata;    context->appdata = appdata;
849    context->map_complete = FALSE;    context->map_complete = FALSE;
850      context->state = MAP_NONE;
851    
852    /* cleanup old (pre 0.8.7) path if it exists */    /* cleanup old (pre 0.8.7) path if it exists */
853    char *old_path = g_strdup_printf("%s/map/", appdata->image_path);    char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
# Line 544  void map(appdata_t *appdata) { Line 890  void map(appdata_t *appdata) {
890    g_free(path);    g_free(path);
891    
892    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) {  
 #endif  
     /* draw all geocaches */  
     gpx_t *gpx = appdata->gpx;  
     while(gpx) {  
       map_draw_cachelist(context->widget, gpx->cache);  
       gpx = gpx->next;  
     }  
     name = g_strdup(_("all geocaches"));  
 #ifdef USE_MAEMO  
   } else {  
     map_draw_cachelist(context->widget, appdata->cur_gpx->cache);  
     name = g_strdup(appdata->cur_gpx->name);  
   }  
 #endif  
   
   char *title = g_strdup_printf(_("Map - %s"), name);  
   g_free(name);  
893    
894  #ifdef USE_MAEMO  #ifdef USE_MAEMO
895  #ifdef USE_STACKABLE_WINDOW    /* we don't use a stackable window here on fremantle, since */
896    context->window = hildon_stackable_window_new();    /* this leaves the main window independent from the map and */
897    /* 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 */
898    /* at runtime with cygwin x */    context->window = hildon_window_new();
899  #ifndef __i386__  
900    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
901    g_signal_connect(G_OBJECT(context->window), "realize",    g_signal_connect(G_OBJECT(context->window), "realize",
902                     G_CALLBACK(on_window_realize), NULL);                     G_CALLBACK(on_window_realize), NULL);
903  #endif // MAEMO_VERSION  #endif // MAEMO_VERSION
904  #else  #else
   context->window = hildon_window_new();  
 #endif  
 #else  
905    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
906  #endif  #endif
907    
   gtk_window_set_title(GTK_WINDOW(context->window), title);  
   
908  #ifndef USE_MAEMO  #ifndef USE_MAEMO
909    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
910  #endif  #endif
911    
912    g_free(title);    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
913                       G_CALLBACK(on_focus_in), context);
914    
915    #ifdef USE_MAEMO
916      g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
917                       G_CALLBACK(on_focus_out), context);
918    #endif
919    
920    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
921                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
# Line 601  void map(appdata_t *appdata) { Line 928  void map(appdata_t *appdata) {
928    
929    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
930    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
931      context->cb_id = gps_register_callback(appdata, gps_callback, context);
932    
933  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
934    /* prevent some of the main screen things */    /* prevent some of the main screen things */
Legend:
Removed from v.98  
changed lines
  Added in v.189