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 297 by harbaum, Wed Aug 25 12:24:38 2010 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 36  Line 41 
41  #include <X11/Xatom.h>  #include <X11/Xatom.h>
42  #endif  #endif
43    
44    /* any defined key enables key support */
45    #if (defined(MAP_KEY_FULLSCREEN) || \
46         defined(MAP_KEY_ZOOMIN) || \
47         defined(MAP_KEY_ZOOMOUT) || \
48         defined(MAP_KEY_UP) || \
49         defined(MAP_KEY_DOWN) || \
50         defined(MAP_KEY_LEFT) || \
51         defined(MAP_KEY_RIGHT))
52    #include <gdk/gdkkeysyms.h>
53    #endif
54    
55  /* default values */  /* default values */
56  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENCYCLEMAP  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENCYCLEMAP
57  #define GPS_DEFAULT_ZOOM 13  #define GPS_DEFAULT_ZOOM 13
# Line 48  static const char *get_proxy_uri(appdata Line 64  static const char *get_proxy_uri(appdata
64    /* use environment settings if preset */    /* use environment settings if preset */
65    const char *proxy = g_getenv("http_proxy");    const char *proxy = g_getenv("http_proxy");
66    if(proxy) {    if(proxy) {
67      printf("http_proxy: %s\n", proxy);      printf("map http proxy from env: %s\n", proxy);
68      return proxy;      return proxy;
69    }    }
70    
# Line 69  static const char *get_proxy_uri(appdata Line 85  static const char *get_proxy_uri(appdata
85    
86        snprintf(proxy_buffer, sizeof(proxy_buffer),        snprintf(proxy_buffer, sizeof(proxy_buffer),
87                 "http://%s:%u", host, port);                 "http://%s:%u", host, port);
88          printf("map http proxy from gconf: %s\n ", proxy_buffer);
89    
90        g_free(host);        g_free(host);
91      }      }
# Line 78  static const char *get_proxy_uri(appdata Line 95  static const char *get_proxy_uri(appdata
95    return NULL;    return NULL;
96  }  }
97    
98    
99    pos_t *map_gps_get_pos(map_context_t *context) {
100      static pos_t pos;
101    
102      if(context->gps.set & FIX_LATLON_SET) {
103        pos.lat = context->gps.fix.latitude;
104        pos.lon = context->gps.fix.longitude;
105        return &pos;
106      }
107    
108      return NULL;
109    }
110    
111    pos_t *map_get_pos(map_context_t *context) {
112      pos_t *pos = &context->appdata->home;
113    
114      if(context->appdata->active_location) {
115        int i = context->appdata->active_location-1;
116        location_t *loc = context->appdata->location;
117        while(i--) loc = loc->next;
118        pos = &loc->pos;
119      }
120    
121      if(context->appdata->use_gps)
122        pos = map_gps_get_pos(context);
123    
124      return pos;
125    }
126    
127    float map_gps_get_heading(map_context_t *context) {
128      if(context->gps.set & FIX_TRACK_SET)
129        return context->gps.fix.track;
130    
131      return NAN;
132    }
133    
134    float map_gps_get_eph(map_context_t *context) {
135      if(context->gps.set & FIX_HERR_SET)
136        return context->gps.fix.eph;
137    
138      return NAN;
139    }
140    
141    /* callback called by the gps layer whenever gps state changes */
142    static void
143    gps_callback(gps_mask_t set, struct gps_t *fix, void *data) {
144      map_context_t *context = (map_context_t*)data;
145    
146      printf("map: gps callback\n");
147    
148      context->gps.set = set;
149      memcpy(&context->gps.fix, fix, sizeof(struct gps_t));
150    }
151    
152  static void  static void
153  cb_map_gps(osd_button_t but, map_context_t *context) {  cb_map_gps(osd_button_t but, map_context_t *context) {
154    
155    if(but == OSD_GPS) {    if(but == OSD_GPS) {
156      pos_t *refpos = get_pos(context->appdata);      pos_t *refpos = get_pos(context->appdata);
157      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
# Line 109  static int dist2pixel(map_context_t *con Line 181  static int dist2pixel(map_context_t *con
181  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
182    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
183    
184    #ifdef USE_MAEMO
185      if(context->appdata->goto_disable_screensaver)
186        if(osso_display_blanking_pause(context->appdata->osso_context) != OSSO_OK)
187          fprintf(stderr, "error with display blank\n");
188    #endif
189    
190    /* get reference position ... */    /* get reference position ... */
191    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = map_get_pos(context);
192    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
193    
194    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
195    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),    if(ok != context->goto_is_enabled) {
196                   OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
197                    OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
198        context->goto_is_enabled = ok;
199      }
200    
201    if(ok) {    if(ok) {
202      float heading = NAN;      float heading = NAN;
203      int radius = 0;      int radius = 0;
204    
205      if(context->appdata->use_gps) {      if(context->appdata->use_gps) {
206        heading = gps_get_heading(context->appdata);        heading = map_gps_get_heading(context);
207    
208        /* get error */        /* get error */
209        float eph = gps_get_eph(context->appdata);        float eph = map_gps_get_eph(context);
210        if(!isnan(eph))        if(!isnan(eph))
211          radius = dist2pixel(context, eph/1000, refpos->lat);          radius = dist2pixel(context, eph/1000, refpos->lat);
212      }      }
213    
214        /* TODO: in order to save energy: only draw if state actually changed */
215    
216      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
217      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
218                           refpos->lat, refpos->lon, heading);                           refpos->lat, refpos->lon, heading);
# Line 139  static gboolean map_gps_update(gpointer Line 222  static gboolean map_gps_update(gpointer
222    return TRUE;    return TRUE;
223  }  }
224    
225  static gboolean on_map_configure(GtkWidget *widget,  static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
226                                   GdkEventConfigure *event,    int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;
                                  map_context_t *context) {  
   
   if(!context->map_complete) {  
   
     /* set default values if they are invalid */  
     if(!context->appdata->map.zoom ||  
        isnan(context->appdata->map.pos.lat) ||  
        isnan(context->appdata->map.pos.lon)) {  
       printf("no valid map position found\n");  
   
       pos_t *refpos = get_pos(context->appdata);  
       if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {  
         /* use gps position if present */  
         context->appdata->map.pos = *refpos;  
         context->appdata->map.zoom = GPS_DEFAULT_ZOOM;  
       } else {  
         /* use world map otherwise */  
         context->appdata->map.pos.lat = 0.0;  
         context->appdata->map.pos.lon = 0.0;  
         context->appdata->map.zoom = 1;  
       }  
     }  
   
     /* jump to initial position */  
     osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                               context->appdata->map.pos.lat,  
                               context->appdata->map.pos.lon,  
                               context->appdata->map.zoom);  
     context->map_complete = TRUE;  
   }  
227    
228    return FALSE;    GdkPixbuf *icon = icon_get(type, cache->type);
229  }    GdkPixbuf *over = NULL;
230    
231  static void map_draw_cache(GtkWidget *map, cache_t *cache) {    if(cache->mine)                   over = icon_get(type, 14);
232    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);    else if(cache->found)             over = icon_get(type, 12);
233      else if(cache->notes) {
234    /* check if there's also an overwritten coordinate */      if(cache->notes->found)         over = icon_get(type, 12);
235    if(cache->notes && cache->notes->override) {      else if(cache->notes->override) over = icon_get(type, 11);
236      GdkPixbuf *over = icon_get(ICON_MISC, 1);      else                            over = icon_get(type, 13);
237      }
238    
239      osm_gps_map_add_image(OSM_GPS_MAP(map),    pos_t *pos = &cache->pos;
240            cache->notes->pos.lat, cache->notes->pos.lon, icon);    /* check if there's also an overwritten coordinate */
241      if(cache->notes && cache->notes->override)
242        pos = &cache->notes->pos;
243    
244      osm_gps_map_add_image(OSM_GPS_MAP(map),    if(!isnan(pos->lat) && !isnan(pos->lon)) {
           cache->notes->pos.lat, cache->notes->pos.lon, over);  
   } else  
245      osm_gps_map_add_image(OSM_GPS_MAP(map),      osm_gps_map_add_image(OSM_GPS_MAP(map),
246                            cache->pos.lat, cache->pos.lon, icon);                            pos->lat, pos->lon, icon);
247        if(over)
248          osm_gps_map_add_image(OSM_GPS_MAP(map),
249                                pos->lat, pos->lon, over);
250      }
251    }
252    
253    static void map_draw_wpt(GtkWidget *map, cache_t *cache, wpt_t *wpt) {
254      /* only draw wpts that don't equal the main point */
255      if(pos_differ(&cache->pos, &wpt->pos)) {
256        if(!isnan(wpt->pos.lat) && !isnan(wpt->pos.lon))  {
257          GdkPixbuf *icon =
258            icon_get(ICON_WPT, (wpt->sym!=WPT_SYM_UNKNOWN)?
259                     wpt->sym:WPT_SYM_REFPOINT);
260    
261          osm_gps_map_add_image(OSM_GPS_MAP(map),
262                                wpt->pos.lat, wpt->pos.lon, icon);
263        }
264      }
265  }  }
266    
267  static void map_draw_gpx(appdata_t *appdata, GtkWidget *map, gpx_t *gpx) {  static void map_draw_gpx(appdata_t *appdata, cache_display_t *caches,
268                             GtkWidget *map, gpx_t *gpx,
269                             cache_t *nav, gboolean semi) {
270    if(!gpx->notes_loaded) {    if(!gpx->notes_loaded) {
271      notes_load_all(appdata, gpx);      notes_load_all(appdata, gpx);
272      gpx->notes_loaded = TRUE;      gpx->notes_loaded = TRUE;
# Line 201  static void map_draw_gpx(appdata_t *appd Line 274  static void map_draw_gpx(appdata_t *appd
274    
275    cache_t *cache = gpx->cache;    cache_t *cache = gpx->cache;
276    while(cache) {    while(cache) {
277      map_draw_cache(map, cache);      /* search if we have that cache already in our list/displayed */
278        int i=0;
279        while(caches[i].id && (strcmp(caches[i].id, cache->id) != 0))
280          i++;
281    
282        if(!caches[i].id) {
283          /* if nav is given draw all other caches semitransparent. */
284          /* if nav is not given do what semi sais */
285          map_draw_cache(map, cache, nav?(cache != nav):semi);
286          caches[i].id = cache->id;
287    
288          /* also draw waypoints of nav cache */
289          if(nav && cache == nav) {
290            wpt_t *wpt = cache->wpt;
291            while(wpt) {
292              map_draw_wpt(map, cache, wpt);
293              wpt = wpt->next;
294            }
295          }
296        }
297    
298      cache = cache->next;      cache = cache->next;
299    }    }
300  }  }
301    
302    static cache_t *cache_search_first(gpx_t *gpx, cache_t *cache) {
303      while(gpx) {
304        cache_t *cur = gpx->cache;
305        while(cur) {
306          /* we do a string comparision to make sure that if copies */
307          /* exist, we get the original one */
308          if(!strcmp(cache->id, cur->id))
309             return cur;
310    
311          cur = cur->next;
312        }
313        gpx = gpx->next;
314      }
315      g_assert(FALSE);
316      return NULL;
317    }
318    
319    /* draw geocaches and set window title */
320    static void map_setup(map_context_t *context) {
321      char *name = NULL;
322    
323      int cache_num = gpx_total_caches_global(context->appdata->gpx);
324    
325      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
326        //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
327        //     cache_num, context->cache_list_len);
328        g_free(context->caches_displayed);
329        context->caches_displayed = NULL;
330        context->cache_list_len = 0;
331      }
332    
333      /* allocate buffer */
334      if(cache_num && !context->caches_displayed) {
335        context->cache_list_len = cache_num;
336        context->caches_displayed = g_new0(cache_display_t, cache_num+1);
337        printf("allocated space to handle %d map icons\n", cache_num);
338      }
339    
340      if(context->appdata->search_results && !context->appdata->cur_cache) {
341        if(context->state != MAP_SEARCH) {
342          printf("map_setup(SEARCH)\n");
343    
344          /* clear any pending balloon */
345          context->balloon = NULL;
346          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
347    
348    #ifdef OSD_NAV
349          /* no navigation in this mode */
350          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
351    #endif
352    
353          /* clear all existing cache images */
354          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
355    
356          if(context->caches_displayed) {
357            memset(context->caches_displayed, 0,
358                   (cache_num+1) * sizeof(cache_display_t));
359    
360            /* draw search results and all other gpx files are semi-transparent */
361            map_draw_gpx(context->appdata, context->caches_displayed,
362                         context->widget, context->appdata->search_results,
363                         NULL, FALSE);
364    
365            gpx_t *gpx = context->appdata->gpx;
366            while(gpx) {
367              map_draw_gpx(context->appdata, context->caches_displayed,
368                           context->widget, gpx, NULL, TRUE);
369    
370              gpx = gpx->next;
371            }
372          }
373          name = g_strdup(_("Search results"));
374          context->state = MAP_SEARCH;
375        }
376      } else if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
377        if(context->state != MAP_ALL) {
378          printf("map_setup(ALL)\n");
379    
380          /* clear any pending balloon */
381          context->balloon = NULL;
382          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
383    
384    #ifdef OSD_NAV
385          /* no navigation in this mode */
386          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
387    #endif
388    
389          /* clear all existing cache images */
390          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
391          if(context->caches_displayed) {
392            memset(context->caches_displayed, 0,
393                   (cache_num+1) * sizeof(cache_display_t));
394    
395            /* draw all geocaches and none is semi-transparent */
396            gpx_t *gpx = context->appdata->gpx;
397            while(gpx) {
398              map_draw_gpx(context->appdata, context->caches_displayed,
399                           context->widget, gpx, NULL, FALSE);
400              gpx = gpx->next;
401            }
402    
403            {
404              int i=0;
405              while(context->caches_displayed[i].id) i++;
406              printf("number of caches actually displayed: %d\n", i);
407            }
408          }
409          name = g_strdup(_("all"));
410          context->state = MAP_ALL;
411        }
412      } else if(!context->appdata->cur_cache) {
413        if(context->state != MAP_GPX) {
414          printf("map_setup(GPX)\n");
415    
416          /* clear any pending balloon */
417          context->balloon = NULL;
418          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
419    
420    #ifdef OSD_NAV
421          /* no navigation in this mode */
422          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
423    #endif
424    
425          /* clear all existing cache images */
426          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
427          if(context->caches_displayed) {
428            memset(context->caches_displayed, 0,
429                   (cache_num+1) * sizeof(cache_display_t));
430    
431            /* draw all geocaches and all other gpx files are semi-transparent */
432            map_draw_gpx(context->appdata, context->caches_displayed,
433                         context->widget, context->appdata->cur_gpx, NULL, FALSE);
434    
435            gpx_t *gpx = context->appdata->gpx;
436            while(gpx) {
437              if(gpx != context->appdata->cur_gpx)
438                map_draw_gpx(context->appdata, context->caches_displayed,
439                             context->widget, gpx, NULL, TRUE);
440    
441              gpx = gpx->next;
442            }
443          }
444    
445          name = g_strdup(context->appdata->cur_gpx->name);
446          context->state = MAP_GPX;
447        }
448      } else {
449        cache_t *cache = context->appdata->cur_cache;
450    
451        printf("map_setup(CACHE)\n");
452    
453        /* clear any pending balloon */
454        context->balloon = NULL;
455        osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
456    
457        /* clear all existing ccahe images */
458        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
459        if(context->caches_displayed) {
460          memset(context->caches_displayed, 0,
461                 (cache_num+1) * sizeof(cache_display_t));
462    
463          /* Make sure we really work on the first copy in the list as */
464          /* only this is being used if duplicates exist */
465          cache = cache_search_first(context->appdata->gpx, cache);
466    
467          /* draw all geocaches and all but selected one are semi-transparent */
468          gpx_t *gpx = context->appdata->gpx;
469          while(gpx) {
470            map_draw_gpx(context->appdata, context->caches_displayed,
471                         context->widget, gpx, cache, FALSE);
472            gpx = gpx->next;
473          }
474        }
475    
476        name = g_strdup(cache->name);
477        context->state = MAP_CACHE;
478    
479        /* navigation in this mode! */
480        pos_t cpos = gpx_cache_pos(cache);
481    
482    #ifdef OSD_NAV
483        osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
484                                  context->appdata->imperial,
485                                  cpos.lat, cpos.lon, cache->name);
486    #else
487    #warning OSD_NAV not defined!
488    #endif
489      }
490    
491      /* also mark geomath position */
492    
493      /* remove all existing appearances of this icon first */
494      osm_gps_map_remove_image(OSM_GPS_MAP(context->widget),
495                               icon_get(ICON_MISC, 4));
496    
497      if(!isnan(context->appdata->geomath.lat) &&
498         !isnan(context->appdata->geomath.lon))  {
499    
500        osm_gps_map_add_image(OSM_GPS_MAP(context->widget),
501                              context->appdata->geomath.lat,
502                              context->appdata->geomath.lon,
503                              icon_get(ICON_MISC, 4));
504      }
505    
506      if(name) {
507        gtk_window_set_title(GTK_WINDOW(context->window), name);
508        g_free(name);
509      } else
510        printf("map_setup(keep)\n");
511    }
512    
513  static void  static void
514  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
515                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
516    
517    while(cache) {    while(cache) {
518      pos_t cpos = gpx_cache_pos(cache);      pos_t cpos = gpx_cache_pos(cache);
519    
# Line 228  map_cachelist_nearest(cache_t *cache, po Line 533  map_cachelist_nearest(cache_t *cache, po
533  static cache_t *map_closest(map_context_t *context, pos_t *pos) {  static cache_t *map_closest(map_context_t *context, pos_t *pos) {
534    cache_t *result = NULL;    cache_t *result = NULL;
535    float distance = NAN;    float distance = NAN;
536    
537    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(context->appdata->search_results && !context->appdata->cur_cache) {
538        /* search search results */
539        map_cachelist_nearest(context->appdata->search_results->cache,
540                              pos, &result, &distance);
541      } else if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
542      /* search all geocaches */      /* search all geocaches */
543      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
544      while(gpx) {      while(gpx) {
# Line 237  static cache_t *map_closest(map_context_ Line 546  static cache_t *map_closest(map_context_
546        gpx = gpx->next;        gpx = gpx->next;
547      }      }
548    } else if(context->appdata->cur_gpx) {    } else if(context->appdata->cur_gpx) {
549        /* search in current gpx file */
550      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
551                            pos, &result, &distance);                            pos, &result, &distance);
552    } else    } else
553      result = context->appdata->cur_gpx->cache;      result = context->appdata->cur_cache;
554    
555      /* make sure this is the first hit */
556      if(context->caches_displayed)
557        result = cache_search_first(context->appdata->gpx, result);
558    
559    return result;    return result;
560  }  }
# Line 258  pos_t coord2pos(coord_t coo) { Line 572  pos_t coord2pos(coord_t coo) {
572  static gboolean  static gboolean
573  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
574                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
575    
576    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
577    
578    /* check if we actually clicked parts of the OSD */    /* check if we actually clicked parts of the OSD */
579    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)
580      return FALSE;      return FALSE;
581    
582    /* 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 611  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
611                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
612    
613    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
614      g_assert(image_surface);
615    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
616    
617    // Draw the image on the new Context    // Draw the image on the new Context
# Line 309  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 625  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
625  }  }
626    
627  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
628  #define LINE_SKIP  7  #define ICON_SIZE  ICON_CACHE_TYPE
629  #else  #else
630  #define LINE_SKIP  12  #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
631  #endif  #endif
632    
633  static void  #ifndef BIG_BALLOONS
634  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  #define FONT_SIZE 14.0
635    cache_t *cache = (cache_t*)data;  #else
636    #define FONT_SIZE 22.0
 #if 0  
   /* draw pink background to check clipping */  
   cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);  
   cairo_set_source_rgba (cr, 1, 0, 0, 0.3);  
   cairo_fill_preserve (cr);  
   cairo_set_line_width (cr, 0);  
   cairo_stroke (cr);  
