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 189 by harbaum, Tue Nov 17 09:07:17 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     * - draw caches only once
28     * - prefer duplicates from selected files
29     * - make semi-transparent caches selectable
30     */
31    
32  #include "gpxview.h"  #include "gpxview.h"
33  #include "converter.h"  #include "converter.h"
34  #include <math.h>    // for isnan  #include <math.h>    // for isnan
# Line 45  Line 52 
52  static const char *get_proxy_uri(appdata_t *appdata) {  static const char *get_proxy_uri(appdata_t *appdata) {
53    static char proxy_buffer[64] = "";    static char proxy_buffer[64] = "";
54    
   printf("get_proxy_uri in\n");  
   
55    /* use environment settings if preset */    /* use environment settings if preset */
56    const char *proxy = g_getenv("http_proxy");    const char *proxy = g_getenv("http_proxy");
57    if(proxy) {    if(proxy) {
58      printf("http_proxy: %s\n", proxy);      printf("map http proxy from env: %s\n", proxy);
59      return proxy;      return proxy;
60    }    }
61    
# Line 71  static const char *get_proxy_uri(appdata Line 76  static const char *get_proxy_uri(appdata
76    
77        snprintf(proxy_buffer, sizeof(proxy_buffer),        snprintf(proxy_buffer, sizeof(proxy_buffer),
78                 "http://%s:%u", host, port);                 "http://%s:%u", host, port);
79          printf("map http proxy from gconf: %s\n ", proxy_buffer);
80    
81        g_free(host);        g_free(host);
82      }      }
83      return proxy_buffer;      return proxy_buffer;
84    }    }
85    
   printf("get_proxy_uri out\n");  
86    return NULL;    return NULL;
87  }  }
88    
89  static void  static void
90  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");  
91    
92    if(but == OSD_GPS) {    if(but == OSD_GPS) {
93      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 109  cb_map_gps(osd_button_t but, map_context
109                                  0.0, 0.0, 1);                                  0.0, 0.0, 1);
110      }      }
111    }    }
   printf("cb_map_gps out\n");  
112  }  }
113    
114  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 117  static int dist2pixel(map_context_t *con
117    
118  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
119    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
120      static gboolean goto_is_enabled = FALSE;
   printf("map_gps_update in\n");  
121    
122    /* get reference position ... */    /* get reference position ... */
123    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
124    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
125    
126    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
127    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),    if(ok != goto_is_enabled) {
128                   OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
129                    OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
130        goto_is_enabled = ok;
131      }
132    
133    if(ok) {    if(ok) {
134      float heading = NAN;      float heading = NAN;
# Line 138  static gboolean map_gps_update(gpointer Line 143  static gboolean map_gps_update(gpointer
143          radius = dist2pixel(context, eph/1000, refpos->lat);          radius = dist2pixel(context, eph/1000, refpos->lat);
144      }      }
145    
146        /* TODO: in order to save energy: only draw if state actually changed */
147    
148      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
149      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
150                           refpos->lat, refpos->lon, heading);                           refpos->lat, refpos->lon, heading);
151    } else    } else
152      osm_gps_map_clear_gps(OSM_GPS_MAP(context->widget));      osm_gps_map_clear_gps(OSM_GPS_MAP(context->widget));
153    
   printf("map_gps_update out\n");  
