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

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

revision 61 by harbaum, Tue Aug 18 14:32:45 2009 UTC revision 233 by harbaum, Wed Dec 9 19:45:36 2009 UTC
# Line 17  Line 17 
17   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.
18   */   */
19    
20    /*
21     * http://topo.geofabrik.de/relief/${z}/${x}/${y}.png  8-15
22     * 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
33    
34  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
35  #include "osm-gps-map.h"  #include "osm-gps-map.h"
36    #include "osm-gps-map-osd-classic.h"
37  #endif  #endif
38    
39  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
40    #include <gdk/gdkx.h>
41    #include <X11/Xatom.h>
42    #endif
43    
44    /* default values */
45    #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENCYCLEMAP
46  #define GPS_DEFAULT_ZOOM 13  #define GPS_DEFAULT_ZOOM 13
47    
48  #define PROXY_KEY  "/system/http_proxy/"  #define PROXY_KEY  "/system/http_proxy/"
# Line 36  static const char *get_proxy_uri(appdata Line 53  static const char *get_proxy_uri(appdata
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 57  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      }      }
# Line 66  static const char *get_proxy_uri(appdata Line 84  static const char *get_proxy_uri(appdata
84    return NULL;    return NULL;
85  }  }
86    
87  static void map_zoom(map_context_t *context, int step) {  static void
88    gint zoom;  cb_map_gps(osd_button_t but, map_context_t *context) {
   OsmGpsMap *map = OSM_GPS_MAP(context->widget);  
   g_object_get(map, "zoom", &zoom, NULL);  
   zoom = osm_gps_map_set_zoom(map, zoom+step);  
   
   /* enable/disable zoom buttons as required */  
   gtk_widget_set_sensitive(context->zoomin,  
            zoom < osm_gps_map_source_get_max_zoom(MAP_SOURCE));  
   gtk_widget_set_sensitive(context->zoomout,  
            zoom > osm_gps_map_source_get_min_zoom(MAP_SOURCE));  
   
   /* save new zoom */  
   context->appdata->map.zoom = zoom;  
 }  
89    
90  static gboolean    if(but == OSD_GPS) {
91  cb_map_zoomin(GtkButton *button, map_context_t *context) {      printf("clicked OSD_GPS %p\n", context);
92    map_zoom(context, +1);      printf("clicked OSD_GPS a %p\n", context->appdata);
   return FALSE;  
 }  
93    
94  static gboolean      pos_t *refpos = get_pos(context->appdata);
95  cb_map_zoomout(GtkButton *button, map_context_t *context) {      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
96    map_zoom(context, -1);        gint zoom;
97    return FALSE;        g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
98  }        if(zoom < 10)
99            osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
100                                      refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
101          else
102            osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
103                                   refpos->lat, refpos->lon);
104    
105  static gboolean        /* re-enable centering */
106  cb_map_gps(GtkButton *button, map_context_t *context) {        g_object_set(context->widget, "auto-center", TRUE, NULL);
107    pos_t *refpos = get_pos(context->appdata);      } else {
108    if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {        /* no coordinates given: display the entire world */
109      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
110                        refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);                                  0.0, 0.0, 1);
111    } else {      }
     /* no coordinates given: display the entire world */  
     osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                               0.0, 0.0, 1);  
