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

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

revision 125 by harbaum, Sun Sep 27 19:11:37 2009 UTC revision 226 by harbaum, Wed Dec 2 20:05:52 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     * - make semi-transparent caches selectable
28     */
29    
30  #include "gpxview.h"  #include "gpxview.h"
31  #include "converter.h"  #include "converter.h"
32  #include <math.h>    // for isnan  #include <math.h>    // for isnan
# Line 48  static const char *get_proxy_uri(appdata Line 53  static const char *get_proxy_uri(appdata
53    /* use environment settings if preset */    /* use environment settings if preset */
54    const char *proxy = g_getenv("http_proxy");    const char *proxy = g_getenv("http_proxy");
55    if(proxy) {    if(proxy) {
56      printf("http_proxy: %s\n", proxy);      printf("map http proxy from env: %s\n", proxy);
57      return proxy;      return proxy;
58    }    }
59    
# Line 69  static const char *get_proxy_uri(appdata Line 74  static const char *get_proxy_uri(appdata
74    
75        snprintf(proxy_buffer, sizeof(proxy_buffer),        snprintf(proxy_buffer, sizeof(proxy_buffer),
76                 "http://%s:%u", host, port);                 "http://%s:%u", host, port);
77          printf("map http proxy from gconf: %s\n ", proxy_buffer);
78    
79        g_free(host);        g_free(host);
80      }      }
# Line 80  static const char *get_proxy_uri(appdata Line 86  static const char *get_proxy_uri(appdata
86    
87  static void  static void
88  cb_map_gps(osd_button_t but, map_context_t *context) {  cb_map_gps(osd_button_t but, map_context_t *context) {
89    
90    if(but == OSD_GPS) {    if(but == OSD_GPS) {
91        printf("clicked OSD_GPS %p\n", context);
92        printf("clicked OSD_GPS a %p\n", context->appdata);
93    
94      pos_t *refpos = get_pos(context->appdata);      pos_t *refpos = get_pos(context->appdata);
95      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
96        gint zoom;        gint zoom;
# Line 114  static gboolean map_gps_update(gpointer Line 124  static gboolean map_gps_update(gpointer
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 != context->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        context->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      GdkPixbuf *over = NULL;
162    
163      if(cache->mine)                   over = icon_get(type, 14);
164      else if(cache->found)             over = icon_get(type, 12);
165      else if(cache->notes) {
166        if(cache->notes->found)         over = icon_get(type, 12);
167        else if(cache->notes->override) over = icon_get(type, 11);
168        else                            over = icon_get(type, 13);
169      }
170    
171      pos_t *pos = &cache->pos;
172      /* check if there's also an overwritten coordinate */
173      if(cache->notes && cache->notes->override)
174        pos = &cache->notes->pos;
175    
176      if(!isnan(pos->lat) && !isnan(pos->lon)) {
177        osm_gps_map_add_image(OSM_GPS_MAP(map),
178                              pos->lat, pos->lon, icon);
179        if(over)
180          osm_gps_map_add_image(OSM_GPS_MAP(map),
181                                pos->lat, pos->lon, over);
182      }
183    }
184    
185    static void map_draw_wpt(GtkWidget *map, cache_t *cache, wpt_t *wpt) {
186      /* only draw wpts that don't equal the main point */
187      if(pos_differ(&cache->pos, &wpt->pos)) {
188        if(!isnan(wpt->pos.lat) && !isnan(wpt->pos.lon))  {
189          GdkPixbuf *icon =
190            icon_get(ICON_WPT, (wpt->sym!=WPT_SYM_UNKNOWN)?
191                     wpt->sym:WPT_SYM_REFPOINT);
192    
193          osm_gps_map_add_image(OSM_GPS_MAP(map),
194                                wpt->pos.lat, wpt->pos.lon, icon);
195        }
196      }
197    }
198    
199    static void map_draw_gpx(appdata_t *appdata, cache_display_t *caches,
200                             GtkWidget *map, gpx_t *gpx,
201                             cache_t *nav, gboolean semi) {
202      if(!gpx->notes_loaded) {
203        notes_load_all(appdata, gpx);
204        gpx->notes_loaded = TRUE;
205      }
206    
207      cache_t *cache = gpx->cache;
208      while(cache) {
209        /* search if we have that cache already in our list/displayed */
210        int i=0;
211        while(caches[i].id && (strcmp(caches[i].id, cache->id) != 0))
212          i++;
213    
214        if(!caches[i].id) {
215          /* if nav is given draw all other caches semitransparent. */
216          /* if nav is not given do what semi sais */
217          map_draw_cache(map, cache, nav?(cache != nav):semi);
218          caches[i].id = cache->id;
219    
220          /* also draw waypoints of nav cache */
221          if(nav && cache == nav) {
222            wpt_t *wpt = cache->wpt;
223            while(wpt) {
224              map_draw_wpt(map, cache, wpt);
225              wpt = wpt->next;
226            }
227          }
228        }
229    
230        cache = cache->next;
231      }
232    }
233    
234    /* draw geocaches and set window title */
235    static void map_setup(map_context_t *context) {
236      char *name = NULL;
237    
238      int cache_num = gpx_total_caches_global(context->appdata->gpx);
239    
240      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
241        //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
242        //     cache_num, context->cache_list_len);
243        g_free(context->caches_displayed);
244        context->caches_displayed = NULL;
245        context->cache_list_len = 0;
246      }
247    
248      /* allocate buffer */
249      if(cache_num && !context->caches_displayed) {
250        context->cache_list_len = cache_num;
251        context->caches_displayed = g_new0(cache_display_t, cache_num+1);
252        printf("allocated space to handle %d map icons\n", cache_num);
253      }
254    
255      if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
256        if(context->state != MAP_ALL) {
257          printf("map_setup(ALL)\n");
258    
259          /* clear any pending balloon */
260          context->balloon = NULL;
261          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
262    
263    #ifdef OSD_NAV
264          /* no navigation in this mode */
265          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
266    #endif
267    
268          /* clear all existing cache images */
269          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
270          memset(context->caches_displayed, 0,
271                 (cache_num+1) * sizeof(cache_display_t));
272    
273          /* draw all geocaches and none is semi-transparent */
274          gpx_t *gpx = context->appdata->gpx;
275          while(gpx) {
276            map_draw_gpx(context->appdata, context->caches_displayed,
277                         context->widget, gpx, NULL, FALSE);
278            gpx = gpx->next;
279          }
280    
281          {
282            int i=0;
283            while(context->caches_displayed[i].id) i++;
284            printf("number of caches actually displayed: %d\n", i);
285          }
286    
287          name = g_strdup(_("all"));
288          context->state = MAP_ALL;
289        }
290      } else if(!context->appdata->cur_cache) {
291        if(context->state != MAP_GPX) {
292          printf("map_setup(GPX)\n");
293    
294          /* clear any pending balloon */
295          context->balloon = NULL;
296          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
297    
298    #ifdef OSD_NAV
299          /* no navigation in this mode */
300          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
301    #endif
302    
303          /* clear all existing cache images */
304          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
305          memset(context->caches_displayed, 0,
306                 (cache_num+1) * sizeof(cache_display_t));
307    
308          /* draw all geocaches and all other gpx files are semi-transparent */
309          map_draw_gpx(context->appdata, context->caches_displayed,
310                       context->widget, context->appdata->cur_gpx, NULL, FALSE);
311    
312          gpx_t *gpx = context->appdata->gpx;
313          while(gpx) {
314            if(gpx != context->appdata->cur_gpx)
315              map_draw_gpx(context->appdata, context->caches_displayed,
316                           context->widget, gpx, NULL, TRUE);
317    
318            gpx = gpx->next;
319          }
320    
321          name = g_strdup(context->appdata->cur_gpx->name);
322          context->state = MAP_GPX;
323        }
324      } else {
325        cache_t *cache = context->appdata->cur_cache;
326    
327        printf("map_setup(CACHE)\n");
328    
329        /* clear any pending balloon */
330        context->balloon = NULL;
331        osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
332    
333        /* clear all existing ccahe images */
334        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
335        memset(context->caches_displayed, 0,
336               (cache_num+1) * sizeof(cache_display_t));
337    
338        /* draw all geocaches and all but selected one are semi-transparent */
339        gpx_t *gpx = context->appdata->gpx;
340        while(gpx) {
341          map_draw_gpx(context->appdata, context->caches_displayed,
342                       context->widget, gpx, cache, FALSE);
343          gpx = gpx->next;
344        }
345    
346        name = g_strdup(cache->name);
347        context->state = MAP_CACHE;
348    
349        /* navigation in this mode! */
350        pos_t cpos = gpx_cache_pos(cache);
351    
352    #ifdef OSD_NAV
353        osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
354                                  context->appdata->imperial,
355                                  cpos.lat, cpos.lon, cache->name);
356    #else
357    #warning OSD_NAV not defined!
358    #endif
359      }
360    
361      /* also mark geomath position */
362    
363      /* remove all existing appearances of this icon first */
364      osm_gps_map_remove_image(OSM_GPS_MAP(context->widget),
365                               icon_get(ICON_MISC, 6));
366    
367      if(!isnan(context->appdata->geomath.lat) &&
368         !isnan(context->appdata->geomath.lon))  {
369    
370        osm_gps_map_add_image(OSM_GPS_MAP(context->widget),
371                              context->appdata->geomath.lat,
372                              context->appdata->geomath.lon,
373                              icon_get(ICON_MISC, 6));
374      }
375    
376      if(name) {
377        char *title = g_strdup_printf(_("Map - %s"), name);
378        g_free(name);
379    
380        gtk_window_set_title(GTK_WINDOW(context->window), title);
381    
382        g_free(title);
383      } else
384        printf("map_setup(keep)\n");
385    }
386    
387  static gboolean on_map_configure(GtkWidget *widget,  static gboolean on_map_configure(GtkWidget *widget,
388                                   GdkEventConfigure *event,                                   GdkEventConfigure *event,
389                                   map_context_t *context) {                                   map_context_t *context) {
390    
391    if(!context->map_complete) {    /* for some reason there's a configure event with 1/1 */
392      /* on diablo. We just ignore this! */
393    
394      printf("on_map_configure %d %d\n",
395             widget->allocation.width,
396             widget->allocation.height);
397    
398      if(!context->map_complete &&
399         (widget->allocation.width > 100) &&
400         (widget->allocation.height > 100)) {
401    
402        /* setup cache state */
403        map_setup(context);
404    
405      /* set default values if they are invalid */      /* set default values if they are invalid */
406      if(!context->appdata->map.zoom ||      if(!context->appdata->map.zoom ||
# Line 153  static gboolean on_map_configure(GtkWidg Line 410  static gboolean on_map_configure(GtkWidg
410    
411        pos_t *refpos = get_pos(context->appdata);        pos_t *refpos = get_pos(context->appdata);
412        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
413            printf("use refpos\n");
414    
415          /* use gps position if present */          /* use gps position if present */
416          context->appdata->map.pos = *refpos;          context->appdata->map.pos = *refpos;
417          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
418        } else {        } else {
419            printf("use zero pos\n");
420    
421          /* use world map otherwise */          /* use world map otherwise */
422          context->appdata->map.pos.lat = 0.0;          context->appdata->map.pos.lat = 0.0;
423          context->appdata->map.pos.lon = 0.0;          context->appdata->map.pos.lon = 0.0;
# Line 165  static gboolean on_map_configure(GtkWidg Line 426  static gboolean on_map_configure(GtkWidg
426      }      }
427    
428      /* jump to initial position */      /* jump to initial position */
429        printf("osm_gps_map_set_mapcenter(%f,%f,%d)\n",
430               context->appdata->map.pos.lat,
431               context->appdata->map.pos.lon,
432               context->appdata->map.zoom);
433    
434      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
435                                context->appdata->map.pos.lat,                                context->appdata->map.pos.lat,
436                                context->appdata->map.pos.lon,                                context->appdata->map.pos.lon,
# Line 175  static gboolean on_map_configure(GtkWidg Line 441  static gboolean on_map_configure(GtkWidg
441    return FALSE;    return FALSE;
442  }  }
443    
 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;  
   }  
 }  
   