637  #endif  #endif
638    #define LINE_SKIP  (FONT_SIZE/4)
639    
   /* leave a little border top and left */  
   gint x = rect->x, y = rect->y;  
640    
641    /* draw the cache type icon ... */  static void
642    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
643    cairo_draw_pixbuf(cr, icon, x, y);    printf("balloon event: ");
644    
645    if(cache->notes && cache->notes->override) {    map_context_t *context = (map_context_t*)data;
646      GdkPixbuf *over = icon_get(ICON_MISC, 1);    cache_t *cache = context->balloon;
     cairo_draw_pixbuf(cr, over, x, y);  
   }  
647    
648    /* ... and right of it the waypoint id */    if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
649    cairo_text_extents_t extents;      printf("draw\n");
650    
651    if(cache->id) {  #if 0
652      cairo_select_font_face (cr, "Sans",      /* draw pink background to check clipping */
653                              CAIRO_FONT_SLANT_NORMAL,      cairo_rectangle (event->data.draw.cr,
654                              CAIRO_FONT_WEIGHT_BOLD);                       event->data.draw.rect->x-20, event->data.draw.rect->y-20,
655                         event->data.draw.rect->w+40, event->data.draw.rect->h+40);
656        cairo_set_source_rgba (event->data.draw.cr, 1, 0, 0, 0.3);
657        cairo_fill_preserve (event->data.draw.cr);
658        cairo_set_line_width (event->data.draw.cr, 0);
659        cairo_stroke (event->data.draw.cr);
660    #endif
661    
662        /* leave a little border top and left */
663        gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
664    
665        /* draw the cache type icon ... */
666        GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
667        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
668    
669        if(cache->notes && cache->notes->override) {
670          GdkPixbuf *over = icon_get(ICON_SIZE, 11);
671          cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
672        }
673    
674        /* ... and right of it the waypoint id */
675        cairo_text_extents_t extents;
676    
677        if(cache->id) {
678          cairo_select_font_face (event->data.draw.cr, "Sans",
679                                  CAIRO_FONT_SLANT_NORMAL,
680                                  CAIRO_FONT_WEIGHT_BOLD);
681    
682  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
683      cairo_set_font_size (cr, 20.0);        cairo_set_font_size (event->data.draw.cr, 20.0);
684  #else  #else
685      cairo_set_font_size (cr, 36.0);        cairo_set_font_size (event->data.draw.cr, 36.0);
686  #endif  #endif
687    
688          cairo_text_extents (event->data.draw.cr, cache->id, &extents);
689    
690          /* display id right of icon vertically centered */
691          x += gdk_pixbuf_get_width(icon) + 5;
692          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
693          cairo_move_to (event->data.draw.cr, x, y);
694          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
695          cairo_show_text (event->data.draw.cr, cache->id);
696          cairo_stroke (event->data.draw.cr);
697    
698          y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
699        } else
700          y += gdk_pixbuf_get_height(icon);
701    
702        /* return to the left border and below icon/text */
703        x = event->data.draw.rect->x;
704    
705        /* everything from here uses the same font */
706        cairo_select_font_face (event->data.draw.cr, "Sans",
707                                CAIRO_FONT_SLANT_NORMAL,
708                                CAIRO_FONT_WEIGHT_NORMAL);
709    
710      cairo_text_extents (cr, cache->id, &extents);      cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
711    
712        if(cache->name) {
713          /* draw cache name */
714          cairo_text_extents (event->data.draw.cr, cache->name, &extents);
715          cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
716          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
717          cairo_show_text (event->data.draw.cr, cache->name);
718          cairo_stroke (event->data.draw.cr);
719    
720          /* return to the left border and below text */
721          y += LINE_SKIP + FONT_SIZE;
722          x = event->data.draw.rect->x;
723        }
724    
725        if(cache->terrain) {
726          int text_y = 0, icon_y = 0;
727    
728      /* display id right of icon vertically centered */        /* draw cache rating */
729      x += gdk_pixbuf_get_width(icon) + 5;        const char *terrain = "Terrain:";
730      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
731      cairo_move_to (cr, x, y);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
     cairo_set_source_rgba (cr, 0, 0, 0, 1);  
     cairo_show_text (cr, cache->id);  
     cairo_stroke (cr);  
732    
733      y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;        if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
734    } else          text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
735      y += gdk_pixbuf_get_height(icon);        else
736            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
737    
738    /* return to the left border and below icon/text */        /* draw "Terrain:" string */
739    x = rect->x;        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
740          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
741          cairo_show_text (event->data.draw.cr, _(terrain));
742          cairo_stroke (event->data.draw.cr);
743          x += extents.width + 2;
744    
745          /* draw terrain stars */
746          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
747    
748          x += gdk_pixbuf_get_width(icon) + FONT_SIZE/2;
749        }
750    
751        if(cache->difficulty) {
752          int text_y = 0, icon_y = 0;
753    
754    /* everything from here uses the same font */        const char *difficulty = "Difficulty:";
755    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
756                            CAIRO_FONT_WEIGHT_NORMAL);        cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
757  #ifndef BIG_BALLOONS  
758    cairo_set_font_size (cr, 14.0);        if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
759  #else          text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
760    cairo_set_font_size (cr, 22.0);        else
761  #endif          icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
762    
763    if(cache->name) {        /* draw "Difficulty:" string */
764      /* draw cache name */        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
765      cairo_text_extents (cr, cache->name, &extents);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
766      y += extents.height;        cairo_show_text (event->data.draw.cr, _(difficulty));
767      cairo_move_to (cr, x, y);        cairo_stroke (event->data.draw.cr);
768      cairo_set_source_rgba (cr, 0, 0, 0, 1);        x += extents.width + 2;
769      cairo_show_text (cr, cache->name);  
770      cairo_stroke (cr);        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
771        }
772      /* return to the left border and below text */  
773      y += LINE_SKIP;      /* draw container info */
774      x = rect->x;      /* TODO ... */
775    }  
776    
777    if(cache->terrain) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
778      /* draw cache rating */      printf("click %s event at %d %d\n",
779      const char *terrain = "Terrain:";             event->data.click.down?"down":"up",
780      icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));             event->data.click.x, event->data.click.y);
781      cairo_text_extents (cr, _(terrain), &extents);  
782      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;      /* make the main screen jump to that cache */
783        if(!event->data.click.down) {
784      /* draw "Terrain:" string */        if(context->appdata->cur_cache) {
785      cairo_move_to (cr, x, y);          printf("ERROR: no current cache should be visible!\n");
786      cairo_set_source_rgba (cr, 0, 0, 0, 1);        } else {
787      cairo_show_text (cr, _(terrain));          gpx_t *is_in = NULL;
788      cairo_stroke (cr);  
789      x += extents.width + 2;          if(context->appdata->search_results) {
790              printf("click while in \"search results\" view\n");
791      /* draw terrain stars */  
792      cairo_draw_pixbuf(cr, icon, x, y -            is_in = context->appdata->search_results;
793                        (gdk_pixbuf_get_height(icon) + extents.height)/2);          } else if(!context->appdata->cur_gpx) {
794              printf("click while in \"all\" view\n");
795      x += gdk_pixbuf_get_width(icon) + LINE_SKIP;  
796      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;            /* we first need to figure out which gpx file this cache */
797    }            /* is in so we can open it first */
798              gpx_t *gpx = context->appdata->gpx;
799    if(cache->difficulty) {            while(gpx && !is_in) {
800      const char *difficulty = "Difficulty:";              cache_t *cur = gpx->cache;
801      cairo_text_extents (cr, _(difficulty), &extents);              while(cur && !is_in) {
802      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;                if(cur == cache)
803                    is_in = gpx;
804      /* draw "Difficulty:" string */                cur = cur->next;
805      cairo_move_to (cr, x, y);              }
806      cairo_set_source_rgba (cr, 0, 0, 0, 1);              gpx = gpx->next;
807      cairo_show_text (cr, _(difficulty));            }
808      cairo_stroke (cr);  
809      x += extents.width + 2;            if(is_in)
810                gpxlist_goto_cachelist(context->appdata, is_in);
811      icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));  
812      cairo_draw_pixbuf(cr, icon, x, y -          } else {
813                        (gdk_pixbuf_get_height(icon) + extents.height)/2);            printf("click while in \"cachelist\" view\n");
814    
815              /* the simple case: there already is an open gpx file and */
816              /* we just jump into the "cache" view */
817              is_in = context->appdata->cur_gpx;
818            }
819    
820            if(is_in) {
821              printf("selecting %s in %s\n",
822                     cache->id,
823                     context->appdata->search_results?
824                     context->appdata->search_results->name:
825                     context->appdata->cur_gpx->name);
826    
827              cachelist_goto_cache(context->appdata, cache);
828    
829              /* give focus to main screen (important for maemo) */
830              printf("raising main window\n");
831              gtk_window_present(GTK_WINDOW(context->appdata->window));
832            }
833          }
834        }
835      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
836        printf("removed\n");
837        context->balloon = NULL;
838    }    }
839  }  }
840    
# Line 441  on_map_button_release_event(GtkWidget *w Line 846  on_map_button_release_event(GtkWidget *w
846    /* in "MAP_CACHE" state only one cache is visible */    /* in "MAP_CACHE" state only one cache is visible */
847    /* and the map is in navigation mode. the balloon is */    /* and the map is in navigation mode. the balloon is */
848    /* pretty useless there */    /* pretty useless there */
849    if(context->press_on && (context->state != MAP_CACHE)) {    if(context->press_on) {
850    
851      coord_t coo;      coord_t coo;
852      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
# Line 456  on_map_button_release_event(GtkWidget *w Line 861  on_map_button_release_event(GtkWidget *w
861        float dist = gpx_pos_get_distance(pos, cpos, FALSE);        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
862        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
863    
864            context->balloon = nearest;
865          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
866                                       balloon_draw_cb, nearest);                                       balloon_cb, context);
867        }        }
868      }      }
869      context->press_on = NULL;      context->press_on = NULL;
# Line 475  on_map_button_release_event(GtkWidget *w Line 881  on_map_button_release_event(GtkWidget *w
881  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
882    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
883    
   printf("destroy map window\n");  
   