112    }    }
   
   return FALSE;  
 }  
   
 static GtkWidget  
 *map_add_button(int icon, GCallback cb, gpointer data,  
                 char *tooltip) {  
   GtkWidget *button = gtk_button_new();  
   gtk_button_set_image(GTK_BUTTON(button), icon_get_widget(ICON_MISC, icon));  
   g_signal_connect(button, "clicked", cb, data);  
 #ifndef USE_MAEMO  
   gtk_widget_set_tooltip_text(button, tooltip);  
 #endif  
   return button;  
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 128  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    #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    gtk_widget_set_sensitive(context->gps, ok);    if(ok != context->goto_is_enabled) {
134        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 148  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);
# Line 157  static gboolean map_gps_update(gpointer Line 160  static gboolean map_gps_update(gpointer
160    return TRUE;    return TRUE;
161  }  }
162    
163  static gboolean on_map_configure(GtkWidget *widget,  static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
164                                   GdkEventConfigure *event,    int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;
165                                   map_context_t *context) {  
166      GdkPixbuf *icon = icon_get(type, cache->type);
167      GdkPixbuf *over = NULL;
168    
169      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 */
179      if(cache->notes && cache->notes->override)
180        pos = &cache->notes->pos;
181    
182      if(!isnan(pos->lat) && !isnan(pos->lon)) {
183        osm_gps_map_add_image(OSM_GPS_MAP(map),
184                              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    static void map_draw_wpt(GtkWidget *map, cache_t *cache, wpt_t *wpt) {
192      /* only draw wpts that don't equal the main point */
193      if(pos_differ(&cache->pos, &wpt->pos)) {
194        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),
200                                wpt->pos.lat, wpt->pos.lon, icon);
201        }
202      }
203    }
204    
205    static void map_draw_gpx(appdata_t *appdata, cache_display_t *caches,
206                             GtkWidget *map, gpx_t *gpx,
207                             cache_t *nav, gboolean semi) {
208      if(!gpx->notes_loaded) {
209        notes_load_all(appdata, gpx);
210        gpx->notes_loaded = TRUE;
211      }
212    
213      cache_t *cache = gpx->cache;
214      while(cache) {
215        /* 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    /* set default values if they are invalid */      cache = cache->next;
237    if(!context->appdata->map.zoom ||    }
238       isnan(context->appdata->map.pos.lat) ||  }
239       isnan(context->appdata->map.pos.lon)) {  
240      printf("no valid map position found\n");  /* draw geocaches and set window title */
241    static void map_setup(map_context_t *context) {
242      char *name = NULL;
243    
244      int cache_num = gpx_total_caches_global(context->appdata->gpx);
245    
246      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
247        //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
248        //     cache_num, context->cache_list_len);
249        g_free(context->caches_displayed);
250        context->caches_displayed = NULL;
251        context->cache_list_len = 0;
252      }
253    
254      /* allocate buffer */
255      if(cache_num && !context->caches_displayed) {
256        context->cache_list_len = cache_num;
257        context->caches_displayed = g_new0(cache_display_t, cache_num+1);
258        printf("allocated space to handle %d map icons\n", cache_num);
259      }
260    
261      if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
262        if(context->state != MAP_ALL) {
263          printf("map_setup(ALL)\n");
264    
265          /* clear any pending balloon */
266          context->balloon = NULL;
267          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
268    
269    #ifdef OSD_NAV
270          /* no navigation in this mode */
271          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
272    #endif
273    
274          /* clear all existing cache images */
275          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
276          memset(context->caches_displayed, 0,
277                 (cache_num+1) * sizeof(cache_display_t));
278    
279          /* draw all geocaches and none is semi-transparent */
280          gpx_t *gpx = context->appdata->gpx;
281          while(gpx) {
282            map_draw_gpx(context->appdata, context->caches_displayed,
283                         context->widget, gpx, NULL, FALSE);
284            gpx = gpx->next;
285          }
286    
287          {
288            int i=0;
289            while(context->caches_displayed[i].id) i++;
290            printf("number of caches actually displayed: %d\n", i);
291          }
292    
293          name = g_strdup(_("all"));
294          context->state = MAP_ALL;
295        }
296      } else if(!context->appdata->cur_cache) {
297        if(context->state != MAP_GPX) {
298          printf("map_setup(GPX)\n");
299    
300          /* clear any pending balloon */
301          context->balloon = NULL;
302          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
303    
304    #ifdef OSD_NAV
305          /* no navigation in this mode */
306          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
307    #endif
308    
309          /* clear all existing cache images */
310          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
311          memset(context->caches_displayed, 0,
312                 (cache_num+1) * sizeof(cache_display_t));
313    
314          /* draw all geocaches and all other gpx files are semi-transparent */
315          map_draw_gpx(context->appdata, context->caches_displayed,
316                       context->widget, context->appdata->cur_gpx, NULL, FALSE);
317    
318          gpx_t *gpx = context->appdata->gpx;
319          while(gpx) {
320            if(gpx != context->appdata->cur_gpx)
321              map_draw_gpx(context->appdata, context->caches_displayed,
322                           context->widget, gpx, NULL, TRUE);
323    
324            gpx = gpx->next;
325          }
326    
327          name = g_strdup(context->appdata->cur_gpx->name);
328          context->state = MAP_GPX;
329        }
330      } else {
331        cache_t *cache = context->appdata->cur_cache;
332    
333      pos_t *refpos = get_pos(context->appdata);      printf("map_setup(CACHE)\n");
334      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {  
335        /* use gps position if present */      /* clear any pending balloon */
336        context->appdata->map.pos = *refpos;      context->balloon = NULL;
337        context->appdata->map.zoom = GPS_DEFAULT_ZOOM;      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
338      } else {  
339        /* use world map otherwise */      /* clear all existing ccahe images */
340        context->appdata->map.pos.lat = 0.0;      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
341        context->appdata->map.pos.lon = 0.0;      memset(context->caches_displayed, 0,
342        context->appdata->map.zoom = 1;             (cache_num+1) * sizeof(cache_display_t));
343    
344        /* draw all geocaches and all but selected one are semi-transparent */
345        gpx_t *gpx = context->appdata->gpx;
346        while(gpx) {
347          map_draw_gpx(context->appdata, context->caches_displayed,
348                       context->widget, gpx, cache, FALSE);
349          gpx = gpx->next;
350      }      }
351    
352        name = g_strdup(cache->name);
353        context->state = MAP_CACHE;
354    
355        /* navigation in this mode! */
356        pos_t cpos = gpx_cache_pos(cache);
357    
358    #ifdef OSD_NAV
359        osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
360                                  context->appdata->imperial,
361                                  cpos.lat, cpos.lon, cache->name);
362    #else
363    #warning OSD_NAV not defined!
364    #endif
365    }    }
366    
367    /* jump to initial position */    /* also mark geomath position */
368    osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
369                              context->appdata->map.pos.lat,    /* remove all existing appearances of this icon first */
370                              context->appdata->map.pos.lon,    osm_gps_map_remove_image(OSM_GPS_MAP(context->widget),
371                              context->appdata->map.zoom);                             icon_get(ICON_MISC, 4));
372    
373    return FALSE;    if(!isnan(context->appdata->geomath.lat) &&
374  }       !isnan(context->appdata->geomath.lon))  {
375    
376  static void map_draw_cachelist(GtkWidget *map, cache_t *cache) {      osm_gps_map_add_image(OSM_GPS_MAP(context->widget),
377    while(cache) {                            context->appdata->geomath.lat,
378      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);                            context->appdata->geomath.lon,
379                              icon_get(ICON_MISC, 4));
380      }
381    
382      if(name) {
383        char *title = g_strdup_printf(_("Map - %s"), name);
384        g_free(name);
385    
386        gtk_window_set_title(GTK_WINDOW(context->window), title);
387    
388      osm_gps_map_add_image(OSM_GPS_MAP(map),      g_free(title);
389                            cache->pos.lat, cache->pos.lon, icon);    } else
390        printf("map_setup(keep)\n");
391    }
392    
393      cache = cache->next;  static gboolean on_map_configure(GtkWidget *widget,
394                                     GdkEventConfigure *event,
395                                     map_context_t *context) {
396    
397      /* for some reason there's a configure event with 1/1 */
398      /* on diablo. We just ignore this! */
399    
400      printf("on_map_configure %d %d\n",
401             widget->allocation.width,
402             widget->allocation.height);
403    
404      if(!context->map_complete &&
405         (widget->allocation.width > 100) &&
406         (widget->allocation.height > 100)) {
407    
408        /* setup cache state */
409        map_setup(context);
410    
411        /* set default values if they are invalid */
412        if(!context->appdata->map.zoom ||
413           isnan(context->appdata->map.pos.lat) ||
414           isnan(context->appdata->map.pos.lon)) {
415          printf("no valid map position found\n");
416    
417          pos_t *refpos = get_pos(context->appdata);
418          if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
419            printf("use refpos\n");
420    
421            /* use gps position if present */
422            context->appdata->map.pos = *refpos;
423            context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
424          } else {
425            printf("use zero pos\n");
426    
427            /* use world map otherwise */
428            context->appdata->map.pos.lat = 0.0;
429            context->appdata->map.pos.lon = 0.0;
430            context->appdata->map.zoom = 1;
431          }
432        }
433    
434        /* jump to initial position */
435        printf("osm_gps_map_set_mapcenter(%f,%f,%d)\n",
436               context->appdata->map.pos.lat,
437               context->appdata->map.pos.lon,
438               context->appdata->map.zoom);
439    
440        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
441                                  context->appdata->map.pos.lat,
442                                  context->appdata->map.pos.lon,
443                                  context->appdata->map.zoom);
444        context->map_complete = TRUE;
445    }    }
446    
447      return FALSE;
448  }  }
449    
450  static void  static void
451  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
452                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
453    
454    while(cache) {    while(cache) {
455        pos_t cpos = gpx_cache_pos(cache);
456    
457      float dist =      float dist =
458        pow(cache->pos.lat - pos->lat, 2) +        pow(cpos.lat - pos->lat, 2) +
459        pow(cache->pos.lon - pos->lon, 2);        pow(cpos.lon - pos->lon, 2);
460    
461      if(!(dist > *distance)) {      if(!(dist > *distance)) {
462        *result = cache;        *result = cache;
# Line 221  static cache_t *map_closest(map_context_ Line 471  static cache_t *map_closest(map_context_
471    cache_t *result = NULL;    cache_t *result = NULL;
472    float distance = NAN;    float distance = NAN;
473    
474  #ifdef USE_MAEMO    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
   if(!context->appdata->cur_gpx) {  
 #endif  
475      /* search all geocaches */      /* search all geocaches */
476      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
477      while(gpx) {      while(gpx) {
478        map_cachelist_nearest(gpx->cache, pos, &result, &distance);        map_cachelist_nearest(gpx->cache, pos, &result, &distance);
479        gpx = gpx->next;        gpx = gpx->next;
480      }      }
481  #ifdef USE_MAEMO    } else if(context->appdata->cur_gpx) {
   } else {  
482      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
483                            pos, &result, &distance);                            pos, &result, &distance);
484    }    } else
485  #endif      result = context->appdata->cur_gpx->cache;
486    
487    return result;    return result;
488  }  }
# Line 253  pos_t coord2pos(coord_t coo) { Line 500  pos_t coord2pos(coord_t coo) {
500  static gboolean  static gboolean
501  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
502                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
503    
504    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
505    
506      /* check if we actually clicked parts of the OSD */
507      if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)
508        return FALSE;
509    
510    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
511    if(context->press_on != NULL) {    if(context->press_on != NULL) {
512      printf("PRESS: already\n");      printf("PRESS: already\n");
513      return TRUE;      return FALSE;
514    }    }
515    
516    pos_t pos =    pos_t pos =
# Line 266  on_map_button_press_event(GtkWidget *wid Line 518  on_map_button_press_event(GtkWidget *wid
518    
519    cache_t *nearest = map_closest(context, &pos);    cache_t *nearest = map_closest(context, &pos);
520    if(nearest) {    if(nearest) {
521      float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);      pos_t cpos = gpx_cache_pos(nearest);
522      if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)  
523        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
524        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ)
525        context->press_on = nearest;        context->press_on = nearest;
526    }    }
527    
# Line 285  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 539  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
539                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
540    
541    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
542      g_assert(image_surface);
543    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
544    
545    // Draw the image on the new Context    // Draw the image on the new Context
# Line 297  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 552  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
552    cairo_paint(cr);    cairo_paint(cr);
553  }  }
554    
555  #define LINE_SKIP  7  #ifndef BIG_BALLOONS
556    #define ICON_SIZE  ICON_CACHE_TYPE
557    #else
558    #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
559    #endif
560    
561    #ifndef BIG_BALLOONS
562    #define FONT_SIZE 14.0
563    #else
564    #define FONT_SIZE 22.0
565    #endif
566    #define LINE_SKIP  (FONT_SIZE/4)
567    
568    
569  static void  static void
570  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
571    cache_t *cache = (cache_t*)data;    printf("balloon event: ");
572    
573      map_context_t *context = (map_context_t*)data;
574      cache_t *cache = context->balloon;
575    
576    //  printf("draw cb for \"%s\"\n", cache->name);    if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
577        printf("draw\n");
578    
579  #if 0  #if 0
580    /* draw pink background to check clipping */      /* draw pink background to check clipping */
581    cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);      cairo_rectangle (event->data.draw.cr,
582    cairo_set_source_rgba (cr, 1, 0, 0, 0.3);                       event->data.draw.rect->x-20, event->data.draw.rect->y-20,
583    cairo_fill_preserve (cr);                       event->data.draw.rect->w+40, event->data.draw.rect->h+40);
584    cairo_set_line_width (cr, 0);      cairo_set_source_rgba (event->data.draw.cr, 1, 0, 0, 0.3);
585    cairo_stroke (cr);      cairo_fill_preserve (event->data.draw.cr);
586  #endif      cairo_set_line_width (event->data.draw.cr, 0);
587        cairo_stroke (event->data.draw.cr);
588    /* leave a little border top and left */  #endif
589    gint x = rect->x, y = rect->y;  
590        /* leave a little border top and left */
591    /* draw the cache type icon ... */      gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
592    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  
593    cairo_draw_pixbuf(cr, icon, x, y);      /* draw the cache type icon ... */
594        GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
595        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
596    
597        if(cache->notes && cache->notes->override) {
598          GdkPixbuf *over = icon_get(ICON_SIZE, 11);
599          cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
600        }
601    
602        /* ... and right of it the waypoint id */
603        cairo_text_extents_t extents;
604    
605        if(cache->id) {
606          cairo_select_font_face (event->data.draw.cr, "Sans",
607                                  CAIRO_FONT_SLANT_NORMAL,
608                                  CAIRO_FONT_WEIGHT_BOLD);
609    
610    #ifndef BIG_BALLOONS
611          cairo_set_font_size (event->data.draw.cr, 20.0);
612    #else
613          cairo_set_font_size (event->data.draw.cr, 36.0);
614    #endif
615    
616          cairo_text_extents (event->data.draw.cr, cache->id, &extents);
617    
618          /* display id right of icon vertically centered */
619          x += gdk_pixbuf_get_width(icon) + 5;
620          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
621          cairo_move_to (event->data.draw.cr, x, y);
622          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
623          cairo_show_text (event->data.draw.cr, cache->id);
624          cairo_stroke (event->data.draw.cr);
625    
626          y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
627        } else
628          y += gdk_pixbuf_get_height(icon);
629    
630        /* return to the left border and below icon/text */
631        x = event->data.draw.rect->x;
632    
633        /* everything from here uses the same font */
634        cairo_select_font_face (event->data.draw.cr, "Sans",
635                                CAIRO_FONT_SLANT_NORMAL,
636                                CAIRO_FONT_WEIGHT_NORMAL);
637    
638    /* ... and right of it the waypoint id */      cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
639    cairo_text_extents_t extents;  
640        if(cache->name) {
641          /* draw cache name */
642          cairo_text_extents (event->data.draw.cr, cache->name, &extents);
643          cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
644          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
645          cairo_show_text (event->data.draw.cr, cache->name);
646          cairo_stroke (event->data.draw.cr);
647    
648          /* return to the left border and below text */
649          y += LINE_SKIP + FONT_SIZE;
650          x = event->data.draw.rect->x;
651        }
652    
653        if(cache->terrain) {
654          int text_y = 0, icon_y = 0;
655    
656    if(cache->id) {        /* draw cache rating */
657      cairo_select_font_face (cr, "Sans",        const char *terrain = "Terrain:";
658                              CAIRO_FONT_SLANT_NORMAL,        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
659                              CAIRO_FONT_WEIGHT_BOLD);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
660    
661      cairo_set_font_size (cr, 20.0);        if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
662      cairo_text_extents (cr, cache->id, &extents);          text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
663          else
664            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
665    
666          /* draw "Terrain:" string */
667          cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
668          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
669          cairo_show_text (event->data.draw.cr, _(terrain));
670          cairo_stroke (event->data.draw.cr);
671          x += extents.width + 2;
672    
673          /* draw terrain stars */
674          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
675    
676          x += gdk_pixbuf_get_width(icon) + FONT_SIZE/2;
677        }
678    
679        if(cache->difficulty) {
680          int text_y = 0, icon_y = 0;
681    
682      /* display id right of icon vertically centered */        const char *difficulty = "Difficulty:";
683      x += gdk_pixbuf_get_width(icon) + 5;        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
684      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
685      cairo_move_to (cr, x, y);  
686      cairo_set_source_rgba (cr, 0, 0, 0, 1);        if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
687      cairo_show_text (cr, cache->id);          text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
688      cairo_stroke (cr);        else
689            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
690    
691          /* draw "Difficulty:" string */
692          cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
693          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
694          cairo_show_text (event->data.draw.cr, _(difficulty));
695          cairo_stroke (event->data.draw.cr);
696          x += extents.width + 2;
697    
698          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
699        }
700    
701      y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;      /* draw container info */
702    } else      /* TODO ... */
     y += gdk_pixbuf_get_height(icon);  
