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

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

revision 130 by harbaum, Wed Sep 30 12:11:22 2009 UTC revision 149 by harbaum, Thu Oct 29 13:59:16 2009 UTC
# Line 80  static const char *get_proxy_uri(appdata Line 80  static const char *get_proxy_uri(appdata
80    
81  static void  static void
82  cb_map_gps(osd_button_t but, map_context_t *context) {  cb_map_gps(osd_button_t but, map_context_t *context) {
83    
84    if(but == OSD_GPS) {    if(but == OSD_GPS) {
85      pos_t *refpos = get_pos(context->appdata);      pos_t *refpos = get_pos(context->appdata);
86      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 109  static int dist2pixel(map_context_t *con
109    
110  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
111    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
112      static gboolean goto_is_enabled = FALSE;
113    
114    /* get reference position ... */    /* get reference position ... */
115    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
116    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
117    
118    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
119    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),    if(ok != goto_is_enabled) {
120                   OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
121                    OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
122        goto_is_enabled = ok;
123      }
124    
125    if(ok) {    if(ok) {
126      float heading = NAN;      float heading = NAN;
# Line 130  static gboolean map_gps_update(gpointer Line 135  static gboolean map_gps_update(gpointer
135          radius = dist2pixel(context, eph/1000, refpos->lat);          radius = dist2pixel(context, eph/1000, refpos->lat);
136      }      }
137    
138        /* TODO: in order to save energy: only draw if state actually changed */
139    
140      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
141      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
142                           refpos->lat, refpos->lon, heading);                           refpos->lat, refpos->lon, heading);
# Line 139  static gboolean map_gps_update(gpointer Line 146  static gboolean map_gps_update(gpointer
146    return TRUE;    return TRUE;
147  }  }
148    
149    static void map_draw_cache(GtkWidget *map, cache_t *cache) {
150      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
151    
152      /* check if there's also an overwritten coordinate */
153      if(cache->notes && cache->notes->override) {
154        GdkPixbuf *over = icon_get(ICON_MISC, 1);
155    
156        osm_gps_map_add_image(OSM_GPS_MAP(map),
157              cache->notes->pos.lat, cache->notes->pos.lon, icon);
158    
159        osm_gps_map_add_image(OSM_GPS_MAP(map),
160              cache->notes->pos.lat, cache->notes->pos.lon, over);
161      } else {
162        if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon))
163          osm_gps_map_add_image(OSM_GPS_MAP(map),
164                                cache->pos.lat, cache->pos.lon, icon);
165      }
166    }
167    
168    static void map_draw_gpx(appdata_t *appdata, GtkWidget *map, gpx_t *gpx) {
169      if(!gpx->notes_loaded) {
170        notes_load_all(appdata, gpx);
171        gpx->notes_loaded = TRUE;
172      }
173    
174      cache_t *cache = gpx->cache;
175      while(cache) {
176        map_draw_cache(map, cache);
177        cache = cache->next;
178      }
179    }
180    
181    /* draw geocaches and set window title */
182    static void map_setup(map_context_t *context) {
183      char *name = NULL;
184    
185      if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
186        if(context->state != MAP_ALL) {
187          printf("map_setup(ALL)\n");
188    
189    #ifdef OSD_NAV
190          /* no navigation in this mode */
191          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
192    #endif
193    
194          /* clear all existing ccahe images */
195          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
196    
197          /* draw all geocaches */
198          gpx_t *gpx = context->appdata->gpx;
199          while(gpx) {
200            map_draw_gpx(context->appdata, context->widget, gpx);
201            gpx = gpx->next;
202          }
203          name = g_strdup(_("all"));
204          context->state = MAP_ALL;
205        }
206      } else if(!context->appdata->cur_cache) {
207        if(context->state != MAP_GPX) {
208          printf("map_setup(GPX)\n");
209    
210    #ifdef OSD_NAV
211          /* no navigation in this mode */
212          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
213    #endif
214    
215          /* clear all existing ccahe images */
216          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
217    
218          map_draw_gpx(context->appdata, context->widget,
219                       context->appdata->cur_gpx);
220          name = g_strdup(context->appdata->cur_gpx->name);
221          context->state = MAP_GPX;
222        }
223      } else {
224        cache_t *cache = context->appdata->cur_cache;
225    
226        printf("map_setp(CACHE)\n");
227    
228        /* no balloons in this mode */
229        context->balloon = NULL;
230        osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
231    
232        /* clear all existing ccahe images */
233        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
234    
235        map_draw_cache(context->widget, cache);
236        name = g_strdup(cache->name);
237        context->state = MAP_CACHE;
238    
239        /* navigation in this mode! */
240        pos_t cpos = gpx_cache_pos(cache);
241    
242    #ifdef OSD_NAV
243        osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
244                                  context->appdata->imperial,
245                                  cpos.lat, cpos.lon, cache->name);
246    #else
247    #warning OSD_NAV not defined!
248    #endif
249      }
250    
251      if(name) {
252        char *title = g_strdup_printf(_("Map - %s"), name);
253        g_free(name);
254    
255        gtk_window_set_title(GTK_WINDOW(context->window), title);
256    
257        g_free(title);
258      } else
259        printf("map_setup(keep)\n");
260    }
261    
262  static gboolean on_map_configure(GtkWidget *widget,  static gboolean on_map_configure(GtkWidget *widget,
263                                   GdkEventConfigure *event,                                   GdkEventConfigure *event,
264                                   map_context_t *context) {                                   map_context_t *context) {
265    
266    if(!context->map_complete) {    /* for some reason there's a configure event with 1/1 */
267      /* on diablo. We just ignore this! */
268    
269      printf("on_map_configure %d %d\n",
270             widget->allocation.width,
271             widget->allocation.height);
272    
273      if(!context->map_complete &&
274         (widget->allocation.width > 100) &&
275         (widget->allocation.height > 100)) {
276    
277        /* setup cache state */
278        map_setup(context);
279    
280      /* set default values if they are invalid */      /* set default values if they are invalid */
281      if(!context->appdata->map.zoom ||      if(!context->appdata->map.zoom ||
# Line 153  static gboolean on_map_configure(GtkWidg Line 285  static gboolean on_map_configure(GtkWidg
285    
286        pos_t *refpos = get_pos(context->appdata);        pos_t *refpos = get_pos(context->appdata);
287        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
288            printf("use refpos\n");
289    
290          /* use gps position if present */          /* use gps position if present */
291          context->appdata->map.pos = *refpos;          context->appdata->map.pos = *refpos;
292          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
293        } else {        } else {
294            printf("use zero pos\n");
295    
296          /* use world map otherwise */          /* use world map otherwise */
297          context->appdata->map.pos.lat = 0.0;          context->appdata->map.pos.lat = 0.0;
298          context->appdata->map.pos.lon = 0.0;          context->appdata->map.pos.lon = 0.0;
# Line 165  static gboolean on_map_configure(GtkWidg Line 301  static gboolean on_map_configure(GtkWidg
301      }      }
302    
303      /* jump to initial position */      /* jump to initial position */
304        printf("osm_gps_map_set_mapcenter(%f,%f,%d)\n",
305               context->appdata->map.pos.lat,
306               context->appdata->map.pos.lon,
307               context->appdata->map.zoom);
308    
309      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
310                                context->appdata->map.pos.lat,                                context->appdata->map.pos.lat,
311                                context->appdata->map.pos.lon,                                context->appdata->map.pos.lon,
# Line 175  static gboolean on_map_configure(GtkWidg Line 316  static gboolean on_map_configure(GtkWidg
316    return FALSE;    return FALSE;
317  }  }
318    
 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;  
   }  
 }  
   
