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

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

revision 143 by harbaum, Mon Oct 26 19:55:00 2009 UTC revision 220 by harbaum, Sat Nov 28 14:20:28 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 45  Line 50 
50  static const char *get_proxy_uri(appdata_t *appdata) {  static const char *get_proxy_uri(appdata_t *appdata) {
51    static char proxy_buffer[64] = "";    static char proxy_buffer[64] = "";
52    
   printf("get_proxy_uri in\n");  
   
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 71  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      }      }
81      return proxy_buffer;      return proxy_buffer;
82    }    }
83    
   printf("get_proxy_uri out\n");  
84    return NULL;    return NULL;
85  }  }
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) {
   printf("cb_map_gps in\n");  
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);
# Line 105  cb_map_gps(osd_button_t but, map_context Line 107  cb_map_gps(osd_button_t but, map_context
107                                  0.0, 0.0, 1);                                  0.0, 0.0, 1);
108      }      }
109    }    }
   printf("cb_map_gps out\n");  
110  }  }
111    
112  static int dist2pixel(map_context_t *context, float km, float lat) {  static int dist2pixel(map_context_t *context, float km, float lat) {
# Line 114  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;
   printf("map_gps_update in\n");  
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 138  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);
149    } else    } else
150      osm_gps_map_clear_gps(OSM_GPS_MAP(context->widget));      osm_gps_map_clear_gps(OSM_GPS_MAP(context->widget));
151    
   printf("map_gps_update out\n");  
152    return TRUE;    return TRUE;
153  }  }
154    
155  static void map_draw_cache(GtkWidget *map, cache_t *cache) {  static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
156    printf("map_draw_cache in\n");    int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;
157    
158    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);    GdkPixbuf *icon = icon_get(type, cache->type);
159      GdkPixbuf *over = NULL;
160    
161      if(cache->mine)                   over = icon_get(type, 14);
162      else if(cache->found)             over = icon_get(type, 12);
163      else if(cache->notes) {
164        if(cache->notes->found)         over = icon_get(type, 12);
165        else if(cache->notes->override) over = icon_get(type, 11);
166        else                            over = icon_get(type, 13);
167      }
168    
169      pos_t *pos = &cache->pos;
170    /* check if there's also an overwritten coordinate */    /* check if there's also an overwritten coordinate */
171    if(cache->notes && cache->notes->override) {    if(cache->notes && cache->notes->override)
172      GdkPixbuf *over = icon_get(ICON_MISC, 1);      pos = &cache->notes->pos;
173    
174      if(!isnan(pos->lat) && !isnan(pos->lon)) {
175      osm_gps_map_add_image(OSM_GPS_MAP(map),      osm_gps_map_add_image(OSM_GPS_MAP(map),
176            cache->notes->pos.lat, cache->notes->pos.lon, icon);                            pos->lat, pos->lon, icon);
177        if(over)
178          osm_gps_map_add_image(OSM_GPS_MAP(map),
179                                pos->lat, pos->lon, over);
180      }
181    }
182    
183      osm_gps_map_add_image(OSM_GPS_MAP(map),  static void map_draw_wpt(GtkWidget *map, cache_t *cache, wpt_t *wpt) {
184            cache->notes->pos.lat, cache->notes->pos.lon, over);    /* only draw wpts that don't equal the main point */
185    } else {    if(pos_differ(&cache->pos, &wpt->pos)) {
186      if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon))      if(!isnan(wpt->pos.lat) && !isnan(wpt->pos.lon))  {
187          GdkPixbuf *icon =
188            icon_get(ICON_WPT, (wpt->sym!=WPT_SYM_UNKNOWN)?
189                     wpt->sym:WPT_SYM_REFPOINT);
190    
191        osm_gps_map_add_image(OSM_GPS_MAP(map),        osm_gps_map_add_image(OSM_GPS_MAP(map),
192                              cache->pos.lat, cache->pos.lon, icon);                              wpt->pos.lat, wpt->pos.lon, icon);
193        }
194    }    }
   printf("map_draw_cache out\n");  
