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

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

revision 136 by harbaum, Mon Oct 19 13:02:41 2009 UTC revision 203 by harbaum, Sun Nov 22 20:39:46 2009 UTC
# Line 22  Line 22 
22   * http://topo.geofabrik.de/trail/${z}/${x}/${y}.png   8-15   * http://topo.geofabrik.de/trail/${z}/${x}/${y}.png   8-15
23   */   */
24    
25    /*
26     * TODO:
27     * - make semi-transparent caches selectable
28     */
29    
30  #include "gpxview.h"  #include "gpxview.h"
31  #include "converter.h"  #include "converter.h"
32  #include <math.h>    // for isnan  #include <math.h>    // for isnan
# Line 48  static const char *get_proxy_uri(appdata Line 53  static const char *get_proxy_uri(appdata
53    /* use environment settings if preset */    /* use environment settings if preset */
54    const char *proxy = g_getenv("http_proxy");    const char *proxy = g_getenv("http_proxy");
55    if(proxy) {    if(proxy) {
56      printf("http_proxy: %s\n", proxy);      printf("map http proxy from env: %s\n", proxy);
57      return proxy;      return proxy;
58    }    }
59    
# Line 69  static const char *get_proxy_uri(appdata Line 74  static const char *get_proxy_uri(appdata
74    
75        snprintf(proxy_buffer, sizeof(proxy_buffer),        snprintf(proxy_buffer, sizeof(proxy_buffer),
76                 "http://%s:%u", host, port);                 "http://%s:%u", host, port);
77          printf("map http proxy from gconf: %s\n ", proxy_buffer);
78    
79        g_free(host);        g_free(host);
80      }      }
# Line 80  static const char *get_proxy_uri(appdata Line 86  static const char *get_proxy_uri(appdata
86    
87  static void  static void
88  cb_map_gps(osd_button_t but, map_context_t *context) {  cb_map_gps(osd_button_t but, map_context_t *context) {
89    
90    if(but == OSD_GPS) {    if(but == OSD_GPS) {
91      pos_t *refpos = get_pos(context->appdata);      pos_t *refpos = get_pos(context->appdata);
92      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
# Line 108  static int dist2pixel(map_context_t *con Line 115  static int dist2pixel(map_context_t *con
115    
116  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
117    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
118      static gboolean goto_is_enabled = FALSE;
119    
120    /* get reference position ... */    /* get reference position ... */
121    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
122    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
123    
124    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
125    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),    if(ok != goto_is_enabled) {
126                   OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
127                    OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
128        goto_is_enabled = ok;
129      }
130    
131    if(ok) {    if(ok) {
132      float heading = NAN;      float heading = NAN;
# Line 130  static gboolean map_gps_update(gpointer Line 141  static gboolean map_gps_update(gpointer
141          radius = dist2pixel(context, eph/1000, refpos->lat);          radius = dist2pixel(context, eph/1000, refpos->lat);
142      }      }
143    
144        /* TODO: in order to save energy: only draw if state actually changed */
145    
146      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
147      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
148                           refpos->lat, refpos->lon, heading);                           refpos->lat, refpos->lon, heading);
# Line 139  static gboolean map_gps_update(gpointer Line 152  static gboolean map_gps_update(gpointer
152    return TRUE;    return TRUE;
153  }  }
154    
155    static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
156      int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;
157    
158      GdkPixbuf *icon = icon_get(type, cache->type);
159    
160      /* check if there's also an overwritten coordinate */
161      if(cache->notes && cache->notes->override) {
162        GdkPixbuf *over = icon_get(type, 11);
163    
164        osm_gps_map_add_image(OSM_GPS_MAP(map),
165              cache->notes->pos.lat, cache->notes->pos.lon, icon);
166    
167        osm_gps_map_add_image(OSM_GPS_MAP(map),
168              cache->notes->pos.lat, cache->notes->pos.lon, over);
169      } else {
170        if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon))
171          osm_gps_map_add_image(OSM_GPS_MAP(map),
172                                cache->pos.lat, cache->pos.lon, icon);
173      }
174    }
175    
176    static void map_draw_gpx(appdata_t *appdata, cache_display_t *caches,
177                             GtkWidget *map, gpx_t *gpx,
178                             cache_t *nav, gboolean semi) {
179      if(!gpx->notes_loaded) {
180        notes_load_all(appdata, gpx);
181        gpx->notes_loaded = TRUE;
182      }
183    
184      cache_t *cache = gpx->cache;
185      while(cache) {
186        /* search if we have that cache already in our list/displayed */
187        int i=0;
188        while(caches[i].id && (strcmp(caches[i].id, cache->id) != 0))
189          i++;
190    
191        if(!caches[i].id) {
192          /* if nav is given draw all other caches semitransparent. */
193          /* if nav is not given do what semi sais */
194          map_draw_cache(map, cache, nav?(cache != nav):semi);
195          caches[i].id = cache->id;
196        }
197    
198        cache = cache->next;
199      }
200    }
201    
202    /* draw geocaches and set window title */
203    static void map_setup(map_context_t *context) {
204      char *name = NULL;
205    
206      int cache_num = gpx_total_caches_global(context->appdata->gpx);
207    
208      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
209        //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
210        //     cache_num, context->cache_list_len);
211        g_free(context->caches_displayed);
212        context->caches_displayed = NULL;
213        context->cache_list_len = 0;
214      }
215    
216      /* allocate buffer */
217      if(cache_num && !context->caches_displayed) {
218        context->cache_list_len = cache_num;
219        context->caches_displayed = g_new0(cache_display_t, cache_num+1);
220        printf("allocated space to handle %d map icons\n", cache_num);
221      }
222    
223      if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
224        if(context->state != MAP_ALL) {
225          printf("map_setup(ALL)\n");
226    
227          /* clear any pending balloon */
228          context->balloon = NULL;
229          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
230    
231    #ifdef OSD_NAV
232          /* no navigation in this mode */
233          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
234    #endif
235    
236          /* clear all existing cache images */
237          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
238          memset(context->caches_displayed, 0,
239                 (cache_num+1) * sizeof(cache_display_t));
240    
241          /* draw all geocaches and none is semi-transparent */
242          gpx_t *gpx = context->appdata->gpx;
243          while(gpx) {
244            map_draw_gpx(context->appdata, context->caches_displayed,
245                         context->widget, gpx, NULL, FALSE);
246            gpx = gpx->next;
247          }
248    
249          {
250            int i=0;
251            while(context->caches_displayed[i].id) i++;
252            printf("number of caches actually displayed: %d\n", i);
253          }
254    
255          name = g_strdup(_("all"));
256          context->state = MAP_ALL;
257        }
258      } else if(!context->appdata->cur_cache) {
259        if(context->state != MAP_GPX) {
260          printf("map_setup(GPX)\n");
261    
262          /* clear any pending balloon */
263          context->balloon = NULL;
264          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
265    
266    #ifdef OSD_NAV
267          /* no navigation in this mode */
268          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
269    #endif
270    
271          /* clear all existing cache images */
272          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
273          memset(context->caches_displayed, 0,
274                 (cache_num+1) * sizeof(cache_display_t));
275    
276          /* draw all geocaches and all other gpx files are semi-transparent */
277          map_draw_gpx(context->appdata, context->caches_displayed,
278                       context->widget, context->appdata->cur_gpx, NULL, FALSE);
279    
280          gpx_t *gpx = context->appdata->gpx;
281          while(gpx) {
282            if(gpx != context->appdata->cur_gpx)
283              map_draw_gpx(context->appdata, context->caches_displayed,
284                           context->widget, gpx, NULL, TRUE);
285    
286            gpx = gpx->next;
287          }
288    
289          name = g_strdup(context->appdata->cur_gpx->name);
290          context->state = MAP_GPX;
291        }
292      } else {
293        cache_t *cache = context->appdata->cur_cache;
294    
295        printf("map_setup(CACHE)\n");
296    
297        /* clear any pending balloon */
298        context->balloon = NULL;
299        osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
300    
301        /* clear all existing ccahe images */
302        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
303        memset(context->caches_displayed, 0,
304               (cache_num+1) * sizeof(cache_display_t));
305    
306        /* draw all geocaches and all but selected one are semi-transparent */
307        gpx_t *gpx = context->appdata->gpx;
308        while(gpx) {
309          map_draw_gpx(context->appdata, context->caches_displayed,
310                       context->widget, gpx, cache, FALSE);
311          gpx = gpx->next;
312        }
313    
314        name = g_strdup(cache->name);
315        context->state = MAP_CACHE;
316    
317        /* navigation in this mode! */
318        pos_t cpos = gpx_cache_pos(cache);
319    
320    #ifdef OSD_NAV
321        osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
322                                  context->appdata->imperial,
323                                  cpos.lat, cpos.lon, cache->name);
324    #else
325    #warning OSD_NAV not defined!
326    #endif
327      }
328    
329      if(name) {
330        char *title = g_strdup_printf(_("Map - %s"), name);
331        g_free(name);
332    
333        gtk_window_set_title(GTK_WINDOW(context->window), title);
334    
335        g_free(title);
336      } else
337        printf("map_setup(keep)\n");
338    }
339    
340  static gboolean on_map_configure(GtkWidget *widget,  static gboolean on_map_configure(GtkWidget *widget,
341                                   GdkEventConfigure *event,                                   GdkEventConfigure *event,
342                                   map_context_t *context) {                                   map_context_t *context) {
343    
344    if(!context->map_complete) {    /* for some reason there's a configure event with 1/1 */
345      /* on diablo. We just ignore this! */
346    
347      printf("on_map_configure %d %d\n",
348             widget->allocation.width,
349             widget->allocation.height);
350    
351      if(!context->map_complete &&
352         (widget->allocation.width > 100) &&
353         (widget->allocation.height > 100)) {
354    
355        /* setup cache state */
356        map_setup(context);
357    
358      /* set default values if they are invalid */      /* set default values if they are invalid */
359      if(!context->appdata->map.zoom ||      if(!context->appdata->map.zoom ||
# Line 153  static gboolean on_map_configure(GtkWidg Line 363  static gboolean on_map_configure(GtkWidg
363    
364        pos_t *refpos = get_pos(context->appdata);        pos_t *refpos = get_pos(context->appdata);
365        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
366            printf("use refpos\n");
367    
368          /* use gps position if present */          /* use gps position if present */
369          context->appdata->map.pos = *refpos;          context->appdata->map.pos = *refpos;
370          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
371        } else {        } else {
372            printf("use zero pos\n");
373    
374          /* use world map otherwise */          /* use world map otherwise */
375          context->appdata->map.pos.lat = 0.0;          context->appdata->map.pos.lat = 0.0;
376          context->appdata->map.pos.lon = 0.0;          context->appdata->map.pos.lon = 0.0;
# Line 165  static gboolean on_map_configure(GtkWidg Line 379  static gboolean on_map_configure(GtkWidg
379      }      }
380    
381      /* jump to initial position */      /* jump to initial position */
382        printf("osm_gps_map_set_mapcenter(%f,%f,%d)\n",
383               context->appdata->map.pos.lat,
384               context->appdata->map.pos.lon,
385               context->appdata->map.zoom);
386    
387      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
388                                context->appdata->map.pos.lat,                                context->appdata->map.pos.lat,
389                                context->appdata->map.pos.lon,                                context->appdata->map.pos.lon,
# Line 175  static gboolean on_map_configure(GtkWidg Line 394  static gboolean on_map_configure(GtkWidg
394    return FALSE;    return FALSE;
395  }  }
396    
 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;  
   }  
 }  
   
