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 155 by harbaum, Tue Nov 3 08:38:23 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) {
# Line 77  static const char *get_proxy_uri(appdata Line 82  static const char *get_proxy_uri(appdata
82      return proxy_buffer;      return proxy_buffer;
83    }    }
84    
   printf("get_proxy_uri out\n");  
85    return NULL;    return NULL;
86  }  }
87    
88  static void  static void
89  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");  
90    
91    if(but == OSD_GPS) {    if(but == OSD_GPS) {
92      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 108  cb_map_gps(osd_button_t but, map_context
108                                  0.0, 0.0, 1);                                  0.0, 0.0, 1);
109      }      }
110    }    }
   printf("cb_map_gps out\n");  
111  }  }
112    
113  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 116  static int dist2pixel(map_context_t *con
116    
117  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
118    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
119      static gboolean goto_is_enabled = FALSE;
   printf("map_gps_update in\n");  
120    
121    /* get reference position ... */    /* get reference position ... */
122    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
123    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
124    
125    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
126    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),    if(ok != goto_is_enabled) {
127                   OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
128                    OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
129        goto_is_enabled = ok;
130      }
131    
132    if(ok) {    if(ok) {
133      float heading = NAN;      float heading = NAN;
# Line 138  static gboolean map_gps_update(gpointer Line 142  static gboolean map_gps_update(gpointer
142          radius = dist2pixel(context, eph/1000, refpos->lat);          radius = dist2pixel(context, eph/1000, refpos->lat);
143      }      }
144    
145        /* TODO: in order to save energy: only draw if state actually changed */
146    
147      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
148      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
149                           refpos->lat, refpos->lon, heading);                           refpos->lat, refpos->lon, heading);
150    } else    } else
151      osm_gps_map_clear_gps(OSM_GPS_MAP(context->widget));      osm_gps_map_clear_gps(OSM_GPS_MAP(context->widget));
152    
   printf("map_gps_update out\n");  
153    return TRUE;    return TRUE;
154  }  }
155    
156  static void map_draw_cache(GtkWidget *map, cache_t *cache) {  static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
157    printf("map_draw_cache in\n");    GdkPixbuf *icon = icon_get(semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE,
158                                 cache->type);
   GdkPixbuf *icon = icon_get(ICON_CACHE_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) {
# 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) {
# Line 201  static void map_setup(map_context_t *con Line 229  static void map_setup(map_context_t *con
229        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
230  #endif  #endif
231    
232        /* clear all existing ccahe images */        /* clear all existing cache images */
233        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
234          memset(context->caches_displayed, 0,
235                 (cache_num+1) * sizeof(cache_display_t));
236    
237        /* draw all geocaches */        /* draw all geocaches and none is semi-transparent */
238        gpx_t *gpx = context->appdata->gpx;        gpx_t *gpx = context->appdata->gpx;
239        while(gpx) {        while(gpx) {
240          map_draw_gpx(context->appdata, context->widget, gpx);          map_draw_gpx(context->appdata, context->caches_displayed,
241                         context->widget, gpx, NULL, FALSE);
242          gpx = gpx->next;          gpx = gpx->next;
243        }        }
244    
245          {
246            int i=0;
247            while(context->caches_displayed[i].id) i++;
248            printf("number of caches actually displayed: %d\n", i);
249          }
250    
251        name = g_strdup(_("all"));        name = g_strdup(_("all"));
252        context->state = MAP_ALL;        context->state = MAP_ALL;
253      }      }
# Line 224  static void map_setup(map_context_t *con Line 262  static void map_setup(map_context_t *con
262    
263        /* clear all existing ccahe images */        /* clear all existing ccahe images */
264        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
265          memset(context->caches_displayed, 0,
266                 (cache_num+1) * sizeof(cache_display_t));
267    
268          /* draw all geocaches and all other gpx files are semi-transparent */
269          map_draw_gpx(context->appdata, context->caches_displayed,
270                       context->widget, context->appdata->cur_gpx, NULL, FALSE);
271    
272          gpx_t *gpx = context->appdata->gpx;
273          while(gpx) {
274            if(gpx != context->appdata->cur_gpx)
275              map_draw_gpx(context->appdata, context->caches_displayed,
276                           context->widget, gpx, NULL, TRUE);
277    
278            gpx = gpx->next;
279          }
280    
       map_draw_gpx(context->appdata, context->widget,  
                    context->appdata->cur_gpx);  