154    return TRUE;    return TRUE;
155  }  }
156    
157  static void map_draw_cache(GtkWidget *map, cache_t *cache) {  static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
158    printf("map_draw_cache in\n");    int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;
159    
160    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);    GdkPixbuf *icon = icon_get(type, cache->type);
161    
162    /* check if there's also an overwritten coordinate */    /* check if there's also an overwritten coordinate */
163    if(cache->notes && cache->notes->override) {    if(cache->notes && cache->notes->override) {
164      GdkPixbuf *over = icon_get(ICON_MISC, 1);      GdkPixbuf *over = icon_get(type, 11);
165    
166      osm_gps_map_add_image(OSM_GPS_MAP(map),      osm_gps_map_add_image(OSM_GPS_MAP(map),
167            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 173  static void map_draw_cache(GtkWidget *ma
173        osm_gps_map_add_image(OSM_GPS_MAP(map),        osm_gps_map_add_image(OSM_GPS_MAP(map),
174                              cache->pos.lat, cache->pos.lon, icon);                              cache->pos.lat, cache->pos.lon, icon);
175    }    }
   printf("map_draw_cache out\n");  
176  }  }
177    
178  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,
179    printf("map_draw_gpx in\n");                           GtkWidget *map, gpx_t *gpx,
180                             cache_t *nav, gboolean semi) {
181    if(!gpx->notes_loaded) {    if(!gpx->notes_loaded) {
182      notes_load_all(appdata, gpx);      notes_load_all(appdata, gpx);
183      gpx->notes_loaded = TRUE;      gpx->notes_loaded = TRUE;
# Line 180  static void map_draw_gpx(appdata_t *appd Line 185  static void map_draw_gpx(appdata_t *appd
185    
186    cache_t *cache = gpx->cache;    cache_t *cache = gpx->cache;
187    while(cache) {    while(cache) {
188      map_draw_cache(map, cache);      /* search if we have that cache already in our list/displayed */
189        int i=0;
190        while(caches[i].id && (strcmp(caches[i].id, cache->id) != 0))
191          i++;
192    
193        if(!caches[i].id) {
194          /* if nav is given draw all other caches semitransparent. */
195          /* if nav is not given do what semi sais */
196          map_draw_cache(map, cache, nav?(cache != nav):semi);
197          caches[i].id = cache->id;
198        }
199    
200      cache = cache->next;      cache = cache->next;
201    }    }
   printf("map_draw_gpx out\n");  
202  }  }
203    
204  /* draw geocaches and set window title */  /* draw geocaches and set window title */
205  static void map_setup(map_context_t *context) {  static void map_setup(map_context_t *context) {
206    char *name = NULL;    char *name = NULL;
207    
208    printf("map_setup in\n");    int cache_num = gpx_total_caches_global(context->appdata->gpx);
209    
210      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
211        //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
212        //     cache_num, context->cache_list_len);
213        g_free(context->caches_displayed);
214        context->caches_displayed = NULL;
215        context->cache_list_len = 0;
216      }
217    
218      /* allocate buffer */
219      if(cache_num && !context->caches_displayed) {
220        context->cache_list_len = cache_num;
221        context->caches_displayed = g_new0(cache_display_t, cache_num+1);
222        printf("allocated space to handle %d map icons\n", cache_num);
223      }
224    
225    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
226      if(context->state != MAP_ALL) {      if(context->state != MAP_ALL) {
# Line 201  static void map_setup(map_context_t *con Line 231  static void map_setup(map_context_t *con
231        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
232  #endif  #endif
233    
234        /* clear all existing ccahe images */        /* clear all existing cache images */
235        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
236          memset(context->caches_displayed, 0,
237                 (cache_num+1) * sizeof(cache_display_t));
238    
239        /* draw all geocaches */        /* draw all geocaches and none is semi-transparent */
240        gpx_t *gpx = context->appdata->gpx;        gpx_t *gpx = context->appdata->gpx;
241        while(gpx) {        while(gpx) {
242          map_draw_gpx(context->appdata, context->widget, gpx);          map_draw_gpx(context->appdata, context->caches_displayed,
243                         context->widget, gpx, NULL, FALSE);
244          gpx = gpx->next;          gpx = gpx->next;
245        }        }
246    
247          {
248            int i=0;
249            while(context->caches_displayed[i].id) i++;
250            printf("number of caches actually displayed: %d\n", i);
251          }
252    
253        name = g_strdup(_("all"));        name = g_strdup(_("all"));
254        context->state = MAP_ALL;        context->state = MAP_ALL;
255      }      }
# Line 224  static void map_setup(map_context_t *con Line 264  static void map_setup(map_context_t *con
264    
265        /* clear all existing ccahe images */        /* clear all existing ccahe images */
266        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
267          memset(context->caches_displayed, 0,
268                 (cache_num+1) * sizeof(cache_display_t));
269    
270          /* draw all geocaches and all other gpx files are semi-transparent */
271          map_draw_gpx(context->appdata, context->caches_displayed,
272                       context->widget, context->appdata->cur_gpx, NULL, FALSE);
273    
274          gpx_t *gpx = context->appdata->gpx;
275          while(gpx) {
276            if(gpx != context->appdata->cur_gpx)
277              map_draw_gpx(context->appdata, context->caches_displayed,
278                           context->widget, gpx, NULL, TRUE);
279    
280            gpx = gpx->next;
281          }
282    
       map_draw_gpx(context->appdata, context->widget,  
                    context->appdata->cur_gpx);  
283        name = g_strdup(context->appdata->cur_gpx->name);        name = g_strdup(context->appdata->cur_gpx->name);
284        context->state = MAP_GPX;        context->state = MAP_GPX;
285      }      }
286    } else {    } else {
287      cache_t *cache = context->appdata->cur_cache;      cache_t *cache = context->appdata->cur_cache;
288    
289      printf("map_setp(CACHE)\n");      printf("map_setup(CACHE)\n");
290    
291      /* no balloons in this mode */      /* no balloons in this mode */
292      context->balloon = NULL;      context->balloon = NULL;
# Line 241  static void map_setup(map_context_t *con Line 294  static void map_setup(map_context_t *con
294    
295      /* clear all existing ccahe images */      /* clear all existing ccahe images */
296      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
297        memset(context->caches_displayed, 0,
298               (cache_num+1) * sizeof(cache_display_t));
299    
300      map_draw_cache(context->widget, cache);      /* draw all geocaches and all but selected one are semi-transparent */
301        gpx_t *gpx = context->appdata->gpx;
302        while(gpx) {
303          map_draw_gpx(context->appdata, context->caches_displayed,
304                       context->widget, gpx, cache, FALSE);
305          gpx = gpx->next;
306        }
307    
308      name = g_strdup(cache->name);      name = g_strdup(cache->name);
309      context->state = MAP_CACHE;      context->state = MAP_CACHE;
310    
# Line 267  static void map_setup(map_context_t *con Line 329  static void map_setup(map_context_t *con
329      g_free(title);      g_free(title);
330    } else    } else
331      printf("map_setup(keep)\n");      printf("map_setup(keep)\n");
   
   printf("map_setup out\n");  