444  static void  static void
445  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
446                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
447    
448    while(cache) {    while(cache) {
449      pos_t cpos = gpx_cache_pos(cache);      pos_t cpos = gpx_cache_pos(cache);
450    
# Line 229  static cache_t *map_closest(map_context_ Line 465  static cache_t *map_closest(map_context_
465    cache_t *result = NULL;    cache_t *result = NULL;
466    float distance = NAN;    float distance = NAN;
467    
 #ifdef USE_MAEMO  
468    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
 #endif  
469      /* search all geocaches */      /* search all geocaches */
470      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
471      while(gpx) {      while(gpx) {
472        map_cachelist_nearest(gpx->cache, pos, &result, &distance);        map_cachelist_nearest(gpx->cache, pos, &result, &distance);
473        gpx = gpx->next;        gpx = gpx->next;
474      }      }
 #ifdef USE_MAEMO  
475    } else if(context->appdata->cur_gpx) {    } else if(context->appdata->cur_gpx) {
476      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
477                            pos, &result, &distance);                            pos, &result, &distance);
478    } else    } else
479      result = context->appdata->cur_gpx->cache;      result = context->appdata->cur_gpx->cache;
 #endif  
480    
481    return result;    return result;
482  }  }
# Line 262  pos_t coord2pos(coord_t coo) { Line 494  pos_t coord2pos(coord_t coo) {
494  static gboolean  static gboolean
495  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
496                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
497    
498    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
499    
500    /* check if we actually clicked parts of the OSD */    /* check if we actually clicked parts of the OSD */
501    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)
502      return FALSE;      return FALSE;
503    
504    /* 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 533  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
533                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
534    
535    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
536      g_assert(image_surface);
537    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
538    
539    // Draw the image on the new Context    // Draw the image on the new Context
# Line 313  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 547  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
547  }  }
548    
549  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
550  #define LINE_SKIP  7  #define ICON_SIZE  ICON_CACHE_TYPE
551  #else  #else
552  #define LINE_SKIP  12  #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
553  #endif  #endif
554    
555  static void  #ifndef BIG_BALLOONS
556  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  #define FONT_SIZE 14.0
557    cache_t *cache = (cache_t*)data;  #else
558    #define FONT_SIZE 22.0
 #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);  
559  #endif  #endif
560    #define LINE_SKIP  (FONT_SIZE/4)
561    
   /* leave a little border top and left */  
   gint x = rect->x, y = rect->y;  