281        name = g_strdup(context->appdata->cur_gpx->name);        name = g_strdup(context->appdata->cur_gpx->name);
282        context->state = MAP_GPX;        context->state = MAP_GPX;
283      }      }
284    } else {    } else {
285      cache_t *cache = context->appdata->cur_cache;      cache_t *cache = context->appdata->cur_cache;
286    
287      printf("map_setp(CACHE)\n");      printf("map_setup(CACHE)\n");
288    
289      /* no balloons in this mode */      /* no balloons in this mode */
290      context->balloon = NULL;      context->balloon = NULL;
# Line 241  static void map_setup(map_context_t *con Line 292  static void map_setup(map_context_t *con
292    
293      /* clear all existing ccahe images */      /* clear all existing ccahe images */
294      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
295        memset(context->caches_displayed, 0,
296               (cache_num+1) * sizeof(cache_display_t));
297    
298      map_draw_cache(context->widget, cache);      /* draw all geocaches and all but selected one are semi-transparent */
299        gpx_t *gpx = context->appdata->gpx;
300        while(gpx) {
301          map_draw_gpx(context->appdata, context->caches_displayed,
302                       context->widget, gpx, cache, FALSE);
303          gpx = gpx->next;
304        }
305    
306      name = g_strdup(cache->name);      name = g_strdup(cache->name);
307      context->state = MAP_CACHE;      context->state = MAP_CACHE;
308    
# Line 267  static void map_setup(map_context_t *con Line 327  static void map_setup(map_context_t *con
327      g_free(title);      g_free(title);
328    } else    } else
329      printf("map_setup(keep)\n");      printf("map_setup(keep)\n");
   
   printf("map_setup out\n");  
330  }  }
331    
332  static gboolean on_map_configure(GtkWidget *widget,  static gboolean on_map_configure(GtkWidget *widget,
# Line 325  static gboolean on_map_configure(GtkWidg Line 383  static gboolean on_map_configure(GtkWidg
383      context->map_complete = TRUE;      context->map_complete = TRUE;
384    }    }
385    
   printf("map configure done\n");  
386    return FALSE;    return FALSE;
387  }  }
388    
389  static void  static void
390  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
391                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
392    printf("map_cachelist_nearest in\n");  
393    while(cache) {    while(cache) {
394      pos_t cpos = gpx_cache_pos(cache);      pos_t cpos = gpx_cache_pos(cache);
395    
# Line 347  map_cachelist_nearest(cache_t *cache, po Line 404  map_cachelist_nearest(cache_t *cache, po
404    
405      cache = cache->next;      cache = cache->next;
406    }    }
   printf("map_cachelist_nearest out\n");  
407  }  }
408    
409  static cache_t *map_closest(map_context_t *context, pos_t *pos) {  static cache_t *map_closest(map_context_t *context, pos_t *pos) {
410    cache_t *result = NULL;    cache_t *result = NULL;
411    float distance = NAN;    float distance = NAN;
412    
   printf("map_closest in\n");  
   
413    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
414      /* search all geocaches */      /* search all geocaches */
415      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
# Line 369  static cache_t *map_closest(map_context_ Line 423  static cache_t *map_closest(map_context_
423    } else    } else
424      result = context->appdata->cur_gpx->cache;      result = context->appdata->cur_gpx->cache;
425    
   printf("map_closest out\n");  
426    return result;    return result;
427  }  }
428    
# Line 386  pos_t coord2pos(coord_t coo) { Line 439  pos_t coord2pos(coord_t coo) {
439  static gboolean  static gboolean
440  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
441                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
   printf("on_map_button_press_event in\n");  
442    
443    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
444    
445    /* check if we actually clicked parts of the OSD */    /* check if we actually clicked parts of the OSD */
446    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");  
447      return FALSE;      return FALSE;
   }  
448    
449    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
450    if(context->press_on != NULL) {    if(context->press_on != NULL) {
# Line 414  on_map_button_press_event(GtkWidget *wid Line 464  on_map_button_press_event(GtkWidget *wid
464        context->press_on = nearest;        context->press_on = nearest;
465    }    }
466    
   printf("on_map_button_press_event out\n");  
467    return FALSE;    return FALSE;
468  }  }
469    
# Line 422  static void Line 471  static void
471  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf *buf, gint x, gint y) {  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf *buf, gint x, gint y) {
472    /* convert the pixbuf into something cairo can handle */    /* convert the pixbuf into something cairo can handle */
473    
   printf("cairo_draw_pixbuf in\n");  
   
474    // Create a new ImageSurface    // Create a new ImageSurface
475    cairo_surface_t *image_surface =    cairo_surface_t *image_surface =
476      cairo_image_surface_create(CAIRO_FORMAT_ARGB32,      cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
# Line 431  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 478  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
478                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
479    
480    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
481      g_assert(image_surface);
482    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
483    
484    // Draw the image on the new Context    // Draw the image on the new Context
# Line 441  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 489  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
489    cairo_set_source_surface(cr, image_surface, x, y);    cairo_set_source_surface(cr, image_surface, x, y);
490    
491    cairo_paint(cr);    cairo_paint(cr);
   printf("cairo_draw_pixbuf out\n");  
492  }  }
493    
494  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
# Line 452  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 499  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
499    
500  static void  static void
501  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
502    printf("balloon event:\n");    printf("balloon event: ");
503    
504    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
505    cache_t *cache = context->balloon;    cache_t *cache = context->balloon;
# Line 628  balloon_cb(osm_gps_map_balloon_event_t * Line 675  balloon_cb(osm_gps_map_balloon_event_t *
675      printf("removed\n");      printf("removed\n");
676      context->balloon = NULL;      context->balloon = NULL;
677    }    }
   printf("balloon out\n");  
