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 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 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    
160    /* check if there's also an overwritten coordinate */    /* check if there's also an overwritten coordinate */
161    if(cache->notes && cache->notes->override) {    if(cache->notes && cache->notes->override) {
162      GdkPixbuf *over = icon_get(ICON_MISC, 1);      GdkPixbuf *over = icon_get(type, 11);
163    
164      osm_gps_map_add_image(OSM_GPS_MAP(map),      osm_gps_map_add_image(OSM_GPS_MAP(map),
165            cache->notes->pos.lat, cache->notes->pos.lon, icon);            cache->notes->pos.lat, cache->notes->pos.lon, icon);
# Line 167  static void map_draw_cache(GtkWidget *ma Line 171  static void map_draw_cache(GtkWidget *ma
171        osm_gps_map_add_image(OSM_GPS_MAP(map),        osm_gps_map_add_image(OSM_GPS_MAP(map),
172                              cache->pos.lat, cache->pos.lon, icon);                              cache->pos.lat, cache->pos.lon, icon);
173    }    }
   printf("map_draw_cache out\n");  
174  }  }
175    
176  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,
177    printf("map_draw_gpx in\n");                           GtkWidget *map, gpx_t *gpx,
178                             cache_t *nav, gboolean semi) {
179    if(!gpx->notes_loaded) {    if(!gpx->notes_loaded) {
180      notes_load_all(appdata, gpx);      notes_load_all(appdata, gpx);
181      gpx->notes_loaded = TRUE;      gpx->notes_loaded = TRUE;
# Line 180  static void map_draw_gpx(appdata_t *appd Line 183  static void map_draw_gpx(appdata_t *appd
183    
184    cache_t *cache = gpx->cache;    cache_t *cache = gpx->cache;
185    while(cache) {    while(cache) {
186      map_draw_cache(map, cache);      /* 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;      cache = cache->next;
199    }    }
   printf("map_draw_gpx out\n");  
200  }  }
201    
202  /* draw geocaches and set window title */  /* draw geocaches and set window title */
203  static void map_setup(map_context_t *context) {  static void map_setup(map_context_t *context) {
204    char *name = NULL;    char *name = NULL;
205    
206    printf("map_setup in\n");    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) {    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
224      if(context->state != MAP_ALL) {      if(context->state != MAP_ALL) {
225        printf("map_setup(ALL)\n");        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  #ifdef OSD_NAV
232        /* no navigation in this mode */        /* no navigation in this mode */
233        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
234  #endif  #endif
235    
236        /* clear all existing ccahe images */        /* clear all existing cache images */
237        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        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 */        /* draw all geocaches and none is semi-transparent */
242        gpx_t *gpx = context->appdata->gpx;        gpx_t *gpx = context->appdata->gpx;
243        while(gpx) {        while(gpx) {
244          map_draw_gpx(context->appdata, context->widget, gpx);          map_draw_gpx(context->appdata, context->caches_displayed,
245                         context->widget, gpx, NULL, FALSE);
246          gpx = gpx->next;          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"));        name = g_strdup(_("all"));
256        context->state = MAP_ALL;        context->state = MAP_ALL;
257      }      }
# Line 217  static void map_setup(map_context_t *con Line 259  static void map_setup(map_context_t *con
259      if(context->state != MAP_GPX) {      if(context->state != MAP_GPX) {
260        printf("map_setup(GPX)\n");        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  #ifdef OSD_NAV
267        /* no navigation in this mode */        /* no navigation in this mode */
268        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
269  #endif  #endif
270    
271        /* clear all existing ccahe images */        /* clear all existing cache images */
272        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        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    
       map_draw_gpx(context->appdata, context->widget,  
                    context->appdata->cur_gpx);  
289        name = g_strdup(context->appdata->cur_gpx->name);        name = g_strdup(context->appdata->cur_gpx->name);
290        context->state = MAP_GPX;        context->state = MAP_GPX;
291      }      }
292    } else {    } else {
293      cache_t *cache = context->appdata->cur_cache;      cache_t *cache = context->appdata->cur_cache;
294    
295      printf("map_setp(CACHE)\n");      printf("map_setup(CACHE)\n");
296    
297      /* no balloons in this mode */      /* clear any pending balloon */
298      context->balloon = NULL;      context->balloon = NULL;
299      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
300    
301      /* clear all existing ccahe images */      /* clear all existing ccahe 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      map_draw_cache(context->widget, cache);      /* 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);      name = g_strdup(cache->name);
315      context->state = MAP_CACHE;      context->state = MAP_CACHE;
316    
# Line 267  static void map_setup(map_context_t *con Line 335  static void map_setup(map_context_t *con
335      g_free(title);      g_free(title);
336    } else    } else
337      printf("map_setup(keep)\n");      printf("map_setup(keep)\n");
   
   printf("map_setup out\n");  
338  }  }
339    
340  static gboolean on_map_configure(GtkWidget *widget,  static gboolean on_map_configure(GtkWidget *widget,
# Line 325  static gboolean on_map_configure(GtkWidg Line 391  static gboolean on_map_configure(GtkWidg
391      context->map_complete = TRUE;      context->map_complete = TRUE;
392    }    }
393    
   printf("map configure done\n");  
394    return FALSE;    return FALSE;
395  }  }
396    
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    printf("map_cachelist_nearest in\n");  
401    while(cache) {    while(cache) {
402      pos_t cpos = gpx_cache_pos(cache);      pos_t cpos = gpx_cache_pos(cache);
403    
# Line 347  map_cachelist_nearest(cache_t *cache, po Line 412  map_cachelist_nearest(cache_t *cache, po
412    
413      cache = cache->next;      cache = cache->next;
414    }    }
   printf("map_cachelist_nearest out\n");  
415  }  }
416    
417  static cache_t *map_closest(map_context_t *context, pos_t *pos) {  static cache_t *map_closest(map_context_t *context, pos_t *pos) {
418    cache_t *result = NULL;    cache_t *result = NULL;
419    float distance = NAN;    float distance = NAN;
420    
   printf("map_closest in\n");  
   
421    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
422      /* search all geocaches */      /* search all geocaches */
423      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
# Line 369  static cache_t *map_closest(map_context_ Line 431  static cache_t *map_closest(map_context_
431    } else    } else
432      result = context->appdata->cur_gpx->cache;      result = context->appdata->cur_gpx->cache;
433    
   printf("map_closest out\n");  
434    return result;    return result;
435  }  }
436    
# Line 386  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) {
   printf("on_map_button_press_event in\n");  
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)
     printf("on_map_button_press_event out 1\n");  
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! */
458    if(context->press_on != NULL) {    if(context->press_on != NULL) {
# Line 414  on_map_button_press_event(GtkWidget *wid Line 472  on_map_button_press_event(GtkWidget *wid
472        context->press_on = nearest;        context->press_on = nearest;
473    }    }
474    
   printf("on_map_button_press_event out\n");  
475    return FALSE;    return FALSE;
476  }  }
477    
# Line 422  static void Line 479  static void
479  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf *buf, gint x, gint y) {  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf *buf, gint x, gint y) {
480    /* convert the pixbuf into something cairo can handle */    /* convert the pixbuf into something cairo can handle */
481    
   printf("cairo_draw_pixbuf in\n");  
   
482    // Create a new ImageSurface    // Create a new ImageSurface
483    cairo_surface_t *image_surface =    cairo_surface_t *image_surface =
484      cairo_image_surface_create(CAIRO_FORMAT_ARGB32,      cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
# Line 431  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 441  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 497  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
497    cairo_set_source_surface(cr, image_surface, x, y);    cairo_set_source_surface(cr, image_surface, x, y);
498    
499    cairo_paint(cr);    cairo_paint(cr);
   printf("cairo_draw_pixbuf out\n");  
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:\n");    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;
# Line 475  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 515  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",
# Line 628  balloon_cb(osm_gps_map_balloon_event_t * Line 702  balloon_cb(osm_gps_map_balloon_event_t *
702      printf("removed\n");      printf("removed\n");
703      context->balloon = NULL;      context->balloon = NULL;
704    }    }
   printf("balloon out\n");  
705  }  }
706    
707  static gboolean  static gboolean
# Line 636  on_map_button_release_event(GtkWidget *w Line 709  on_map_button_release_event(GtkWidget *w
709                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
710    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
711    
   printf("on_map_button_release_event in\n");  
   
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 670  on_map_button_release_event(GtkWidget *w Line 741  on_map_button_release_event(GtkWidget *w
741      context->appdata->map.pos.lon = lon;      context->appdata->map.pos.lon = lon;
742    }    }
743    
   printf("on_map_button_release_event out\n");  
