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

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

revision 142 by harbaum, Mon Oct 26 10:40:06 2009 UTC revision 205 by harbaum, Mon Nov 23 20:12:22 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      GdkPixbuf *over = NULL;
160    
161      if(cache->mine)                   over = icon_get(type, 14);
162      else if(cache->found)             over = icon_get(type, 12);
163      else if(cache->notes) {
164        if(cache->notes->found)         over = icon_get(type, 12);
165        else if(cache->notes->override) over = icon_get(type, 11);
166        else                            over = icon_get(type, 13);
167      }
168    
169      pos_t *pos = &cache->pos;
170      /* check if there's also an overwritten coordinate */
171      if(cache->notes && cache->notes->override)
172        pos = &cache->notes->pos;
173    
174      if(!isnan(pos->lat) && !isnan(pos->lon)) {
175        osm_gps_map_add_image(OSM_GPS_MAP(map),
176                              pos->lat, pos->lon, icon);
177        if(over)
178          osm_gps_map_add_image(OSM_GPS_MAP(map),
179                                pos->lat, pos->lon, over);
180      }
181    }
182    
183    static void map_draw_gpx(appdata_t *appdata, cache_display_t *caches,
184                             GtkWidget *map, gpx_t *gpx,
185                             cache_t *nav, gboolean semi) {
186      if(!gpx->notes_loaded) {
187        notes_load_all(appdata, gpx);
188        gpx->notes_loaded = TRUE;
189      }
190    
191      cache_t *cache = gpx->cache;
192      while(cache) {
193        /* search if we have that cache already in our list/displayed */
194        int i=0;
195        while(caches[i].id && (strcmp(caches[i].id, cache->id) != 0))
196          i++;
197    
198        if(!caches[i].id) {
199          /* if nav is given draw all other caches semitransparent. */
200          /* if nav is not given do what semi sais */
201          map_draw_cache(map, cache, nav?(cache != nav):semi);
202          caches[i].id = cache->id;
203        }
204    
205        cache = cache->next;
206      }
207    }
208    
209    /* draw geocaches and set window title */
210    static void map_setup(map_context_t *context) {
211      char *name = NULL;
212    
213      int cache_num = gpx_total_caches_global(context->appdata->gpx);
214    
215      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
216        //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
217        //     cache_num, context->cache_list_len);
218        g_free(context->caches_displayed);
219        context->caches_displayed = NULL;
220        context->cache_list_len = 0;
221      }
222    
223      /* allocate buffer */
224      if(cache_num && !context->caches_displayed) {
225        context->cache_list_len = cache_num;
226        context->caches_displayed = g_new0(cache_display_t, cache_num+1);
227        printf("allocated space to handle %d map icons\n", cache_num);
228      }
229    
230      if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
231        if(context->state != MAP_ALL) {
232          printf("map_setup(ALL)\n");
233    
234          /* clear any pending balloon */
235          context->balloon = NULL;
236          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
237    
238    #ifdef OSD_NAV
239          /* no navigation in this mode */
240          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
241    #endif
242    
243          /* clear all existing cache images */
244          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
245          memset(context->caches_displayed, 0,
246                 (cache_num+1) * sizeof(cache_display_t));
247    
248          /* draw all geocaches and none is semi-transparent */
249          gpx_t *gpx = context->appdata->gpx;
250          while(gpx) {
251            map_draw_gpx(context->appdata, context->caches_displayed,
252                         context->widget, gpx, NULL, FALSE);
253            gpx = gpx->next;
254          }
255    
256          {
257            int i=0;
258            while(context->caches_displayed[i].id) i++;
259            printf("number of caches actually displayed: %d\n", i);
260          }
261    
262          name = g_strdup(_("all"));
263          context->state = MAP_ALL;
264        }
265      } else if(!context->appdata->cur_cache) {
266        if(context->state != MAP_GPX) {
267          printf("map_setup(GPX)\n");
268    
269          /* clear any pending balloon */
270          context->balloon = NULL;
271          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
272    
273    #ifdef OSD_NAV
274          /* no navigation in this mode */
275          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
276    #endif
277    
278          /* clear all existing cache images */
279          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
280          memset(context->caches_displayed, 0,
281                 (cache_num+1) * sizeof(cache_display_t));
282    
283          /* draw all geocaches and all other gpx files are semi-transparent */
284          map_draw_gpx(context->appdata, context->caches_displayed,
285                       context->widget, context->appdata->cur_gpx, NULL, FALSE);
286    
287          gpx_t *gpx = context->appdata->gpx;
288          while(gpx) {
289            if(gpx != context->appdata->cur_gpx)
290              map_draw_gpx(context->appdata, context->caches_displayed,
291                           context->widget, gpx, NULL, TRUE);
292    
293            gpx = gpx->next;
294          }
295    
296          name = g_strdup(context->appdata->cur_gpx->name);
297          context->state = MAP_GPX;
298        }
299      } else {
300        cache_t *cache = context->appdata->cur_cache;
301    
302        printf("map_setup(CACHE)\n");
303    
304        /* clear any pending balloon */
305        context->balloon = NULL;
306        osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
307    
308        /* clear all existing ccahe images */
309        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
310        memset(context->caches_displayed, 0,
311               (cache_num+1) * sizeof(cache_display_t));
312    
313        /* draw all geocaches and all but selected one are semi-transparent */
314        gpx_t *gpx = context->appdata->gpx;
315        while(gpx) {
316          map_draw_gpx(context->appdata, context->caches_displayed,
317                       context->widget, gpx, cache, FALSE);
318          gpx = gpx->next;
319        }
320    
321        name = g_strdup(cache->name);
322        context->state = MAP_CACHE;
323    
324        /* navigation in this mode! */
325        pos_t cpos = gpx_cache_pos(cache);
326    
327    #ifdef OSD_NAV
328        osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
329                                  context->appdata->imperial,
330                                  cpos.lat, cpos.lon, cache->name);
331    #else
332    #warning OSD_NAV not defined!
333    #endif
334      }
335    
336      if(name) {
337        char *title = g_strdup_printf(_("Map - %s"), name);
338        g_free(name);
339    
340        gtk_window_set_title(GTK_WINDOW(context->window), title);
341    
342        g_free(title);
343      } else
344        printf("map_setup(keep)\n");
345    }
346    
347  static gboolean on_map_configure(GtkWidget *widget,  static gboolean on_map_configure(GtkWidget *widget,
348                                   GdkEventConfigure *event,                                   GdkEventConfigure *event,
349                                   map_context_t *context) {                                   map_context_t *context) {
350    
351    if(!context->map_complete) {    /* for some reason there's a configure event with 1/1 */
352      /* on diablo. We just ignore this! */
353    
354      printf("on_map_configure %d %d\n",
355             widget->allocation.width,
356             widget->allocation.height);
357    
358      if(!context->map_complete &&
359         (widget->allocation.width > 100) &&
360         (widget->allocation.height > 100)) {
361    
362        /* setup cache state */
363        map_setup(context);
364    
365      /* set default values if they are invalid */      /* set default values if they are invalid */
366      if(!context->appdata->map.zoom ||      if(!context->appdata->map.zoom ||
# Line 153  static gboolean on_map_configure(GtkWidg Line 370  static gboolean on_map_configure(GtkWidg
370    
371        pos_t *refpos = get_pos(context->appdata);        pos_t *refpos = get_pos(context->appdata);
372        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
373            printf("use refpos\n");
374    
375          /* use gps position if present */          /* use gps position if present */
376          context->appdata->map.pos = *refpos;          context->appdata->map.pos = *refpos;
377          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
378        } else {        } else {
379            printf("use zero pos\n");
380    
381          /* use world map otherwise */          /* use world map otherwise */
382          context->appdata->map.pos.lat = 0.0;          context->appdata->map.pos.lat = 0.0;
383          context->appdata->map.pos.lon = 0.0;          context->appdata->map.pos.lon = 0.0;
# Line 165  static gboolean on_map_configure(GtkWidg Line 386  static gboolean on_map_configure(GtkWidg
386      }      }
387    
388      /* jump to initial position */      /* jump to initial position */
389        printf("osm_gps_map_set_mapcenter(%f,%f,%d)\n",
390               context->appdata->map.pos.lat,
391               context->appdata->map.pos.lon,
392               context->appdata->map.zoom);
393    
394      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
395                                context->appdata->map.pos.lat,                                context->appdata->map.pos.lat,
396                                context->appdata->map.pos.lon,                                context->appdata->map.pos.lon,
# Line 175  static gboolean on_map_configure(GtkWidg Line 401  static gboolean on_map_configure(GtkWidg
401    return FALSE;    return FALSE;
402  }  }
403    
 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;  
   }  
 }  
   