319  static void  static void
320  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
321                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
322    
323    while(cache) {    while(cache) {
324      pos_t cpos = gpx_cache_pos(cache);      pos_t cpos = gpx_cache_pos(cache);
325    
# Line 258  pos_t coord2pos(coord_t coo) { Line 369  pos_t coord2pos(coord_t coo) {
369  static gboolean  static gboolean
370  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
371                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
372    
373    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
374    
375    /* check if we actually clicked parts of the OSD */    /* check if we actually clicked parts of the OSD */
376    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)
377      return FALSE;      return FALSE;
378    
379    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
# Line 315  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 427  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
427  #endif  #endif
428    
429  static void  static void
430  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
431    cache_t *cache = (cache_t*)data;    printf("balloon event: ");
   
 #if 0  
   /* draw pink background to check clipping */  
   cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);  
   cairo_set_source_rgba (cr, 1, 0, 0, 0.3);  
   cairo_fill_preserve (cr);  
   cairo_set_line_width (cr, 0);  
   cairo_stroke (cr);  
 #endif  
432    
433    /* leave a little border top and left */    map_context_t *context = (map_context_t*)data;
434    gint x = rect->x, y = rect->y;    cache_t *cache = context->balloon;
   
   /* draw the cache type icon ... */  
   GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  
   cairo_draw_pixbuf(cr, icon, x, y);  
   
   if(cache->notes && cache->notes->override) {  
     GdkPixbuf *over = icon_get(ICON_MISC, 1);  
     cairo_draw_pixbuf(cr, over, x, y);  
   }  
