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 280 by harbaum, Fri May 21 19:28:16 2010 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        printf("clicked OSD_GPS %p\n", context);
92        printf("clicked OSD_GPS a %p\n", context->appdata);
93    
94      pos_t *refpos = get_pos(context->appdata);      pos_t *refpos = get_pos(context->appdata);
95      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
96        gint zoom;        gint zoom;
# Line 105  cb_map_gps(osd_button_t but, map_context Line 110  cb_map_gps(osd_button_t but, map_context
110                                  0.0, 0.0, 1);                                  0.0, 0.0, 1);
111      }      }
112    }    }
   printf("cb_map_gps out\n");  
113  }  }
114    
115  static int dist2pixel(map_context_t *context, float km, float lat) {  static int dist2pixel(map_context_t *context, float km, float lat) {
# Line 115  static int dist2pixel(map_context_t *con Line 119  static int dist2pixel(map_context_t *con
119  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
120    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
121    
122    printf("map_gps_update in\n");  #ifdef USE_MAEMO
123      if(context->appdata->goto_disable_screensaver)
124        if(osso_display_blanking_pause(context->appdata->osso_context) != OSSO_OK)
125          fprintf(stderr, "error with display blank\n");
126    #endif
127    
128    /* get reference position ... */    /* get reference position ... */
129    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
130    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
131    
132    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
133    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),    if(ok != context->goto_is_enabled) {
134                   OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
135                    OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
136        context->goto_is_enabled = ok;
137      }
138    
139    if(ok) {    if(ok) {
140      float heading = NAN;      float heading = NAN;
# Line 138  static gboolean map_gps_update(gpointer Line 149  static gboolean map_gps_update(gpointer
149          radius = dist2pixel(context, eph/1000, refpos->lat);          radius = dist2pixel(context, eph/1000, refpos->lat);
150      }      }
151    
152        /* TODO: in order to save energy: only draw if state actually changed */
153    
154      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
155      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
156                           refpos->lat, refpos->lon, heading);                           refpos->lat, refpos->lon, heading);
157    } else    } else
158      osm_gps_map_clear_gps(OSM_GPS_MAP(context->widget));      osm_gps_map_clear_gps(OSM_GPS_MAP(context->widget));
159    
   printf("map_gps_update out\n");  
160    return TRUE;    return TRUE;
161  }  }
162    
163  static void map_draw_cache(GtkWidget *map, cache_t *cache) {  static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
164    printf("map_draw_cache in\n");    int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;
165    
166      GdkPixbuf *icon = icon_get(type, cache->type);
167      GdkPixbuf *over = NULL;
168    
169    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);    if(cache->mine)                   over = icon_get(type, 14);
170      else if(cache->found)             over = icon_get(type, 12);
171      else if(cache->notes) {
172        if(cache->notes->found)         over = icon_get(type, 12);
173        else if(cache->notes->override) over = icon_get(type, 11);
174        else                            over = icon_get(type, 13);
175      }
176    
177      pos_t *pos = &cache->pos;
178    /* check if there's also an overwritten coordinate */    /* check if there's also an overwritten coordinate */
179    if(cache->notes && cache->notes->override) {    if(cache->notes && cache->notes->override)
180      GdkPixbuf *over = icon_get(ICON_MISC, 1);      pos = &cache->notes->pos;
181    
182      if(!isnan(pos->lat) && !isnan(pos->lon)) {
183      osm_gps_map_add_image(OSM_GPS_MAP(map),      osm_gps_map_add_image(OSM_GPS_MAP(map),
184            cache->notes->pos.lat, cache->notes->pos.lon, icon);                            pos->lat, pos->lon, icon);
185        if(over)
186          osm_gps_map_add_image(OSM_GPS_MAP(map),
187                                pos->lat, pos->lon, over);
188      }
189    }
190    
191      osm_gps_map_add_image(OSM_GPS_MAP(map),  static void map_draw_wpt(GtkWidget *map, cache_t *cache, wpt_t *wpt) {
192            cache->notes->pos.lat, cache->notes->pos.lon, over);    /* only draw wpts that don't equal the main point */
193    } else {    if(pos_differ(&cache->pos, &wpt->pos)) {
194      if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon))      if(!isnan(wpt->pos.lat) && !isnan(wpt->pos.lon))  {
195          GdkPixbuf *icon =
196            icon_get(ICON_WPT, (wpt->sym!=WPT_SYM_UNKNOWN)?
197                     wpt->sym:WPT_SYM_REFPOINT);
198    
199        osm_gps_map_add_image(OSM_GPS_MAP(map),        osm_gps_map_add_image(OSM_GPS_MAP(map),
200                              cache->pos.lat, cache->pos.lon, icon);                              wpt->pos.lat, wpt->pos.lon, icon);
201        }
202    }    }
   printf("map_draw_cache out\n");  