703    
   /* return to the left border and below icon/text */  
   x = rect->x;  
704    
705    /* everything from here uses the same font */    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
706    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      printf("click %s event at %d %d\n",
707                            CAIRO_FONT_WEIGHT_NORMAL);             event->data.click.down?"down":"up",
708    cairo_set_font_size (cr, 14.0);             event->data.click.x, event->data.click.y);
709    
710    if(cache->name) {      /* make the main screen jump to that cache */
711      /* draw cache name */      if(!event->data.click.down) {
712      cairo_text_extents (cr, cache->name, &extents);        if(context->appdata->cur_cache) {
713      y += extents.height;          printf("ERROR: no current cache should be visible!\n");
714      cairo_move_to (cr, x, y);        } else {
715      cairo_set_source_rgba (cr, 0, 0, 0, 1);          gpx_t *is_in = NULL;
716      cairo_show_text (cr, cache->name);  
717      cairo_stroke (cr);          if(!context->appdata->cur_gpx) {
718              printf("click while in \"all\" view\n");
719      /* return to the left border and below text */  
720      y += LINE_SKIP;            /* we first need to figure out which gpx file this cache */
721      x = rect->x;            /* is in so we can open it first */
722    }            gpx_t *gpx = context->appdata->gpx;
723              while(gpx && !is_in) {
724    if(cache->terrain) {              cache_t *cur = gpx->cache;
725      /* draw cache rating */              while(cur && !is_in) {
726      const char *terrain = "Terrain:";                if(cur == cache)
727      icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));                  is_in = gpx;
728      cairo_text_extents (cr, _(terrain), &extents);                cur = cur->next;
729      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;              }
730                gpx = gpx->next;
731      /* draw "Terrain:" string */            }
732      cairo_move_to (cr, x, y);  
733      cairo_set_source_rgba (cr, 0, 0, 0, 1);            if(is_in)
734      cairo_show_text (cr, _(terrain));              gpxlist_goto_cachelist(context->appdata, is_in);
735      cairo_stroke (cr);  
736      x += extents.width + 2;          } else
737              /* the simple case: there already is an open gpx file and */
738      /* draw terrain stars */            /* we just jump into the "cache" view */
739      cairo_draw_pixbuf(cr, icon, x, y -            is_in = context->appdata->cur_gpx;
740                        (gdk_pixbuf_get_height(icon) + extents.height)/2);  
741            if(is_in) {
742      x += gdk_pixbuf_get_width(icon) + LINE_SKIP;            printf("selecting %s in %s\n",
743      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;                   cache->id,
744    }                   context->appdata->cur_gpx->name);
745    
746    if(cache->difficulty) {            cachelist_goto_cache(context->appdata, cache);
747      const char *difficulty = "Difficulty:";  
748      cairo_text_extents (cr, _(difficulty), &extents);            /* give focus to main screen (important for maemo) */
749      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;            printf("raising main window\n");
750              gtk_window_present(GTK_WINDOW(context->appdata->window));
751      /* draw "Difficulty:" string */          }
752      cairo_move_to (cr, x, y);        }
753      cairo_set_source_rgba (cr, 0, 0, 0, 1);      }
754      cairo_show_text (cr, _(difficulty));    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
755      cairo_stroke (cr);      printf("removed\n");
756      x += extents.width + 2;      context->balloon = NULL;
   
     icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));  
     cairo_draw_pixbuf(cr, icon, x, y -  
                       (gdk_pixbuf_get_height(icon) + extents.height)/2);  