332  }  }
333    
334  static gboolean on_map_configure(GtkWidget *widget,  static gboolean on_map_configure(GtkWidget *widget,
# Line 325  static gboolean on_map_configure(GtkWidg Line 385  static gboolean on_map_configure(GtkWidg
385      context->map_complete = TRUE;      context->map_complete = TRUE;
386    }    }
387    
   printf("map configure done\n");  
388    return FALSE;    return FALSE;
389  }  }
390    
391  static void  static void
392  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
393                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
394    printf("map_cachelist_nearest in\n");  
395    while(cache) {    while(cache) {
396      pos_t cpos = gpx_cache_pos(cache);      pos_t cpos = gpx_cache_pos(cache);
397    
# Line 347  map_cachelist_nearest(cache_t *cache, po Line 406  map_cachelist_nearest(cache_t *cache, po
406    
407      cache = cache->next;      cache = cache->next;
408    }    }
   printf("map_cachelist_nearest out\n");  
409  }  }
410    
411  static cache_t *map_closest(map_context_t *context, pos_t *pos) {  static cache_t *map_closest(map_context_t *context, pos_t *pos) {
412    cache_t *result = NULL;    cache_t *result = NULL;
413    float distance = NAN;    float distance = NAN;
414    
   printf("map_closest in\n");  
   
415    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
416      /* search all geocaches */      /* search all geocaches */
417      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
# Line 369  static cache_t *map_closest(map_context_ Line 425  static cache_t *map_closest(map_context_
425    } else    } else
426      result = context->appdata->cur_gpx->cache;      result = context->appdata->cur_gpx->cache;
427    
   printf("map_closest out\n");  
