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

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

revision 189 by harbaum, Tue Nov 17 09:07:17 2009 UTC revision 282 by harbaum, Wed May 26 19:21:47 2010 UTC
# Line 24  Line 24 
24    
25  /*  /*
26   * TODO:   * TODO:
  * - draw caches only once  
  * - prefer duplicates from selected files  
27   * - make semi-transparent caches selectable   * - make semi-transparent caches selectable
28   */   */
29    
# Line 86  static const char *get_proxy_uri(appdata Line 84  static const char *get_proxy_uri(appdata
84    return NULL;    return NULL;
85  }  }
86    
87    
88    pos_t *map_gps_get_pos(map_context_t *context) {
89      static pos_t pos;
90    
91      if(context->gps.set & FIX_LATLON_SET) {
92        pos.lat = context->gps.fix.latitude;
93        pos.lon = context->gps.fix.longitude;
94        return &pos;
95      }
96    
97      return NULL;
98    }
99    
100    pos_t *map_get_pos(map_context_t *context) {
101      pos_t *pos = &context->appdata->home;
102    
103      if(context->appdata->active_location) {
104        int i = context->appdata->active_location-1;
105        location_t *loc = context->appdata->location;
106        while(i--) loc = loc->next;
107        pos = &loc->pos;
108      }
109    
110      if(context->appdata->use_gps)
111        pos = map_gps_get_pos(context);
112    
113      return pos;
114    }
115    
116    float map_gps_get_heading(map_context_t *context) {
117      if(context->gps.set & FIX_TRACK_SET)
118        return context->gps.fix.track;
119    
120      return NAN;
121    }
122    
123    float map_gps_get_eph(map_context_t *context) {
124      if(context->gps.set & FIX_LATLON_SET)
125        return context->gps.fix.eph;
126    
127      return NAN;
128    }
129    
130    /* callback called by the gps layer whenever gps state changes */
131    static void
132    gps_callback(gps_mask_t set, struct gps_t *fix, void *data) {
133      map_context_t *context = (map_context_t*)data;
134    
135      printf("map: gps callback\n");
136    
137      context->gps.set = set;
138      memcpy(&context->gps.fix, fix, sizeof(struct gps_t));
139    }
140    
141  static void  static void
142  cb_map_gps(osd_button_t but, map_context_t *context) {  cb_map_gps(osd_button_t but, map_context_t *context) {
143    
144    if(but == OSD_GPS) {    if(but == OSD_GPS) {
145        printf("clicked OSD_GPS %p\n", context);
146        printf("clicked OSD_GPS a %p\n", context->appdata);
147    
148      pos_t *refpos = get_pos(context->appdata);      pos_t *refpos = get_pos(context->appdata);
149      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
150        gint zoom;        gint zoom;
# Line 117  static int dist2pixel(map_context_t *con Line 172  static int dist2pixel(map_context_t *con
172    
173  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
174    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
175    static gboolean goto_is_enabled = FALSE;  
176    #ifdef USE_MAEMO
177      if(context->appdata->goto_disable_screensaver)
178        if(osso_display_blanking_pause(context->appdata->osso_context) != OSSO_OK)
179          fprintf(stderr, "error with display blank\n");
180    #endif
181    
182    /* get reference position ... */    /* get reference position ... */
183    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = map_get_pos(context);
184    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
185    
186    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
187    if(ok != goto_is_enabled) {    if(ok != context->goto_is_enabled) {
188      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
189                  OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);                  OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
190      goto_is_enabled = ok;      context->goto_is_enabled = ok;
191    }    }
192    
193    if(ok) {    if(ok) {
# Line 135  static gboolean map_gps_update(gpointer Line 195  static gboolean map_gps_update(gpointer
195      int radius = 0;      int radius = 0;
196    
197      if(context->appdata->use_gps) {      if(context->appdata->use_gps) {
198        heading = gps_get_heading(context->appdata);        heading = map_gps_get_heading(context);
199    
200        /* get error */        /* get error */
201        float eph = gps_get_eph(context->appdata);        float eph = map_gps_get_eph(context);
202        if(!isnan(eph))        if(!isnan(eph))
203          radius = dist2pixel(context, eph/1000, refpos->lat);          radius = dist2pixel(context, eph/1000, refpos->lat);
204      }      }
# Line 158  static void map_draw_cache(GtkWidget *ma Line 218  static void map_draw_cache(GtkWidget *ma
218    int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;    int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;
219    
220    GdkPixbuf *icon = icon_get(type, cache->type);    GdkPixbuf *icon = icon_get(type, cache->type);
221      GdkPixbuf *over = NULL;
222    
223      if(cache->mine)                   over = icon_get(type, 14);
224      else if(cache->found)             over = icon_get(type, 12);
225      else if(cache->notes) {
226        if(cache->notes->found)         over = icon_get(type, 12);
227        else if(cache->notes->override) over = icon_get(type, 11);
228        else                            over = icon_get(type, 13);
229      }
230    
231      pos_t *pos = &cache->pos;
232    /* check if there's also an overwritten coordinate */    /* check if there's also an overwritten coordinate */
233    if(cache->notes && cache->notes->override) {    if(cache->notes && cache->notes->override)
234      GdkPixbuf *over = icon_get(type, 11);      pos = &cache->notes->pos;
235    
236      if(!isnan(pos->lat) && !isnan(pos->lon)) {
237      osm_gps_map_add_image(OSM_GPS_MAP(map),      osm_gps_map_add_image(OSM_GPS_MAP(map),
238            cache->notes->pos.lat, cache->notes->pos.lon, icon);                            pos->lat, pos->lon, icon);
239        if(over)
240          osm_gps_map_add_image(OSM_GPS_MAP(map),
241                                pos->lat, pos->lon, over);
242      }
243    }
244    
245      osm_gps_map_add_image(OSM_GPS_MAP(map),  static void map_draw_wpt(GtkWidget *map, cache_t *cache, wpt_t *wpt) {
246            cache->notes->pos.lat, cache->notes->pos.lon, over);    /* only draw wpts that don't equal the main point */
247    } else {    if(pos_differ(&cache->pos, &wpt->pos)) {
248      if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon))      if(!isnan(wpt->pos.lat) && !isnan(wpt->pos.lon))  {
249          GdkPixbuf *icon =
250            icon_get(ICON_WPT, (wpt->sym!=WPT_SYM_UNKNOWN)?
251                     wpt->sym:WPT_SYM_REFPOINT);
252    
253        osm_gps_map_add_image(OSM_GPS_MAP(map),        osm_gps_map_add_image(OSM_GPS_MAP(map),
254                              cache->pos.lat, cache->pos.lon, icon);                              wpt->pos.lat, wpt->pos.lon, icon);
255        }
256    }    }
257  }  }
258    
# Line 195  static void map_draw_gpx(appdata_t *appd Line 276  static void map_draw_gpx(appdata_t *appd
276        /* if nav is not given do what semi sais */        /* if nav is not given do what semi sais */
277        map_draw_cache(map, cache, nav?(cache != nav):semi);        map_draw_cache(map, cache, nav?(cache != nav):semi);
278        caches[i].id = cache->id;        caches[i].id = cache->id;
279    
280          /* also draw waypoints of nav cache */
281          if(nav && cache == nav) {
282            wpt_t *wpt = cache->wpt;
283            while(wpt) {
284              map_draw_wpt(map, cache, wpt);
285              wpt = wpt->next;
286            }
287          }
288      }      }
289    
290      cache = cache->next;      cache = cache->next;
291    }    }
292  }  }
293    
294    static cache_t *cache_search_first(gpx_t *gpx, cache_t *cache) {
295      while(gpx) {
296        cache_t *cur = gpx->cache;
297        while(cur) {
298          /* we do a string comparision to make sure that if copies */
299          /* exist, we get the original one */
300          if(!strcmp(cache->id, cur->id))
301             return cur;
302    
303          cur = cur->next;
304        }
305        gpx = gpx->next;
306      }
307      g_assert(FALSE);
308      return NULL;
309    }
310    
311  /* draw geocaches and set window title */  /* draw geocaches and set window title */
312  static void map_setup(map_context_t *context) {  static void map_setup(map_context_t *context) {
313    char *name = NULL;    char *name = NULL;
# Line 222  static void map_setup(map_context_t *con Line 329  static void map_setup(map_context_t *con
329      printf("allocated space to handle %d map icons\n", cache_num);      printf("allocated space to handle %d map icons\n", cache_num);
330    }    }
331    
332    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(context->appdata->search_results && !context->appdata->cur_cache) {
333      if(context->state != MAP_ALL) {      if(context->state != MAP_SEARCH) {
334        printf("map_setup(ALL)\n");        printf("map_setup(SEARCH)\n");
335    
336          /* clear any pending balloon */
337          context->balloon = NULL;
338          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
339    
340  #ifdef OSD_NAV  #ifdef OSD_NAV
341        /* no navigation in this mode */        /* no navigation in this mode */
# Line 233  static void map_setup(map_context_t *con Line 344  static void map_setup(map_context_t *con
344    
345        /* clear all existing cache images */        /* clear all existing cache images */
346        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
       memset(context->caches_displayed, 0,  
              (cache_num+1) * sizeof(cache_display_t));  
347    
348        /* draw all geocaches and none is semi-transparent */        if(context->caches_displayed) {
349        gpx_t *gpx = context->appdata->gpx;          memset(context->caches_displayed, 0,
350        while(gpx) {                 (cache_num+1) * sizeof(cache_display_t));
351    
352            /* draw search results and all other gpx files are semi-transparent */
353          map_draw_gpx(context->appdata, context->caches_displayed,          map_draw_gpx(context->appdata, context->caches_displayed,
354                       context->widget, gpx, NULL, FALSE);                       context->widget, context->appdata->search_results,
355          gpx = gpx->next;                       NULL, FALSE);
356        }  
357            gpx_t *gpx = context->appdata->gpx;
358            while(gpx) {
359              map_draw_gpx(context->appdata, context->caches_displayed,
360                           context->widget, gpx, NULL, TRUE);
361    
362        {            gpx = gpx->next;
363          int i=0;          }
         while(context->caches_displayed[i].id) i++;  
         printf("number of caches actually displayed: %d\n", i);  
364        }        }
365          name = g_strdup(_("Search results"));
366          context->state = MAP_SEARCH;
367        }
368      } else if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
369        if(context->state != MAP_ALL) {
370          printf("map_setup(ALL)\n");
371    
372          /* clear any pending balloon */
373          context->balloon = NULL;
374          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
375    
376    #ifdef OSD_NAV
377          /* no navigation in this mode */
378          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
379    #endif
380    
381          /* clear all existing cache images */
382          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
383          if(context->caches_displayed) {
384            memset(context->caches_displayed, 0,
385                   (cache_num+1) * sizeof(cache_display_t));
386    
387            /* draw all geocaches and none is semi-transparent */
388            gpx_t *gpx = context->appdata->gpx;
389            while(gpx) {
390              map_draw_gpx(context->appdata, context->caches_displayed,
391                           context->widget, gpx, NULL, FALSE);
392              gpx = gpx->next;
393            }
394    
395            {
396              int i=0;
397              while(context->caches_displayed[i].id) i++;
398              printf("number of caches actually displayed: %d\n", i);
399            }
400          }
401        name = g_strdup(_("all"));        name = g_strdup(_("all"));
402        context->state = MAP_ALL;        context->state = MAP_ALL;
403      }      }
# Line 257  static void map_setup(map_context_t *con Line 405  static void map_setup(map_context_t *con
405      if(context->state != MAP_GPX) {      if(context->state != MAP_GPX) {
406        printf("map_setup(GPX)\n");        printf("map_setup(GPX)\n");
407    
408          /* clear any pending balloon */
409          context->balloon = NULL;
410          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
411    
412  #ifdef OSD_NAV  #ifdef OSD_NAV
413        /* no navigation in this mode */        /* no navigation in this mode */
414        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
415  #endif  #endif
416    
417        /* clear all existing ccahe images */        /* clear all existing cache images */
418        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
419        memset(context->caches_displayed, 0,        if(context->caches_displayed) {
420               (cache_num+1) * sizeof(cache_display_t));          memset(context->caches_displayed, 0,
421                   (cache_num+1) * sizeof(cache_display_t));
422        /* draw all geocaches and all other gpx files are semi-transparent */  
423        map_draw_gpx(context->appdata, context->caches_displayed,          /* draw all geocaches and all other gpx files are semi-transparent */
424                     context->widget, context->appdata->cur_gpx, NULL, FALSE);          map_draw_gpx(context->appdata, context->caches_displayed,
425                         context->widget, context->appdata->cur_gpx, NULL, FALSE);
426        gpx_t *gpx = context->appdata->gpx;  
427        while(gpx) {          gpx_t *gpx = context->appdata->gpx;
428          if(gpx != context->appdata->cur_gpx)          while(gpx) {
429            map_draw_gpx(context->appdata, context->caches_displayed,            if(gpx != context->appdata->cur_gpx)
430                         context->widget, gpx, NULL, TRUE);              map_draw_gpx(context->appdata, context->caches_displayed,
431                             context->widget, gpx, NULL, TRUE);
432          gpx = gpx->next;  
433              gpx = gpx->next;
434            }
435        }        }
436    
437        name = g_strdup(context->appdata->cur_gpx->name);        name = g_strdup(context->appdata->cur_gpx->name);
# Line 288  static void map_setup(map_context_t *con Line 442  static void map_setup(map_context_t *con
442    
443      printf("map_setup(CACHE)\n");      printf("map_setup(CACHE)\n");
444    
445      /* no balloons in this mode */      /* clear any pending balloon */
446      context->balloon = NULL;      context->balloon = NULL;
447      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
448    
449      /* clear all existing ccahe images */      /* clear all existing ccahe images */
450      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
451      memset(context->caches_displayed, 0,      if(context->caches_displayed) {
452             (cache_num+1) * sizeof(cache_display_t));        memset(context->caches_displayed, 0,
453                 (cache_num+1) * sizeof(cache_display_t));
454      /* draw all geocaches and all but selected one are semi-transparent */  
455      gpx_t *gpx = context->appdata->gpx;        /* Make sure we really work on the first copy in the list as */
456      while(gpx) {        /* only this is being used if duplicates exist */
457        map_draw_gpx(context->appdata, context->caches_displayed,        cache = cache_search_first(context->appdata->gpx, cache);
458                     context->widget, gpx, cache, FALSE);  
459        gpx = gpx->next;        /* draw all geocaches and all but selected one are semi-transparent */
460          gpx_t *gpx = context->appdata->gpx;
461          while(gpx) {
462            map_draw_gpx(context->appdata, context->caches_displayed,
463                         context->widget, gpx, cache, FALSE);
464            gpx = gpx->next;
465          }
466      }      }
467    
468      name = g_strdup(cache->name);      name = g_strdup(cache->name);
# Line 320  static void map_setup(map_context_t *con Line 480  static void map_setup(map_context_t *con
480  #endif  #endif
481    }    }
482    
483    if(name) {    /* also mark geomath position */
     char *title = g_strdup_printf(_("Map - %s"), name);  
     g_free(name);  
484    
485      gtk_window_set_title(GTK_WINDOW(context->window), title);    /* remove all existing appearances of this icon first */
486      osm_gps_map_remove_image(OSM_GPS_MAP(context->widget),
487      g_free(title);                             icon_get(ICON_MISC, 4));
488    } else  
489      printf("map_setup(keep)\n");    if(!isnan(context->appdata->geomath.lat) &&
490  }       !isnan(context->appdata->geomath.lon))  {
   
 static gboolean on_map_configure(GtkWidget *widget,  
                                  GdkEventConfigure *event,  
                                  map_context_t *context) {  
   
   /* for some reason there's a configure event with 1/1 */  
   /* on diablo. We just ignore this! */  
   
   printf("on_map_configure %d %d\n",  
          widget->allocation.width,  
          widget->allocation.height);  
   
   if(!context->map_complete &&  
      (widget->allocation.width > 100) &&  
      (widget->allocation.height > 100)) {  
   
     /* setup cache state */  
     map_setup(context);  
   
     /* 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)) {  
         printf("use refpos\n");  
   
         /* use gps position if present */  
         context->appdata->map.pos = *refpos;  
         context->appdata->map.zoom = GPS_DEFAULT_ZOOM;  
       } else {  
         printf("use zero pos\n");  
491    
492          /* use world map otherwise */      osm_gps_map_add_image(OSM_GPS_MAP(context->widget),
493          context->appdata->map.pos.lat = 0.0;                            context->appdata->geomath.lat,
494          context->appdata->map.pos.lon = 0.0;                            context->appdata->geomath.lon,
495          context->appdata->map.zoom = 1;                            icon_get(ICON_MISC, 4));
       }  
     }  
   
     /* jump to initial position */  
     printf("osm_gps_map_set_mapcenter(%f,%f,%d)\n",  
            context->appdata->map.pos.lat,  
            context->appdata->map.pos.lon,  
            context->appdata->map.zoom);  
   
     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;  
496    }    }
497    
498    return FALSE;    if(name) {
499        gtk_window_set_title(GTK_WINDOW(context->window), name);
500        g_free(name);
501      } else
502        printf("map_setup(keep)\n");
503  }  }
504    
505  static void  static void
# Line 411  map_cachelist_nearest(cache_t *cache, po Line 525  map_cachelist_nearest(cache_t *cache, po
525  static cache_t *map_closest(map_context_t *context, pos_t *pos) {  static cache_t *map_closest(map_context_t *context, pos_t *pos) {
526    cache_t *result = NULL;    cache_t *result = NULL;
527    float distance = NAN;    float distance = NAN;
528    
529    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(context->appdata->search_results && !context->appdata->cur_cache) {
530        /* search search results */
531        map_cachelist_nearest(context->appdata->search_results->cache,
532                              pos, &result, &distance);
533      } else if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
534      /* search all geocaches */      /* search all geocaches */
535      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
536      while(gpx) {      while(gpx) {
# Line 420  static cache_t *map_closest(map_context_ Line 538  static cache_t *map_closest(map_context_
538        gpx = gpx->next;        gpx = gpx->next;
539      }      }
540    } else if(context->appdata->cur_gpx) {    } else if(context->appdata->cur_gpx) {
541        /* search in current gpx file */
542      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
543                            pos, &result, &distance);                            pos, &result, &distance);
544    } else    } else
545      result = context->appdata->cur_gpx->cache;      result = context->appdata->cur_cache;
546    
547      /* make sure this is the first hit */
548      if(context->caches_displayed)
549        result = cache_search_first(context->appdata->gpx, result);
550    
551    return result;    return result;
552  }  }
# Line 495  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 618  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
618    
619  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
620  #define ICON_SIZE  ICON_CACHE_TYPE  #define ICON_SIZE  ICON_CACHE_TYPE
 #define LINE_SKIP  7  