562    
563    /* draw the cache type icon ... */  static void
564    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
565    cairo_draw_pixbuf(cr, icon, x, y);    printf("balloon event: ");
566    
567    if(cache->notes && cache->notes->override) {    map_context_t *context = (map_context_t*)data;
568      GdkPixbuf *over = icon_get(ICON_MISC, 1);    cache_t *cache = context->balloon;
     cairo_draw_pixbuf(cr, over, x, y);  
   }  
569    
570    /* ... and right of it the waypoint id */    if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
571    cairo_text_extents_t extents;      printf("draw\n");
572    
573    if(cache->id) {  #if 0
574      cairo_select_font_face (cr, "Sans",      /* draw pink background to check clipping */
575                              CAIRO_FONT_SLANT_NORMAL,      cairo_rectangle (event->data.draw.cr,
576                              CAIRO_FONT_WEIGHT_BOLD);                       event->data.draw.rect->x-20, event->data.draw.rect->y-20,
577                         event->data.draw.rect->w+40, event->data.draw.rect->h+40);
578        cairo_set_source_rgba (event->data.draw.cr, 1, 0, 0, 0.3);
579        cairo_fill_preserve (event->data.draw.cr);
580        cairo_set_line_width (event->data.draw.cr, 0);
581        cairo_stroke (event->data.draw.cr);
582    #endif
583    
584        /* leave a little border top and left */
585        gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
586    
587        /* draw the cache type icon ... */
588        GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
589        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
590    
591        if(cache->notes && cache->notes->override) {
592          GdkPixbuf *over = icon_get(ICON_SIZE, 11);
593          cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
594        }
595    
596        /* ... and right of it the waypoint id */
597        cairo_text_extents_t extents;
598    
599        if(cache->id) {
600          cairo_select_font_face (event->data.draw.cr, "Sans",
601                                  CAIRO_FONT_SLANT_NORMAL,
602                                  CAIRO_FONT_WEIGHT_BOLD);
603    
604  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
605      cairo_set_font_size (cr, 20.0);        cairo_set_font_size (event->data.draw.cr, 20.0);
606  #else  #else
607      cairo_set_font_size (cr, 36.0);        cairo_set_font_size (event->data.draw.cr, 36.0);
608  #endif  #endif
609    
610          cairo_text_extents (event->data.draw.cr, cache->id, &extents);
611    
612          /* display id right of icon vertically centered */
613          x += gdk_pixbuf_get_width(icon) + 5;
614          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
615          cairo_move_to (event->data.draw.cr, x, y);
616          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
617          cairo_show_text (event->data.draw.cr, cache->id);
618          cairo_stroke (event->data.draw.cr);
619    
620          y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
621        } else
622          y += gdk_pixbuf_get_height(icon);
623    
624        /* return to the left border and below icon/text */
625        x = event->data.draw.rect->x;
626    
627        /* everything from here uses the same font */
628        cairo_select_font_face (event->data.draw.cr, "Sans",
629                                CAIRO_FONT_SLANT_NORMAL,
630                                CAIRO_FONT_WEIGHT_NORMAL);
631    
632      cairo_text_extents (cr, cache->id, &extents);      cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
633    
634        if(cache->name) {
635          /* draw cache name */
636          cairo_text_extents (event->data.draw.cr, cache->name, &extents);
637          cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
638          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
639          cairo_show_text (event->data.draw.cr, cache->name);
640          cairo_stroke (event->data.draw.cr);
641    
642          /* return to the left border and below text */
643          y += LINE_SKIP + FONT_SIZE;
644          x = event->data.draw.rect->x;
645        }
646    
647        if(cache->terrain) {
648          int text_y = 0, icon_y = 0;
649    
650      /* display id right of icon vertically centered */        /* draw cache rating */
651      x += gdk_pixbuf_get_width(icon) + 5;        const char *terrain = "Terrain:";
652      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
653      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);  
654    
655      y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;        if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
656    } else          text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
657      y += gdk_pixbuf_get_height(icon);        else
658            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
659    
660    /* return to the left border and below icon/text */        /* draw "Terrain:" string */
661    x = rect->x;        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
662          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
663          cairo_show_text (event->data.draw.cr, _(terrain));
664          cairo_stroke (event->data.draw.cr);
665          x += extents.width + 2;
666    
667          /* draw terrain stars */
668          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
669    
670          x += gdk_pixbuf_get_width(icon) + FONT_SIZE/2;
671        }
672    
673        if(cache->difficulty) {
674          int text_y = 0, icon_y = 0;
675    
676    /* everything from here uses the same font */        const char *difficulty = "Difficulty:";
677    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
678                            CAIRO_FONT_WEIGHT_NORMAL);        cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
679  #ifndef BIG_BALLOONS  
680    cairo_set_font_size (cr, 14.0);        if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
681  #else          text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
682    cairo_set_font_size (cr, 22.0);        else
683  #endif          icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
684    
685    if(cache->name) {        /* draw "Difficulty:" string */
686      /* draw cache name */        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
687      cairo_text_extents (cr, cache->name, &extents);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
688      y += extents.height;        cairo_show_text (event->data.draw.cr, _(difficulty));
689      cairo_move_to (cr, x, y);        cairo_stroke (event->data.draw.cr);
690      cairo_set_source_rgba (cr, 0, 0, 0, 1);        x += extents.width + 2;
691      cairo_show_text (cr, cache->name);  
692      cairo_stroke (cr);        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
693        }
694      /* return to the left border and below text */  
695      y += LINE_SKIP;      /* draw container info */
696      x = rect->x;      /* TODO ... */
697    }  
698    
699    if(cache->terrain) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
700      /* draw cache rating */      printf("click %s event at %d %d\n",
701      const char *terrain = "Terrain:";             event->data.click.down?"down":"up",
702      icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));             event->data.click.x, event->data.click.y);
703      cairo_text_extents (cr, _(terrain), &extents);  
704      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;      /* make the main screen jump to that cache */
705        if(!event->data.click.down) {
706      /* draw "Terrain:" string */        if(context->appdata->cur_cache) {
707      cairo_move_to (cr, x, y);          printf("ERROR: no current cache should be visible!\n");
708      cairo_set_source_rgba (cr, 0, 0, 0, 1);        } else {
709      cairo_show_text (cr, _(terrain));          gpx_t *is_in = NULL;
710      cairo_stroke (cr);  
711      x += extents.width + 2;          if(!context->appdata->cur_gpx) {
712              printf("click while in \"all\" view\n");
713      /* draw terrain stars */  
714      cairo_draw_pixbuf(cr, icon, x, y -            /* we first need to figure out which gpx file this cache */
715                        (gdk_pixbuf_get_height(icon) + extents.height)/2);            /* is in so we can open it first */
716              gpx_t *gpx = context->appdata->gpx;
717      x += gdk_pixbuf_get_width(icon) + LINE_SKIP;            while(gpx && !is_in) {
718      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;              cache_t *cur = gpx->cache;
719    }              while(cur && !is_in) {
720                  if(cur == cache)
721    if(cache->difficulty) {                  is_in = gpx;
722      const char *difficulty = "Difficulty:";                cur = cur->next;
723      cairo_text_extents (cr, _(difficulty), &extents);              }
724      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;              gpx = gpx->next;
725              }
726      /* draw "Difficulty:" string */  
727      cairo_move_to (cr, x, y);            if(is_in)
728      cairo_set_source_rgba (cr, 0, 0, 0, 1);              gpxlist_goto_cachelist(context->appdata, is_in);
729      cairo_show_text (cr, _(difficulty));  
730      cairo_stroke (cr);          } else
731      x += extents.width + 2;            /* the simple case: there already is an open gpx file and */
732              /* we just jump into the "cache" view */
733      icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));            is_in = context->appdata->cur_gpx;
734      cairo_draw_pixbuf(cr, icon, x, y -  
735                        (gdk_pixbuf_get_height(icon) + extents.height)/2);          if(is_in) {
736              printf("selecting %s in %s\n",
737                     cache->id,
738                     context->appdata->cur_gpx->name);
739    
740              cachelist_goto_cache(context->appdata, cache);
741    
742              /* give focus to main screen (important for maemo) */
743              printf("raising main window\n");
744              gtk_window_present(GTK_WINDOW(context->appdata->window));
745            }
746          }
747        }
748      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
749        printf("removed\n");
750        context->balloon = NULL;
751    }    }
752  }  }
753    
# Line 442  on_map_button_release_event(GtkWidget *w Line 756  on_map_button_release_event(GtkWidget *w
756                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
757    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
758    
759      /* in "MAP_CACHE" state only one cache is visible */
760      /* and the map is in navigation mode. the balloon is */
761      /* pretty useless there */
762    if(context->press_on) {    if(context->press_on) {
763    
764      coord_t coo;      coord_t coo;
765      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
766    
# Line 456  on_map_button_release_event(GtkWidget *w Line 774  on_map_button_release_event(GtkWidget *w
774        float dist = gpx_pos_get_distance(pos, cpos, FALSE);        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
775        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
776    
777            context->balloon = nearest;
778          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
779                                       balloon_draw_cb, nearest);                                       balloon_cb, context);
   
         osm_gps_map_osd_draw_nav (map, cpos.lat, cpos.lon, nearest->name);  
   