195  }  }
196    
197  static void map_draw_gpx(appdata_t *appdata, GtkWidget *map, gpx_t *gpx) {  static void map_draw_gpx(appdata_t *appdata, cache_display_t *caches,
198    printf("map_draw_gpx in\n");                           GtkWidget *map, gpx_t *gpx,
199                             cache_t *nav, gboolean semi) {
200    if(!gpx->notes_loaded) {    if(!gpx->notes_loaded) {
201      notes_load_all(appdata, gpx);      notes_load_all(appdata, gpx);
202      gpx->notes_loaded = TRUE;      gpx->notes_loaded = TRUE;
# Line 180  static void map_draw_gpx(appdata_t *appd Line 204  static void map_draw_gpx(appdata_t *appd
204    
205    cache_t *cache = gpx->cache;    cache_t *cache = gpx->cache;
206    while(cache) {    while(cache) {
207      map_draw_cache(map, cache);      /* search if we have that cache already in our list/displayed */
208        int i=0;
209        while(caches[i].id && (strcmp(caches[i].id, cache->id) != 0))
210          i++;
211    
212        if(!caches[i].id) {
213          /* if nav is given draw all other caches semitransparent. */
214          /* if nav is not given do what semi sais */
215          map_draw_cache(map, cache, nav?(cache != nav):semi);
216          caches[i].id = cache->id;
217    
218          /* also draw waypoints of nav cache */
219          if(nav && cache == nav) {
220            wpt_t *wpt = cache->wpt;
221            while(wpt) {
222              map_draw_wpt(map, cache, wpt);
223              wpt = wpt->next;
224            }
225          }
226        }
227    
228      cache = cache->next;      cache = cache->next;
229    }    }
   printf("map_draw_gpx out\n");  
230  }  }
231    
232  /* draw geocaches and set window title */  /* draw geocaches and set window title */
233  static void map_setup(map_context_t *context) {  static void map_setup(map_context_t *context) {
234    char *name = NULL;    char *name = NULL;
235    
236    printf("map_setup in\n");    int cache_num = gpx_total_caches_global(context->appdata->gpx);
237    
238      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
239        //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
240        //     cache_num, context->cache_list_len);
241        g_free(context->caches_displayed);
242        context->caches_displayed = NULL;
243        context->cache_list_len = 0;
244      }
245    
246      /* allocate buffer */
247      if(cache_num && !context->caches_displayed) {
248        context->cache_list_len = cache_num;
249        context->caches_displayed = g_new0(cache_display_t, cache_num+1);
250        printf("allocated space to handle %d map icons\n", cache_num);
251      }
252    
253    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
254      if(context->state != MAP_ALL) {      if(context->state != MAP_ALL) {
255        printf("map_setup(ALL)\n");        printf("map_setup(ALL)\n");
256    
257          /* clear any pending balloon */
258          context->balloon = NULL;
259          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
260    
261  #ifdef OSD_NAV  #ifdef OSD_NAV
262        /* no navigation in this mode */        /* no navigation in this mode */
263        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
264  #endif  #endif
265    
266        /* clear all existing ccahe images */        /* clear all existing cache images */
267        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
268          memset(context->caches_displayed, 0,
269                 (cache_num+1) * sizeof(cache_display_t));
270    
271        /* draw all geocaches */        /* draw all geocaches and none is semi-transparent */
272        gpx_t *gpx = context->appdata->gpx;        gpx_t *gpx = context->appdata->gpx;
273        while(gpx) {        while(gpx) {
274          map_draw_gpx(context->appdata, context->widget, gpx);          map_draw_gpx(context->appdata, context->caches_displayed,
275                         context->widget, gpx, NULL, FALSE);
276          gpx = gpx->next;          gpx = gpx->next;
277        }        }
278    
279          {
280            int i=0;
281            while(context->caches_displayed[i].id) i++;
282            printf("number of caches actually displayed: %d\n", i);
283          }
284    
285        name = g_strdup(_("all"));        name = g_strdup(_("all"));
286        context->state = MAP_ALL;        context->state = MAP_ALL;
287      }      }
# Line 217  static void map_setup(map_context_t *con Line 289  static void map_setup(map_context_t *con
289      if(context->state != MAP_GPX) {      if(context->state != MAP_GPX) {
290        printf("map_setup(GPX)\n");        printf("map_setup(GPX)\n");
291    
292          /* clear any pending balloon */
293          context->balloon = NULL;
294          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
295    
296  #ifdef OSD_NAV  #ifdef OSD_NAV
297        /* no navigation in this mode */        /* no navigation in this mode */
298        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
299  #endif  #endif
300    
301        /* clear all existing ccahe images */        /* clear all existing cache images */
302        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
303          memset(context->caches_displayed, 0,
304                 (cache_num+1) * sizeof(cache_display_t));
305    
306          /* draw all geocaches and all other gpx files are semi-transparent */
307          map_draw_gpx(context->appdata, context->caches_displayed,
308                       context->widget, context->appdata->cur_gpx, NULL, FALSE);
309    
310          gpx_t *gpx = context->appdata->gpx;
311          while(gpx) {
312            if(gpx != context->appdata->cur_gpx)
313              map_draw_gpx(context->appdata, context->caches_displayed,
314                           context->widget, gpx, NULL, TRUE);
315    
316            gpx = gpx->next;
317          }
318    
       map_draw_gpx(context->appdata, context->widget,  
                    context->appdata->cur_gpx);  
319        name = g_strdup(context->appdata->cur_gpx->name);        name = g_strdup(context->appdata->cur_gpx->name);
320        context->state = MAP_GPX;        context->state = MAP_GPX;
321      }      }
322    } else {    } else {
323      cache_t *cache = context->appdata->cur_cache;      cache_t *cache = context->appdata->cur_cache;
324    
325      printf("map_setp(CACHE)\n");      printf("map_setup(CACHE)\n");
326    
327      /* no balloons in this mode */      /* clear any pending balloon */
328      context->balloon = NULL;      context->balloon = NULL;
329      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
330    
331      /* clear all existing ccahe images */      /* clear all existing ccahe images */
332      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
333        memset(context->caches_displayed, 0,
334               (cache_num+1) * sizeof(cache_display_t));
335    
336      map_draw_cache(context->widget, cache);      /* draw all geocaches and all but selected one are semi-transparent */
337        gpx_t *gpx = context->appdata->gpx;
338        while(gpx) {
339          map_draw_gpx(context->appdata, context->caches_displayed,
340                       context->widget, gpx, cache, FALSE);
341          gpx = gpx->next;
342        }
343    
344      name = g_strdup(cache->name);      name = g_strdup(cache->name);
345      context->state = MAP_CACHE;      context->state = MAP_CACHE;
346    
# Line 258  static void map_setup(map_context_t *con Line 356  static void map_setup(map_context_t *con
356  #endif  #endif
357    }    }
358    
359      /* also mark geomath position */
360    
361      /* remove all existing appearances of this icon first */
362      osm_gps_map_remove_image(OSM_GPS_MAP(context->widget),
363                               icon_get(ICON_MISC, 6));
364    
365      if(!isnan(context->appdata->geomath.lat) &&
366         !isnan(context->appdata->geomath.lon))  {
367    
368        osm_gps_map_add_image(OSM_GPS_MAP(context->widget),
369                              context->appdata->geomath.lat,
370                              context->appdata->geomath.lon,
371                              icon_get(ICON_MISC, 6));
372      }
373    
374    if(name) {    if(name) {
375      char *title = g_strdup_printf(_("Map - %s"), name);      char *title = g_strdup_printf(_("Map - %s"), name);
376      g_free(name);      g_free(name);
# Line 267  static void map_setup(map_context_t *con Line 380  static void map_setup(map_context_t *con
380      g_free(title);      g_free(title);
381    } else    } else
382      printf("map_setup(keep)\n");      printf("map_setup(keep)\n");
   
   printf("map_setup out\n");  
383  }  }
384    
385  static gboolean on_map_configure(GtkWidget *widget,  static gboolean on_map_configure(GtkWidget *widget,
# Line 325  static gboolean on_map_configure(GtkWidg Line 436  static gboolean on_map_configure(GtkWidg
436      context->map_complete = TRUE;      context->map_complete = TRUE;
437    }    }
438    
   printf("map configure done\n");  