678  }  }
679    
680  static gboolean  static gboolean
# Line 636  on_map_button_release_event(GtkWidget *w Line 682  on_map_button_release_event(GtkWidget *w
682                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
683    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
684    
   printf("on_map_button_release_event in\n");  
   
685    /* in "MAP_CACHE" state only one cache is visible */    /* in "MAP_CACHE" state only one cache is visible */
686    /* and the map is in navigation mode. the balloon is */    /* and the map is in navigation mode. the balloon is */
687    /* pretty useless there */    /* pretty useless there */
# Line 670  on_map_button_release_event(GtkWidget *w Line 714  on_map_button_release_event(GtkWidget *w
714      context->appdata->map.pos.lon = lon;      context->appdata->map.pos.lon = lon;
715    }    }
716    
   printf("on_map_button_release_event out\n");  
717    return FALSE;    return FALSE;
718  }  }
719    
720  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
721    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
722    
   printf("destroy map window\n");  
   
723    /* save map parameters */    /* save map parameters */
724    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
725    gint zoom;    gint zoom;
# Line 700  static void on_window_destroy(GtkWidget Line 741  static void on_window_destroy(GtkWidget
741  #endif  #endif
742    
743    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
744      gps_unregister_callback(appdata, context->cb_id);
745    
746      if(context->caches_displayed) {
747        g_free(context->caches_displayed);
748        context->caches_displayed = NULL;
749      }
750    
751    g_free(context);    g_free(context);
752    appdata->map.context = NULL;    appdata->map.context = NULL;
# Line 743  void map_update(appdata_t *appdata) { Line 790  void map_update(appdata_t *appdata) {
790  #endif  #endif
791  }  }
792    
793    /* callback called by the gps layer whenever gps state changes */
794    static void
795    gps_callback(struct gps_state *state, gpointer data) {
796      printf("map: gps callback\n");
797    }
798    
799  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
800    map_context_t *context = NULL;    map_context_t *context = NULL;
801    
   printf("map 1\n");  
   
802    /* if the map window already exists, just raise it */    /* if the map window already exists, just raise it */
803    if(appdata->map.context) {    if(appdata->map.context) {
804      printf("using existing map!\n");      printf("using existing map!\n");
# Line 756  void map(appdata_t *appdata) { Line 807  void map(appdata_t *appdata) {
807      return;      return;
808    }    }
809    
   printf("map 2\n");  
   
810    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
811    context->appdata = appdata;    context->appdata = appdata;
812    context->map_complete = FALSE;    context->map_complete = FALSE;
# Line 770  void map(appdata_t *appdata) { Line 819  void map(appdata_t *appdata) {
819      rmdir_recursive(old_path);      rmdir_recursive(old_path);
820    }    }
821    
   printf("map 3\n");  
   
822    /* It is recommanded that all applications share these same */    /* It is recommanded that all applications share these same */
823    /* map path, so data is only cached once. The path should be: */    /* map path, so data is only cached once. The path should be: */
824    /* ~/.osm-gps-map on standard PC     (users home) */    /* ~/.osm-gps-map on standard PC     (users home) */
# Line 794  void map(appdata_t *appdata) { Line 841  void map(appdata_t *appdata) {
841    gint source = context->appdata->map.source;    gint source = context->appdata->map.source;
842    if(!source) source = MAP_SOURCE;    if(!source) source = MAP_SOURCE;
843    
   printf("map 4\n");  
   
844    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
845                   "map-source",               source,                   "map-source",               source,
846                   "tile-cache",               path,                   "tile-cache",               path,
# Line 809  void map(appdata_t *appdata) { Line 854  void map(appdata_t *appdata) {
854    
855    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
856    
   printf("map 5\n");  
   
857  #ifdef USE_MAEMO  #ifdef USE_MAEMO
858    /* we don't use a stackable window here on fremantle, since */    /* we don't use a stackable window here on fremantle, since */
859    /* 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 868  void map(appdata_t *appdata) {
868    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
869  #endif  #endif
870    
   printf("map 6\n");  
   
871  #ifndef USE_MAEMO  #ifndef USE_MAEMO
872    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
873  #endif  #endif
# Line 845  void map(appdata_t *appdata) { Line 886  void map(appdata_t *appdata) {
886    
887    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
888    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
889      context->cb_id = gps_register_callback(appdata, gps_callback, context);
   printf("map 7\n");  
890    
891  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
892    /* prevent some of the main screen things */    /* prevent some of the main screen things */
# Line 854  void map(appdata_t *appdata) { Line 894  void map(appdata_t *appdata) {
894    appdata->cur_view = NULL;    appdata->cur_view = NULL;
895  #endif  #endif
896    
   printf("map 8\n");  
   
897    g_signal_connect(G_OBJECT(context->window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
898                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
899    
   printf("map 9\n");  
900    gtk_container_add(GTK_CONTAINER(context->window), context->widget);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
   printf("map 10\n");  
901    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
   
   printf("map 11\n");  
902  }  }
Legend:
Removed from v.143  
changed lines
  Added in v.155