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 233 by harbaum, Wed Dec 9 19:45:36 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 109  static int dist2pixel(map_context_t *con Line 119  static int dist2pixel(map_context_t *con
119  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
120    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
121    
122    #ifdef USE_MAEMO
123      if(context->appdata->goto_disable_screensaver)
124        if(osso_display_blanking_pause(context->appdata->osso_context) != OSSO_OK)
125          fprintf(stderr, "error with display blank\n");
126    #endif
127    
128    /* get reference position ... */    /* get reference position ... */
129    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
130    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
131    
132    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
133    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),    if(ok != context->goto_is_enabled) {
134                   OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
135                    OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
136        context->goto_is_enabled = ok;
137      }
138    
139    if(ok) {    if(ok) {
140      float heading = NAN;      float heading = NAN;
# Line 130  static gboolean map_gps_update(gpointer Line 149  static gboolean map_gps_update(gpointer
149          radius = dist2pixel(context, eph/1000, refpos->lat);          radius = dist2pixel(context, eph/1000, refpos->lat);
150      }      }
151    
152        /* TODO: in order to save energy: only draw if state actually changed */
153    
154      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
155      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
156                           refpos->lat, refpos->lon, heading);                           refpos->lat, refpos->lon, heading);
# Line 139  static gboolean map_gps_update(gpointer Line 160  static gboolean map_gps_update(gpointer
160    return TRUE;    return TRUE;
161  }  }
162    
163    static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
164      int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;
165    
166      GdkPixbuf *icon = icon_get(type, cache->type);
167      GdkPixbuf *over = NULL;
168    
169      if(cache->mine)                   over = icon_get(type, 14);
170      else if(cache->found)             over = icon_get(type, 12);
171      else if(cache->notes) {
172        if(cache->notes->found)         over = icon_get(type, 12);
173        else if(cache->notes->override) over = icon_get(type, 11);
174        else                            over = icon_get(type, 13);
175      }
176    
177      pos_t *pos = &cache->pos;
178      /* check if there's also an overwritten coordinate */
179      if(cache->notes && cache->notes->override)
180        pos = &cache->notes->pos;
181    
182      if(!isnan(pos->lat) && !isnan(pos->lon)) {
183        osm_gps_map_add_image(OSM_GPS_MAP(map),
184                              pos->lat, pos->lon, icon);
185        if(over)
186          osm_gps_map_add_image(OSM_GPS_MAP(map),
187                                pos->lat, pos->lon, over);
188      }
189    }
190    
191    static void map_draw_wpt(GtkWidget *map, cache_t *cache, wpt_t *wpt) {
192      /* only draw wpts that don't equal the main point */
193      if(pos_differ(&cache->pos, &wpt->pos)) {
194        if(!isnan(wpt->pos.lat) && !isnan(wpt->pos.lon))  {
195          GdkPixbuf *icon =
196            icon_get(ICON_WPT, (wpt->sym!=WPT_SYM_UNKNOWN)?
197                     wpt->sym:WPT_SYM_REFPOINT);
198    
199          osm_gps_map_add_image(OSM_GPS_MAP(map),
200                                wpt->pos.lat, wpt->pos.lon, icon);
201        }
202      }
203    }
204    
205    static void map_draw_gpx(appdata_t *appdata, cache_display_t *caches,
206                             GtkWidget *map, gpx_t *gpx,
207                             cache_t *nav, gboolean semi) {
208      if(!gpx->notes_loaded) {
209        notes_load_all(appdata, gpx);
210        gpx->notes_loaded = TRUE;
211      }
212    
213      cache_t *cache = gpx->cache;
214      while(cache) {
215        /* search if we have that cache already in our list/displayed */
216        int i=0;
217        while(caches[i].id && (strcmp(caches[i].id, cache->id) != 0))
218          i++;
219    
220        if(!caches[i].id) {
221          /* if nav is given draw all other caches semitransparent. */
222          /* if nav is not given do what semi sais */
223          map_draw_cache(map, cache, nav?(cache != nav):semi);
224          caches[i].id = cache->id;
225    
226          /* also draw waypoints of nav cache */
227          if(nav && cache == nav) {
228            wpt_t *wpt = cache->wpt;
229            while(wpt) {
230              map_draw_wpt(map, cache, wpt);
231              wpt = wpt->next;
232            }
233          }
234        }
235    
236        cache = cache->next;
237      }
238    }
239    
240    /* draw geocaches and set window title */
241    static void map_setup(map_context_t *context) {
242      char *name = NULL;
243    
244      int cache_num = gpx_total_caches_global(context->appdata->gpx);
245    
246      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
247        //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
248        //     cache_num, context->cache_list_len);
249        g_free(context->caches_displayed);
250        context->caches_displayed = NULL;
251        context->cache_list_len = 0;
252      }
253    
254      /* allocate buffer */
255      if(cache_num && !context->caches_displayed) {
256        context->cache_list_len = cache_num;
257        context->caches_displayed = g_new0(cache_display_t, cache_num+1);
258        printf("allocated space to handle %d map icons\n", cache_num);
259      }
260    
261      if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
262        if(context->state != MAP_ALL) {
263          printf("map_setup(ALL)\n");
264    
265          /* clear any pending balloon */
266          context->balloon = NULL;
267          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
268    
269    #ifdef OSD_NAV
270          /* no navigation in this mode */
271          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
272    #endif
273    
274          /* clear all existing cache images */
275          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
276          memset(context->caches_displayed, 0,
277                 (cache_num+1) * sizeof(cache_display_t));
278    
279          /* draw all geocaches and none is semi-transparent */
280          gpx_t *gpx = context->appdata->gpx;
281          while(gpx) {
282            map_draw_gpx(context->appdata, context->caches_displayed,
283                         context->widget, gpx, NULL, FALSE);
284            gpx = gpx->next;
285          }
286    
287          {
288            int i=0;
289            while(context->caches_displayed[i].id) i++;
290            printf("number of caches actually displayed: %d\n", i);
291          }
292    
293          name = g_strdup(_("all"));
294          context->state = MAP_ALL;
295        }
296      } else if(!context->appdata->cur_cache) {
297        if(context->state != MAP_GPX) {
298          printf("map_setup(GPX)\n");
299    
300          /* clear any pending balloon */
301          context->balloon = NULL;
302          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
303    
304    #ifdef OSD_NAV
305          /* no navigation in this mode */
306          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
307    #endif
308    
309          /* clear all existing cache images */
310          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
311          memset(context->caches_displayed, 0,
312                 (cache_num+1) * sizeof(cache_display_t));
313    
314          /* draw all geocaches and all other gpx files are semi-transparent */
315          map_draw_gpx(context->appdata, context->caches_displayed,
316                       context->widget, context->appdata->cur_gpx, NULL, FALSE);
317    
318          gpx_t *gpx = context->appdata->gpx;
319          while(gpx) {
320            if(gpx != context->appdata->cur_gpx)
321              map_draw_gpx(context->appdata, context->caches_displayed,
322                           context->widget, gpx, NULL, TRUE);
323    
324            gpx = gpx->next;
325          }
326    
327          name = g_strdup(context->appdata->cur_gpx->name);
328          context->state = MAP_GPX;
329        }
330      } else {
331        cache_t *cache = context->appdata->cur_cache;
332    
333        printf("map_setup(CACHE)\n");
334    
335        /* clear any pending balloon */
336        context->balloon = NULL;
337        osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
338    
339        /* clear all existing ccahe images */
340        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
341        memset(context->caches_displayed, 0,
342               (cache_num+1) * sizeof(cache_display_t));
343    
344        /* draw all geocaches and all but selected one are semi-transparent */
345        gpx_t *gpx = context->appdata->gpx;
346        while(gpx) {
347          map_draw_gpx(context->appdata, context->caches_displayed,
348                       context->widget, gpx, cache, FALSE);
349          gpx = gpx->next;
350        }
351    
352        name = g_strdup(cache->name);
353        context->state = MAP_CACHE;
354    
355        /* navigation in this mode! */
356        pos_t cpos = gpx_cache_pos(cache);
357    
358    #ifdef OSD_NAV
359        osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
360                                  context->appdata->imperial,
361                                  cpos.lat, cpos.lon, cache->name);
362    #else
363    #warning OSD_NAV not defined!
364    #endif
365      }
366    
367      /* also mark geomath position */
368    
369      /* remove all existing appearances of this icon first */
370      osm_gps_map_remove_image(OSM_GPS_MAP(context->widget),
371                               icon_get(ICON_MISC, 4));
372    
373      if(!isnan(context->appdata->geomath.lat) &&
374         !isnan(context->appdata->geomath.lon))  {
375    
376        osm_gps_map_add_image(OSM_GPS_MAP(context->widget),
377                              context->appdata->geomath.lat,
378                              context->appdata->geomath.lon,
379                              icon_get(ICON_MISC, 4));
380      }
381    
382      if(name) {
383        char *title = g_strdup_printf(_("Map - %s"), name);
384        g_free(name);
385    
386        gtk_window_set_title(GTK_WINDOW(context->window), title);
387    
388        g_free(title);
389      } else
390        printf("map_setup(keep)\n");
391    }
392    
393  static gboolean on_map_configure(GtkWidget *widget,  static gboolean on_map_configure(GtkWidget *widget,
394                                   GdkEventConfigure *event,                                   GdkEventConfigure *event,
395                                   map_context_t *context) {                                   map_context_t *context) {
396    
397    if(!context->map_complete) {    /* for some reason there's a configure event with 1/1 */
398      /* on diablo. We just ignore this! */
399    
400      printf("on_map_configure %d %d\n",
401             widget->allocation.width,
402             widget->allocation.height);
403    
404      if(!context->map_complete &&
405         (widget->allocation.width > 100) &&
406         (widget->allocation.height > 100)) {
407    
408        /* setup cache state */
409        map_setup(context);
410    
411      /* set default values if they are invalid */      /* set default values if they are invalid */
412      if(!context->appdata->map.zoom ||      if(!context->appdata->map.zoom ||
# Line 153  static gboolean on_map_configure(GtkWidg Line 416  static gboolean on_map_configure(GtkWidg
416    
417        pos_t *refpos = get_pos(context->appdata);        pos_t *refpos = get_pos(context->appdata);
418        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
419            printf("use refpos\n");
420    
421          /* use gps position if present */          /* use gps position if present */
422          context->appdata->map.pos = *refpos;          context->appdata->map.pos = *refpos;
423          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
424        } else {        } else {
425            printf("use zero pos\n");
426    
427          /* use world map otherwise */          /* use world map otherwise */
428          context->appdata->map.pos.lat = 0.0;          context->appdata->map.pos.lat = 0.0;
429          context->appdata->map.pos.lon = 0.0;          context->appdata->map.pos.lon = 0.0;
# Line 165  static gboolean on_map_configure(GtkWidg Line 432  static gboolean on_map_configure(GtkWidg
432      }      }
433    
434      /* jump to initial position */      /* jump to initial position */
435        printf("osm_gps_map_set_mapcenter(%f,%f,%d)\n",
436               context->appdata->map.pos.lat,
437               context->appdata->map.pos.lon,
438               context->appdata->map.zoom);
439    
440      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
441                                context->appdata->map.pos.lat,                                context->appdata->map.pos.lat,
442                                context->appdata->map.pos.lon,                                context->appdata->map.pos.lon,
# Line 175  static gboolean on_map_configure(GtkWidg Line 447  static gboolean on_map_configure(GtkWidg
447    return FALSE;    return FALSE;
448  }  }
449    
 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;  
   }  
 }  
   