744    return FALSE;    return FALSE;
745  }  }
746    
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 700  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 730  on_window_realize(GtkWidget *widget, gpo Line 804  on_window_realize(GtkWidget *widget, gpo
804    
805  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
806                           gpointer data) {                           gpointer data) {
807      map_context_t *context = (map_context_t*)data;
808    
809    printf("map got focus\n");    printf("map got focus\n");
810    map_setup((map_context_t*)data);  
811    #ifdef USE_MAEMO
812      /* 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_setup(context);
818    return FALSE;    return FALSE;
819  }  }
820    
821    #ifdef USE_MAEMO
822    static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
823                             gpointer data) {
824      map_context_t *context = (map_context_t*)data;
825    
826      printf("map lost focus\n");
827      gtk_timeout_remove(context->handler_id);
828      context->handler_id = 0;
829    
830      return FALSE;
831    }
832    #endif
833    
834  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
835    printf("map_update\n");    printf("map_update\n");
836  #ifndef USE_MAEMO  #ifndef USE_MAEMO
# Line 743  void map_update(appdata_t *appdata) { Line 839  void map_update(appdata_t *appdata) {
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    
   printf("map 1\n");  
   
851    /* if the map window already exists, just raise it */    /* if the map window already exists, just raise it */
852    if(appdata->map.context) {    if(appdata->map.context) {
853      printf("using existing map!\n");      printf("using existing map!\n");
# Line 756  void map(appdata_t *appdata) { Line 856  void map(appdata_t *appdata) {
856      return;      return;
857    }    }
858    
   printf("map 2\n");  
   
859    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
860    context->appdata = appdata;    context->appdata = appdata;
861    context->map_complete = FALSE;    context->map_complete = FALSE;
# Line 770  void map(appdata_t *appdata) { Line 868  void map(appdata_t *appdata) {
868      rmdir_recursive(old_path);      rmdir_recursive(old_path);
869    }    }
870    
   printf("map 3\n");  
   