397  static void  static void
398  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
399                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
400    
401    while(cache) {    while(cache) {
402      pos_t cpos = gpx_cache_pos(cache);      pos_t cpos = gpx_cache_pos(cache);
403    
# Line 258  pos_t coord2pos(coord_t coo) { Line 447  pos_t coord2pos(coord_t coo) {
447  static gboolean  static gboolean
448  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
449                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
450    
451    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
452    
453    /* check if we actually clicked parts of the OSD */    /* check if we actually clicked parts of the OSD */
454    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)
455      return FALSE;      return FALSE;
456    
457    /* 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 486  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
486                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
487    
488    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
489      g_assert(image_surface);
490    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
491    
492    // Draw the image on the new Context    // Draw the image on the new Context
# Line 309  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 500  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
500  }  }
501    
502  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
503  #define LINE_SKIP  7  #define ICON_SIZE  ICON_CACHE_TYPE
504    #else
505    #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
506    #endif
507    
508    #ifndef BIG_BALLOONS
509    #define FONT_SIZE 14.0
510  #else  #else
511  #define LINE_SKIP  12  #define FONT_SIZE 22.0
512  #endif  #endif
513    #define LINE_SKIP  (FONT_SIZE/4)
514    
515    
516  static void  static void
517  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
518      printf("balloon event: ");
519    
520    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
521    cache_t *cache = context->balloon;    cache_t *cache = context->balloon;
522    
   printf("balloon event: ");  
   
523    if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {    if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
524      printf("draw\n");      printf("draw\n");
525    
# Line 339  balloon_cb(osm_gps_map_balloon_event_t * Line 538  balloon_cb(osm_gps_map_balloon_event_t *
538      gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;      gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
539    
540      /* draw the cache type icon ... */      /* draw the cache type icon ... */
541      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);      GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
542      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
543    
544      if(cache->notes && cache->notes->override) {      if(cache->notes && cache->notes->override) {
545        GdkPixbuf *over = icon_get(ICON_MISC, 1);        GdkPixbuf *over = icon_get(ICON_SIZE, 11);
546        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
547      }      }
548    
# Line 379  balloon_cb(osm_gps_map_balloon_event_t * Line 578  balloon_cb(osm_gps_map_balloon_event_t *
578      x = event->data.draw.rect->x;      x = event->data.draw.rect->x;
579    
580      /* everything from here uses the same font */      /* everything from here uses the same font */
581      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans",
582                                CAIRO_FONT_SLANT_NORMAL,
583                              CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
584  #ifndef BIG_BALLOONS  
585      cairo_set_font_size (event->data.draw.cr, 14.0);      cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
 #else  
     cairo_set_font_size (event->data.draw.cr, 22.0);  
 #endif  