884    /* save map parameters */    /* save map parameters */
885    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
886    gint zoom;    gint zoom;
887    g_object_get(map, "zoom", &zoom, NULL);    g_object_get(map, "zoom", &zoom, NULL);
888    context->appdata->map.zoom = zoom;    context->appdata->map.zoom = zoom;
889    
890      gboolean dpix;
891      g_object_get(map, "double-pixel", &dpix, NULL);
892      context->appdata->map.dpix = dpix;
893    
894    gfloat lat, lon;    gfloat lat, lon;
895    g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);    g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
896    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
# Line 499  static void on_window_destroy(GtkWidget Line 907  static void on_window_destroy(GtkWidget
907    
908    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
909    
910      if(context->caches_displayed) {
911        g_free(context->caches_displayed);
912        context->caches_displayed = NULL;
913      }
914    
915      printf("destroy map context\n");
916    g_free(context);    g_free(context);
917    appdata->map.context = NULL;    appdata->map.context = NULL;
918  }  }
# Line 522  on_window_realize(GtkWidget *widget, gpo Line 936  on_window_realize(GtkWidget *widget, gpo
936  }  }
937  #endif  #endif
938    
939  /* draw geocaches and set window title */  /* on maemo a window is either on top or completely invisible. this */
940  static void map_setup(map_context_t *context) {  /* means that we only need to update the map window if its raised.  */
941    char *name = NULL;  /* on ordinary desktops this is different and we always update */
942    
943    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
944      if(context->state != MAP_ALL) {                           gpointer data) {
945        printf("map_setp(ALL)\n");    map_context_t *context = (map_context_t*)data;
946    
947        /* no navigation in this mode */    printf("map got focus\n");
       osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));  