780        }        }
781      }      }
782      context->press_on = NULL;      context->press_on = NULL;
# Line 478  on_map_button_release_event(GtkWidget *w Line 794  on_map_button_release_event(GtkWidget *w
794  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
795    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
796    
   printf("destroy map window\n");  
   
797    /* save map parameters */    /* save map parameters */
798    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
799    gint zoom;    gint zoom;
# Line 501  static void on_window_destroy(GtkWidget Line 815  static void on_window_destroy(GtkWidget
815  #endif  #endif
816    
817    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
818      gps_unregister_callback(appdata, context->cb_id);
819    
820      if(context->caches_displayed) {
821        g_free(context->caches_displayed);
822        context->caches_displayed = NULL;
823      }
824    
825      printf("destroy map context\n");
826    g_free(context);    g_free(context);
827    appdata->map.context = NULL;    appdata->map.context = NULL;
828  }  }
# Line 525  on_window_realize(GtkWidget *widget, gpo Line 846  on_window_realize(GtkWidget *widget, gpo
846  }  }
847  #endif  #endif
848    
849  /* draw geocaches and set window title */  /* on maemo a window is either on top or completely invisible. this */
850  static void map_setup(map_context_t *context) {  /* means that we only need to update the map window if its raised.  */
851    char *name = NULL;  /* on ordinary desktops this is different and we always update */
852    
853    /* clear all existing ccahe images */  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
854    osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));                           gpointer data) {
855      map_context_t *context = (map_context_t*)data;
856    
857      printf("map got focus\n");
858    
859  #ifdef USE_MAEMO  #ifdef USE_MAEMO
860    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    /* re-enable refresh of map */
861      if(!context->handler_id)
862        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
863  #endif  #endif
864      /* draw all geocaches */  
865      gpx_t *gpx = context->appdata->gpx;    map_setup(context);
866      while(gpx) {    return FALSE;
867        map_draw_gpx(context->appdata, context->widget, gpx);  }
868        gpx = gpx->next;  
869      }  static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
870      name = g_strdup(_("all"));                           gpointer data) {
871      map_context_t *context = (map_context_t*)data;
872    
873      printf("map lost focus\n");
874    
875      /* save new map position */
876      gfloat lat, lon;
877      g_object_get(widget, "latitude", &lat, "longitude", &lon, NULL);
878    
879      context->appdata->map.pos.lat = lat;
880      context->appdata->map.pos.lon = lon;
881    
882  #ifdef USE_MAEMO  #ifdef USE_MAEMO
883    } else if(!context->appdata->cur_cache) {    gtk_timeout_remove(context->handler_id);
884      map_draw_gpx(context->appdata, context->widget, context->appdata->cur_gpx);    context->handler_id = 0;
     name = g_strdup(context->appdata->cur_gpx->name);  
   } else {  
     map_draw_cache(context->widget, context->appdata->cur_cache);  
     name = g_strdup(context->appdata->cur_cache->name);  
   }  