439    return FALSE;    return FALSE;
440  }  }
441    
442  static void  static void
443  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
444                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
445    printf("map_cachelist_nearest in\n");  
446    while(cache) {    while(cache) {
447      pos_t cpos = gpx_cache_pos(cache);      pos_t cpos = gpx_cache_pos(cache);
448    
# Line 347  map_cachelist_nearest(cache_t *cache, po Line 457  map_cachelist_nearest(cache_t *cache, po
457    
458      cache = cache->next;      cache = cache->next;
459    }    }
   printf("map_cachelist_nearest out\n");  
460  }  }
461    
462  static cache_t *map_closest(map_context_t *context, pos_t *pos) {  static cache_t *map_closest(map_context_t *context, pos_t *pos) {
463    cache_t *result = NULL;    cache_t *result = NULL;
464    float distance = NAN;    float distance = NAN;
465    
   printf("map_closest in\n");  
   
466    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
467      /* search all geocaches */      /* search all geocaches */
468      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
# Line 369  static cache_t *map_closest(map_context_ Line 476  static cache_t *map_closest(map_context_
476    } else    } else
477      result = context->appdata->cur_gpx->cache;      result = context->appdata->cur_gpx->cache;
478    
   printf("map_closest out\n");  
479    return result;    return result;
480  }  }
481    
# Line 386  pos_t coord2pos(coord_t coo) { Line 492  pos_t coord2pos(coord_t coo) {
492  static gboolean  static gboolean
493  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
494                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
   printf("on_map_button_press_event in\n");  