435    
436    /* ... and right of it the waypoint id */    if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
437    cairo_text_extents_t extents;      printf("draw\n");
438    
439    if(cache->id) {  #if 0
440      cairo_select_font_face (cr, "Sans",      /* draw pink background to check clipping */
441                              CAIRO_FONT_SLANT_NORMAL,      cairo_rectangle (event->data.draw.cr,
442                              CAIRO_FONT_WEIGHT_BOLD);                       event->data.draw.rect->x-20, event->data.draw.rect->y-20,
443                         event->data.draw.rect->w+40, event->data.draw.rect->h+40);
444        cairo_set_source_rgba (event->data.draw.cr, 1, 0, 0, 0.3);
445        cairo_fill_preserve (event->data.draw.cr);
446        cairo_set_line_width (event->data.draw.cr, 0);
447        cairo_stroke (event->data.draw.cr);
448    #endif
449    
450        /* leave a little border top and left */
451        gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
452    
453        /* draw the cache type icon ... */
454        GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
455        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
456    
457        if(cache->notes && cache->notes->override) {
458          GdkPixbuf *over = icon_get(ICON_MISC, 1);
459          cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
460        }
461    
462        /* ... and right of it the waypoint id */
463        cairo_text_extents_t extents;
464    
465        if(cache->id) {
466          cairo_select_font_face (event->data.draw.cr, "Sans",
467                                  CAIRO_FONT_SLANT_NORMAL,
468                                  CAIRO_FONT_WEIGHT_BOLD);
469    
470  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
471      cairo_set_font_size (cr, 20.0);        cairo_set_font_size (event->data.draw.cr, 20.0);
472  #else  #else
473      cairo_set_font_size (cr, 36.0);        cairo_set_font_size (event->data.draw.cr, 36.0);
474  #endif  #endif
475    
476      cairo_text_extents (cr, cache->id, &extents);        cairo_text_extents (event->data.draw.cr, cache->id, &extents);
477    
478      /* display id right of icon vertically centered */        /* display id right of icon vertically centered */
479      x += gdk_pixbuf_get_width(icon) + 5;        x += gdk_pixbuf_get_width(icon) + 5;
480      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
481      cairo_move_to (cr, x, y);        cairo_move_to (event->data.draw.cr, x, y);
482      cairo_set_source_rgba (cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
483      cairo_show_text (cr, cache->id);        cairo_show_text (event->data.draw.cr, cache->id);
484      cairo_stroke (cr);        cairo_stroke (event->data.draw.cr);
485    
486      y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;        y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
487    } else      } else
488      y += gdk_pixbuf_get_height(icon);        y += gdk_pixbuf_get_height(icon);
489    
490    /* return to the left border and below icon/text */      /* return to the left border and below icon/text */
491    x = rect->x;      x = event->data.draw.rect->x;
492    
493    /* everything from here uses the same font */      /* everything from here uses the same font */
494    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
495                            CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
496  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
497    cairo_set_font_size (cr, 14.0);      cairo_set_font_size (event->data.draw.cr, 14.0);
498  #else  #else
499    cairo_set_font_size (cr, 22.0);      cairo_set_font_size (event->data.draw.cr, 22.0);
500  #endif  #endif
501    
502    if(cache->name) {      if(cache->name) {
503      /* draw cache name */        /* draw cache name */
504      cairo_text_extents (cr, cache->name, &extents);        cairo_text_extents (event->data.draw.cr, cache->name, &extents);
505      y += extents.height;        y += extents.height;
506      cairo_move_to (cr, x, y);        cairo_move_to (event->data.draw.cr, x, y);
507      cairo_set_source_rgba (cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
508      cairo_show_text (cr, cache->name);        cairo_show_text (event->data.draw.cr, cache->name);
509      cairo_stroke (cr);        cairo_stroke (event->data.draw.cr);
510    
511      /* return to the left border and below text */        /* return to the left border and below text */
512      y += LINE_SKIP;        y += LINE_SKIP;
513      x = rect->x;        x = event->data.draw.rect->x;
514    }      }
515    
516    if(cache->terrain) {      if(cache->terrain) {
517      /* draw cache rating */        /* draw cache rating */
518      const char *terrain = "Terrain:";        const char *terrain = "Terrain:";
519      icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
520      cairo_text_extents (cr, _(terrain), &extents);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
521      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
522    
523      /* draw "Terrain:" string */        /* draw "Terrain:" string */
524      cairo_move_to (cr, x, y);        cairo_move_to (event->data.draw.cr, x, y);
525      cairo_set_source_rgba (cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
526      cairo_show_text (cr, _(terrain));        cairo_show_text (event->data.draw.cr, _(terrain));
527      cairo_stroke (cr);        cairo_stroke (event->data.draw.cr);
528      x += extents.width + 2;        x += extents.width + 2;
529    
530      /* draw terrain stars */        /* draw terrain stars */
531      cairo_draw_pixbuf(cr, icon, x, y -        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -
532                        (gdk_pixbuf_get_height(icon) + extents.height)/2);                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
533    
534      x += gdk_pixbuf_get_width(icon) + LINE_SKIP;        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
535      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;
536    }      }
   
   if(cache->difficulty) {  
     const char *difficulty = "Difficulty:";  
     cairo_text_extents (cr, _(difficulty), &extents);  
     y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
   
     /* draw "Difficulty:" string */  
     cairo_move_to (cr, x, y);  
     cairo_set_source_rgba (cr, 0, 0, 0, 1);  
     cairo_show_text (cr, _(difficulty));  
     cairo_stroke (cr);  
     x += extents.width + 2;  
537    
538      icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));      if(cache->difficulty) {
539      cairo_draw_pixbuf(cr, icon, x, y -        const char *difficulty = "Difficulty:";
540          cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
541          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
542    
543          /* draw "Difficulty:" string */
544          cairo_move_to (event->data.draw.cr, x, y);
545          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
546          cairo_show_text (event->data.draw.cr, _(difficulty));
547          cairo_stroke (event->data.draw.cr);
548          x += extents.width + 2;
549    
550          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
551          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -
552                        (gdk_pixbuf_get_height(icon) + extents.height)/2);                        (gdk_pixbuf_get_height(icon) + extents.height)/2);
553        }
554      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
555        printf("click %s event at %d %d\n",
556               event->data.click.down?"down":"up",
557               event->data.click.x, event->data.click.y);
558    
559        /* make the main screen jump to that cache */
560        if(!event->data.click.down) {
561          if(context->appdata->cur_cache) {
562            printf("ERROR: no current cache should be visible!\n");
563          } else {
564            gpx_t *is_in = NULL;
565    
566            if(!context->appdata->cur_gpx) {
567              printf("click while in \"all\" view\n");
568    
569              /* we first need to figure out which gpx file this cache */
570              /* is in so we can open it first */
571              gpx_t *gpx = context->appdata->gpx;
572              while(gpx && !is_in) {
573                cache_t *cur = gpx->cache;
574                while(cur && !is_in) {
575                  if(cur == cache)
576                    is_in = gpx;
577                  cur = cur->next;
578                }
579                gpx = gpx->next;
580              }
581    
582              if(is_in)
583                gpxlist_goto_cachelist(context->appdata, is_in);
584    
585            } else
586              /* the simple case: there already is an open gpx file and */
587              /* we just jump into the "cache" view */
588              is_in = context->appdata->cur_gpx;
589    
590            if(is_in) {
591              printf("selecting %s in %s\n",
592                     cache->id,
593                     context->appdata->cur_gpx->name);
594    
595              cachelist_goto_cache(context->appdata, cache);
596    
597              /* give focus to main screen (important for maemo) */
598              printf("raising main window\n");
599              gtk_window_present(GTK_WINDOW(context->appdata->window));
600            }
601          }
602        }
603      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
604        printf("removed\n");
605        context->balloon = NULL;
606    }    }
607  }  }
608    
# Line 438  on_map_button_release_event(GtkWidget *w Line 611  on_map_button_release_event(GtkWidget *w
611                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
612    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
613    
614    if(context->press_on) {    /* in "MAP_CACHE" state only one cache is visible */
615      /* and the map is in navigation mode. the balloon is */
616      /* pretty useless there */
617      if(context->press_on && (context->state != MAP_CACHE)) {
618    
619      coord_t coo;      coord_t coo;
620      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
621    
# Line 452  on_map_button_release_event(GtkWidget *w Line 629  on_map_button_release_event(GtkWidget *w
629        float dist = gpx_pos_get_distance(pos, cpos, FALSE);        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
630        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
631    
632            context->balloon = nearest;
633          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
634                                       balloon_draw_cb, nearest);                                       balloon_cb, context);
   
         osm_gps_map_osd_draw_nav (map, cpos.lat, cpos.lon, nearest->name);  
   