428    return result;    return result;
429  }  }
430    
# Line 386  pos_t coord2pos(coord_t coo) { Line 441  pos_t coord2pos(coord_t coo) {
441  static gboolean  static gboolean
442  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
443                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
   printf("on_map_button_press_event in\n");  
444    
445    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
446    
447    /* check if we actually clicked parts of the OSD */    /* check if we actually clicked parts of the OSD */
448    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");  
449      return FALSE;      return FALSE;
   }  
450    
451    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
452    if(context->press_on != NULL) {    if(context->press_on != NULL) {
# Line 414  on_map_button_press_event(GtkWidget *wid Line 466  on_map_button_press_event(GtkWidget *wid
466        context->press_on = nearest;        context->press_on = nearest;
467    }    }
468    
   printf("on_map_button_press_event out\n");  
469    return FALSE;    return FALSE;
470  }  }
471    
# Line 422  static void Line 473  static void
473  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf *buf, gint x, gint y) {  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf *buf, gint x, gint y) {
474    /* convert the pixbuf into something cairo can handle */    /* convert the pixbuf into something cairo can handle */
475    
   printf("cairo_draw_pixbuf in\n");  
   
476    // Create a new ImageSurface    // Create a new ImageSurface
477    cairo_surface_t *image_surface =    cairo_surface_t *image_surface =
478      cairo_image_surface_create(CAIRO_FORMAT_ARGB32,      cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
# Line 431  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 480  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
480                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
481    
482    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
483      g_assert(image_surface);
484    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
485    
486    // Draw the image on the new Context    // Draw the image on the new Context
# Line 441  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 491  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
491    cairo_set_source_surface(cr, image_surface, x, y);    cairo_set_source_surface(cr, image_surface, x, y);
492    
493    cairo_paint(cr);    cairo_paint(cr);
   printf("cairo_draw_pixbuf out\n");  
494  }  }
495    
496  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
497    #define ICON_SIZE  ICON_CACHE_TYPE
498  #define LINE_SKIP  7  #define LINE_SKIP  7
499  #else  #else
500    #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
501  #define LINE_SKIP  12  #define LINE_SKIP  12
502  #endif  #endif
503    
504  static void  static void
505  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
506    printf("balloon event:\n");    printf("balloon event: ");
507    
508    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
509    cache_t *cache = context->balloon;    cache_t *cache = context->balloon;
# Line 475  balloon_cb(osm_gps_map_balloon_event_t * Line 526  balloon_cb(osm_gps_map_balloon_event_t *
526      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;
527    
528      /* draw the cache type icon ... */      /* draw the cache type icon ... */
529      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);      GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
530      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
531    
532      if(cache->notes && cache->notes->override) {      if(cache->notes && cache->notes->override) {
533        GdkPixbuf *over = icon_get(ICON_MISC, 1);        GdkPixbuf *over = icon_get(ICON_SIZE, 11);
534        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
535      }      }
536    
# Line 518  balloon_cb(osm_gps_map_balloon_event_t * Line 569  balloon_cb(osm_gps_map_balloon_event_t *
569      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
570                              CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
571  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
572      cairo_set_font_size (event->data.draw.cr, 14.0);  #define FONT_SIZE 14.0
573  #else  #else
574      cairo_set_font_size (event->data.draw.cr, 22.0);  #define FONT_SIZE 22.0
575  #endif  #endif
576    
577        cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
578    
579      if(cache->name) {      if(cache->name) {
580        /* draw cache name */        /* draw cache name */
# Line 538  balloon_cb(osm_gps_map_balloon_event_t * Line 591  balloon_cb(osm_gps_map_balloon_event_t *
591      }      }
592    
593      if(cache->terrain) {      if(cache->terrain) {
594          int text_y = 0, icon_y = 0;
595    
596        /* draw cache rating */        /* draw cache rating */
597        const char *terrain = "Terrain:";        const char *terrain = "Terrain:";
598        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
599        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
600        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
601          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
602            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
603          else
604            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
605    
606        /* draw "Terrain:" string */        /* draw "Terrain:" string */
607        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
608        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
609        cairo_show_text (event->data.draw.cr, _(terrain));        cairo_show_text (event->data.draw.cr, _(terrain));
610        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
611        x += extents.width + 2;        x += extents.width + 2;
612    
613        /* draw terrain stars */        /* draw terrain stars */
614        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);  
615    
616        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;        x += gdk_pixbuf_get_width(icon) + LINE_SKIP - 2;
     y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;  
617      }      }
618    
619      if(cache->difficulty) {      if(cache->difficulty) {
620          int text_y = 0, icon_y = 0;
621    
622        const char *difficulty = "Difficulty:";        const char *difficulty = "Difficulty:";
623          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
624        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;  
625    
626          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
627            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
628          else
629            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
630    
631        /* draw "Difficulty:" string */        /* draw "Difficulty:" string */
632        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
633        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
634        cairo_show_text (event->data.draw.cr, _(difficulty));        cairo_show_text (event->data.draw.cr, _(difficulty));
635        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
636        x += extents.width + 2;        x += extents.width + 2;
637    
638        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);  
639      }      }
640    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
641      printf("click %s event at %d %d\n",      printf("click %s event at %d %d\n",
# Line 628  balloon_cb(osm_gps_map_balloon_event_t * Line 690  balloon_cb(osm_gps_map_balloon_event_t *
690      printf("removed\n");      printf("removed\n");
691      context->balloon = NULL;      context->balloon = NULL;
692    }    }
   printf("balloon out\n");  