450  static void  static void
451  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
452                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
453    
454    while(cache) {    while(cache) {
455      pos_t cpos = gpx_cache_pos(cache);      pos_t cpos = gpx_cache_pos(cache);
456    
# Line 258  pos_t coord2pos(coord_t coo) { Line 500  pos_t coord2pos(coord_t coo) {
500  static gboolean  static gboolean
501  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
502                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
503    
504    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
505    
506    /* check if we actually clicked parts of the OSD */    /* check if we actually clicked parts of the OSD */
507    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)
508      return FALSE;      return FALSE;
509    
510    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
# Line 296  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 539  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
539                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
540    
541    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
542      g_assert(image_surface);
543    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
544    
545    // Draw the image on the new Context    // Draw the image on the new Context
# Line 309  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 553  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
553  }  }
554    
555  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
556  #define LINE_SKIP  7  #define ICON_SIZE  ICON_CACHE_TYPE
557  #else  #else
558  #define LINE_SKIP  12  #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
559  #endif  #endif
560    
561  static void  #ifndef BIG_BALLOONS
562  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  #define FONT_SIZE 14.0
563    cache_t *cache = (cache_t*)data;  #else
564    #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);  
565  #endif  #endif
566    #define LINE_SKIP  (FONT_SIZE/4)
567    
   /* leave a little border top and left */  
   gint x = rect->x, y = rect->y;  