586    
587      if(cache->name) {      if(cache->name) {
588        /* draw cache name */        /* draw cache name */
589        cairo_text_extents (event->data.draw.cr, cache->name, &extents);        cairo_text_extents (event->data.draw.cr, cache->name, &extents);
590        y += extents.height;        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
       cairo_move_to (event->data.draw.cr, x, y);  
591        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
592        cairo_show_text (event->data.draw.cr, cache->name);        cairo_show_text (event->data.draw.cr, cache->name);
593        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
594    
595        /* return to the left border and below text */        /* return to the left border and below text */
596        y += LINE_SKIP;        y += LINE_SKIP + FONT_SIZE;
597        x = event->data.draw.rect->x;        x = event->data.draw.rect->x;
598      }      }
599    
600      if(cache->terrain) {      if(cache->terrain) {
601          int text_y = 0, icon_y = 0;
602    
603        /* draw cache rating */        /* draw cache rating */
604        const char *terrain = "Terrain:";        const char *terrain = "Terrain:";
605        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
606        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
607        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
608          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
609            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
610          else
611            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
612    
613        /* draw "Terrain:" string */        /* draw "Terrain:" string */
614        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
615        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
616        cairo_show_text (event->data.draw.cr, _(terrain));        cairo_show_text (event->data.draw.cr, _(terrain));
617        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
618        x += extents.width + 2;        x += extents.width + 2;
619    
620        /* draw terrain stars */        /* draw terrain stars */
621        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
                         (gdk_pixbuf_get_height(icon) + extents.height)/2);  
622    
623        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;        x += gdk_pixbuf_get_width(icon) + FONT_SIZE/2;
     y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;  
624      }      }
625    
626      if(cache->difficulty) {      if(cache->difficulty) {
627          int text_y = 0, icon_y = 0;
628    
629        const char *difficulty = "Difficulty:";        const char *difficulty = "Difficulty:";
630          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
631        cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);        cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
       y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
632    
633          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
634            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
635          else
636            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
637    
638        /* draw "Difficulty:" string */        /* draw "Difficulty:" string */
639        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
640        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
641        cairo_show_text (event->data.draw.cr, _(difficulty));        cairo_show_text (event->data.draw.cr, _(difficulty));
642        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
643        x += extents.width + 2;        x += extents.width + 2;
644    
645        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
       cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -  
                       (gdk_pixbuf_get_height(icon) + extents.height)/2);  