948    
949        /* clear all existing ccahe images */  #ifdef USE_MAEMO
950        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));    /* re-enable refresh of map */
951      if(!context->handler_id)
952        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
953    #endif
954    
955        /* draw all geocaches */    gps_register_callback(context->appdata->gps_state,
956        gpx_t *gpx = context->appdata->gpx;                          LATLON_CHANGED | HERR_CHANGED | TRACK_CHANGED,
957        while(gpx) {                          gps_callback, context);
         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");  
958    
959        /* no navigation in this mode */    map_setup(context);
960        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));    return FALSE;
961    }
962    
963        /* clear all existing ccahe images */  static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
964        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));                           gpointer data) {
965      map_context_t *context = (map_context_t*)data;
966    
967        map_draw_gpx(context->appdata, context->widget,    printf("map lost focus\n");
                    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);  
   }  
968    
969    if(name) {    /* save new map position */
970      char *title = g_strdup_printf(_("Map - %s"), name);    gfloat lat, lon;
971      g_free(name);    g_object_get(widget, "latitude", &lat, "longitude", &lon, NULL);
972    
973      gtk_window_set_title(GTK_WINDOW(context->window), title);    context->appdata->map.pos.lat = lat;
974      context->appdata->map.pos.lon = lon;
975      g_free(title);  
976    } else  #ifdef USE_MAEMO
977      printf("map_setup(keep)\n");    gtk_timeout_remove(context->handler_id);
978  }    context->handler_id = 0;
979    #endif
980    
981      gps_unregister_callback(context->appdata->gps_state, gps_callback);
982    
 /* 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);  
983    return FALSE;    return FALSE;
984  }  }
985    
986  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
987      printf("map_update\n");
988  #ifndef USE_MAEMO  #ifndef USE_MAEMO
989    if(appdata->map.context)    if(appdata->map.context)
990      map_setup(appdata->map.context);      map_setup(appdata->map.context);
991  #endif  #endif
992  }  }
993    
994    static gboolean
995    on_map_window_key_press(GtkWidget *window, GdkEventKey *event, GtkWidget *map)  {
996    #ifdef USE_MAEMO
997      if((event->keyval == HILDON_HARDKEY_FULLSCREEN) ||
998         (event->keyval == HILDON_HARDKEY_INCREASE) ||
999         (event->keyval == HILDON_HARDKEY_DECREASE))
1000    #else
1001      if(event->keyval == GDK_F11)
1002    #endif
1003      {
1004        gboolean return_val;
1005        g_signal_emit_by_name(GTK_OBJECT(map), "key_press_event",
1006                              event, &return_val);
1007        return return_val;
1008      }
1009    
1010      return FALSE;
1011    }
1012    
1013  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
1014    map_context_t *context = NULL;    map_context_t *context = NULL;
1015    
# Line 622  void map(appdata_t *appdata) { Line 1022  void map(appdata_t *appdata) {
1022    }    }
1023    
1024    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
1025      printf("allocated new context at %p\n", context);
1026    
1027    context->appdata = appdata;    context->appdata = appdata;
   context->map_complete = FALSE;  
1028    context->state = MAP_NONE;    context->state = MAP_NONE;
1029    
1030    /* cleanup old (pre 0.8.7) path if it exists */    /* cleanup old (pre 0.8.7) path if it exists */
# Line 657  void map(appdata_t *appdata) { Line 1058  void map(appdata_t *appdata) {
1058    
1059    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
1060                   "map-source",               source,                   "map-source",               source,
1061                   "tile-cache",               path,                   "tile-cache",               OSM_GPS_MAP_CACHE_FRIENDLY,
1062                     "tile-cache-base",          path,
1063                   "auto-center",              FALSE,                   "auto-center",              FALSE,
1064                   "record-trip-history",      FALSE,                   "record-trip-history",      FALSE,
1065                   "show-trip-history",        FALSE,                   "show-trip-history",        FALSE,
1066                     "double-pixel",             context->appdata->map.dpix,
1067                   proxy?"proxy-uri":NULL,     proxy,                   proxy?"proxy-uri":NULL,     proxy,
1068                   NULL);                   NULL);
1069    
# Line 668  void map(appdata_t *appdata) { Line 1071  void map(appdata_t *appdata) {
1071    
1072    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
1073    
1074      /* set default values if they are invalid */
1075      if(!context->appdata->map.zoom ||
1076         isnan(context->appdata->map.pos.lat) ||
1077         isnan(context->appdata->map.pos.lon)) {
1078        printf("no valid map position found\n");
1079    
1080        pos_t *refpos = get_pos(context->appdata);
1081        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
1082          printf("use refpos\n");
1083    
1084            /* use gps position if present */
1085          context->appdata->map.pos = *refpos;
1086          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
1087        } else {
1088          printf("use zero pos\n");
1089    
1090          /* use world map otherwise */
1091          context->appdata->map.pos.lat = 0.0;
1092          context->appdata->map.pos.lon = 0.0;
1093          context->appdata->map.zoom = 1;
1094        }
1095      }
1096    
1097      int key_maps[][2] = {
1098        { OSM_GPS_MAP_KEY_FULLSCREEN, MAP_KEY_FULLSCREEN },
1099        { OSM_GPS_MAP_KEY_ZOOMIN, MAP_KEY_ZOOMIN },
1100        { OSM_GPS_MAP_KEY_ZOOMOUT, MAP_KEY_ZOOMOUT },
1101        { OSM_GPS_MAP_KEY_UP, MAP_KEY_UP },
1102        { OSM_GPS_MAP_KEY_DOWN, MAP_KEY_DOWN },
1103        { OSM_GPS_MAP_KEY_LEFT, MAP_KEY_LEFT },
1104        { OSM_GPS_MAP_KEY_RIGHT, MAP_KEY_RIGHT },
1105        { OSM_GPS_MAP_KEY_MAX, 0 } };
1106    
1107      int i;
1108      for(i=0;key_maps[i][0] != OSM_GPS_MAP_KEY_MAX;i++)
1109        osm_gps_map_set_keyboard_shortcut(OSM_GPS_MAP(context->widget),
1110                                          key_maps[i][0], key_maps[i][1]);
1111    
1112      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
1113                                context->appdata->map.pos.lat,
1114                                context->appdata->map.pos.lon,
1115                                context->appdata->map.zoom);
1116    
1117  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1118    /* we don't use a stackable window here on fremantle, since */    /* we don't use a stackable window here on fremantle, since */
1119    /* this leaves the main window independent from the map and */    /* this leaves the main window independent from the map and */
# Line 682  void map(appdata_t *appdata) { Line 1128  void map(appdata_t *appdata) {
1128    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
1129  #endif  #endif
1130    
   /* setup cache state */  
   map_setup(context);  
   