203  }  }
204    
205  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,
206    printf("map_draw_gpx in\n");                           GtkWidget *map, gpx_t *gpx,
207                             cache_t *nav, gboolean semi) {
208    if(!gpx->notes_loaded) {    if(!gpx->notes_loaded) {
209      notes_load_all(appdata, gpx);      notes_load_all(appdata, gpx);
210      gpx->notes_loaded = TRUE;      gpx->notes_loaded = TRUE;
# Line 180  static void map_draw_gpx(appdata_t *appd Line 212  static void map_draw_gpx(appdata_t *appd
212    
213    cache_t *cache = gpx->cache;    cache_t *cache = gpx->cache;
214    while(cache) {    while(cache) {
215      map_draw_cache(map, cache);      /* search if we have that cache already in our list/displayed */
216        int i=0;
217        while(caches[i].id && (strcmp(caches[i].id, cache->id) != 0))
218          i++;
219    
220        if(!caches[i].id) {
221          /* if nav is given draw all other caches semitransparent. */
222          /* if nav is not given do what semi sais */
223          map_draw_cache(map, cache, nav?(cache != nav):semi);
224          caches[i].id = cache->id;
225    
226          /* also draw waypoints of nav cache */
227          if(nav && cache == nav) {
228            wpt_t *wpt = cache->wpt;
229            while(wpt) {
230              map_draw_wpt(map, cache, wpt);
231              wpt = wpt->next;
232            }
233          }
234        }
235    
236      cache = cache->next;      cache = cache->next;
237    }    }
238    printf("map_draw_gpx out\n");  }
239    
240    static cache_t *cache_search_first(gpx_t *gpx, cache_t *cache) {
241      while(gpx) {
242        cache_t *cur = gpx->cache;
243        while(cur) {
244          /* we do a string comparision to make sure that if copies */
245          /* exist, we get the original one */
246          if(!strcmp(cache->id, cur->id))
247             return cur;
248    
249          cur = cur->next;
250        }
251        gpx = gpx->next;
252      }
253      g_assert(FALSE);
254      return NULL;
255  }  }
256    
257  /* draw geocaches and set window title */  /* draw geocaches and set window title */
258  static void map_setup(map_context_t *context) {  static void map_setup(map_context_t *context) {
259    char *name = NULL;    char *name = NULL;
260    
261    printf("map_setup in\n");    int cache_num = gpx_total_caches_global(context->appdata->gpx);
262    
263      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
264        //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
265        //     cache_num, context->cache_list_len);
266        g_free(context->caches_displayed);
267        context->caches_displayed = NULL;
268        context->cache_list_len = 0;
269      }
270    
271      /* allocate buffer */
272      if(cache_num && !context->caches_displayed) {
273        context->cache_list_len = cache_num;
274        context->caches_displayed = g_new0(cache_display_t, cache_num+1);
275        printf("allocated space to handle %d map icons\n", cache_num);
276      }
277    
278      if(context->appdata->search_results && !context->appdata->cur_cache) {
279        if(context->state != MAP_SEARCH) {
280          printf("map_setup(SEARCH)\n");
281    
282          /* clear any pending balloon */
283          context->balloon = NULL;
284          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
285    
286    #ifdef OSD_NAV
287          /* no navigation in this mode */
288          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
289    #endif
290    
291          /* clear all existing cache images */
292          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
293    
294          if(context->caches_displayed) {
295            memset(context->caches_displayed, 0,
296                   (cache_num+1) * sizeof(cache_display_t));
297    
298            /* draw search results and all other gpx files are semi-transparent */
299            map_draw_gpx(context->appdata, context->caches_displayed,
300                         context->widget, context->appdata->search_results,
301                         NULL, FALSE);
302    
303            gpx_t *gpx = context->appdata->gpx;
304            while(gpx) {
305              map_draw_gpx(context->appdata, context->caches_displayed,
306                           context->widget, gpx, NULL, TRUE);
307    
308    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {            gpx = gpx->next;
309            }
310          }
311          name = g_strdup(_("Search results"));
312          context->state = MAP_SEARCH;
313        }
314      } else if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
315      if(context->state != MAP_ALL) {      if(context->state != MAP_ALL) {
316        printf("map_setup(ALL)\n");        printf("map_setup(ALL)\n");
317    
318          /* clear any pending balloon */
319          context->balloon = NULL;
320          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
321    
322  #ifdef OSD_NAV  #ifdef OSD_NAV
323        /* no navigation in this mode */        /* no navigation in this mode */
324        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
325  #endif  #endif
326    
327        /* clear all existing ccahe images */        /* clear all existing cache images */
328        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
329          if(context->caches_displayed) {
330        /* draw all geocaches */          memset(context->caches_displayed, 0,
331        gpx_t *gpx = context->appdata->gpx;                 (cache_num+1) * sizeof(cache_display_t));
332        while(gpx) {  
333          map_draw_gpx(context->appdata, context->widget, gpx);          /* draw all geocaches and none is semi-transparent */
334          gpx = gpx->next;          gpx_t *gpx = context->appdata->gpx;
335            while(gpx) {
336              map_draw_gpx(context->appdata, context->caches_displayed,
337                           context->widget, gpx, NULL, FALSE);
338              gpx = gpx->next;
339            }
340    
341            {
342              int i=0;
343              while(context->caches_displayed[i].id) i++;
344              printf("number of caches actually displayed: %d\n", i);
345            }
346        }        }
347        name = g_strdup(_("all"));        name = g_strdup(_("all"));
348        context->state = MAP_ALL;        context->state = MAP_ALL;
# Line 217  static void map_setup(map_context_t *con Line 351  static void map_setup(map_context_t *con
351      if(context->state != MAP_GPX) {      if(context->state != MAP_GPX) {
352        printf("map_setup(GPX)\n");        printf("map_setup(GPX)\n");
353    
354          /* clear any pending balloon */
355          context->balloon = NULL;
356          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
357    
358  #ifdef OSD_NAV  #ifdef OSD_NAV
359        /* no navigation in this mode */        /* no navigation in this mode */
360        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
361  #endif  #endif
362    
363        /* clear all existing ccahe images */        /* clear all existing cache images */
364        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
365          if(context->caches_displayed) {
366            memset(context->caches_displayed, 0,
367                   (cache_num+1) * sizeof(cache_display_t));
368    
369            /* draw all geocaches and all other gpx files are semi-transparent */
370            map_draw_gpx(context->appdata, context->caches_displayed,
371                         context->widget, context->appdata->cur_gpx, NULL, FALSE);
372    
373            gpx_t *gpx = context->appdata->gpx;
374            while(gpx) {
375              if(gpx != context->appdata->cur_gpx)
376                map_draw_gpx(context->appdata, context->caches_displayed,
377                             context->widget, gpx, NULL, TRUE);
378    
379              gpx = gpx->next;
380            }
381          }
382    
       map_draw_gpx(context->appdata, context->widget,  
                    context->appdata->cur_gpx);  
383        name = g_strdup(context->appdata->cur_gpx->name);        name = g_strdup(context->appdata->cur_gpx->name);
384        context->state = MAP_GPX;        context->state = MAP_GPX;
385      }      }
386    } else {    } else {
387      cache_t *cache = context->appdata->cur_cache;      cache_t *cache = context->appdata->cur_cache;
388    
389      printf("map_setp(CACHE)\n");      printf("map_setup(CACHE)\n");
390    
391      /* no balloons in this mode */      /* clear any pending balloon */
392      context->balloon = NULL;      context->balloon = NULL;
393      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
394    
395      /* clear all existing ccahe images */      /* clear all existing ccahe images */
396      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
397        if(context->caches_displayed) {
398      map_draw_cache(context->widget, cache);        memset(context->caches_displayed, 0,
399                 (cache_num+1) * sizeof(cache_display_t));
400    
401          /* Make sure we really work on the first copy in the list as */
402          /* only this is being used if duplicates exist */
403          cache = cache_search_first(context->appdata->gpx, cache);
404    
405          /* draw all geocaches and all but selected one are semi-transparent */
406          gpx_t *gpx = context->appdata->gpx;
407          while(gpx) {
408            map_draw_gpx(context->appdata, context->caches_displayed,
409                         context->widget, gpx, cache, FALSE);
410            gpx = gpx->next;
411          }
412        }
413    
414      name = g_strdup(cache->name);      name = g_strdup(cache->name);
415      context->state = MAP_CACHE;      context->state = MAP_CACHE;
416    
# Line 258  static void map_setup(map_context_t *con Line 426  static void map_setup(map_context_t *con
426  #endif  #endif
427    }    }
428    
429    if(name) {    /* also mark geomath position */
     char *title = g_strdup_printf(_("Map - %s"), name);  
     g_free(name);  
   
     gtk_window_set_title(GTK_WINDOW(context->window), title);  
   
     g_free(title);  
   } else  
     printf("map_setup(keep)\n");  
   
   printf("map_setup out\n");  
 }  
   
 static gboolean on_map_configure(GtkWidget *widget,  
                                  GdkEventConfigure *event,  
                                  map_context_t *context) {  
   
   /* for some reason there's a configure event with 1/1 */  
   /* on diablo. We just ignore this! */  
   
   printf("on_map_configure %d %d\n",  
          widget->allocation.width,  
          widget->allocation.height);  
   
   if(!context->map_complete &&  
      (widget->allocation.width > 100) &&  
      (widget->allocation.height > 100)) {  
430    
431      /* setup cache state */    /* remove all existing appearances of this icon first */
432      map_setup(context);    osm_gps_map_remove_image(OSM_GPS_MAP(context->widget),
433                               icon_get(ICON_MISC, 4));
434      /* set default values if they are invalid */  
435      if(!context->appdata->map.zoom ||    if(!isnan(context->appdata->geomath.lat) &&
436         isnan(context->appdata->map.pos.lat) ||       !isnan(context->appdata->geomath.lon))  {
        isnan(context->appdata->map.pos.lon)) {  
       printf("no valid map position found\n");  
   
       pos_t *refpos = get_pos(context->appdata);  
       if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {  
         printf("use refpos\n");  
   
         /* use gps position if present */  
         context->appdata->map.pos = *refpos;  
         context->appdata->map.zoom = GPS_DEFAULT_ZOOM;  
       } else {  
         printf("use zero pos\n");  
437    
438          /* use world map otherwise */      osm_gps_map_add_image(OSM_GPS_MAP(context->widget),
439          context->appdata->map.pos.lat = 0.0;                            context->appdata->geomath.lat,
440          context->appdata->map.pos.lon = 0.0;                            context->appdata->geomath.lon,
441          context->appdata->map.zoom = 1;                            icon_get(ICON_MISC, 4));
       }  
     }  
   
     /* jump to initial position */  
     printf("osm_gps_map_set_mapcenter(%f,%f,%d)\n",  
            context->appdata->map.pos.lat,  
            context->appdata->map.pos.lon,  
            context->appdata->map.zoom);  
   
     osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                               context->appdata->map.pos.lat,  
                               context->appdata->map.pos.lon,  
                               context->appdata->map.zoom);  
     context->map_complete = TRUE;  
442    }    }
443    
444    printf("map configure done\n");    if(name) {
445    return FALSE;      gtk_window_set_title(GTK_WINDOW(context->window), name);
446        g_free(name);
447      } else
448        printf("map_setup(keep)\n");
449  }  }
450    
451  static void  static void
452  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
453                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
454    printf("map_cachelist_nearest in\n");  
455    while(cache) {    while(cache) {
456      pos_t cpos = gpx_cache_pos(cache);      pos_t cpos = gpx_cache_pos(cache);
457    
# Line 347  map_cachelist_nearest(cache_t *cache, po Line 466  map_cachelist_nearest(cache_t *cache, po
466    
467      cache = cache->next;      cache = cache->next;
468    }    }
   printf("map_cachelist_nearest out\n");  
