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 219 by harbaum, Fri Nov 27 17:10:57 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_wpt(GtkWidget *map, cache_t *cache, wpt_t *wpt) {
184    
185      /* only draw wpts that don't equal the main point */
186      if(pos_differ(&cache->pos, &wpt->pos)) {
187        GdkPixbuf *icon =
188          icon_get(ICON_WPT, (wpt->sym!=WPT_SYM_UNKNOWN)?
189                   wpt->sym:WPT_SYM_REFPOINT);
190    
191        if(!isnan(wpt->pos.lat) && !isnan(wpt->pos.lon))
192          osm_gps_map_add_image(OSM_GPS_MAP(map),
193                                wpt->pos.lat, wpt->pos.lon, icon);
194      }
195    }
196    
197    static void map_draw_gpx(appdata_t *appdata, cache_display_t *caches,
198                             GtkWidget *map, gpx_t *gpx,
199                             cache_t *nav, gboolean semi) {
200      if(!gpx->notes_loaded) {
201        notes_load_all(appdata, gpx);
202        gpx->notes_loaded = TRUE;
203      }
204    
205      cache_t *cache = gpx->cache;
206      while(cache) {
207        /* search if we have that cache already in our list/displayed */
208        int i=0;
209        while(caches[i].id && (strcmp(caches[i].id, cache->id) != 0))
210          i++;
211    
212        if(!caches[i].id) {
213          /* if nav is given draw all other caches semitransparent. */
214          /* if nav is not given do what semi sais */
215          map_draw_cache(map, cache, nav?(cache != nav):semi);
216          caches[i].id = cache->id;
217    
218          /* also draw waypoints of nav cache */
219          if(nav && cache == nav) {
220            wpt_t *wpt = cache->wpt;
221            while(wpt) {
222              map_draw_wpt(map, cache, wpt);
223              wpt = wpt->next;
224            }
225          }
226        }
227    
228        cache = cache->next;
229      }
230    }
231    
232    /* draw geocaches and set window title */
233    static void map_setup(map_context_t *context) {
234      char *name = NULL;
235    
236      int cache_num = gpx_total_caches_global(context->appdata->gpx);
237    
238      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
239        //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
240        //     cache_num, context->cache_list_len);
241        g_free(context->caches_displayed);
242        context->caches_displayed = NULL;
243        context->cache_list_len = 0;
244      }
245    
246      /* allocate buffer */
247      if(cache_num && !context->caches_displayed) {
248        context->cache_list_len = cache_num;
249        context->caches_displayed = g_new0(cache_display_t, cache_num+1);
250        printf("allocated space to handle %d map icons\n", cache_num);
251      }
252    
253      if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
254        if(context->state != MAP_ALL) {
255          printf("map_setup(ALL)\n");
256    
257          /* clear any pending balloon */
258          context->balloon = NULL;
259          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
260    
261    #ifdef OSD_NAV
262          /* no navigation in this mode */
263          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
264    #endif
265    
266          /* clear all existing cache images */
267          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
268          memset(context->caches_displayed, 0,
269                 (cache_num+1) * sizeof(cache_display_t));
270    
271          /* draw all geocaches and none is semi-transparent */
272          gpx_t *gpx = context->appdata->gpx;
273          while(gpx) {
274            map_draw_gpx(context->appdata, context->caches_displayed,
275                         context->widget, gpx, NULL, FALSE);
276            gpx = gpx->next;
277          }
278    
279          {
280            int i=0;
281            while(context->caches_displayed[i].id) i++;
282            printf("number of caches actually displayed: %d\n", i);
283          }
284    
285          name = g_strdup(_("all"));
286          context->state = MAP_ALL;
287        }
288      } else if(!context->appdata->cur_cache) {
289        if(context->state != MAP_GPX) {
290          printf("map_setup(GPX)\n");
291    
292          /* clear any pending balloon */
293          context->balloon = NULL;
294          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
295    
296    #ifdef OSD_NAV
297          /* no navigation in this mode */
298          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
299    #endif
300    
301          /* clear all existing cache images */
302          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
303          memset(context->caches_displayed, 0,
304                 (cache_num+1) * sizeof(cache_display_t));
305    
306          /* draw all geocaches and all other gpx files are semi-transparent */
307          map_draw_gpx(context->appdata, context->caches_displayed,
308                       context->widget, context->appdata->cur_gpx, NULL, FALSE);
309    
310          gpx_t *gpx = context->appdata->gpx;
311          while(gpx) {
312            if(gpx != context->appdata->cur_gpx)
313              map_draw_gpx(context->appdata, context->caches_displayed,
314                           context->widget, gpx, NULL, TRUE);
315    
316            gpx = gpx->next;
317          }
318    
319          name = g_strdup(context->appdata->cur_gpx->name);
320          context->state = MAP_GPX;
321        }
322      } else {
323        cache_t *cache = context->appdata->cur_cache;
324    
325        printf("map_setup(CACHE)\n");
326    
327        /* clear any pending balloon */
328        context->balloon = NULL;
329        osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
330    
331        /* clear all existing ccahe images */
332        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
333        memset(context->caches_displayed, 0,
334               (cache_num+1) * sizeof(cache_display_t));
335    
336        /* draw all geocaches and all but selected one are semi-transparent */
337        gpx_t *gpx = context->appdata->gpx;
338        while(gpx) {
339          map_draw_gpx(context->appdata, context->caches_displayed,
340                       context->widget, gpx, cache, FALSE);
341          gpx = gpx->next;
342        }
343    
344        name = g_strdup(cache->name);
345        context->state = MAP_CACHE;
346    
347        /* navigation in this mode! */
348        pos_t cpos = gpx_cache_pos(cache);
349    
350    #ifdef OSD_NAV
351        osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
352                                  context->appdata->imperial,
353                                  cpos.lat, cpos.lon, cache->name);
354    #else
355    #warning OSD_NAV not defined!
356    #endif
357      }
358    
359      if(name) {
360        char *title = g_strdup_printf(_("Map - %s"), name);
361        g_free(name);
362    
363        gtk_window_set_title(GTK_WINDOW(context->window), title);
364    
365        g_free(title);
366      } else
367        printf("map_setup(keep)\n");
368    }
369    
370  static gboolean on_map_configure(GtkWidget *widget,  static gboolean on_map_configure(GtkWidget *widget,
371                                   GdkEventConfigure *event,                                   GdkEventConfigure *event,
372                                   map_context_t *context) {                                   map_context_t *context) {
373    
374    if(!context->map_complete) {    /* for some reason there's a configure event with 1/1 */
375      /* on diablo. We just ignore this! */
376    
377      printf("on_map_configure %d %d\n",
378             widget->allocation.width,
379             widget->allocation.height);
380    
381      if(!context->map_complete &&
382         (widget->allocation.width > 100) &&
383         (widget->allocation.height > 100)) {
384    
385        /* setup cache state */
386        map_setup(context);
387    
388      /* set default values if they are invalid */      /* set default values if they are invalid */
389      if(!context->appdata->map.zoom ||      if(!context->appdata->map.zoom ||
# Line 153  static gboolean on_map_configure(GtkWidg Line 393  static gboolean on_map_configure(GtkWidg
393    
394        pos_t *refpos = get_pos(context->appdata);        pos_t *refpos = get_pos(context->appdata);
395        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
396            printf("use refpos\n");
397    
398          /* use gps position if present */          /* use gps position if present */
399          context->appdata->map.pos = *refpos;          context->appdata->map.pos = *refpos;
400          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
401        } else {        } else {
402            printf("use zero pos\n");
403    
404          /* use world map otherwise */          /* use world map otherwise */
405          context->appdata->map.pos.lat = 0.0;          context->appdata->map.pos.lat = 0.0;
406          context->appdata->map.pos.lon = 0.0;          context->appdata->map.pos.lon = 0.0;
# Line 165  static gboolean on_map_configure(GtkWidg Line 409  static gboolean on_map_configure(GtkWidg
409      }      }
410    
411      /* jump to initial position */      /* jump to initial position */
412        printf("osm_gps_map_set_mapcenter(%f,%f,%d)\n",
413               context->appdata->map.pos.lat,
414               context->appdata->map.pos.lon,
415               context->appdata->map.zoom);
416    
417      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
418                                context->appdata->map.pos.lat,                                context->appdata->map.pos.lat,
419                                context->appdata->map.pos.lon,                                context->appdata->map.pos.lon,
# Line 175  static gboolean on_map_configure(GtkWidg Line 424  static gboolean on_map_configure(GtkWidg
424    return FALSE;    return FALSE;
425  }  }
426    
 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;  
   }  
 }  
   
