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 161 by harbaum, Thu Nov 5 08:58:28 2009 UTC
# Line 22  Line 22 
22   * http://topo.geofabrik.de/trail/${z}/${x}/${y}.png   8-15   * http://topo.geofabrik.de/trail/${z}/${x}/${y}.png   8-15
23   */   */
24    
25    /*
26     * TODO:
27     * - draw caches only once
28     * - prefer duplicates from selected files
29     * - make semi-transparent caches selectable
30     */
31    
32  #include "gpxview.h"  #include "gpxview.h"
33  #include "converter.h"  #include "converter.h"
34  #include <math.h>    // for isnan  #include <math.h>    // for isnan
# Line 48  static const char *get_proxy_uri(appdata Line 55  static const char *get_proxy_uri(appdata
55    /* use environment settings if preset */    /* use environment settings if preset */
56    const char *proxy = g_getenv("http_proxy");    const char *proxy = g_getenv("http_proxy");
57    if(proxy) {    if(proxy) {
58      printf("http_proxy: %s\n", proxy);      printf("map http proxy from env: %s\n", proxy);
59      return proxy;      return proxy;
60    }    }
61    
# Line 69  static const char *get_proxy_uri(appdata Line 76  static const char *get_proxy_uri(appdata
76    
77        snprintf(proxy_buffer, sizeof(proxy_buffer),        snprintf(proxy_buffer, sizeof(proxy_buffer),
78                 "http://%s:%u", host, port);                 "http://%s:%u", host, port);
79          printf("map http proxy from gconf: %s\n ", proxy_buffer);
80    
81        g_free(host);        g_free(host);
82      }      }
# Line 80  static const char *get_proxy_uri(appdata Line 88  static const char *get_proxy_uri(appdata
88    
89  static void  static void
90  cb_map_gps(osd_button_t but, map_context_t *context) {  cb_map_gps(osd_button_t but, map_context_t *context) {
91    
92    if(but == OSD_GPS) {    if(but == OSD_GPS) {
93      pos_t *refpos = get_pos(context->appdata);      pos_t *refpos = get_pos(context->appdata);
94      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
# Line 108  static int dist2pixel(map_context_t *con Line 117  static int dist2pixel(map_context_t *con
117    
118  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
119    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
120      static gboolean goto_is_enabled = FALSE;
121    
122    /* get reference position ... */    /* get reference position ... */
123    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
124    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
125    
126    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
127    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),    if(ok != goto_is_enabled) {
128                   OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
129                    OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
130        goto_is_enabled = ok;
131      }
132    
133    if(ok) {    if(ok) {
134      float heading = NAN;      float heading = NAN;
# Line 130  static gboolean map_gps_update(gpointer Line 143  static gboolean map_gps_update(gpointer
143          radius = dist2pixel(context, eph/1000, refpos->lat);          radius = dist2pixel(context, eph/1000, refpos->lat);
144      }      }
145    
146        /* TODO: in order to save energy: only draw if state actually changed */
147    
148      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
149      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
150                           refpos->lat, refpos->lon, heading);                           refpos->lat, refpos->lon, heading);
# Line 139  static gboolean map_gps_update(gpointer Line 154  static gboolean map_gps_update(gpointer
154    return TRUE;    return TRUE;
155  }  }
156    
157    static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
158      GdkPixbuf *icon = icon_get(semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE,
159                                 cache->type);
160    
161      /* check if there's also an overwritten coordinate */
162      if(cache->notes && cache->notes->override) {
163        GdkPixbuf *over = icon_get(ICON_MISC, 1);
164    
165        osm_gps_map_add_image(OSM_GPS_MAP(map),
166              cache->notes->pos.lat, cache->notes->pos.lon, icon);
167    
168        osm_gps_map_add_image(OSM_GPS_MAP(map),
169              cache->notes->pos.lat, cache->notes->pos.lon, over);
170      } else {
171        if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon))
172          osm_gps_map_add_image(OSM_GPS_MAP(map),
173                                cache->pos.lat, cache->pos.lon, icon);
174      }
175    }
176    
177    static void map_draw_gpx(appdata_t *appdata, cache_display_t *caches,
178                             GtkWidget *map, gpx_t *gpx,
179                             cache_t *nav, gboolean semi) {
180      if(!gpx->notes_loaded) {
181        notes_load_all(appdata, gpx);
182        gpx->notes_loaded = TRUE;
183      }
184    
185      cache_t *cache = gpx->cache;
186      while(cache) {
187        /* search if we have that cache already in our list/displayed */
188        int i=0;
189        while(caches[i].id && (strcmp(caches[i].id, cache->id) != 0))
190          i++;
191    
192        if(!caches[i].id) {
193          /* if nav is given draw all other caches semitransparent. */
194          /* if nav is not given do what semi sais */
195          map_draw_cache(map, cache, nav?(cache != nav):semi);
196          caches[i].id = cache->id;
197        }
198    
199        cache = cache->next;
200      }
201    }
202    
203    /* draw geocaches and set window title */
204    static void map_setup(map_context_t *context) {
205      char *name = NULL;
206    
207      int cache_num = gpx_total_caches_global(context->appdata->gpx);
208    
209      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
210        //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
211        //     cache_num, context->cache_list_len);
212        g_free(context->caches_displayed);
213        context->caches_displayed = NULL;
214        context->cache_list_len = 0;
215      }
216    
217      /* allocate buffer */
218      if(cache_num && !context->caches_displayed) {
219        context->cache_list_len = cache_num;
220        context->caches_displayed = g_new0(cache_display_t, cache_num+1);
221        printf("allocated space to handle %d map icons\n", cache_num);
222      }
223    
224      if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
225        if(context->state != MAP_ALL) {
226          printf("map_setup(ALL)\n");
227    
228    #ifdef OSD_NAV
229          /* no navigation in this mode */
230          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
231    #endif
232    
233          /* clear all existing cache images */
234          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
235          memset(context->caches_displayed, 0,
236                 (cache_num+1) * sizeof(cache_display_t));
237    
238          /* draw all geocaches and none is semi-transparent */
239          gpx_t *gpx = context->appdata->gpx;
240          while(gpx) {
241            map_draw_gpx(context->appdata, context->caches_displayed,
242                         context->widget, gpx, NULL, FALSE);
243            gpx = gpx->next;
244          }
245    
246          {
247            int i=0;
248            while(context->caches_displayed[i].id) i++;
249            printf("number of caches actually displayed: %d\n", i);
250          }
251    
252          name = g_strdup(_("all"));
253          context->state = MAP_ALL;
254        }
255      } else if(!context->appdata->cur_cache) {
256        if(context->state != MAP_GPX) {
257          printf("map_setup(GPX)\n");
258    
259    #ifdef OSD_NAV
260          /* no navigation in this mode */
261          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
262    #endif
263    
264          /* clear all existing ccahe images */
265          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
266          memset(context->caches_displayed, 0,
267                 (cache_num+1) * sizeof(cache_display_t));
268    
269          /* draw all geocaches and all other gpx files are semi-transparent */
270          map_draw_gpx(context->appdata, context->caches_displayed,
271                       context->widget, context->appdata->cur_gpx, NULL, FALSE);
272    
273          gpx_t *gpx = context->appdata->gpx;
274          while(gpx) {
275            if(gpx != context->appdata->cur_gpx)
276              map_draw_gpx(context->appdata, context->caches_displayed,
277                           context->widget, gpx, NULL, TRUE);
278    
279            gpx = gpx->next;
280          }
281    
282          name = g_strdup(context->appdata->cur_gpx->name);
283          context->state = MAP_GPX;
284        }
285      } else {
286        cache_t *cache = context->appdata->cur_cache;
287    
288        printf("map_setup(CACHE)\n");
289    
290        /* no balloons in this mode */
291        context->balloon = NULL;
292        osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
293    
294        /* clear all existing ccahe images */
295        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
296        memset(context->caches_displayed, 0,
297               (cache_num+1) * sizeof(cache_display_t));
298    
299        /* draw all geocaches and all but selected one are semi-transparent */
300        gpx_t *gpx = context->appdata->gpx;
301        while(gpx) {
302          map_draw_gpx(context->appdata, context->caches_displayed,
303                       context->widget, gpx, cache, FALSE);
304          gpx = gpx->next;
305        }
306    
307        name = g_strdup(cache->name);
308        context->state = MAP_CACHE;
309    
310        /* navigation in this mode! */
311        pos_t cpos = gpx_cache_pos(cache);
312    
313    #ifdef OSD_NAV
314        osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
315                                  context->appdata->imperial,
316                                  cpos.lat, cpos.lon, cache->name);
317    #else
318    #warning OSD_NAV not defined!
319    #endif
320      }
321    
322      if(name) {
323        char *title = g_strdup_printf(_("Map - %s"), name);
324        g_free(name);
325    
326        gtk_window_set_title(GTK_WINDOW(context->window), title);
327    
328        g_free(title);
329      } else
330        printf("map_setup(keep)\n");
331    }
332    
333  static gboolean on_map_configure(GtkWidget *widget,  static gboolean on_map_configure(GtkWidget *widget,
334                                   GdkEventConfigure *event,                                   GdkEventConfigure *event,
335                                   map_context_t *context) {                                   map_context_t *context) {
336    
337    if(!context->map_complete) {    /* for some reason there's a configure event with 1/1 */
338      /* on diablo. We just ignore this! */
339    
340      printf("on_map_configure %d %d\n",
341             widget->allocation.width,
342             widget->allocation.height);
343    
344      if(!context->map_complete &&
345         (widget->allocation.width > 100) &&
346         (widget->allocation.height > 100)) {
347    
348        /* setup cache state */
349        map_setup(context);
350    
351      /* set default values if they are invalid */      /* set default values if they are invalid */
352      if(!context->appdata->map.zoom ||      if(!context->appdata->map.zoom ||
# Line 153  static gboolean on_map_configure(GtkWidg Line 356  static gboolean on_map_configure(GtkWidg
356    
357        pos_t *refpos = get_pos(context->appdata);        pos_t *refpos = get_pos(context->appdata);
358        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
359            printf("use refpos\n");
360    
361          /* use gps position if present */          /* use gps position if present */
362          context->appdata->map.pos = *refpos;          context->appdata->map.pos = *refpos;
363          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
364        } else {        } else {
365            printf("use zero pos\n");
366    
367          /* use world map otherwise */          /* use world map otherwise */
368          context->appdata->map.pos.lat = 0.0;          context->appdata->map.pos.lat = 0.0;
369          context->appdata->map.pos.lon = 0.0;          context->appdata->map.pos.lon = 0.0;
# Line 165  static gboolean on_map_configure(GtkWidg Line 372  static gboolean on_map_configure(GtkWidg
372      }      }
373    
374      /* jump to initial position */      /* jump to initial position */
375        printf("osm_gps_map_set_mapcenter(%f,%f,%d)\n",
376               context->appdata->map.pos.lat,
377               context->appdata->map.pos.lon,
378               context->appdata->map.zoom);
379    
380      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
381                                context->appdata->map.pos.lat,                                context->appdata->map.pos.lat,
382                                context->appdata->map.pos.lon,                                context->appdata->map.pos.lon,
# Line 175  static gboolean on_map_configure(GtkWidg Line 387  static gboolean on_map_configure(GtkWidg
387    return FALSE;    return FALSE;
388  }  }
389    
 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;  
   }  
 }  
   