469  }  }
470    
471  static cache_t *map_closest(map_context_t *context, pos_t *pos) {  static cache_t *map_closest(map_context_t *context, pos_t *pos) {
472    cache_t *result = NULL;    cache_t *result = NULL;
473    float distance = NAN;    float distance = NAN;
   
   printf("map_closest in\n");  
474    
475    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(context->appdata->search_results && !context->appdata->cur_cache) {
476        /* search search results */
477        map_cachelist_nearest(context->appdata->search_results->cache,
478                              pos, &result, &distance);
479      } else if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
480      /* search all geocaches */      /* search all geocaches */
481      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
482      while(gpx) {      while(gpx) {
# Line 364  static cache_t *map_closest(map_context_ Line 484  static cache_t *map_closest(map_context_
484        gpx = gpx->next;        gpx = gpx->next;
485      }      }
486    } else if(context->appdata->cur_gpx) {    } else if(context->appdata->cur_gpx) {
487        /* search in current gpx file */
488      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
489                            pos, &result, &distance);                            pos, &result, &distance);
490    } else    } else
491      result = context->appdata->cur_gpx->cache;      result = context->appdata->cur_cache;
492    
493      /* make sure this is the first hit */
494      if(context->caches_displayed)
495        result = cache_search_first(context->appdata->gpx, result);
496    
   printf("map_closest out\n");  
