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