427  static void  static void
428  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
429                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
430    
431    while(cache) {    while(cache) {
432      pos_t cpos = gpx_cache_pos(cache);      pos_t cpos = gpx_cache_pos(cache);
433    
# Line 258  pos_t coord2pos(coord_t coo) { Line 477  pos_t coord2pos(coord_t coo) {
477  static gboolean  static gboolean
478  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
479                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
480    
481    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
482    
483    /* check if we actually clicked parts of the OSD */    /* check if we actually clicked parts of the OSD */
484    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)
485      return FALSE;      return FALSE;
486    
487    /* 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 516  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
516                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
517    
518    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
519      g_assert(image_surface);
520    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
521    
522    // Draw the image on the new Context    // Draw the image on the new Context
# Line 309  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 530  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
530  }  }
531    
532  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
533  #define LINE_SKIP  7  #define ICON_SIZE  ICON_CACHE_TYPE
534    #else
535    #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
536    #endif
537    
538    #ifndef BIG_BALLOONS
539    #define FONT_SIZE 14.0
540  #else  #else
541  #define LINE_SKIP  12  #define FONT_SIZE 22.0
542  #endif  #endif
543    #define LINE_SKIP  (FONT_SIZE/4)
544    
545    
546  static void  static void
547  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
548      printf("balloon event: ");
549    
550    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
551    cache_t *cache = context->balloon;    cache_t *cache = context->balloon;
552    
   printf("balloon event: ");  
   
553    if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {    if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
554      printf("draw\n");      printf("draw\n");
555    
# Line 339  balloon_cb(osm_gps_map_balloon_event_t * Line 568  balloon_cb(osm_gps_map_balloon_event_t *
568      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;
569    
570      /* draw the cache type icon ... */      /* draw the cache type icon ... */
571      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);      GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
572      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
573    
574      if(cache->notes && cache->notes->override) {      if(cache->notes && cache->notes->override) {
575        GdkPixbuf *over = icon_get(ICON_MISC, 1);        GdkPixbuf *over = icon_get(ICON_SIZE, 11);
576        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
577      }      }
578    
# Line 379  balloon_cb(osm_gps_map_balloon_event_t * Line 608  balloon_cb(osm_gps_map_balloon_event_t *
608      x = event->data.draw.rect->x;      x = event->data.draw.rect->x;
609    
610      /* everything from here uses the same font */      /* everything from here uses the same font */
611      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans",
612                                CAIRO_FONT_SLANT_NORMAL,
613                              CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
614  #ifndef BIG_BALLOONS  
615      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  
616    
617      if(cache->name) {      if(cache->name) {
618        /* draw cache name */        /* draw cache name */
619        cairo_text_extents (event->data.draw.cr, cache->name, &extents);        cairo_text_extents (event->data.draw.cr, cache->name, &extents);
620        y += extents.height;        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
       cairo_move_to (event->data.draw.cr, x, y);  
621        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
622        cairo_show_text (event->data.draw.cr, cache->name);        cairo_show_text (event->data.draw.cr, cache->name);
623        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
624    
625        /* return to the left border and below text */        /* return to the left border and below text */
626        y += LINE_SKIP;        y += LINE_SKIP + FONT_SIZE;
627        x = event->data.draw.rect->x;        x = event->data.draw.rect->x;
628      }      }
629    
630      if(cache->terrain) {      if(cache->terrain) {
631          int text_y = 0, icon_y = 0;
632    
633        /* draw cache rating */        /* draw cache rating */
634        const char *terrain = "Terrain:";        const char *terrain = "Terrain:";
635        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
636        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
637        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
638          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
639            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
640          else
641            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
642    
643        /* draw "Terrain:" string */        /* draw "Terrain:" string */
644        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
645        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
646        cairo_show_text (event->data.draw.cr, _(terrain));        cairo_show_text (event->data.draw.cr, _(terrain));
647        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
648        x += extents.width + 2;        x += extents.width + 2;
649    
650        /* draw terrain stars */        /* draw terrain stars */
651        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);  
652    
653        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;  
654      }      }
655    
656      if(cache->difficulty) {      if(cache->difficulty) {
657          int text_y = 0, icon_y = 0;
658    
659        const char *difficulty = "Difficulty:";        const char *difficulty = "Difficulty:";
660          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
661        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;  
662    
663          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
664            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
665          else
666            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
667    
668        /* draw "Difficulty:" string */        /* draw "Difficulty:" string */
669        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
670        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
671        cairo_show_text (event->data.draw.cr, _(difficulty));        cairo_show_text (event->data.draw.cr, _(difficulty));
672        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
673        x += extents.width + 2;        x += extents.width + 2;
674    
675        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);  
676      }      }
677    
678        /* draw container info */
679        /* TODO ... */
680    
681    
682    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
683      printf("click %s event at %d %d\n",      printf("click %s event at %d %d\n",
684             event->data.click.down?"down":"up",             event->data.click.down?"down":"up",
# Line 502  on_map_button_release_event(GtkWidget *w Line 742  on_map_button_release_event(GtkWidget *w
742    /* in "MAP_CACHE" state only one cache is visible */    /* in "MAP_CACHE" state only one cache is visible */
743    /* and the map is in navigation mode. the balloon is */    /* and the map is in navigation mode. the balloon is */
744    /* pretty useless there */    /* pretty useless there */
745    if(context->press_on && (context->state != MAP_CACHE)) {    if(context->press_on) {
746    
747      coord_t coo;      coord_t coo;
748      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 777  on_map_button_release_event(GtkWidget *w
777  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
778    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
779    
   printf("destroy map window\n");  
   
780    /* save map parameters */    /* save map parameters */
781    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
782    gint zoom;    gint zoom;
# Line 560  static void on_window_destroy(GtkWidget Line 798  static void on_window_destroy(GtkWidget
798  #endif  #endif
799    
800    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
801      gps_unregister_callback(appdata, context->cb_id);
802    
803      if(context->caches_displayed) {
804        g_free(context->caches_displayed);
805        context->caches_displayed = NULL;
806      }
807    
808    g_free(context);    g_free(context);
809    appdata->map.context = NULL;    appdata->map.context = NULL;
# Line 584  on_window_realize(GtkWidget *widget, gpo Line 828  on_window_realize(GtkWidget *widget, gpo
828  }  }
829  #endif  #endif
830    
831  /* draw geocaches and set window title */  /* on maemo a window is either on top or completely invisible. this */
832  static void map_setup(map_context_t *context) {  /* means that we only need to update the map window if its raised.  */
833    char *name = NULL;  /* on ordinary desktops this is different and we always update */
834    
835    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
836      if(context->state != MAP_ALL) {                           gpointer data) {
837        printf("map_setp(ALL)\n");    map_context_t *context = (map_context_t*)data;
838    
839        /* no navigation in this mode */    printf("map got focus\n");
       osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));  
840    
841        /* clear all existing ccahe images */  #ifdef USE_MAEMO
842        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));    /* re-enable refresh of map */
843      if(!context->handler_id)
844        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
845    #endif
846    
847        /* draw all geocaches */    map_setup(context);
848        gpx_t *gpx = context->appdata->gpx;    return FALSE;
849        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");  
850    
851        /* no navigation in this mode */  static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
852        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));                           gpointer data) {
853      map_context_t *context = (map_context_t*)data;
854    
855        /* clear all existing ccahe images */    printf("map lost focus\n");
       osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));  