497    return result;    return result;
498  }  }
499    
# Line 386  pos_t coord2pos(coord_t coo) { Line 510  pos_t coord2pos(coord_t coo) {
510  static gboolean  static gboolean
511  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
512                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
   printf("on_map_button_press_event in\n");  
513    
514    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
515    
516      puts("press event");
517    
518    /* check if we actually clicked parts of the OSD */    /* check if we actually clicked parts of the OSD */
519    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");  
520      return FALSE;      return FALSE;
   }  
521    
522    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
523    if(context->press_on != NULL) {    if(context->press_on != NULL) {
# Line 414  on_map_button_press_event(GtkWidget *wid Line 537  on_map_button_press_event(GtkWidget *wid
537        context->press_on = nearest;        context->press_on = nearest;
538    }    }
539    
   printf("on_map_button_press_event out\n");  
540    return FALSE;    return FALSE;
541  }  }
542    
# Line 422  static void Line 544  static void
544  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf *buf, gint x, gint y) {  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf *buf, gint x, gint y) {
545    /* convert the pixbuf into something cairo can handle */    /* convert the pixbuf into something cairo can handle */
546    
   printf("cairo_draw_pixbuf in\n");  
   
547    // Create a new ImageSurface    // Create a new ImageSurface
548    cairo_surface_t *image_surface =    cairo_surface_t *image_surface =
549      cairo_image_surface_create(CAIRO_FORMAT_ARGB32,      cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
# Line 431  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 551  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
551                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
552    
553    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
554      g_assert(image_surface);
555    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
556    
557    // Draw the image on the new Context    // Draw the image on the new Context
# Line 441  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 562  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
562    cairo_set_source_surface(cr, image_surface, x, y);    cairo_set_source_surface(cr, image_surface, x, y);
563    
564    cairo_paint(cr);    cairo_paint(cr);
   printf("cairo_draw_pixbuf out\n");  
565  }  }
566    
567  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
568  #define LINE_SKIP  7  #define ICON_SIZE  ICON_CACHE_TYPE
569    #else
570    #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
571    #endif
572    
573    #ifndef BIG_BALLOONS
574    #define FONT_SIZE 14.0
575  #else  #else
576  #define LINE_SKIP  12  #define FONT_SIZE 22.0
577  #endif  #endif
578    #define LINE_SKIP  (FONT_SIZE/4)
579    
580    
581  static void  static void
582  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
583    printf("balloon event:\n");    printf("balloon event: ");
584    
585    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
586    cache_t *cache = context->balloon;    cache_t *cache = context->balloon;
# Line 475  balloon_cb(osm_gps_map_balloon_event_t * Line 603  balloon_cb(osm_gps_map_balloon_event_t *
603      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;
604    
605      /* draw the cache type icon ... */      /* draw the cache type icon ... */
606      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);      GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
607      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
608    
609      if(cache->notes && cache->notes->override) {      if(cache->notes && cache->notes->override) {
610        GdkPixbuf *over = icon_get(ICON_MISC, 1);        GdkPixbuf *over = icon_get(ICON_SIZE, 11);
611        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
612      }      }
613    
# Line 515  balloon_cb(osm_gps_map_balloon_event_t * Line 643  balloon_cb(osm_gps_map_balloon_event_t *
643      x = event->data.draw.rect->x;      x = event->data.draw.rect->x;
644    
645      /* everything from here uses the same font */      /* everything from here uses the same font */
646      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans",
647                                CAIRO_FONT_SLANT_NORMAL,
648                              CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
649  #ifndef BIG_BALLOONS  
650      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  
651    
652      if(cache->name) {      if(cache->name) {
653        /* draw cache name */        /* draw cache name */
654        cairo_text_extents (event->data.draw.cr, cache->name, &extents);        cairo_text_extents (event->data.draw.cr, cache->name, &extents);
655        y += extents.height;        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
       cairo_move_to (event->data.draw.cr, x, y);  
656        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
657        cairo_show_text (event->data.draw.cr, cache->name);        cairo_show_text (event->data.draw.cr, cache->name);
658        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
659    
660        /* return to the left border and below text */        /* return to the left border and below text */
661        y += LINE_SKIP;        y += LINE_SKIP + FONT_SIZE;
662        x = event->data.draw.rect->x;        x = event->data.draw.rect->x;
663      }      }
664    
665      if(cache->terrain) {      if(cache->terrain) {
666          int text_y = 0, icon_y = 0;
667    
668        /* draw cache rating */        /* draw cache rating */
669        const char *terrain = "Terrain:";        const char *terrain = "Terrain:";
670        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
671        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
672        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
673          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
674            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
675          else
676            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
677    
678        /* draw "Terrain:" string */        /* draw "Terrain:" string */
679        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
680        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
681        cairo_show_text (event->data.draw.cr, _(terrain));        cairo_show_text (event->data.draw.cr, _(terrain));
682        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
683        x += extents.width + 2;        x += extents.width + 2;
684    
685        /* draw terrain stars */        /* draw terrain stars */
686        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);  
687    
688        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;  
689      }      }
690    
691      if(cache->difficulty) {      if(cache->difficulty) {
692          int text_y = 0, icon_y = 0;
693    
694        const char *difficulty = "Difficulty:";        const char *difficulty = "Difficulty:";
695          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
696        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;  
697    
698          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
699            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
700          else
701            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
702    
703        /* draw "Difficulty:" string */        /* draw "Difficulty:" string */
704        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
705        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
706        cairo_show_text (event->data.draw.cr, _(difficulty));        cairo_show_text (event->data.draw.cr, _(difficulty));
707        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
708        x += extents.width + 2;        x += extents.width + 2;
709    
710        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);  
711      }      }
712    
713        /* draw container info */
714        /* TODO ... */
715    
716    
717    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
718      printf("click %s event at %d %d\n",      printf("click %s event at %d %d\n",
719             event->data.click.down?"down":"up",             event->data.click.down?"down":"up",
720             event->data.click.x, event->data.click.y);             event->data.click.x, event->data.click.y);
721    
722      /* make the main screen jump to that cache */      /* make the main screen jump to that cache */
723      if(!event->data.click.down) {      if(!event->data.click.down) {
724        if(context->appdata->cur_cache) {        if(context->appdata->cur_cache) {
725          printf("ERROR: no current cache should be visible!\n");          printf("ERROR: no current cache should be visible!\n");
726        } else {        } else {
727          gpx_t *is_in = NULL;          gpx_t *is_in = NULL;
728    
729            if(context->appdata->search_results) {
730              printf("click while in \"search results\" view\n");
731    
732          if(!context->appdata->cur_gpx) {            is_in = context->appdata->search_results;
733            } else if(!context->appdata->cur_gpx) {
734            printf("click while in \"all\" view\n");            printf("click while in \"all\" view\n");
735    
736            /* we first need to figure out which gpx file this cache */            /* we first need to figure out which gpx file this cache */
737            /* is in so we can open it first */            /* is in so we can open it first */
738            gpx_t *gpx = context->appdata->gpx;            gpx_t *gpx = context->appdata->gpx;
# Line 605  balloon_cb(osm_gps_map_balloon_event_t * Line 748  balloon_cb(osm_gps_map_balloon_event_t *
748    
749            if(is_in)            if(is_in)
750              gpxlist_goto_cachelist(context->appdata, is_in);              gpxlist_goto_cachelist(context->appdata, is_in);
751    
752          } else          } else {
753              printf("click while in \"cachelist\" view\n");
754    
755            /* the simple case: there already is an open gpx file and */            /* the simple case: there already is an open gpx file and */
756            /* we just jump into the "cache" view */            /* we just jump into the "cache" view */
757            is_in = context->appdata->cur_gpx;            is_in = context->appdata->cur_gpx;
758            }
759    
760          if(is_in) {          if(is_in) {
761            printf("selecting %s in %s\n",            printf("selecting %s in %s\n",
762                   cache->id,                   cache->id,
763                     context->appdata->search_results?
764                     context->appdata->search_results->name:
765                   context->appdata->cur_gpx->name);                   context->appdata->cur_gpx->name);
766    
767            cachelist_goto_cache(context->appdata, cache);            cachelist_goto_cache(context->appdata, cache);
768    
769            /* give focus to main screen (important for maemo) */            /* give focus to main screen (important for maemo) */
770            printf("raising main window\n");            printf("raising main window\n");
771            gtk_window_present(GTK_WINDOW(context->appdata->window));            gtk_window_present(GTK_WINDOW(context->appdata->window));
# Line 628  balloon_cb(osm_gps_map_balloon_event_t * Line 776  balloon_cb(osm_gps_map_balloon_event_t *
776      printf("removed\n");      printf("removed\n");
777      context->balloon = NULL;      context->balloon = NULL;
778    }    }
   printf("balloon out\n");  
779  }  }
780    
781  static gboolean  static gboolean
# Line 636  on_map_button_release_event(GtkWidget *w Line 783  on_map_button_release_event(GtkWidget *w
783                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
784    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
785    
786    printf("on_map_button_release_event in\n");    puts("release event");
787    
788    /* in "MAP_CACHE" state only one cache is visible */    /* in "MAP_CACHE" state only one cache is visible */
789    /* and the map is in navigation mode. the balloon is */    /* and the map is in navigation mode. the balloon is */
790    /* pretty useless there */    /* pretty useless there */
791    if(context->press_on && (context->state != MAP_CACHE)) {    if(context->press_on) {
792    
793      coord_t coo;      coord_t coo;
794      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 817  on_map_button_release_event(GtkWidget *w
817      context->appdata->map.pos.lon = lon;      context->appdata->map.pos.lon = lon;
818    }    }
819    
   printf("on_map_button_release_event out\n");  
820    return FALSE;    return FALSE;
821  }  }
822    
823  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
824    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
825    
   printf("destroy map window\n");  
   
826    /* save map parameters */    /* save map parameters */
827    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
828    gint zoom;    gint zoom;
829    g_object_get(map, "zoom", &zoom, NULL);    g_object_get(map, "zoom", &zoom, NULL);
830    context->appdata->map.zoom = zoom;    context->appdata->map.zoom = zoom;
831    
832      gboolean dpix;
833      g_object_get(map, "double-pixel", &dpix, NULL);
834      context->appdata->map.dpix = dpix;
835    
836    gfloat lat, lon;    gfloat lat, lon;
837    g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);    g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
838    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
# Line 700  static void on_window_destroy(GtkWidget Line 848  static void on_window_destroy(GtkWidget
848  #endif  #endif
849    
850    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
851      gps_unregister_callback(appdata, context->cb_id);
852    
853      if(context->caches_displayed) {
854        g_free(context->caches_displayed);
855        context->caches_displayed = NULL;
856      }
857    
858      printf("destroy map context\n");
859    g_free(context);    g_free(context);
860    appdata->map.context = NULL;    appdata->map.context = NULL;
861  }  }
# Line 730  on_window_realize(GtkWidget *widget, gpo Line 885  on_window_realize(GtkWidget *widget, gpo
885    
886  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
887                           gpointer data) {                           gpointer data) {
888      map_context_t *context = (map_context_t*)data;
889    
890    printf("map got focus\n");    printf("map got focus\n");
891    map_setup((map_context_t*)data);  
892    #ifdef USE_MAEMO
893      /* re-enable refresh of map */
894      if(!context->handler_id)
895        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
896    #endif
897    
898      map_setup(context);
899    return FALSE;    return FALSE;
900  }  }
901    
902    static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
903                             gpointer data) {
904      map_context_t *context = (map_context_t*)data;
905    
906      printf("map lost focus\n");
907    
908      /* save new map position */
909      gfloat lat, lon;
910      g_object_get(widget, "latitude", &lat, "longitude", &lon, NULL);
911    
912      context->appdata->map.pos.lat = lat;
913      context->appdata->map.pos.lon = lon;
914    
915    #ifdef USE_MAEMO
916      gtk_timeout_remove(context->handler_id);
917      context->handler_id = 0;
918    #endif
919    
920      return FALSE;
921    }
922    
923  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
924    printf("map_update\n");    printf("map_update\n");
925  #ifndef USE_MAEMO  #ifndef USE_MAEMO
# Line 743  void map_update(appdata_t *appdata) { Line 928  void map_update(appdata_t *appdata) {
928  #endif  #endif
929  }  }
930    
931    /* callback called by the gps layer whenever gps state changes */
932    static void
933    gps_callback(struct gps_state *state, gpointer data) {
934      printf("map: gps callback\n");
935    }
936    
937  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
938    map_context_t *context = NULL;    map_context_t *context = NULL;
939    
   printf("map 1\n");  
   