390  static void  static void
391  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
392                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
393    
394    while(cache) {    while(cache) {
395      pos_t cpos = gpx_cache_pos(cache);      pos_t cpos = gpx_cache_pos(cache);
396    
# Line 258  pos_t coord2pos(coord_t coo) { Line 440  pos_t coord2pos(coord_t coo) {
440  static gboolean  static gboolean
441  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
442                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
443    
444    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
445    
446    /* check if we actually clicked parts of the OSD */    /* check if we actually clicked parts of the OSD */
447    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)
448      return FALSE;      return FALSE;
449    
450    /* 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 479  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
479                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
480    
481    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
482      g_assert(image_surface);
483    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
484    
485    // Draw the image on the new Context    // Draw the image on the new Context
# Line 315  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 499  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
499  #endif  #endif
500    
501  static void  static void
502  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
503    cache_t *cache = (cache_t*)data;    printf("balloon event: ");
   
 #if 0  
   /* draw pink background to check clipping */  
   cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);  
   cairo_set_source_rgba (cr, 1, 0, 0, 0.3);  
   cairo_fill_preserve (cr);  
   cairo_set_line_width (cr, 0);  
   cairo_stroke (cr);  
 #endif  
   
   /* 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);  
504    
505    if(cache->notes && cache->notes->override) {    map_context_t *context = (map_context_t*)data;
506      GdkPixbuf *over = icon_get(ICON_MISC, 1);    cache_t *cache = context->balloon;
     cairo_draw_pixbuf(cr, over, x, y);  
   }  
507    
508    /* ... and right of it the waypoint id */    if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
509    cairo_text_extents_t extents;      printf("draw\n");
510    
511    if(cache->id) {  #if 0
512      cairo_select_font_face (cr, "Sans",      /* draw pink background to check clipping */
513                              CAIRO_FONT_SLANT_NORMAL,      cairo_rectangle (event->data.draw.cr,
514                              CAIRO_FONT_WEIGHT_BOLD);                       event->data.draw.rect->x-20, event->data.draw.rect->y-20,
515                         event->data.draw.rect->w+40, event->data.draw.rect->h+40);
516        cairo_set_source_rgba (event->data.draw.cr, 1, 0, 0, 0.3);
517        cairo_fill_preserve (event->data.draw.cr);
518        cairo_set_line_width (event->data.draw.cr, 0);
519        cairo_stroke (event->data.draw.cr);
520    #endif
521    
522        /* leave a little border top and left */
523        gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
524    
525        /* draw the cache type icon ... */
526        GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
527        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
528    
529        if(cache->notes && cache->notes->override) {
530          GdkPixbuf *over = icon_get(ICON_MISC, 1);
531          cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
532        }
533    
534        /* ... and right of it the waypoint id */
535        cairo_text_extents_t extents;
536    
537        if(cache->id) {
538          cairo_select_font_face (event->data.draw.cr, "Sans",
539                                  CAIRO_FONT_SLANT_NORMAL,
540                                  CAIRO_FONT_WEIGHT_BOLD);
541    
542  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
543      cairo_set_font_size (cr, 20.0);        cairo_set_font_size (event->data.draw.cr, 20.0);
544  #else  #else
545      cairo_set_font_size (cr, 36.0);        cairo_set_font_size (event->data.draw.cr, 36.0);
546  #endif  #endif
547    
548      cairo_text_extents (cr, cache->id, &extents);        cairo_text_extents (event->data.draw.cr, cache->id, &extents);
549    
550      /* display id right of icon vertically centered */        /* display id right of icon vertically centered */
551      x += gdk_pixbuf_get_width(icon) + 5;        x += gdk_pixbuf_get_width(icon) + 5;
552      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
553      cairo_move_to (cr, x, y);        cairo_move_to (event->data.draw.cr, x, y);
554      cairo_set_source_rgba (cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
555      cairo_show_text (cr, cache->id);        cairo_show_text (event->data.draw.cr, cache->id);
556      cairo_stroke (cr);        cairo_stroke (event->data.draw.cr);
557    
558      y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;        y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
559    } else      } else
560      y += gdk_pixbuf_get_height(icon);        y += gdk_pixbuf_get_height(icon);
561    
562    /* return to the left border and below icon/text */      /* return to the left border and below icon/text */
563    x = rect->x;      x = event->data.draw.rect->x;
564    
565    /* everything from here uses the same font */      /* everything from here uses the same font */
566    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
567                            CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
568  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
569    cairo_set_font_size (cr, 14.0);      cairo_set_font_size (event->data.draw.cr, 14.0);
570  #else  #else
571    cairo_set_font_size (cr, 22.0);      cairo_set_font_size (event->data.draw.cr, 22.0);
572  #endif  #endif
573    
574    if(cache->name) {      if(cache->name) {
575      /* draw cache name */        /* draw cache name */
576      cairo_text_extents (cr, cache->name, &extents);        cairo_text_extents (event->data.draw.cr, cache->name, &extents);
577      y += extents.height;        y += extents.height;
578      cairo_move_to (cr, x, y);        cairo_move_to (event->data.draw.cr, x, y);
579      cairo_set_source_rgba (cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
580      cairo_show_text (cr, cache->name);        cairo_show_text (event->data.draw.cr, cache->name);
581      cairo_stroke (cr);        cairo_stroke (event->data.draw.cr);
582    
583      /* return to the left border and below text */        /* return to the left border and below text */
584      y += LINE_SKIP;        y += LINE_SKIP;
585      x = rect->x;        x = event->data.draw.rect->x;
586    }      }
587    
588    if(cache->terrain) {      if(cache->terrain) {
589      /* draw cache rating */        /* draw cache rating */
590      const char *terrain = "Terrain:";        const char *terrain = "Terrain:";
591      icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
592      cairo_text_extents (cr, _(terrain), &extents);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
593      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
594    
595      /* draw "Terrain:" string */        /* draw "Terrain:" string */
596      cairo_move_to (cr, x, y);        cairo_move_to (event->data.draw.cr, x, y);
597      cairo_set_source_rgba (cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
598      cairo_show_text (cr, _(terrain));        cairo_show_text (event->data.draw.cr, _(terrain));
599      cairo_stroke (cr);        cairo_stroke (event->data.draw.cr);
600      x += extents.width + 2;        x += extents.width + 2;
601    
602      /* draw terrain stars */        /* draw terrain stars */
603      cairo_draw_pixbuf(cr, icon, x, y -        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -
604                        (gdk_pixbuf_get_height(icon) + extents.height)/2);                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
605    
606      x += gdk_pixbuf_get_width(icon) + LINE_SKIP;        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
607      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;
608    }      }
   
   if(cache->difficulty) {  
     const char *difficulty = "Difficulty:";  
     cairo_text_extents (cr, _(difficulty), &extents);  
     y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
   
     /* draw "Difficulty:" string */  
     cairo_move_to (cr, x, y);  
     cairo_set_source_rgba (cr, 0, 0, 0, 1);  
     cairo_show_text (cr, _(difficulty));  
     cairo_stroke (cr);  
     x += extents.width + 2;  
609    
610      icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));      if(cache->difficulty) {
611      cairo_draw_pixbuf(cr, icon, x, y -        const char *difficulty = "Difficulty:";
612          cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
613          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
614    
615          /* draw "Difficulty:" string */
616          cairo_move_to (event->data.draw.cr, x, y);
617          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
618          cairo_show_text (event->data.draw.cr, _(difficulty));
619          cairo_stroke (event->data.draw.cr);
620          x += extents.width + 2;
621    
622          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
623          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -
624                        (gdk_pixbuf_get_height(icon) + extents.height)/2);                        (gdk_pixbuf_get_height(icon) + extents.height)/2);
625        }
626      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
627        printf("click %s event at %d %d\n",
628               event->data.click.down?"down":"up",
629               event->data.click.x, event->data.click.y);
630    
631        /* make the main screen jump to that cache */
632        if(!event->data.click.down) {
633          if(context->appdata->cur_cache) {
634            printf("ERROR: no current cache should be visible!\n");
635          } else {
636            gpx_t *is_in = NULL;
637    
638            if(!context->appdata->cur_gpx) {
639              printf("click while in \"all\" view\n");
640    
641              /* we first need to figure out which gpx file this cache */
642              /* is in so we can open it first */
643              gpx_t *gpx = context->appdata->gpx;
644              while(gpx && !is_in) {
645                cache_t *cur = gpx->cache;
646                while(cur && !is_in) {
647                  if(cur == cache)
648                    is_in = gpx;
649                  cur = cur->next;
650                }
651                gpx = gpx->next;
652              }
653    
654              if(is_in)
655                gpxlist_goto_cachelist(context->appdata, is_in);
656    
657            } else
658              /* the simple case: there already is an open gpx file and */
659              /* we just jump into the "cache" view */
660              is_in = context->appdata->cur_gpx;
661    
662            if(is_in) {
663              printf("selecting %s in %s\n",
664                     cache->id,
665                     context->appdata->cur_gpx->name);
666    
667              cachelist_goto_cache(context->appdata, cache);
668    
669              /* give focus to main screen (important for maemo) */
670              printf("raising main window\n");
671              gtk_window_present(GTK_WINDOW(context->appdata->window));
672            }
673          }
674        }
675      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
676        printf("removed\n");
677        context->balloon = NULL;
678    }    }
679  }  }
680    
# Line 456  on_map_button_release_event(GtkWidget *w Line 701  on_map_button_release_event(GtkWidget *w
701        float dist = gpx_pos_get_distance(pos, cpos, FALSE);        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
702        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
703    
704            context->balloon = nearest;
705          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
706                                       balloon_draw_cb, nearest);                                       balloon_cb, context);
707        }        }
708      }      }
709      context->press_on = NULL;      context->press_on = NULL;
# Line 475  on_map_button_release_event(GtkWidget *w Line 721  on_map_button_release_event(GtkWidget *w
721  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
722    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
723    
   printf("destroy map window\n");  
   