856    
857        map_draw_gpx(context->appdata, context->widget,    /* save new map position */
858                     context->appdata->cur_gpx);    gfloat lat, lon;
859        name = g_strdup(context->appdata->cur_gpx->name);    g_object_get(widget, "latitude", &lat, "longitude", &lon, NULL);
       context->state = MAP_GPX;  
     }  
   } else {  
     cache_t *cache = context->appdata->cur_cache;  
   
     printf("map_setp(CACHE)\n");  
   
     /* no balloons in this mode */  
     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);  
   }  
860    
861    if(name) {    context->appdata->map.pos.lat = lat;
862      char *title = g_strdup_printf("%s - %s", _("Map"), name);    context->appdata->map.pos.lon = lon;
     g_free(name);  
863    
864      gtk_window_set_title(GTK_WINDOW(context->window), title);  #ifdef USE_MAEMO
865      gtk_timeout_remove(context->handler_id);
866      g_free(title);    context->handler_id = 0;
867    } else  #endif
     printf("map_setup(keep)\n");  
 }  
868    
 /* 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);  
869    return FALSE;    return FALSE;
870  }  }
871    
872  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
873      printf("map_update\n");
874  #ifndef USE_MAEMO  #ifndef USE_MAEMO
875    if(appdata->map.context)    if(appdata->map.context)
876      map_setup(appdata->map.context);      map_setup(appdata->map.context);
877  #endif  #endif
878  }  }
879    
880    /* callback called by the gps layer whenever gps state changes */
881    static void
882    gps_callback(struct gps_state *state, gpointer data) {
883      printf("map: gps callback\n");
884    }
885    
886  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
887    map_context_t *context = NULL;    map_context_t *context = NULL;
888    
# Line 745  void map(appdata_t *appdata) { Line 955  void map(appdata_t *appdata) {
955    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
956  #endif  #endif
957    
   /* setup cache state */  
   map_setup(context);  
   
958  #ifndef USE_MAEMO  #ifndef USE_MAEMO
959    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
960  #endif  #endif
# Line 755  void map(appdata_t *appdata) { Line 962  void map(appdata_t *appdata) {
962    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
963                     G_CALLBACK(on_focus_in), context);                     G_CALLBACK(on_focus_in), context);
964    
965      g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
966                       G_CALLBACK(on_focus_out), context);
967    
968    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
969                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
970    
# Line 766  void map(appdata_t *appdata) { Line 976  void map(appdata_t *appdata) {
976    
977    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
978    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
979      context->cb_id = gps_register_callback(appdata, gps_callback, context);
980    
981  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
982    /* prevent some of the main screen things */    /* prevent some of the main screen things */
Legend:
Removed from v.142  
changed lines
  Added in v.219