495    
496    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
497    
498    /* check if we actually clicked parts of the OSD */    /* check if we actually clicked parts of the OSD */
499    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)
     printf("on_map_button_press_event out 1\n");  
500      return FALSE;      return FALSE;
   }  
501    
502    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
503    if(context->press_on != NULL) {    if(context->press_on != NULL) {
# Line 414  on_map_button_press_event(GtkWidget *wid Line 517  on_map_button_press_event(GtkWidget *wid
517        context->press_on = nearest;        context->press_on = nearest;
518    }    }
519    
   printf("on_map_button_press_event out\n");  
520    return FALSE;    return FALSE;
521  }  }
522    
# Line 422  static void Line 524  static void
524  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf *buf, gint x, gint y) {  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf *buf, gint x, gint y) {
525    /* convert the pixbuf into something cairo can handle */    /* convert the pixbuf into something cairo can handle */
526    
   printf("cairo_draw_pixbuf in\n");  
   
527    // Create a new ImageSurface    // Create a new ImageSurface
528    cairo_surface_t *image_surface =    cairo_surface_t *image_surface =
529      cairo_image_surface_create(CAIRO_FORMAT_ARGB32,      cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
# Line 431  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 531  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
531                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
532    
533    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
534      g_assert(image_surface);
535    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
536    
537    // Draw the image on the new Context    // Draw the image on the new Context
# Line 441  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 542  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
542    cairo_set_source_surface(cr, image_surface, x, y);    cairo_set_source_surface(cr, image_surface, x, y);
543    
544    cairo_paint(cr);    cairo_paint(cr);
   printf("cairo_draw_pixbuf out\n");  
545  }  }
546    
547  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
548  #define LINE_SKIP  7  #define ICON_SIZE  ICON_CACHE_TYPE
549    #else
550    #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
551    #endif
552    
553    #ifndef BIG_BALLOONS
554    #define FONT_SIZE 14.0
555  #else  #else
556  #define LINE_SKIP  12  #define FONT_SIZE 22.0
557  #endif  #endif
558    #define LINE_SKIP  (FONT_SIZE/4)
559    
560    
561  static void  static void
562  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
563    printf("balloon event:\n");    printf("balloon event: ");
564    
565    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
566    cache_t *cache = context->balloon;    cache_t *cache = context->balloon;
# Line 475  balloon_cb(osm_gps_map_balloon_event_t * Line 583  balloon_cb(osm_gps_map_balloon_event_t *
583      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;
584    
585      /* draw the cache type icon ... */      /* draw the cache type icon ... */
586      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);      GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
587      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
588    
589      if(cache->notes && cache->notes->override) {      if(cache->notes && cache->notes->override) {
590        GdkPixbuf *over = icon_get(ICON_MISC, 1);        GdkPixbuf *over = icon_get(ICON_SIZE, 11);
591        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
592      }      }
593    
# Line 515  balloon_cb(osm_gps_map_balloon_event_t * Line 623  balloon_cb(osm_gps_map_balloon_event_t *
623      x = event->data.draw.rect->x;      x = event->data.draw.rect->x;
624    
625      /* everything from here uses the same font */      /* everything from here uses the same font */
626      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans",
627                                CAIRO_FONT_SLANT_NORMAL,
628                              CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
629  #ifndef BIG_BALLOONS  
630      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  
631    
632      if(cache->name) {      if(cache->name) {
633        /* draw cache name */        /* draw cache name */
634        cairo_text_extents (event->data.draw.cr, cache->name, &extents);        cairo_text_extents (event->data.draw.cr, cache->name, &extents);
635        y += extents.height;        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
       cairo_move_to (event->data.draw.cr, x, y);  
636        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
637        cairo_show_text (event->data.draw.cr, cache->name);        cairo_show_text (event->data.draw.cr, cache->name);
638        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
639    
640        /* return to the left border and below text */        /* return to the left border and below text */
641        y += LINE_SKIP;        y += LINE_SKIP + FONT_SIZE;
642        x = event->data.draw.rect->x;        x = event->data.draw.rect->x;
643      }      }
644    
645      if(cache->terrain) {      if(cache->terrain) {
646          int text_y = 0, icon_y = 0;
647    
648        /* draw cache rating */        /* draw cache rating */
649        const char *terrain = "Terrain:";        const char *terrain = "Terrain:";
650        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
651        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
652        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
653          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
654            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
655          else
656            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
657    
658        /* draw "Terrain:" string */        /* draw "Terrain:" string */
659        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
660        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
661        cairo_show_text (event->data.draw.cr, _(terrain));        cairo_show_text (event->data.draw.cr, _(terrain));
662        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
663        x += extents.width + 2;        x += extents.width + 2;
664    
665        /* draw terrain stars */        /* draw terrain stars */
666        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);  
667    
668        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;  
669      }      }
670    
671      if(cache->difficulty) {      if(cache->difficulty) {
672          int text_y = 0, icon_y = 0;
673    
674        const char *difficulty = "Difficulty:";        const char *difficulty = "Difficulty:";
675          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
676        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;  
677    
678          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
679            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
680          else
681            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
682    
683        /* draw "Difficulty:" string */        /* draw "Difficulty:" string */
684        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
685        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
686        cairo_show_text (event->data.draw.cr, _(difficulty));        cairo_show_text (event->data.draw.cr, _(difficulty));
687        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
688        x += extents.width + 2;        x += extents.width + 2;
689    
690        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);  
691      }      }
692    
693        /* draw container info */
694        /* TODO ... */
695    
696    
697    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
698      printf("click %s event at %d %d\n",      printf("click %s event at %d %d\n",
699             event->data.click.down?"down":"up",             event->data.click.down?"down":"up",
# Line 628  balloon_cb(osm_gps_map_balloon_event_t * Line 747  balloon_cb(osm_gps_map_balloon_event_t *
747      printf("removed\n");      printf("removed\n");
748      context->balloon = NULL;      context->balloon = NULL;
749    }    }
   printf("balloon out\n");  