404  static void  static void
405  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
406                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
407    
408    while(cache) {    while(cache) {
409      pos_t cpos = gpx_cache_pos(cache);      pos_t cpos = gpx_cache_pos(cache);
410    
# Line 258  pos_t coord2pos(coord_t coo) { Line 454  pos_t coord2pos(coord_t coo) {
454  static gboolean  static gboolean
455  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
456                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
457    
458    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
459    
460    /* check if we actually clicked parts of the OSD */    /* check if we actually clicked parts of the OSD */
461    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)
462      return FALSE;      return FALSE;
463    
464    /* 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 493  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
493                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
494    
495    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
496      g_assert(image_surface);
497    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
498    
499    // Draw the image on the new Context    // Draw the image on the new Context
# Line 309  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 507  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
507  }  }
508    
509  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
510  #define LINE_SKIP  7  #define ICON_SIZE  ICON_CACHE_TYPE
511    #else
512    #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
513    #endif
514    
515    #ifndef BIG_BALLOONS
516    #define FONT_SIZE 14.0
517  #else  #else
518  #define LINE_SKIP  12  #define FONT_SIZE 22.0
519  #endif  #endif
520    #define LINE_SKIP  (FONT_SIZE/4)
521    
522    
523  static void  static void
524  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
525      printf("balloon event: ");
526    
527    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
528    cache_t *cache = context->balloon;    cache_t *cache = context->balloon;
529    
   printf("balloon event: ");  
   
530    if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {    if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
531      printf("draw\n");      printf("draw\n");
532    
# Line 339  balloon_cb(osm_gps_map_balloon_event_t * Line 545  balloon_cb(osm_gps_map_balloon_event_t *
545      gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;      gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
546    
547      /* draw the cache type icon ... */      /* draw the cache type icon ... */
548      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);      GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
549      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
550    
551      if(cache->notes && cache->notes->override) {      if(cache->notes && cache->notes->override) {
552        GdkPixbuf *over = icon_get(ICON_MISC, 1);        GdkPixbuf *over = icon_get(ICON_SIZE, 11);
553        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
554      }      }
555    
# Line 379  balloon_cb(osm_gps_map_balloon_event_t * Line 585  balloon_cb(osm_gps_map_balloon_event_t *
585      x = event->data.draw.rect->x;      x = event->data.draw.rect->x;
586    
587      /* everything from here uses the same font */      /* everything from here uses the same font */
588      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans",
589                                CAIRO_FONT_SLANT_NORMAL,
590                              CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
591  #ifndef BIG_BALLOONS  
592      cairo_set_font_size (event->data.draw.cr, 14.0);      cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
 #else  
     cairo_set_font_size (event->data.draw.cr, 22.0);  
 #endif  