568    
569    /* draw the cache type icon ... */  static void
570    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
571    cairo_draw_pixbuf(cr, icon, x, y);    printf("balloon event: ");
572    
573    if(cache->notes && cache->notes->override) {    map_context_t *context = (map_context_t*)data;
574      GdkPixbuf *over = icon_get(ICON_MISC, 1);    cache_t *cache = context->balloon;
     cairo_draw_pixbuf(cr, over, x, y);  
   }  
575    
576    /* ... and right of it the waypoint id */    if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
577    cairo_text_extents_t extents;      printf("draw\n");
578    
579    if(cache->id) {  #if 0
580      cairo_select_font_face (cr, "Sans",      /* draw pink background to check clipping */
581                              CAIRO_FONT_SLANT_NORMAL,      cairo_rectangle (event->data.draw.cr,
582                              CAIRO_FONT_WEIGHT_BOLD);                       event->data.draw.rect->x-20, event->data.draw.rect->y-20,
583                         event->data.draw.rect->w+40, event->data.draw.rect->h+40);
584        cairo_set_source_rgba (event->data.draw.cr, 1, 0, 0, 0.3);
585        cairo_fill_preserve (event->data.draw.cr);
586        cairo_set_line_width (event->data.draw.cr, 0);
587        cairo_stroke (event->data.draw.cr);
588    #endif
589    
590        /* leave a little border top and left */
591        gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
592    
593        /* draw the cache type icon ... */
594        GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
595        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
596    
597        if(cache->notes && cache->notes->override) {
598          GdkPixbuf *over = icon_get(ICON_SIZE, 11);
599          cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
600        }
601    
602        /* ... and right of it the waypoint id */
603        cairo_text_extents_t extents;
604    
605        if(cache->id) {
606          cairo_select_font_face (event->data.draw.cr, "Sans",
607                                  CAIRO_FONT_SLANT_NORMAL,
608                                  CAIRO_FONT_WEIGHT_BOLD);
609    
610  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
611      cairo_set_font_size (cr, 20.0);        cairo_set_font_size (event->data.draw.cr, 20.0);
612  #else  #else
613      cairo_set_font_size (cr, 36.0);        cairo_set_font_size (event->data.draw.cr, 36.0);
614  #endif  #endif
615    
616          cairo_text_extents (event->data.draw.cr, cache->id, &extents);
617    
618          /* display id right of icon vertically centered */
619          x += gdk_pixbuf_get_width(icon) + 5;
620          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
621          cairo_move_to (event->data.draw.cr, x, y);
622          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
623          cairo_show_text (event->data.draw.cr, cache->id);
624          cairo_stroke (event->data.draw.cr);
625    
626          y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
627        } else
628          y += gdk_pixbuf_get_height(icon);
629    
630        /* return to the left border and below icon/text */
631        x = event->data.draw.rect->x;
632    
633        /* everything from here uses the same font */
634        cairo_select_font_face (event->data.draw.cr, "Sans",
635                                CAIRO_FONT_SLANT_NORMAL,
636                                CAIRO_FONT_WEIGHT_NORMAL);
637    
638      cairo_text_extents (cr, cache->id, &extents);      cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
639    
640        if(cache->name) {
641          /* draw cache name */
642          cairo_text_extents (event->data.draw.cr, cache->name, &extents);
643          cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
644          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
645          cairo_show_text (event->data.draw.cr, cache->name);
646          cairo_stroke (event->data.draw.cr);
647    
648          /* return to the left border and below text */
649          y += LINE_SKIP + FONT_SIZE;
650          x = event->data.draw.rect->x;
651        }
652    
653        if(cache->terrain) {
654          int text_y = 0, icon_y = 0;
655    
656      /* display id right of icon vertically centered */        /* draw cache rating */
657      x += gdk_pixbuf_get_width(icon) + 5;        const char *terrain = "Terrain:";
658      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
659      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);  
660    
661      y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;        if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
662    } else          text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
663      y += gdk_pixbuf_get_height(icon);        else
664            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
665    
666    /* return to the left border and below icon/text */        /* draw "Terrain:" string */
667    x = rect->x;        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
668          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
669          cairo_show_text (event->data.draw.cr, _(terrain));
670          cairo_stroke (event->data.draw.cr);
671          x += extents.width + 2;
672    
673          /* draw terrain stars */
674          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
675    
676          x += gdk_pixbuf_get_width(icon) + FONT_SIZE/2;
677        }
678    
679        if(cache->difficulty) {
680          int text_y = 0, icon_y = 0;
681    
682    /* everything from here uses the same font */        const char *difficulty = "Difficulty:";
683    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
684                            CAIRO_FONT_WEIGHT_NORMAL);        cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
685  #ifndef BIG_BALLOONS  
686    cairo_set_font_size (cr, 14.0);        if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
687  #else          text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
688    cairo_set_font_size (cr, 22.0);        else
689  #endif          icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
690    
691    if(cache->name) {        /* draw "Difficulty:" string */
692      /* draw cache name */        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
693      cairo_text_extents (cr, cache->name, &extents);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
694      y += extents.height;        cairo_show_text (event->data.draw.cr, _(difficulty));
695      cairo_move_to (cr, x, y);        cairo_stroke (event->data.draw.cr);
696      cairo_set_source_rgba (cr, 0, 0, 0, 1);        x += extents.width + 2;
697      cairo_show_text (cr, cache->name);  
698      cairo_stroke (cr);        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
699        }
700      /* return to the left border and below text */  
701      y += LINE_SKIP;      /* draw container info */
702      x = rect->x;      /* TODO ... */
703    }  
704    
705    if(cache->terrain) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
706      /* draw cache rating */      printf("click %s event at %d %d\n",
707      const char *terrain = "Terrain:";             event->data.click.down?"down":"up",
708      icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));             event->data.click.x, event->data.click.y);
709      cairo_text_extents (cr, _(terrain), &extents);  
710      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;      /* make the main screen jump to that cache */
711        if(!event->data.click.down) {
712      /* draw "Terrain:" string */        if(context->appdata->cur_cache) {
713      cairo_move_to (cr, x, y);          printf("ERROR: no current cache should be visible!\n");
714      cairo_set_source_rgba (cr, 0, 0, 0, 1);        } else {
715      cairo_show_text (cr, _(terrain));          gpx_t *is_in = NULL;
716      cairo_stroke (cr);  
717      x += extents.width + 2;          if(!context->appdata->cur_gpx) {
718              printf("click while in \"all\" view\n");
719      /* draw terrain stars */  
720      cairo_draw_pixbuf(cr, icon, x, y -            /* we first need to figure out which gpx file this cache */
721                        (gdk_pixbuf_get_height(icon) + extents.height)/2);            /* is in so we can open it first */
722              gpx_t *gpx = context->appdata->gpx;
723      x += gdk_pixbuf_get_width(icon) + LINE_SKIP;            while(gpx && !is_in) {
724      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;              cache_t *cur = gpx->cache;
725    }              while(cur && !is_in) {
726                  if(cur == cache)
727    if(cache->difficulty) {                  is_in = gpx;
728      const char *difficulty = "Difficulty:";                cur = cur->next;
729      cairo_text_extents (cr, _(difficulty), &extents);              }
730      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;              gpx = gpx->next;
731              }
732      /* draw "Difficulty:" string */  
733      cairo_move_to (cr, x, y);            if(is_in)
734      cairo_set_source_rgba (cr, 0, 0, 0, 1);              gpxlist_goto_cachelist(context->appdata, is_in);
735      cairo_show_text (cr, _(difficulty));  
736      cairo_stroke (cr);          } else
737      x += extents.width + 2;            /* the simple case: there already is an open gpx file and */
738              /* we just jump into the "cache" view */
739      icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));            is_in = context->appdata->cur_gpx;
740      cairo_draw_pixbuf(cr, icon, x, y -  
741                        (gdk_pixbuf_get_height(icon) + extents.height)/2);          if(is_in) {
742              printf("selecting %s in %s\n",
743                     cache->id,
744                     context->appdata->cur_gpx->name);
745    
746              cachelist_goto_cache(context->appdata, cache);
747    
748              /* give focus to main screen (important for maemo) */
749              printf("raising main window\n");
750              gtk_window_present(GTK_WINDOW(context->appdata->window));
751            }
752          }
753        }
754      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
755        printf("removed\n");
756        context->balloon = NULL;
757    }    }
758  }  }
759    
# Line 441  on_map_button_release_event(GtkWidget *w Line 765  on_map_button_release_event(GtkWidget *w
765    /* in "MAP_CACHE" state only one cache is visible */    /* in "MAP_CACHE" state only one cache is visible */
766    /* and the map is in navigation mode. the balloon is */    /* and the map is in navigation mode. the balloon is */
767    /* pretty useless there */    /* pretty useless there */
768    if(context->press_on && (context->state != MAP_CACHE)) {    if(context->press_on) {
769    
770      coord_t coo;      coord_t coo;
771      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
# Line 456  on_map_button_release_event(GtkWidget *w Line 780  on_map_button_release_event(GtkWidget *w
780        float dist = gpx_pos_get_distance(pos, cpos, FALSE);        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
781        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
782    
783            context->balloon = nearest;
784          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
785                                       balloon_draw_cb, nearest);                                       balloon_cb, context);
786        }        }
787      }      }
788      context->press_on = NULL;      context->press_on = NULL;
# Line 475  on_map_button_release_event(GtkWidget *w Line 800  on_map_button_release_event(GtkWidget *w
800  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
801    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
802    
   printf("destroy map window\n");  
   