724    /* save map parameters */    /* save map parameters */
725    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
726    gint zoom;    gint zoom;
# Line 498  static void on_window_destroy(GtkWidget Line 742  static void on_window_destroy(GtkWidget
742  #endif  #endif
743    
744    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
745      gps_unregister_callback(appdata, context->cb_id);
746    
747      if(context->caches_displayed) {
748        g_free(context->caches_displayed);
749        context->caches_displayed = NULL;
750      }
751    
752    g_free(context);    g_free(context);
753    appdata->map.context = NULL;    appdata->map.context = NULL;
# Line 522  on_window_realize(GtkWidget *widget, gpo Line 772  on_window_realize(GtkWidget *widget, gpo
772  }  }
773  #endif  #endif
774    
775  /* draw geocaches and set window title */  /* on maemo a window is either on top or completely invisible. this */
776  static void map_setup(map_context_t *context) {  /* means that we only need to update the map window if its raised.  */
777    char *name = NULL;  /* on ordinary desktops this is different and we always update */
   
   if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {  
     if(context->state != MAP_ALL) {  
       printf("map_setp(ALL)\n");  
   
       /* no navigation in this mode */  
       osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));  
   
       /* clear all existing ccahe images */  
       osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));  
   
       /* draw all geocaches */  
       gpx_t *gpx = context->appdata->gpx;  
       while(gpx) {  
         map_draw_gpx(context->appdata, context->widget, gpx);  
         gpx = gpx->next;  
       }  
       name = g_strdup(_("all"));  
       context->state = MAP_ALL;  
     }  
   } else if(!context->appdata->cur_cache) {  
     if(context->state != MAP_GPX) {  
       printf("map_setp(GPX)\n");  
   
       /* no navigation in this mode */  
       osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));  
   
       /* clear all existing ccahe images */  
       osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));  
   
       map_draw_gpx(context->appdata, context->widget,  
                    context->appdata->cur_gpx);  
       name = g_strdup(context->appdata->cur_gpx->name);  
       context->state = MAP_GPX;  
     }  
   } else {  
     cache_t *cache = context->appdata->cur_cache;  
   
     printf("map_setp(CACHE)\n");  
   
     /* no balloons in this mode */  
     osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));  
   
     /* clear all existing ccahe images */  
     osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));  
   
     map_draw_cache(context->widget, cache);  
     name = g_strdup(cache->name);  
     context->state = MAP_CACHE;  
   
     /* navigation in this mode! */  
     pos_t cpos = gpx_cache_pos(cache);  
     osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),  
                               context->appdata->imperial,  
                               cpos.lat, cpos.lon, cache->name);  
   }  
   
   if(name) {  
     char *title = g_strdup_printf(_("Map - %s"), name);  
     g_free(name);  
778    
     gtk_window_set_title(GTK_WINDOW(context->window), title);  
   
     g_free(title);  
   } else  
     printf("map_setup(keep)\n");  
 }  
   
 /* on maemo a window is either on top or completely invisible. this means that */  
 /* we only need to update the map window if its raised. on ordinary desktops this */  
 /* is different and we always update */  