593    
594      if(cache->name) {      if(cache->name) {
595        /* draw cache name */        /* draw cache name */
596        cairo_text_extents (event->data.draw.cr, cache->name, &extents);        cairo_text_extents (event->data.draw.cr, cache->name, &extents);
597        y += extents.height;        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
       cairo_move_to (event->data.draw.cr, x, y);  
598        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
599        cairo_show_text (event->data.draw.cr, cache->name);        cairo_show_text (event->data.draw.cr, cache->name);
600        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
601    
602        /* return to the left border and below text */        /* return to the left border and below text */
603        y += LINE_SKIP;        y += LINE_SKIP + FONT_SIZE;
604        x = event->data.draw.rect->x;        x = event->data.draw.rect->x;
605      }      }
606    
607      if(cache->terrain) {      if(cache->terrain) {
608          int text_y = 0, icon_y = 0;
609    
610        /* draw cache rating */        /* draw cache rating */
611        const char *terrain = "Terrain:";        const char *terrain = "Terrain:";
612        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
613        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
614        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
615          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
616            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
617          else
618            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
619    
620        /* draw "Terrain:" string */        /* draw "Terrain:" string */
621        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
622        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
623        cairo_show_text (event->data.draw.cr, _(terrain));        cairo_show_text (event->data.draw.cr, _(terrain));
624        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
625        x += extents.width + 2;        x += extents.width + 2;
626    
627        /* draw terrain stars */        /* draw terrain stars */
628        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
                         (gdk_pixbuf_get_height(icon) + extents.height)/2);  
629    
630        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;        x += gdk_pixbuf_get_width(icon) + FONT_SIZE/2;
     y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;  
631      }      }
632    
633      if(cache->difficulty) {      if(cache->difficulty) {
634          int text_y = 0, icon_y = 0;
635    
636        const char *difficulty = "Difficulty:";        const char *difficulty = "Difficulty:";
637          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
638        cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);        cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
       y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
639    
640          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
641            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
642          else
643            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
644    
645        /* draw "Difficulty:" string */        /* draw "Difficulty:" string */
646        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
647        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
648        cairo_show_text (event->data.draw.cr, _(difficulty));        cairo_show_text (event->data.draw.cr, _(difficulty));
649        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
650        x += extents.width + 2;        x += extents.width + 2;
651    
652        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
       cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -  
                       (gdk_pixbuf_get_height(icon) + extents.height)/2);  