803    /* save map parameters */    /* save map parameters */
804    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
805    gint zoom;    gint zoom;
# Line 498  static void on_window_destroy(GtkWidget Line 821  static void on_window_destroy(GtkWidget
821  #endif  #endif
822    
823    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
824      gps_unregister_callback(appdata, context->cb_id);
825    
826      if(context->caches_displayed) {
827        g_free(context->caches_displayed);
828        context->caches_displayed = NULL;
829      }
830    
831      printf("destroy map context\n");
832    g_free(context);    g_free(context);
833    appdata->map.context = NULL;    appdata->map.context = NULL;
834  }  }
# Line 522  on_window_realize(GtkWidget *widget, gpo Line 852  on_window_realize(GtkWidget *widget, gpo
852  }  }
853  #endif  #endif
854    
855  /* draw geocaches and set window title */  /* on maemo a window is either on top or completely invisible. this */
856  static void map_setup(map_context_t *context) {  /* means that we only need to update the map window if its raised.  */
857    char *name = NULL;  /* on ordinary desktops this is different and we always update */
858    
859    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
860      if(context->state != MAP_ALL) {                           gpointer data) {
861        printf("map_setp(ALL)\n");    map_context_t *context = (map_context_t*)data;
862    
863        /* no navigation in this mode */    printf("map got focus\n");
       osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));  