871    /* It is recommanded that all applications share these same */    /* It is recommanded that all applications share these same */
872    /* map path, so data is only cached once. The path should be: */    /* map path, so data is only cached once. The path should be: */
873    /* ~/.osm-gps-map on standard PC     (users home) */    /* ~/.osm-gps-map on standard PC     (users home) */
# Line 794  void map(appdata_t *appdata) { Line 890  void map(appdata_t *appdata) {
890    gint source = context->appdata->map.source;    gint source = context->appdata->map.source;
891    if(!source) source = MAP_SOURCE;    if(!source) source = MAP_SOURCE;
892    
   printf("map 4\n");  
   
893    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
894                   "map-source",               source,                   "map-source",               source,
895                   "tile-cache",               path,                   "tile-cache",               path,
# Line 809  void map(appdata_t *appdata) { Line 903  void map(appdata_t *appdata) {
903    
904    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
905    
   printf("map 5\n");  
   
906  #ifdef USE_MAEMO  #ifdef USE_MAEMO
907    /* we don't use a stackable window here on fremantle, since */    /* we don't use a stackable window here on fremantle, since */
908    /* 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 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    
   printf("map 6\n");  
   
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 834  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 845  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);
   printf("map 7\n");  
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 */
# Line 854  void map(appdata_t *appdata) { Line 948  void map(appdata_t *appdata) {
948    appdata->cur_view = NULL;    appdata->cur_view = NULL;
949  #endif  #endif
950    
   printf("map 8\n");  
   
951    g_signal_connect(G_OBJECT(context->window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
952                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
953    
   printf("map 9\n");  
954    gtk_container_add(GTK_CONTAINER(context->window), context->widget);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
   printf("map 10\n");  
955    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
   
   printf("map 11\n");  
956  }  }
Legend:
Removed from v.143  
changed lines
  Added in v.203