693  }  }
694    
695  static gboolean  static gboolean
# Line 636  on_map_button_release_event(GtkWidget *w Line 697  on_map_button_release_event(GtkWidget *w
697                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
698    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
699    
   printf("on_map_button_release_event in\n");  
   
700    /* in "MAP_CACHE" state only one cache is visible */    /* in "MAP_CACHE" state only one cache is visible */
701    /* and the map is in navigation mode. the balloon is */    /* and the map is in navigation mode. the balloon is */
702    /* pretty useless there */    /* pretty useless there */
# Line 670  on_map_button_release_event(GtkWidget *w Line 729  on_map_button_release_event(GtkWidget *w
729      context->appdata->map.pos.lon = lon;      context->appdata->map.pos.lon = lon;
730    }    }
731    
   printf("on_map_button_release_event out\n");  
732    return FALSE;    return FALSE;
733  }  }
734    
735  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
736    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
737    
   printf("destroy map window\n");  
   
738    /* save map parameters */    /* save map parameters */
739    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
740    gint zoom;    gint zoom;
# Line 700  static void on_window_destroy(GtkWidget Line 756  static void on_window_destroy(GtkWidget
756  #endif  #endif
757    
758    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
759      gps_unregister_callback(appdata, context->cb_id);
760    
761      if(context->caches_displayed) {
762        g_free(context->caches_displayed);
763        context->caches_displayed = NULL;
764      }
765    
766    g_free(context);    g_free(context);
767    appdata->map.context = NULL;    appdata->map.context = NULL;
# Line 730  on_window_realize(GtkWidget *widget, gpo Line 792  on_window_realize(GtkWidget *widget, gpo
792    
793  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
794                           gpointer data) {                           gpointer data) {
795      map_context_t *context = (map_context_t*)data;
796    
797    printf("map got focus\n");    printf("map got focus\n");
798    map_setup((map_context_t*)data);  
799    #ifdef USE_MAEMO
800      /* re-enable refresh of map */
801      if(!context->handler_id)
802        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
803    #endif
804    
805      map_setup(context);
806    return FALSE;    return FALSE;
807  }  }
808    
809    #ifdef USE_MAEMO
810    static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
811                             gpointer data) {
812      map_context_t *context = (map_context_t*)data;
813    
814      printf("map lost focus\n");
815      gtk_timeout_remove(context->handler_id);
816      context->handler_id = 0;
817    
818      return FALSE;
819    }
820    #endif
821    
822  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
823    printf("map_update\n");    printf("map_update\n");
824  #ifndef USE_MAEMO  #ifndef USE_MAEMO
# Line 743  void map_update(appdata_t *appdata) { Line 827  void map_update(appdata_t *appdata) {
827  #endif  #endif
828  }  }
829    
830    /* callback called by the gps layer whenever gps state changes */
831    static void
832    gps_callback(struct gps_state *state, gpointer data) {
833      printf("map: gps callback\n");
834    }
835    
836  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
837    map_context_t *context = NULL;    map_context_t *context = NULL;
838    
   printf("map 1\n");  
   