635        }        }
636      }      }
637      context->press_on = NULL;      context->press_on = NULL;
# Line 474  on_map_button_release_event(GtkWidget *w Line 649  on_map_button_release_event(GtkWidget *w
649  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
650    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
651    
   printf("destroy map window\n");  
   
652    /* save map parameters */    /* save map parameters */
653    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
654    gint zoom;    gint zoom;
# Line 497  static void on_window_destroy(GtkWidget Line 670  static void on_window_destroy(GtkWidget
670  #endif  #endif
671    
672    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
673      gps_unregister_callback(appdata, context->cb_id);
674    
675    g_free(context);    g_free(context);
676    appdata->map.context = NULL;    appdata->map.context = NULL;
# Line 521  on_window_realize(GtkWidget *widget, gpo Line 695  on_window_realize(GtkWidget *widget, gpo
695  }  }
696  #endif  #endif
697    
698  /* draw geocaches and set window title */  /* on maemo a window is either on top or completely invisible. this */
699  static void map_setup(map_context_t *context) {  /* means that we only need to update the map window if its raised.  */
700    char *name = NULL;  /* on ordinary desktops this is different and we always update */
   
   if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {  
     if(context->state != MAP_ALL) {  
       printf("map_setp(ALL)\n");  
   
       /* clear all existing ccahe images */  
       osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));  
   
       /* draw all geocaches */  
       gpx_t *gpx = context->appdata->gpx;  
       while(gpx) {  
         map_draw_gpx(context->appdata, context->widget, gpx);  
         gpx = gpx->next;  
       }  
       name = g_strdup(_("all"));  
       context->state = MAP_ALL;  
     }  
   } else if(!context->appdata->cur_cache) {  
     if(context->state != MAP_GPX) {  
       printf("map_setp(GPX)\n");  
   
       /* clear all existing ccahe images */  
       osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));  
   
       map_draw_gpx(context->appdata, context->widget,  
                    context->appdata->cur_gpx);  
       name = g_strdup(context->appdata->cur_gpx->name);  
       context->state = MAP_GPX;  
     }  
   } else {  
     if(context->state != MAP_CACHE) {  
       printf("map_setp(CACHE)\n");  
   
       /* clear all existing ccahe images */  
       osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));  
   
       map_draw_cache(context->widget, context->appdata->cur_cache);  
       name = g_strdup(context->appdata->cur_cache->name);  
       context->state = MAP_CACHE;  
     }  
   }  
   
   if(name) {  
     char *title = g_strdup_printf(_("Map - %s"), name);  
     g_free(name);  
   
     gtk_window_set_title(GTK_WINDOW(context->window), title);  
   
     g_free(title);  
   } else  
     printf("map_setup(keep)\n");  
 }  