621  #else  #else
622  #define ICON_SIZE  ICON_CACHE_TYPE_1_5X  #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
 #define LINE_SKIP  12  
623  #endif  #endif
624    
625    #ifndef BIG_BALLOONS
626    #define FONT_SIZE 14.0
627    #else
628    #define FONT_SIZE 22.0
629    #endif
630    #define LINE_SKIP  (FONT_SIZE/4)
631    
632    
633  static void  static void
634  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
635    printf("balloon event: ");    printf("balloon event: ");
# Line 566  balloon_cb(osm_gps_map_balloon_event_t * Line 695  balloon_cb(osm_gps_map_balloon_event_t *
695      x = event->data.draw.rect->x;      x = event->data.draw.rect->x;
696    
697      /* everything from here uses the same font */      /* everything from here uses the same font */
698      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans",
699                                CAIRO_FONT_SLANT_NORMAL,
700                              CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
 #ifndef BIG_BALLOONS  
 #define FONT_SIZE 14.0  
 #else  
 #define FONT_SIZE 22.0  
 #endif  
701    
702      cairo_set_font_size (event->data.draw.cr, FONT_SIZE);      cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
703    
704      if(cache->name) {      if(cache->name) {
705        /* draw cache name */        /* draw cache name */
706        cairo_text_extents (event->data.draw.cr, cache->name, &extents);        cairo_text_extents (event->data.draw.cr, cache->name, &extents);
707        y += extents.height;        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
       cairo_move_to (event->data.draw.cr, x, y);  
708        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
709        cairo_show_text (event->data.draw.cr, cache->name);        cairo_show_text (event->data.draw.cr, cache->name);
710        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
711    
712        /* return to the left border and below text */        /* return to the left border and below text */
713        y += LINE_SKIP;        y += LINE_SKIP + FONT_SIZE;
714        x = event->data.draw.rect->x;        x = event->data.draw.rect->x;
715      }      }
716    
# Line 613  balloon_cb(osm_gps_map_balloon_event_t * Line 737  balloon_cb(osm_gps_map_balloon_event_t *
737        /* draw terrain stars */        /* draw terrain stars */
738        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
739    
740        x += gdk_pixbuf_get_width(icon) + LINE_SKIP - 2;        x += gdk_pixbuf_get_width(icon) + FONT_SIZE/2;
741      }      }
742    
743      if(cache->difficulty) {      if(cache->difficulty) {
# Line 637  balloon_cb(osm_gps_map_balloon_event_t * Line 761  balloon_cb(osm_gps_map_balloon_event_t *
761    
762        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
763      }      }
764    
765        /* draw container info */
766        /* TODO ... */
767    
768    
769    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
770      printf("click %s event at %d %d\n",      printf("click %s event at %d %d\n",
771             event->data.click.down?"down":"up",             event->data.click.down?"down":"up",
772             event->data.click.x, event->data.click.y);             event->data.click.x, event->data.click.y);
773    
774      /* make the main screen jump to that cache */      /* make the main screen jump to that cache */
775      if(!event->data.click.down) {      if(!event->data.click.down) {
776        if(context->appdata->cur_cache) {        if(context->appdata->cur_cache) {
777          printf("ERROR: no current cache should be visible!\n");          printf("ERROR: no current cache should be visible!\n");
778        } else {        } else {
779          gpx_t *is_in = NULL;          gpx_t *is_in = NULL;
780    
781            if(context->appdata->search_results) {
782              printf("click while in \"search results\" view\n");
783    
784          if(!context->appdata->cur_gpx) {            is_in = context->appdata->search_results;
785            } else if(!context->appdata->cur_gpx) {
786            printf("click while in \"all\" view\n");            printf("click while in \"all\" view\n");
787    
788            /* we first need to figure out which gpx file this cache */            /* we first need to figure out which gpx file this cache */
789            /* is in so we can open it first */            /* is in so we can open it first */
790            gpx_t *gpx = context->appdata->gpx;            gpx_t *gpx = context->appdata->gpx;
# Line 667  balloon_cb(osm_gps_map_balloon_event_t * Line 800  balloon_cb(osm_gps_map_balloon_event_t *
800    
801            if(is_in)            if(is_in)
802              gpxlist_goto_cachelist(context->appdata, is_in);              gpxlist_goto_cachelist(context->appdata, is_in);
803    
804          } else          } else {
805              printf("click while in \"cachelist\" view\n");
806    
807            /* the simple case: there already is an open gpx file and */            /* the simple case: there already is an open gpx file and */
808            /* we just jump into the "cache" view */            /* we just jump into the "cache" view */
809            is_in = context->appdata->cur_gpx;            is_in = context->appdata->cur_gpx;
810            }
811    
812          if(is_in) {          if(is_in) {
813            printf("selecting %s in %s\n",            printf("selecting %s in %s\n",
814                   cache->id,                   cache->id,
815                     context->appdata->search_results?
816                     context->appdata->search_results->name:
817                   context->appdata->cur_gpx->name);                   context->appdata->cur_gpx->name);
818    
819            cachelist_goto_cache(context->appdata, cache);            cachelist_goto_cache(context->appdata, cache);
820    
821            /* give focus to main screen (important for maemo) */            /* give focus to main screen (important for maemo) */
822            printf("raising main window\n");            printf("raising main window\n");
823            gtk_window_present(GTK_WINDOW(context->appdata->window));            gtk_window_present(GTK_WINDOW(context->appdata->window));
# Line 700  on_map_button_release_event(GtkWidget *w Line 838  on_map_button_release_event(GtkWidget *w
838    /* in "MAP_CACHE" state only one cache is visible */    /* in "MAP_CACHE" state only one cache is visible */
839    /* and the map is in navigation mode. the balloon is */    /* and the map is in navigation mode. the balloon is */
840    /* pretty useless there */    /* pretty useless there */
841    if(context->press_on && (context->state != MAP_CACHE)) {    if(context->press_on) {
842    
843      coord_t coo;      coord_t coo;
844      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 741  static void on_window_destroy(GtkWidget Line 879  static void on_window_destroy(GtkWidget
879    g_object_get(map, "zoom", &zoom, NULL);    g_object_get(map, "zoom", &zoom, NULL);
880    context->appdata->map.zoom = zoom;    context->appdata->map.zoom = zoom;
881    
882      gboolean dpix;
883      g_object_get(map, "double-pixel", &dpix, NULL);
884      context->appdata->map.dpix = dpix;
885    
886    gfloat lat, lon;    gfloat lat, lon;
887    g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);    g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
888    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
# Line 756  static void on_window_destroy(GtkWidget Line 898  static void on_window_destroy(GtkWidget
898  #endif  #endif
899    
900    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
901    gps_unregister_callback(appdata, context->cb_id);    gps_unregister_callback(appdata->gps_state, gps_callback);
902    
903    if(context->caches_displayed) {    if(context->caches_displayed) {
904      g_free(context->caches_displayed);      g_free(context->caches_displayed);
905      context->caches_displayed = NULL;      context->caches_displayed = NULL;
906    }    }
907    
908      printf("destroy map context\n");
909    g_free(context);    g_free(context);
910    appdata->map.context = NULL;    appdata->map.context = NULL;
911  }  }
# Line 806  static gboolean on_focus_in(GtkWidget *w Line 949  static gboolean on_focus_in(GtkWidget *w
949    return FALSE;    return FALSE;
950  }  }
951    
 #ifdef USE_MAEMO  
952  static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,  static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
953                           gpointer data) {                           gpointer data) {
954    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
955    
956    printf("map lost focus\n");    printf("map lost focus\n");
957    
958      /* save new map position */
959      gfloat lat, lon;
960      g_object_get(widget, "latitude", &lat, "longitude", &lon, NULL);
961    
962      context->appdata->map.pos.lat = lat;
963      context->appdata->map.pos.lon = lon;
964    
965    #ifdef USE_MAEMO
966    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
967    context->handler_id = 0;    context->handler_id = 0;
968    #endif
969    
970    return FALSE;    return FALSE;
971  }  }
 #endif  
972    
973  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
974    printf("map_update\n");    printf("map_update\n");
# Line 827  void map_update(appdata_t *appdata) { Line 978  void map_update(appdata_t *appdata) {
978  #endif  #endif
979  }  }
980    
 /* callback called by the gps layer whenever gps state changes */  
 static void  
 gps_callback(struct gps_state *state, gpointer data) {  
   printf("map: gps callback\n");  
 }  
   
981  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
982    map_context_t *context = NULL;    map_context_t *context = NULL;
983    
# Line 845  void map(appdata_t *appdata) { Line 990  void map(appdata_t *appdata) {
990    }    }
991    
992    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
993      printf("allocated new context at %p\n", context);
994    
995    context->appdata = appdata;    context->appdata = appdata;
   context->map_complete = FALSE;  