750  }  }
751    
752  static gboolean  static gboolean
# Line 636  on_map_button_release_event(GtkWidget *w Line 754  on_map_button_release_event(GtkWidget *w
754                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
755    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
756    
   printf("on_map_button_release_event in\n");  
   
757    /* in "MAP_CACHE" state only one cache is visible */    /* in "MAP_CACHE" state only one cache is visible */
758    /* and the map is in navigation mode. the balloon is */    /* and the map is in navigation mode. the balloon is */
759    /* pretty useless there */    /* pretty useless there */
760    if(context->press_on && (context->state != MAP_CACHE)) {    if(context->press_on) {
761    
762      coord_t coo;      coord_t coo;
763      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 670  on_map_button_release_event(GtkWidget *w Line 786  on_map_button_release_event(GtkWidget *w
786      context->appdata->map.pos.lon = lon;      context->appdata->map.pos.lon = lon;
787    }    }
788    
   printf("on_map_button_release_event out\n");  
789    return FALSE;    return FALSE;
790  }  }
791    
792  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
793    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
794    
   printf("destroy map window\n");  
   
795    /* save map parameters */    /* save map parameters */
796    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
797    gint zoom;    gint zoom;
# Line 700  static void on_window_destroy(GtkWidget Line 813  static void on_window_destroy(GtkWidget
813  #endif  #endif
814    
815    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
816      gps_unregister_callback(appdata, context->cb_id);
817    
818      if(context->caches_displayed) {
819        g_free(context->caches_displayed);
820        context->caches_displayed = NULL;
821      }
822    
823    g_free(context);    g_free(context);
824    appdata->map.context = NULL;    appdata->map.context = NULL;
# Line 730  on_window_realize(GtkWidget *widget, gpo Line 849  on_window_realize(GtkWidget *widget, gpo
849    
850  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
851                           gpointer data) {                           gpointer data) {
852      map_context_t *context = (map_context_t*)data;
853    
854    printf("map got focus\n");    printf("map got focus\n");
855    map_setup((map_context_t*)data);  
856    #ifdef USE_MAEMO
857      /* re-enable refresh of map */
858      if(!context->handler_id)
859        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
860    #endif
861    
862      map_setup(context);
863    return FALSE;    return FALSE;
864  }  }
865    
866    static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
867                             gpointer data) {
868      map_context_t *context = (map_context_t*)data;
869    
870      printf("map lost focus\n");
871    
872      /* save new map position */
873      gfloat lat, lon;
874      g_object_get(widget, "latitude", &lat, "longitude", &lon, NULL);
875    
876      context->appdata->map.pos.lat = lat;
877      context->appdata->map.pos.lon = lon;
878    
879    #ifdef USE_MAEMO
880      gtk_timeout_remove(context->handler_id);
881      context->handler_id = 0;
882    #endif
883    
884      return FALSE;
885    }
886    
887  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
888    printf("map_update\n");    printf("map_update\n");
889  #ifndef USE_MAEMO  #ifndef USE_MAEMO
# Line 743  void map_update(appdata_t *appdata) { Line 892  void map_update(appdata_t *appdata) {
892  #endif  #endif
893  }  }
894    
895    /* callback called by the gps layer whenever gps state changes */
896    static void
897    gps_callback(struct gps_state *state, gpointer data) {
898      printf("map: gps callback\n");
899    }
900    
901  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
902    map_context_t *context = NULL;    map_context_t *context = NULL;
903    
   printf("map 1\n");  
   