940    /* if the map window already exists, just raise it */    /* if the map window already exists, just raise it */
941    if(appdata->map.context) {    if(appdata->map.context) {
942      printf("using existing map!\n");      printf("using existing map!\n");
# Line 756  void map(appdata_t *appdata) { Line 945  void map(appdata_t *appdata) {
945      return;      return;
946    }    }
947    
   printf("map 2\n");  
   
948    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
949      printf("allocated new context at %p\n", context);
950    
951    context->appdata = appdata;    context->appdata = appdata;
   context->map_complete = FALSE;  
952    context->state = MAP_NONE;    context->state = MAP_NONE;
953    
954    /* cleanup old (pre 0.8.7) path if it exists */    /* cleanup old (pre 0.8.7) path if it exists */
# Line 770  void map(appdata_t *appdata) { Line 958  void map(appdata_t *appdata) {
958      rmdir_recursive(old_path);      rmdir_recursive(old_path);
959    }    }
960    
   printf("map 3\n");  
   
961    /* It is recommanded that all applications share these same */    /* It is recommanded that all applications share these same */
962    /* map path, so data is only cached once. The path should be: */    /* map path, so data is only cached once. The path should be: */
963    /* ~/.osm-gps-map on standard PC     (users home) */    /* ~/.osm-gps-map on standard PC     (users home) */
# Line 794  void map(appdata_t *appdata) { Line 980  void map(appdata_t *appdata) {
980    gint source = context->appdata->map.source;    gint source = context->appdata->map.source;
981    if(!source) source = MAP_SOURCE;    if(!source) source = MAP_SOURCE;
982    
   printf("map 4\n");  
   