653      }      }
654    
655        /* draw container info */
656        /* TODO ... */
657    
658    
659    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
660      printf("click %s event at %d %d\n",      printf("click %s event at %d %d\n",
661             event->data.click.down?"down":"up",             event->data.click.down?"down":"up",
# Line 502  on_map_button_release_event(GtkWidget *w Line 719  on_map_button_release_event(GtkWidget *w
719    /* in "MAP_CACHE" state only one cache is visible */    /* in "MAP_CACHE" state only one cache is visible */
720    /* and the map is in navigation mode. the balloon is */    /* and the map is in navigation mode. the balloon is */
721    /* pretty useless there */    /* pretty useless there */
722    if(context->press_on && (context->state != MAP_CACHE)) {    if(context->press_on) {
723    
724      coord_t coo;      coord_t coo;
725      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 537  on_map_button_release_event(GtkWidget *w Line 754  on_map_button_release_event(GtkWidget *w
754  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
755    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
756    
   printf("destroy map window\n");  
   
757    /* save map parameters */    /* save map parameters */
758    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
759    gint zoom;    gint zoom;
# Line 560  static void on_window_destroy(GtkWidget Line 775  static void on_window_destroy(GtkWidget
775  #endif  #endif
776    
777    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
778      gps_unregister_callback(appdata, context->cb_id);
779    
780      if(context->caches_displayed) {
781        g_free(context->caches_displayed);
782        context->caches_displayed = NULL;
783      }
784    
785    g_free(context);    g_free(context);
786    appdata->map.context = NULL;    appdata->map.context = NULL;
# Line 584  on_window_realize(GtkWidget *widget, gpo Line 805  on_window_realize(GtkWidget *widget, gpo
805  }  }
806  #endif  #endif
807    
808  /* draw geocaches and set window title */  /* on maemo a window is either on top or completely invisible. this */
809  static void map_setup(map_context_t *context) {  /* means that we only need to update the map window if its raised.  */
810    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));  
811    
812        /* draw all geocaches */  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
813        gpx_t *gpx = context->appdata->gpx;                           gpointer data) {
814        while(gpx) {    map_context_t *context = (map_context_t*)data;
         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");  
815    
816        /* no navigation in this mode */    printf("map got focus\n");
       osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));  
817    
818        /* clear all existing ccahe images */  #ifdef USE_MAEMO
819        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));    /* re-enable refresh of map */
820      if(!context->handler_id)
821        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
822    #endif
823    
824        map_draw_gpx(context->appdata, context->widget,    map_setup(context);
825                     context->appdata->cur_gpx);    return FALSE;
826        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 */  
     context->balloon = NULL;  
     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);  
   }  
827    
828    if(name) {  #ifdef USE_MAEMO
829      char *title = g_strdup_printf("%s - %s", _("Map"), name);  static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
830      g_free(name);                           gpointer data) {
831      map_context_t *context = (map_context_t*)data;
832    
833      gtk_window_set_title(GTK_WINDOW(context->window), title);    printf("map lost focus\n");
834      gtk_timeout_remove(context->handler_id);
835      g_free(title);    context->handler_id = 0;
   } else  
     printf("map_setup(keep)\n");  
 }  
836    
 /* 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);  
837    return FALSE;    return FALSE;
838  }  }
839    #endif
840    
841  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
842      printf("map_update\n");
843  #ifndef USE_MAEMO  #ifndef USE_MAEMO
844    if(appdata->map.context)    if(appdata->map.context)
845      map_setup(appdata->map.context);      map_setup(appdata->map.context);
846  #endif  #endif
847  }  }
848    
849    /* callback called by the gps layer whenever gps state changes */
850    static void
851    gps_callback(struct gps_state *state, gpointer data) {
852      printf("map: gps callback\n");
853    }
854    
855  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
856    map_context_t *context = NULL;    map_context_t *context = NULL;
857    
# Line 745  void map(appdata_t *appdata) { Line 924  void map(appdata_t *appdata) {
924    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
925  #endif  #endif
926    
   /* setup cache state */  
   map_setup(context);  
   
927  #ifndef USE_MAEMO  #ifndef USE_MAEMO
928    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
929  #endif  #endif
# Line 755  void map(appdata_t *appdata) { Line 931  void map(appdata_t *appdata) {
931    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
932                     G_CALLBACK(on_focus_in), context);                     G_CALLBACK(on_focus_in), context);
933    
934    #ifdef USE_MAEMO
935      g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
936                       G_CALLBACK(on_focus_out), context);
937    #endif
938    
939    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
940                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
941    
# Line 766  void map(appdata_t *appdata) { Line 947  void map(appdata_t *appdata) {
947    
948    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
949    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
950      context->cb_id = gps_register_callback(appdata, gps_callback, context);
951    
952  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
953    /* prevent some of the main screen things */    /* prevent some of the main screen things */
Legend:
Removed from v.142  
changed lines
  Added in v.205