757    }    }
758  }  }
759    
# Line 411  on_map_button_release_event(GtkWidget *w Line 762  on_map_button_release_event(GtkWidget *w
762                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
763    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
764    
765      /* in "MAP_CACHE" state only one cache is visible */
766      /* and the map is in navigation mode. the balloon is */
767      /* pretty useless there */
768    if(context->press_on) {    if(context->press_on) {
769    
770      coord_t coo;      coord_t coo;
771      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
772    
# Line 420  on_map_button_release_event(GtkWidget *w Line 775  on_map_button_release_event(GtkWidget *w
775    
776      cache_t *nearest = map_closest(context, &pos);      cache_t *nearest = map_closest(context, &pos);
777      if(nearest && nearest == context->press_on) {      if(nearest && nearest == context->press_on) {
778        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);        pos_t cpos = gpx_cache_pos(nearest);
779        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {  
780          float dist = gpx_pos_get_distance(pos, cpos, FALSE);
781          if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
782    
783          osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,          context->balloon = nearest;
784                                   balloon_draw_cb, nearest);          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
785                                         balloon_cb, context);
786        }        }
787      }      }
788      context->press_on = NULL;      context->press_on = NULL;
# Line 442  on_map_button_release_event(GtkWidget *w Line 800  on_map_button_release_event(GtkWidget *w
800  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
801    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
802    
   printf("destroy map window\n");  
   