646      }      }
647    
648        /* draw container info */
649        /* TODO ... */
650    
651    
652    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
653      printf("click %s event at %d %d\n",      printf("click %s event at %d %d\n",
654             event->data.click.down?"down":"up",             event->data.click.down?"down":"up",
655             event->data.click.x, event->data.click.y);             event->data.click.x, event->data.click.y);
656    
657        /* make the main screen jump to that cache */
658        if(!event->data.click.down) {
659          if(context->appdata->cur_cache) {
660            printf("ERROR: no current cache should be visible!\n");
661          } else {
662            gpx_t *is_in = NULL;
663    
664            if(!context->appdata->cur_gpx) {
665              printf("click while in \"all\" view\n");
666    
667              /* we first need to figure out which gpx file this cache */
668              /* is in so we can open it first */
669              gpx_t *gpx = context->appdata->gpx;
670              while(gpx && !is_in) {
671                cache_t *cur = gpx->cache;
672                while(cur && !is_in) {
673                  if(cur == cache)
674                    is_in = gpx;
675                  cur = cur->next;
676                }
677                gpx = gpx->next;
678              }
679    
680              if(is_in)
681                gpxlist_goto_cachelist(context->appdata, is_in);
682    
683            } else
684              /* the simple case: there already is an open gpx file and */
685              /* we just jump into the "cache" view */
686              is_in = context->appdata->cur_gpx;
687    
688            if(is_in) {
689              printf("selecting %s in %s\n",
690                     cache->id,
691                     context->appdata->cur_gpx->name);
692    
693              cachelist_goto_cache(context->appdata, cache);
694    
695              /* give focus to main screen (important for maemo) */
696              printf("raising main window\n");
697              gtk_window_present(GTK_WINDOW(context->appdata->window));
698            }
699          }
700        }
701    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
702      printf("removed\n");      printf("removed\n");
703      context->balloon = NULL;      context->balloon = NULL;
# Line 458  on_map_button_release_event(GtkWidget *w Line 712  on_map_button_release_event(GtkWidget *w
712    /* in "MAP_CACHE" state only one cache is visible */    /* in "MAP_CACHE" state only one cache is visible */
713    /* and the map is in navigation mode. the balloon is */    /* and the map is in navigation mode. the balloon is */
714    /* pretty useless there */    /* pretty useless there */
715    if(context->press_on && (context->state != MAP_CACHE)) {    if(context->press_on) {
716    
717      coord_t coo;      coord_t coo;
718      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 493  on_map_button_release_event(GtkWidget *w Line 747  on_map_button_release_event(GtkWidget *w
747  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
748    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
749    
   printf("destroy map window\n");  
   
750    /* save map parameters */    /* save map parameters */
751    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
752    gint zoom;    gint zoom;
# Line 516  static void on_window_destroy(GtkWidget Line 768  static void on_window_destroy(GtkWidget
768  #endif  #endif
769    
770    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
771      gps_unregister_callback(appdata, context->cb_id);
772    
773      if(context->caches_displayed) {
774        g_free(context->caches_displayed);
775        context->caches_displayed = NULL;
776      }
777    
778    g_free(context);    g_free(context);
779    appdata->map.context = NULL;    appdata->map.context = NULL;
# Line 540  on_window_realize(GtkWidget *widget, gpo Line 798  on_window_realize(GtkWidget *widget, gpo
798  }  }
799  #endif  #endif
800    
801  /* draw geocaches and set window title */  /* on maemo a window is either on top or completely invisible. this */
802  static void map_setup(map_context_t *context) {  /* means that we only need to update the map window if its raised.  */
803    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");  
804    
805        /* no navigation in this mode */  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
806        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));                           gpointer data) {
807      map_context_t *context = (map_context_t*)data;
       /* 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");  
808    
809        /* no navigation in this mode */    printf("map got focus\n");
       osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));  