779  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
780                           gpointer data) {                           gpointer data) {
781    printf("map got focus\n");    printf("map got focus\n");
# Line 604  static gboolean on_focus_in(GtkWidget *w Line 784  static gboolean on_focus_in(GtkWidget *w
784  }  }
785    
786  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
787      printf("map_update\n");
788  #ifndef USE_MAEMO  #ifndef USE_MAEMO
789    if(appdata->map.context)    if(appdata->map.context)
790      map_setup(appdata->map.context);      map_setup(appdata->map.context);
791  #endif  #endif
792  }  }
793    
794    /* callback called by the gps layer whenever gps state changes */
795    static void
796    gps_callback(struct gps_state *state, gpointer data) {
797      printf("map: gps callback\n");
798    }
799    
800  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
801    map_context_t *context = NULL;    map_context_t *context = NULL;
802    
# Line 682  void map(appdata_t *appdata) { Line 869  void map(appdata_t *appdata) {
869    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
870  #endif  #endif
871    
   /* setup cache state */  
   map_setup(context);  
   
872  #ifndef USE_MAEMO  #ifndef USE_MAEMO
873    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
874  #endif  #endif
# Line 703  void map(appdata_t *appdata) { Line 887  void map(appdata_t *appdata) {
887    
888    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
889    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
890      context->cb_id = gps_register_callback(appdata, gps_callback, context);
891    
892  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
893    /* prevent some of the main screen things */    /* prevent some of the main screen things */
Legend:
Removed from v.133  
changed lines
  Added in v.161