885  #endif  #endif
886    
887    char *title = g_strdup_printf(_("Map - %s"), name);    return FALSE;
888    g_free(name);  }
889    
890    gtk_window_set_title(GTK_WINDOW(context->window), title);  void map_update(appdata_t *appdata) {
891      printf("map_update\n");
892    #ifndef USE_MAEMO
893      if(appdata->map.context)
894        map_setup(appdata->map.context);
895    #endif
896    }
897    
898    g_free(title);  /* callback called by the gps layer whenever gps state changes */
899    static void
900    gps_callback(struct gps_state *state, gpointer data) {
901      printf("map: gps callback\n");
902  }  }
903    
904  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
# Line 572  void map(appdata_t *appdata) { Line 913  void map(appdata_t *appdata) {
913    }    }
914    
915    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
916      printf("allocated new context at %p\n", context);
917    
918    context->appdata = appdata;    context->appdata = appdata;
919    context->map_complete = FALSE;    context->map_complete = FALSE;
920      context->state = MAP_NONE;
921    
922    /* cleanup old (pre 0.8.7) path if it exists */    /* cleanup old (pre 0.8.7) path if it exists */
923    char *old_path = g_strdup_printf("%s/map/", appdata->image_path);    char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
# Line 631  void map(appdata_t *appdata) { Line 975  void map(appdata_t *appdata) {
975    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
976  #endif  #endif
977    
   /* setup cache state */  
   map_setup(context);  
   
978  #ifndef USE_MAEMO  #ifndef USE_MAEMO
979    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
980  #endif  #endif
981    
982      g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
983                       G_CALLBACK(on_focus_in), context);
984    
985      g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
986                       G_CALLBACK(on_focus_out), context);
987    
988    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
989                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
990    
# Line 649  void map(appdata_t *appdata) { Line 996  void map(appdata_t *appdata) {
996    
997    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
998    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
999      context->cb_id = gps_register_callback(appdata, gps_callback, context);
1000    
1001  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
1002    /* prevent some of the main screen things */    /* prevent some of the main screen things */
Legend:
Removed from v.125  
changed lines
  Added in v.226