996    context->state = MAP_NONE;    context->state = MAP_NONE;
997    
998    /* cleanup old (pre 0.8.7) path if it exists */    /* cleanup old (pre 0.8.7) path if it exists */
# Line 884  void map(appdata_t *appdata) { Line 1030  void map(appdata_t *appdata) {
1030                   "auto-center",              FALSE,                   "auto-center",              FALSE,
1031                   "record-trip-history",      FALSE,                   "record-trip-history",      FALSE,
1032                   "show-trip-history",        FALSE,                   "show-trip-history",        FALSE,
1033                     "double-pixel",             context->appdata->map.dpix,
1034                   proxy?"proxy-uri":NULL,     proxy,                   proxy?"proxy-uri":NULL,     proxy,
1035                   NULL);                   NULL);
1036    
# Line 891  void map(appdata_t *appdata) { Line 1038  void map(appdata_t *appdata) {
1038    
1039    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
1040    
1041      /* set default values if they are invalid */
1042      if(!context->appdata->map.zoom ||
1043         isnan(context->appdata->map.pos.lat) ||
1044         isnan(context->appdata->map.pos.lon)) {
1045        printf("no valid map position found\n");
1046    
1047        pos_t *refpos = get_pos(context->appdata);
1048        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
1049          printf("use refpos\n");
1050    
1051            /* use gps position if present */
1052          context->appdata->map.pos = *refpos;
1053          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
1054        } else {
1055          printf("use zero pos\n");
1056    
1057          /* use world map otherwise */
1058          context->appdata->map.pos.lat = 0.0;
1059          context->appdata->map.pos.lon = 0.0;
1060          context->appdata->map.zoom = 1;
1061        }
1062      }
1063    
1064      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
1065                                context->appdata->map.pos.lat,
1066                                context->appdata->map.pos.lon,
1067                                context->appdata->map.zoom);
1068    
1069  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1070    /* we don't use a stackable window here on fremantle, since */    /* we don't use a stackable window here on fremantle, since */
1071    /* this leaves the main window independent from the map and */    /* this leaves the main window independent from the map and */
# Line 912  void map(appdata_t *appdata) { Line 1087  void map(appdata_t *appdata) {
1087    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
1088                     G_CALLBACK(on_focus_in), context);                     G_CALLBACK(on_focus_in), context);
1089    
 #ifdef USE_MAEMO  