810    
811        /* clear all existing ccahe images */  #ifdef USE_MAEMO
812        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));    /* re-enable refresh of map */
813      if(!context->handler_id)
814        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
815    #endif
816    
817        map_draw_gpx(context->appdata, context->widget,    map_setup(context);
818                     context->appdata->cur_gpx);    return FALSE;
819        name = g_strdup(context->appdata->cur_gpx->name);  }
       context->state = MAP_GPX;  
     }  
   } else {  
     cache_t *cache = context->appdata->cur_cache;  
   
     printf("map_setp(CACHE)\n");  
   
     /* no balloons in this mode */  
     context->balloon = NULL;  
     osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));  
   
     /* clear all existing ccahe images */  
     osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));  
   
     map_draw_cache(context->widget, cache);  
     name = g_strdup(cache->name);  
     context->state = MAP_CACHE;  
   
     /* navigation in this mode! */  
     pos_t cpos = gpx_cache_pos(cache);  
     osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),  
                               context->appdata->imperial,  
                               cpos.lat, cpos.lon, cache->name);  
   }  
820    
821    if(name) {  #ifdef USE_MAEMO
822      char *title = g_strdup_printf(_("Map - %s"), name);  static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
823      g_free(name);                           gpointer data) {
824      map_context_t *context = (map_context_t*)data;
825    
826      gtk_window_set_title(GTK_WINDOW(context->window), title);    printf("map lost focus\n");
827      gtk_timeout_remove(context->handler_id);
828      g_free(title);    context->handler_id = 0;
   } else  
     printf("map_setup(keep)\n");  
 }  