803    /* save map parameters */    /* save map parameters */
804    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
805    gint zoom;    gint zoom;
# Line 455  static void on_window_destroy(GtkWidget Line 811  static void on_window_destroy(GtkWidget
811    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
812    context->appdata->map.pos.lon = lon;    context->appdata->map.pos.lon = lon;
813    
814      gint source;
815      g_object_get(map, "map-source", &source, NULL);
816      context->appdata->map.source = source;
817    
818  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
819    /* restore cur_view */    /* restore cur_view */
820    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
821  #endif  #endif
822    
823    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
824      gps_unregister_callback(appdata, context->cb_id);
825    
826      if(context->caches_displayed) {
827        g_free(context->caches_displayed);
828        context->caches_displayed = NULL;
829      }
830    
831      printf("destroy map context\n");
832    g_free(context);    g_free(context);
833    appdata->map.context = NULL;    appdata->map.context = NULL;
834  }  }
835    
836    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
837    /* get access to zoom buttons */
838    static void
839    on_window_realize(GtkWidget *widget, gpointer data) {
840      if (widget->window) {
841        unsigned char value = 1;
842        Atom hildon_zoom_key_atom =
843          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
844          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
845        Display *dpy =
846          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
847        Window w = GDK_WINDOW_XID(widget->window);
848    
849        XChangeProperty(dpy, w, hildon_zoom_key_atom,
850                        integer_atom, 8, PropModeReplace, &value, 1);
851      }
852    }
853    #endif
854    
855    /* on maemo a window is either on top or completely invisible. this */
856    /* means that we only need to update the map window if its raised.  */
857    /* on ordinary desktops this is different and we always update */
858    
859    static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
860                             gpointer data) {
861      map_context_t *context = (map_context_t*)data;
862    
863      printf("map got focus\n");
864    
865    #ifdef USE_MAEMO
866      /* re-enable refresh of map */
867      if(!context->handler_id)
868        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
869    #endif
870    
871      map_setup(context);
872      return FALSE;
873    }
874    
875    static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
876                             gpointer data) {
877      map_context_t *context = (map_context_t*)data;
878    
879      printf("map lost focus\n");
880    
881      /* save new map position */
882      gfloat lat, lon;
883      g_object_get(widget, "latitude", &lat, "longitude", &lon, NULL);
884    
885      context->appdata->map.pos.lat = lat;
886      context->appdata->map.pos.lon = lon;
887    
888    #ifdef USE_MAEMO
889      gtk_timeout_remove(context->handler_id);
890      context->handler_id = 0;
891    #endif
892    
893      return FALSE;
894    }
895    
896    void map_update(appdata_t *appdata) {
897      printf("map_update\n");
898    #ifndef USE_MAEMO
899      if(appdata->map.context)
900        map_setup(appdata->map.context);
901    #endif
902    }
903    
904    /* callback called by the gps layer whenever gps state changes */
905    static void
906    gps_callback(struct gps_state *state, gpointer data) {
907      printf("map: gps callback\n");
908    }
909    
910  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
911    map_context_t *context = NULL;    map_context_t *context = NULL;
912    
913    /* if the map window already exists, just raise it */    /* if the map window already exists, just raise it */
914    if(appdata->map.context) {    if(appdata->map.context) {
915        printf("using existing map!\n");
916      gtk_window_present(GTK_WINDOW(appdata->map.context->window));      gtk_window_present(GTK_WINDOW(appdata->map.context->window));
917        map_setup(appdata->map.context);
918      return;      return;
919    }    }
920    
921    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
922      printf("allocated new context at %p\n", context);
923    
924    context->appdata = appdata;    context->appdata = appdata;
925      context->map_complete = FALSE;
926      context->state = MAP_NONE;
927    
928    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);    /* cleanup old (pre 0.8.7) path if it exists */
929      char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
930      if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
931        printf("old file path %s exists\n", old_path);
932        rmdir_recursive(old_path);
933      }
934    
935      /* It is recommanded that all applications share these same */
936      /* map path, so data is only cached once. The path should be: */
937      /* ~/.osm-gps-map on standard PC     (users home) */
938      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
939      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
940    #if !defined(USE_MAEMO)
941      char *p = getenv("HOME");
942      if(!p) p = "/tmp";
943      char *path = g_strdup_printf("%s/.osm-gps-map", p);
944    #else
945    #if MAEMO_VERSION_MAJOR == 5
946      char *path = g_strdup("/home/user/.osm-gps-map");
947    #else
948      char *path = g_strdup("/media/mmc2/osm-gps-map");
949    #endif
950    #endif
951    
   char *path = g_strdup_printf("%s/map/", appdata->image_path);  