1090    g_signal_connect(G_OBJECT(context->widget), "focus-out-event",    g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
1091                     G_CALLBACK(on_focus_out), context);                     G_CALLBACK(on_focus_out), context);
 #endif  
   
   g_signal_connect(G_OBJECT(context->widget), "configure-event",  
                    G_CALLBACK(on_map_configure), context);  
1092    
1093    g_signal_connect(G_OBJECT(context->widget), "button-press-event",    g_signal_connect(G_OBJECT(context->widget), "button-press-event",
1094                     G_CALLBACK(on_map_button_press_event), context);                     G_CALLBACK(on_map_button_press_event), context);
# Line 928  void map(appdata_t *appdata) { Line 1098  void map(appdata_t *appdata) {
1098    
1099    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
1100    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
1101    context->cb_id = gps_register_callback(appdata, gps_callback, context);    gps_register_callback(appdata->gps_state, LATLON_CHANGED | HERR_CHANGED,
1102                            gps_callback, context);
1103    
1104  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
1105    /* prevent some of the main screen things */    /* prevent some of the main screen things */
# Line 941  void map(appdata_t *appdata) { Line 1112  void map(appdata_t *appdata) {
1112    
1113    gtk_container_add(GTK_CONTAINER(context->window), context->widget);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
1114    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
1115    
1116      /* setup cache state */
1117      map_setup(context);
1118  }  }
Legend:
Removed from v.189  
changed lines
  Added in v.282