829    
 /* 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);  
830    return FALSE;    return FALSE;
831  }  }
832    #endif
833    
834  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
835      printf("map_update\n");
836  #ifndef USE_MAEMO  #ifndef USE_MAEMO
837    if(appdata->map.context)    if(appdata->map.context)
838      map_setup(appdata->map.context);      map_setup(appdata->map.context);
839  #endif  #endif
840  }  }
841    
842    /* callback called by the gps layer whenever gps state changes */
843    static void
844    gps_callback(struct gps_state *state, gpointer data) {
845      printf("map: gps callback\n");
846    }
847    
848  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
849    map_context_t *context = NULL;    map_context_t *context = NULL;
850    
# Line 701  void map(appdata_t *appdata) { Line 917  void map(appdata_t *appdata) {
917    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
918  #endif  #endif
919    
   /* setup cache state */  
   map_setup(context);  
   
920  #ifndef USE_MAEMO  #ifndef USE_MAEMO
921    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
922  #endif  #endif
# Line 711  void map(appdata_t *appdata) { Line 924  void map(appdata_t *appdata) {
924    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
925                     G_CALLBACK(on_focus_in), context);                     G_CALLBACK(on_focus_in), context);
926    
927    #ifdef USE_MAEMO
928      g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
929                       G_CALLBACK(on_focus_out), context);
930    #endif
931    
932    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
933                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
934    
# Line 722  void map(appdata_t *appdata) { Line 940  void map(appdata_t *appdata) {
940    
941    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
942    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
943      context->cb_id = gps_register_callback(appdata, gps_callback, context);
944    
945  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
946    /* prevent some of the main screen things */    /* prevent some of the main screen things */
Legend:
Removed from v.136  
changed lines
  Added in v.203