952    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
953    
954      gint source = context->appdata->map.source;
955      if(!source) source = MAP_SOURCE;
956    
957    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
958                   "map-source",               MAP_SOURCE,                   "map-source",               source,
959                   "tile-cache",               path,                   "tile-cache",               path,
960                   "auto-center",              FALSE,                   "auto-center",              FALSE,
961                   "record-trip-history",      FALSE,                   "record-trip-history",      FALSE,
# Line 494  void map(appdata_t *appdata) { Line 965  void map(appdata_t *appdata) {
965    
966    g_free(path);    g_free(path);
967    
968    char *name = NULL;    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
 #ifdef USE_MAEMO  
   if(!appdata->cur_gpx) {  
 #endif  
     /* draw all geocaches */  
     gpx_t *gpx = appdata->gpx;  
     while(gpx) {  
       map_draw_cachelist(context->widget, gpx->cache);  
       gpx = gpx->next;  
     }  
     name = g_strdup(_("all geocaches"));  
 #ifdef USE_MAEMO  
   } else {  
     map_draw_cachelist(context->widget, appdata->cur_gpx->cache);  
     name = g_strdup(appdata->cur_gpx->name);  
   }  
 #endif  
   
   char *title = g_strdup_printf(_("Map - %s"), name);  
   g_free(name);  