864    
865        /* clear all existing ccahe images */  #ifdef USE_MAEMO
866        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));    /* re-enable refresh of map */
867      if(!context->handler_id)
868        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
869    #endif
870    
871        /* draw all geocaches */    map_setup(context);
872        gpx_t *gpx = context->appdata->gpx;    return FALSE;
873        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");  
874    
875        /* no navigation in this mode */  static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
876        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));                           gpointer data) {
877      map_context_t *context = (map_context_t*)data;
878    
879        /* clear all existing ccahe images */    printf("map lost focus\n");
       osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));  
880    
881        map_draw_gpx(context->appdata, context->widget,    /* save new map position */
882                     context->appdata->cur_gpx);    gfloat lat, lon;
883        name = g_strdup(context->appdata->cur_gpx->name);    g_object_get(widget, "latitude", &lat, "longitude", &lon, NULL);
       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);  
   }  
884    
885    if(name) {    context->appdata->map.pos.lat = lat;
886      char *title = g_strdup_printf(_("Map - %s"), name);    context->appdata->map.pos.lon = lon;
     g_free(name);  
887    
888      gtk_window_set_title(GTK_WINDOW(context->window), title);  #ifdef USE_MAEMO
889      gtk_timeout_remove(context->handler_id);
890      g_free(title);    context->handler_id = 0;
891    } else  #endif
     printf("map_setup(keep)\n");  
 }  