904    /* if the map window already exists, just raise it */    /* if the map window already exists, just raise it */
905    if(appdata->map.context) {    if(appdata->map.context) {
906      printf("using existing map!\n");      printf("using existing map!\n");
# Line 756  void map(appdata_t *appdata) { Line 909  void map(appdata_t *appdata) {
909      return;      return;
910    }    }
911    
   printf("map 2\n");  
   
912    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
913    context->appdata = appdata;    context->appdata = appdata;
914    context->map_complete = FALSE;    context->map_complete = FALSE;
# Line 770  void map(appdata_t *appdata) { Line 921  void map(appdata_t *appdata) {
921      rmdir_recursive(old_path);      rmdir_recursive(old_path);
922    }    }
923    
   printf("map 3\n");  
   
924    /* It is recommanded that all applications share these same */    /* It is recommanded that all applications share these same */
925    /* map path, so data is only cached once. The path should be: */    /* map path, so data is only cached once. The path should be: */
926    /* ~/.osm-gps-map on standard PC     (users home) */    /* ~/.osm-gps-map on standard PC     (users home) */
# Line 794  void map(appdata_t *appdata) { Line 943  void map(appdata_t *appdata) {
943    gint source = context->appdata->map.source;    gint source = context->appdata->map.source;
944    if(!source) source = MAP_SOURCE;    if(!source) source = MAP_SOURCE;
945    
   printf("map 4\n");  
   
946    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
947                   "map-source",               source,                   "map-source",               source,
948                   "tile-cache",               path,                   "tile-cache",               path,
# Line 809  void map(appdata_t *appdata) { Line 956  void map(appdata_t *appdata) {
956    
957    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
958    
   printf("map 5\n");  
   
959  #ifdef USE_MAEMO  #ifdef USE_MAEMO
960    /* we don't use a stackable window here on fremantle, since */    /* we don't use a stackable window here on fremantle, since */
961    /* this leaves the main window independent from the map and */    /* this leaves the main window independent from the map and */
# Line 825  void map(appdata_t *appdata) { Line 970  void map(appdata_t *appdata) {
970    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
971  #endif  #endif
972    
   printf("map 6\n");  
   
973  #ifndef USE_MAEMO  #ifndef USE_MAEMO
974    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
975  #endif  #endif
# Line 834  void map(appdata_t *appdata) { Line 977  void map(appdata_t *appdata) {
977    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
978                     G_CALLBACK(on_focus_in), context);                     G_CALLBACK(on_focus_in), context);
979    
980      g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
981                       G_CALLBACK(on_focus_out), context);
982    
983    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
984                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
985    
# Line 845  void map(appdata_t *appdata) { Line 991  void map(appdata_t *appdata) {
991    
992    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
993    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
994      context->cb_id = gps_register_callback(appdata, gps_callback, context);
   printf("map 7\n");  
995    
996  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
997    /* prevent some of the main screen things */    /* prevent some of the main screen things */
# Line 854  void map(appdata_t *appdata) { Line 999  void map(appdata_t *appdata) {
999    appdata->cur_view = NULL;    appdata->cur_view = NULL;
1000  #endif  #endif
1001    
   printf("map 8\n");  
   
1002    g_signal_connect(G_OBJECT(context->window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
1003                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
1004    
   printf("map 9\n");  
1005    gtk_container_add(GTK_CONTAINER(context->window), context->widget);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
   printf("map 10\n");  
1006    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
   
   printf("map 11\n");  
1007  }  }
Legend:
Removed from v.143  
changed lines
  Added in v.220