969    
970  #ifdef USE_MAEMO  #ifdef USE_MAEMO
971  #ifdef USE_STACKABLE_WINDOW    /* we don't use a stackable window here on fremantle, since */
972    context->window = hildon_stackable_window_new();    /* this leaves the main window independent from the map and */
973  #else    /* the user can e.g. still navigate the main menu */
974    context->window = hildon_window_new();    context->window = hildon_window_new();
975  #endif  
976    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
977      g_signal_connect(G_OBJECT(context->window), "realize",
978                       G_CALLBACK(on_window_realize), NULL);
979    #endif // MAEMO_VERSION
980  #else  #else
981    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
982  #endif  #endif
983    
   gtk_window_set_title(GTK_WINDOW(context->window), title);  
   
984  #ifndef USE_MAEMO  #ifndef USE_MAEMO
985    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
986  #endif  #endif
987    
988    g_free(title);    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
989                       G_CALLBACK(on_focus_in), context);
990    
991      g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
992                       G_CALLBACK(on_focus_out), context);
993    
994    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
995                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
# Line 542  void map(appdata_t *appdata) { Line 1000  void map(appdata_t *appdata) {
1000    g_signal_connect(G_OBJECT(context->widget), "button-release-event",    g_signal_connect(G_OBJECT(context->widget), "button-release-event",
1001                     G_CALLBACK(on_map_button_release_event), context);                     G_CALLBACK(on_map_button_release_event), context);
1002    
   gtk_box_pack_start_defaults(GTK_BOX(hbox), context->widget);  
   /* zoom button box */  
   GtkWidget *vbox = gtk_vbox_new(FALSE,0);  
   
   context->zoomin =  
     map_add_button(10, G_CALLBACK(cb_map_zoomin),  
                    context, _("Zoom in"));  
   gtk_box_pack_start(GTK_BOX(vbox), context->zoomin, FALSE, FALSE, 0);  
   
   context->zoomout =  
     map_add_button(11, G_CALLBACK(cb_map_zoomout),  
                    context, _("Zoom out"));  
   gtk_box_pack_start(GTK_BOX(vbox), context->zoomout, FALSE, FALSE, 0);  
   
   context->gps =  
     map_add_button(9, G_CALLBACK(cb_map_gps),  
                    context, _("Jump to GPS position"));  
   gtk_widget_set_sensitive(context->gps, FALSE);  
   
1003    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
1004    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
1005    gtk_box_pack_start(GTK_BOX(vbox), context->gps, FALSE, FALSE, 0);    context->cb_id = gps_register_callback(appdata, gps_callback, context);
   
   gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);  
1006    
1007  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
1008    /* prevent some of the main screen things */    /* prevent some of the main screen things */
# Line 576  void map(appdata_t *appdata) { Line 1013  void map(appdata_t *appdata) {
1013    g_signal_connect(G_OBJECT(context->window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
1014                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
1015    
1016    gtk_container_add(GTK_CONTAINER(context->window), hbox);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
1017    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
1018  }  }
Legend:
Removed from v.61  
changed lines
  Added in v.233