892    
 /* 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 */  
 static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,  
                          gpointer data) {  
   printf("map got focus\n");  
   map_setup((map_context_t*)data);  
893    return FALSE;    return FALSE;
894  }  }
895    
896  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
897      printf("map_update\n");
898  #ifndef USE_MAEMO  #ifndef USE_MAEMO
899    if(appdata->map.context)    if(appdata->map.context)
900      map_setup(appdata->map.context);      map_setup(appdata->map.context);
901  #endif  #endif
902  }  }
903    
904    /* callback called by the gps layer whenever gps state changes */
905    static void
906    gps_callback(struct gps_state *state, gpointer data) {
907      printf("map: gps callback\n");
908    }
909    
910  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
911    map_context_t *context = NULL;    map_context_t *context = NULL;
912    
# Line 622  void map(appdata_t *appdata) { Line 919  void map(appdata_t *appdata) {
919    }    }
920    
921    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
922      printf("allocated new context at %p\n", context);
923    
924    context->appdata = appdata;    context->appdata = appdata;
925    context->map_complete = FALSE;    context->map_complete = FALSE;
926    context->state = MAP_NONE;    context->state = MAP_NONE;
# Line 682  void map(appdata_t *appdata) { Line 981  void map(appdata_t *appdata) {
981    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
982  #endif  #endif
983    
   /* setup cache state */  
   map_setup(context);  
   
984  #ifndef USE_MAEMO  #ifndef USE_MAEMO
985    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
986  #endif  #endif
# Line 692  void map(appdata_t *appdata) { Line 988  void map(appdata_t *appdata) {
988    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
989                     G_CALLBACK(on_focus_in), context);                     G_CALLBACK(on_focus_in), context);
990    
991      g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
992                       G_CALLBACK(on_focus_out), context);
993    
994    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
995                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
996    
# Line 703  void map(appdata_t *appdata) { Line 1002  void map(appdata_t *appdata) {
1002    
1003    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
1004    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
1005      context->cb_id = gps_register_callback(appdata, gps_callback, context);
1006    
1007  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
1008    /* prevent some of the main screen things */    /* prevent some of the main screen things */
Legend:
Removed from v.133  
changed lines
  Added in v.233