839    /* if the map window already exists, just raise it */    /* if the map window already exists, just raise it */
840    if(appdata->map.context) {    if(appdata->map.context) {
841      printf("using existing map!\n");      printf("using existing map!\n");
# Line 756  void map(appdata_t *appdata) { Line 844  void map(appdata_t *appdata) {
844      return;      return;
845    }    }
846    
   printf("map 2\n");  
   
847    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
848    context->appdata = appdata;    context->appdata = appdata;
849    context->map_complete = FALSE;    context->map_complete = FALSE;
# Line 770  void map(appdata_t *appdata) { Line 856  void map(appdata_t *appdata) {
856      rmdir_recursive(old_path);      rmdir_recursive(old_path);
857    }    }
858    
   printf("map 3\n");  
   
859    /* It is recommanded that all applications share these same */    /* It is recommanded that all applications share these same */
860    /* map path, so data is only cached once. The path should be: */    /* map path, so data is only cached once. The path should be: */
861    /* ~/.osm-gps-map on standard PC     (users home) */    /* ~/.osm-gps-map on standard PC     (users home) */
# Line 794  void map(appdata_t *appdata) { Line 878  void map(appdata_t *appdata) {
878    gint source = context->appdata->map.source;    gint source = context->appdata->map.source;
879    if(!source) source = MAP_SOURCE;    if(!source) source = MAP_SOURCE;
880    
   printf("map 4\n");  
   
881    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
882                   "map-source",               source,                   "map-source",               source,
883                   "tile-cache",               path,                   "tile-cache",               path,
# Line 809  void map(appdata_t *appdata) { Line 891  void map(appdata_t *appdata) {
891    
892    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
893    
   printf("map 5\n");  
   
894  #ifdef USE_MAEMO  #ifdef USE_MAEMO
895    /* we don't use a stackable window here on fremantle, since */    /* we don't use a stackable window here on fremantle, since */
896    /* 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 905  void map(appdata_t *appdata) {
905    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
906  #endif  #endif
907    
   printf("map 6\n");  
   
908  #ifndef USE_MAEMO  #ifndef USE_MAEMO
909    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
910  #endif  #endif
# Line 834  void map(appdata_t *appdata) { Line 912  void map(appdata_t *appdata) {
912    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
913                     G_CALLBACK(on_focus_in), context);                     G_CALLBACK(on_focus_in), context);
914    
915    #ifdef USE_MAEMO
916      g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
917                       G_CALLBACK(on_focus_out), context);
918    #endif
919    
920    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
921                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
922    
# Line 845  void map(appdata_t *appdata) { Line 928  void map(appdata_t *appdata) {
928    
929    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
930    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
931      context->cb_id = gps_register_callback(appdata, gps_callback, context);
   printf("map 7\n");  
932    
933  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
934    /* prevent some of the main screen things */    /* prevent some of the main screen things */
# Line 854  void map(appdata_t *appdata) { Line 936  void map(appdata_t *appdata) {
936    appdata->cur_view = NULL;    appdata->cur_view = NULL;
937  #endif  #endif
938    
   printf("map 8\n");  
   
939    g_signal_connect(G_OBJECT(context->window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
940                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
941    
   printf("map 9\n");  
942    gtk_container_add(GTK_CONTAINER(context->window), context->widget);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
   printf("map 10\n");  
943    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
   
   printf("map 11\n");  
944  }  }
Legend:
Removed from v.143  
changed lines
  Added in v.189