1131  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1132    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
1133  #endif  #endif
# Line 692  void map(appdata_t *appdata) { Line 1135  void map(appdata_t *appdata) {
1135    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
1136                     G_CALLBACK(on_focus_in), context);                     G_CALLBACK(on_focus_in), context);
1137    
1138    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
1139                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_focus_out), context);
1140    
1141    g_signal_connect(G_OBJECT(context->widget), "button-press-event",    g_signal_connect(G_OBJECT(context->widget), "button-press-event",
1142                     G_CALLBACK(on_map_button_press_event), context);                     G_CALLBACK(on_map_button_press_event), context);
# Line 713  void map(appdata_t *appdata) { Line 1156  void map(appdata_t *appdata) {
1156    g_signal_connect(G_OBJECT(context->window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
1157                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
1158    
1159      /* connect a key handler to forward global shortcuts (function keys) */
1160      /* to the ap widget */
1161      g_signal_connect(G_OBJECT(context->window), "key_press_event",
1162                       G_CALLBACK(on_map_window_key_press), context->widget);
1163    
1164    gtk_container_add(GTK_CONTAINER(context->window), context->widget);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
1165    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
1166    
1167      /* setup cache state */
1168      map_setup(context);
1169  }  }
Legend:
Removed from v.133  
changed lines
  Added in v.297