983    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
984                   "map-source",               source,                   "map-source",               source,
985                   "tile-cache",               path,                   "tile-cache",               path,
986                   "auto-center",              FALSE,                   "auto-center",              FALSE,
987                   "record-trip-history",      FALSE,                   "record-trip-history",      FALSE,
988                   "show-trip-history",        FALSE,                   "show-trip-history",        FALSE,
989                     "double-pixel",             context->appdata->map.dpix,
990                   proxy?"proxy-uri":NULL,     proxy,                   proxy?"proxy-uri":NULL,     proxy,
991                   NULL);                   NULL);
992    
# Line 809  void map(appdata_t *appdata) { Line 994  void map(appdata_t *appdata) {
994    
995    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
996    
997    printf("map 5\n");    /* set default values if they are invalid */
998      if(!context->appdata->map.zoom ||
999         isnan(context->appdata->map.pos.lat) ||
1000         isnan(context->appdata->map.pos.lon)) {
1001        printf("no valid map position found\n");
1002    
1003        pos_t *refpos = get_pos(context->appdata);
1004        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
1005          printf("use refpos\n");
1006    
1007            /* use gps position if present */
1008          context->appdata->map.pos = *refpos;
1009          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
1010        } else {
1011          printf("use zero pos\n");
1012    
1013          /* use world map otherwise */
1014          context->appdata->map.pos.lat = 0.0;
1015          context->appdata->map.pos.lon = 0.0;
1016          context->appdata->map.zoom = 1;
1017        }
1018      }
1019    
1020      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
1021                                context->appdata->map.pos.lat,
1022                                context->appdata->map.pos.lon,
1023                                context->appdata->map.zoom);
1024    
1025  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1026    /* we don't use a stackable window here on fremantle, since */    /* we don't use a stackable window here on fremantle, since */
1027    /* 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 1036  void map(appdata_t *appdata) {
1036    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
1037  #endif  #endif
1038    
   printf("map 6\n");  
   
1039  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1040    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
1041  #endif  #endif
# Line 834  void map(appdata_t *appdata) { Line 1043  void map(appdata_t *appdata) {
1043    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
1044                     G_CALLBACK(on_focus_in), context);                     G_CALLBACK(on_focus_in), context);
1045    
1046    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
1047                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_focus_out), context);
1048    
1049    g_signal_connect(G_OBJECT(context->widget), "button-press-event",    g_signal_connect(G_OBJECT(context->widget), "button-press-event",
1050                     G_CALLBACK(on_map_button_press_event), context);                     G_CALLBACK(on_map_button_press_event), context);
# Line 845  void map(appdata_t *appdata) { Line 1054  void map(appdata_t *appdata) {
1054    
1055    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
1056    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
1057      context->cb_id = gps_register_callback(appdata, gps_callback, context);
   printf("map 7\n");  
1058    
1059  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
1060    /* prevent some of the main screen things */    /* prevent some of the main screen things */
# Line 854  void map(appdata_t *appdata) { Line 1062  void map(appdata_t *appdata) {
1062    appdata->cur_view = NULL;    appdata->cur_view = NULL;
1063  #endif  #endif
1064    
   printf("map 8\n");  
   
1065    g_signal_connect(G_OBJECT(context->window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
1066                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
1067    
   printf("map 9\n");  
1068    gtk_container_add(GTK_CONTAINER(context->window), context->widget);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
   printf("map 10\n");  
1069    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
1070    
1071    printf("map 11\n");    /* setup cache state */
1072      map_setup(context);
1073  }  }
Legend:
Removed from v.143  
changed lines
  Added in v.280