701    
 #ifdef USE_MAEMO  
 /* 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 */  
702  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
703                           gpointer data) {                           gpointer data) {
704      printf("map got focus\n");
705    map_setup((map_context_t*)data);    map_setup((map_context_t*)data);
706    return FALSE;    return FALSE;
707  }  }
 #endif  
708    
709  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
710      printf("map_update\n");
711  #ifndef USE_MAEMO  #ifndef USE_MAEMO
712    if(appdata->map.context)    if(appdata->map.context)
713      map_setup(appdata->map.context);      map_setup(appdata->map.context);
714  #endif  #endif
715  }  }
716    
717    /* callback called by the gps layer whenever gps state changes */
718    static void
719    gps_callback(struct gps_state *state, gpointer data) {
720      printf("map: gps callback\n");
721    }
722    
723  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
724    map_context_t *context = NULL;    map_context_t *context = NULL;
725    
# Line 668  void map(appdata_t *appdata) { Line 792  void map(appdata_t *appdata) {
792    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
793  #endif  #endif
794    
   /* setup cache state */  
   map_setup(context);  
   
795  #ifndef USE_MAEMO  #ifndef USE_MAEMO
796    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
797  #endif  #endif
798    
 #ifdef USE_MAEMO  
799    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
800                     G_CALLBACK(on_focus_in), context);                     G_CALLBACK(on_focus_in), context);
 #endif  
801    
802    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
803                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
# Line 691  void map(appdata_t *appdata) { Line 810  void map(appdata_t *appdata) {
810    
811    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
812    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
813      context->cb_id = gps_register_callback(appdata, gps_callback, context);
814    
815  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
816    /* prevent some of the main screen things */    /* prevent some of the main screen things */
Legend:
Removed from v.130  
changed lines
  Added in v.149