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

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

revision 40 by harbaum, Sun Aug 2 19:05:24 2009 UTC revision 81 by harbaum, Tue Aug 25 13:21:45 2009 UTC
# Line 1  Line 1 
1  /*  /*
2   * Copyright (C) 2008 Till Harbaum <till@harbaum.org>.   * Copyright (C) 2008-2009 Till Harbaum <till@harbaum.org>.
3   *   *
4   * This file is part of GPXView.   * This file is part of GPXView.
5   *   *
# Line 18  Line 18 
18   */   */
19    
20  #include "gpxview.h"  #include "gpxview.h"
21    #include "converter.h"
22  #include <math.h>    // for isnan  #include <math.h>    // for isnan
23    
24  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
25  #include "osm-gps-map.h"  #include "osm-gps-map.h"
26    #include "osm-gps-map-osd-classic.h"
27  #endif  #endif
28    
29  typedef struct {  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
30    appdata_t *appdata;  #include <gdk/gdkx.h>
31    GtkWidget *widget;  #include <X11/Xatom.h>
   GtkWidget *zoomin, *zoomout, *gps;  
   gint handler_id;  
 #if MAEMO_VERSION_MAJOR == 5  
   GtkWidget *old_view;  
32  #endif  #endif
33  } map_context_t;  
34    #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP
35    #define GPS_DEFAULT_ZOOM 13
36    
37  #define PROXY_KEY  "/system/http_proxy/"  #define PROXY_KEY  "/system/http_proxy/"
38    
# Line 72  static const char *get_proxy_uri(appdata Line 72  static const char *get_proxy_uri(appdata
72    return NULL;    return NULL;
73  }  }
74    
75  static void map_zoom(map_context_t *context, int step) {  static void
76    int zoom;  cb_map_gps(osd_button_t but, map_context_t *context) {
77    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    if(but == OSD_GPS) {
78    g_object_get(map, "zoom", &zoom, NULL);      pos_t *refpos = get_pos(context->appdata);
79    zoom = osm_gps_map_set_zoom(map, zoom+step);      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
80          gint zoom;
81    /* enable/disable zoom buttons as required */        g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
82    gtk_widget_set_sensitive(context->zoomin, zoom<17);        if(zoom < 10)
83    gtk_widget_set_sensitive(context->zoomout, zoom>1);          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
84  }                                    refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
85          else
86  static gboolean          osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
87  cb_map_zoomin(GtkButton *button, map_context_t *context) {                                 refpos->lat, refpos->lon);
88    map_zoom(context, +1);  
89    return FALSE;        /* re-enable centering */
90  }        g_object_set(context->widget, "auto-center", TRUE, NULL);
91        } else {
92  static gboolean        /* no coordinates given: display the entire world */
93  cb_map_zoomout(GtkButton *button, map_context_t *context) {        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
94    map_zoom(context, -1);                                  0.0, 0.0, 1);
95    return FALSE;      }
 }  
   
 static gboolean  
 cb_map_gps(GtkButton *button, map_context_t *context) {  
   pos_t *refpos = get_pos(context->appdata);  
   if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {  
     osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                               refpos->lat, refpos->lon, 14);  
   } else {  
     /* no coordinates given: display the entire world */  
     osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                               0.0, 0.0, 1);  
96    }    }
   
   return FALSE;  
97  }  }
98    
99  static GtkWidget  static int dist2pixel(map_context_t *context, float km, float lat) {
100  *map_add_button(const gchar *icon, GCallback cb, gpointer data,    return 1000.0*km/osm_gps_map_get_scale(OSM_GPS_MAP(context->widget));
                 char *tooltip) {  
   GtkWidget *button = gtk_button_new();  
   gtk_button_set_image(GTK_BUTTON(button),  
                        gtk_image_new_from_stock(icon, GTK_ICON_SIZE_MENU));  
   g_signal_connect(button, "clicked", cb, data);  
 #ifndef USE_MAEMO  
   gtk_widget_set_tooltip_text(button, tooltip);  
 #endif  
   return button;  
101  }  }
102    
103  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
104    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
105    
106      /* get reference position ... */
107    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
108    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
109    
110    /* get reference position and go there */    /* ... and enable "goto" button if it's valid */
111    gtk_widget_set_sensitive(context->gps, ok);    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
112                     OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
113    
114      if(ok) {
115        float heading = NAN;
116        int radius = 0;
117    
118        if(context->appdata->use_gps) {
119          heading = gps_get_heading(context->appdata);
120    
121          /* get error */
122          float eph = gps_get_eph(context->appdata);
123          if(!isnan(eph))
124            radius = dist2pixel(context, eph/1000, refpos->lat);
125        }
126    
127        g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
128        osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
129                             refpos->lat, refpos->lon, heading);
130      } else
131        osm_gps_map_clear_gps(OSM_GPS_MAP(context->widget));
132    
133    return TRUE;    return TRUE;
134  }  }
135    
# Line 139  static gboolean on_map_configure(GtkWidg Line 137  static gboolean on_map_configure(GtkWidg
137                                   GdkEventConfigure *event,                                   GdkEventConfigure *event,
138                                   map_context_t *context) {                                   map_context_t *context) {
139    
140    cb_map_gps(NULL, context);    /* set default values if they are invalid */
141      if(!context->appdata->map.zoom ||
142         isnan(context->appdata->map.pos.lat) ||
143         isnan(context->appdata->map.pos.lon)) {
144        printf("no valid map position found\n");
145    
146        pos_t *refpos = get_pos(context->appdata);
147        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
148          /* use gps position if present */
149          context->appdata->map.pos = *refpos;
150          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
151        } else {
152          /* use world map otherwise */
153          context->appdata->map.pos.lat = 0.0;
154          context->appdata->map.pos.lon = 0.0;
155          context->appdata->map.zoom = 1;
156        }
157      }
158    
159      /* jump to initial position */
160      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
161                                context->appdata->map.pos.lat,
162                                context->appdata->map.pos.lon,
163                                context->appdata->map.zoom);
164    
165    return FALSE;    return FALSE;
166  }  }
# Line 155  static void map_draw_cachelist(GtkWidget Line 176  static void map_draw_cachelist(GtkWidget
176    }    }
177  }  }
178    
179  #if MAEMO_VERSION_MAJOR == 5  static void
180    map_cachelist_nearest(cache_t *cache, pos_t *pos,
181                          cache_t **result, float *distance) {
182      while(cache) {
183        float dist =
184          pow(cache->pos.lat - pos->lat, 2) +
185          pow(cache->pos.lon - pos->lon, 2);
186    
187        if(!(dist > *distance)) {
188          *result = cache;
189          *distance = dist;
190        }
191    
192        cache = cache->next;
193      }
194    }
195    
196    static cache_t *map_closest(map_context_t *context, pos_t *pos) {
197      cache_t *result = NULL;
198      float distance = NAN;
199    
200    #ifdef USE_MAEMO
201      if(!context->appdata->cur_gpx) {
202    #endif
203        /* search all geocaches */
204        gpx_t *gpx = context->appdata->gpx;
205        while(gpx) {
206          map_cachelist_nearest(gpx->cache, pos, &result, &distance);
207          gpx = gpx->next;
208        }
209    #ifdef USE_MAEMO
210      } else {
211        map_cachelist_nearest(context->appdata->cur_gpx->cache,
212                              pos, &result, &distance);
213      }
214    #endif
215    
216      return result;
217    }
218    
219    /* translate between osm-gps-map positions and gpxview ones */
220    pos_t coord2pos(coord_t coo) {
221      pos_t pos;
222      pos.lat = rad2deg(coo.rlat);
223      pos.lon = rad2deg(coo.rlon);
224      return pos;
225    }
226    
227    #define CLICK_FUZZ (24)
228    
229    static gboolean
230    on_map_button_press_event(GtkWidget *widget,
231                                GdkEventButton *event, map_context_t *context) {
232      OsmGpsMap *map = OSM_GPS_MAP(context->widget);
233    
234      /* got a press event without release event? eat it! */
235      if(context->press_on != NULL) {
236        printf("PRESS: already\n");
237        return TRUE;
238      }
239    
240      pos_t pos =
241        coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));
242    
243      cache_t *nearest = map_closest(context, &pos);
244      if(nearest) {
245        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);
246        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)
247          context->press_on = nearest;
248      }
249    
250      return FALSE;
251    }
252    
253    static void
254    cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf *buf, gint x, gint y) {
255      /* convert the pixbuf into something cairo can handle */
256    
257      // Create a new ImageSurface
258      cairo_surface_t *image_surface =
259        cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
260                                   gdk_pixbuf_get_width(buf),
261                                   gdk_pixbuf_get_height(buf));
262    
263      // Create the new Context for the ImageSurface
264      cairo_t *context = cairo_create(image_surface);
265    
266      // Draw the image on the new Context
267      gdk_cairo_set_source_pixbuf(context, buf, 0.0, 0.0);
268      cairo_paint(context);
269    
270      // now draw this onto the original context
271      cairo_set_source_surface(cr, image_surface, x, y);
272    
273      cairo_paint(cr);
274    }
275    
276    #ifndef BIG_BALLOONS
277    #define LINE_SKIP  7
278    #else
279    #define LINE_SKIP  12
280    #endif
281    
282    static void
283    balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {
284      cache_t *cache = (cache_t*)data;
285    
286    #if 0
287      /* draw pink background to check clipping */
288      cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);
289      cairo_set_source_rgba (cr, 1, 0, 0, 0.3);
290      cairo_fill_preserve (cr);
291      cairo_set_line_width (cr, 0);
292      cairo_stroke (cr);
293    #endif
294    
295      /* leave a little border top and left */
296      gint x = rect->x, y = rect->y;
297    
298      /* draw the cache type icon ... */
299      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
300      cairo_draw_pixbuf(cr, icon, x, y);
301    
302      /* ... and right of it the waypoint id */
303      cairo_text_extents_t extents;
304    
305      if(cache->id) {
306        cairo_select_font_face (cr, "Sans",
307                                CAIRO_FONT_SLANT_NORMAL,
308                                CAIRO_FONT_WEIGHT_BOLD);
309    
310    #ifndef BIG_BALLOONS
311        cairo_set_font_size (cr, 20.0);
312    #else
313        cairo_set_font_size (cr, 36.0);
314    #endif
315    
316        cairo_text_extents (cr, cache->id, &extents);
317    
318        /* display id right of icon vertically centered */
319        x += gdk_pixbuf_get_width(icon) + 5;
320        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
321        cairo_move_to (cr, x, y);
322        cairo_set_source_rgba (cr, 0, 0, 0, 1);
323        cairo_show_text (cr, cache->id);
324        cairo_stroke (cr);
325    
326        y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
327      } else
328        y += gdk_pixbuf_get_height(icon);
329    
330      /* return to the left border and below icon/text */
331      x = rect->x;
332    
333      /* everything from here uses the same font */
334      cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
335                              CAIRO_FONT_WEIGHT_NORMAL);
336    #ifndef BIG_BALLOONS
337      cairo_set_font_size (cr, 14.0);
338    #else
339      cairo_set_font_size (cr, 22.0);
340    #endif
341    
342      if(cache->name) {
343        /* draw cache name */
344        cairo_text_extents (cr, cache->name, &extents);
345        y += extents.height;
346        cairo_move_to (cr, x, y);
347        cairo_set_source_rgba (cr, 0, 0, 0, 1);
348        cairo_show_text (cr, cache->name);
349        cairo_stroke (cr);
350    
351        /* return to the left border and below text */
352        y += LINE_SKIP;
353        x = rect->x;
354      }
355    
356      if(cache->terrain) {
357        /* draw cache rating */
358        const char *terrain = "Terrain:";
359        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
360        cairo_text_extents (cr, _(terrain), &extents);
361        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
362    
363        /* draw "Terrain:" string */
364        cairo_move_to (cr, x, y);
365        cairo_set_source_rgba (cr, 0, 0, 0, 1);
366        cairo_show_text (cr, _(terrain));
367        cairo_stroke (cr);
368        x += extents.width + 2;
369    
370        /* draw terrain stars */
371        cairo_draw_pixbuf(cr, icon, x, y -
372                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
373    
374        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
375        y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;
376      }
377    
378      if(cache->difficulty) {
379        const char *difficulty = "Difficulty:";
380        cairo_text_extents (cr, _(difficulty), &extents);
381        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
382    
383        /* draw "Difficulty:" string */
384        cairo_move_to (cr, x, y);
385        cairo_set_source_rgba (cr, 0, 0, 0, 1);
386        cairo_show_text (cr, _(difficulty));
387        cairo_stroke (cr);
388        x += extents.width + 2;
389    
390        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
391        cairo_draw_pixbuf(cr, icon, x, y -
392                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
393      }
394    }
395    
396    static gboolean
397    on_map_button_release_event(GtkWidget *widget,
398                                GdkEventButton *event, map_context_t *context) {
399      OsmGpsMap *map = OSM_GPS_MAP(context->widget);
400    
401      if(context->press_on) {
402        coord_t coo;
403        coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
404    
405        pos_t pos =
406          coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));
407    
408        cache_t *nearest = map_closest(context, &pos);
409        if(nearest && nearest == context->press_on) {
410          float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);
411          if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {
412    
413            osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,
414                                     balloon_draw_cb, nearest);
415          }
416        }
417        context->press_on = NULL;
418      } else {
419        /* save new map position */
420        gfloat lat, lon;
421        g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
422        context->appdata->map.pos.lat = lat;
423        context->appdata->map.pos.lon = lon;
424      }
425    
426      return FALSE;
427    }
428    
429  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
430    printf("destroy map view\n");    appdata_t *appdata = context->appdata;
431    
432      printf("destroy map window\n");
433    
434      /* save map parameters */
435      OsmGpsMap *map = OSM_GPS_MAP(context->widget);
436      gint zoom;
437      g_object_get(map, "zoom", &zoom, NULL);
438      context->appdata->map.zoom = zoom;
439    
440      gfloat lat, lon;
441      g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
442      context->appdata->map.pos.lat = lat;
443      context->appdata->map.pos.lon = lon;
444    
445    #if MAEMO_VERSION_MAJOR == 5
446    /* restore cur_view */    /* restore cur_view */
447    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
448    #endif
449    
450    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
451    
452    g_free(context);    g_free(context);
453      appdata->map.context = NULL;
454    }
455    
456    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
457    /* get access to zoom buttons */
458    static void
459    on_window_realize(GtkWidget *widget, gpointer data) {
460      if (widget->window) {
461        unsigned char value = 1;
462        Atom hildon_zoom_key_atom =
463          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
464          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
465        Display *dpy =
466          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
467        Window w = GDK_WINDOW_XID(widget->window);
468    
469        XChangeProperty(dpy, w, hildon_zoom_key_atom,
470                        integer_atom, 8, PropModeReplace, &value, 1);
471      }
472  }  }
473  #endif  #endif
474    
475  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
476    map_context_t *context = g_new0(map_context_t, 1);    map_context_t *context = NULL;
477    
478      /* if the map window already exists, just raise it */
479      if(appdata->map.context) {
480        gtk_window_present(GTK_WINDOW(appdata->map.context->window));
481        return;
482      }
483    
484      context = appdata->map.context = g_new0(map_context_t, 1);
485    context->appdata = appdata;    context->appdata = appdata;
486    
487  #if MAEMO_VERSION_MAJOR == 5    /* cleanup old (pre 0.8.7) path if it exists */
488    GtkWidget *window = hildon_stackable_window_new();    char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
489    gtk_window_set_title(GTK_WINDOW(window), _("Map"));    if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
490  #else      printf("old file path %s exists\n", old_path);
491    GtkWidget *dialog = gtk_dialog_new_with_buttons(_("Map"),      rmdir_recursive(old_path);
492                            GTK_WINDOW(appdata->window),    }
                           GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,  
                           GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,  
                           NULL);  
493    
494  #ifndef USE_MAEMO    /* It is recommanded that all applications share these same */
495    gtk_window_set_default_size(GTK_WINDOW(dialog), 400, 350);    /* map path, so data is only cached once. The path should be: */
496      /* ~/.osm-gps-map on standard PC     (users home) */
497      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
498      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
499    #if !defined(USE_MAEMO)
500      char *p = getenv("HOME");
501      if(!p) p = "/tmp";
502      char *path = g_strdup_printf("%s/.osm-gps-map", p);
503  #else  #else
504    gtk_window_set_default_size(GTK_WINDOW(dialog), 800, 480);  #if MAEMO_VERSION_MAJOR == 5
505      char *path = g_strdup("/home/user/.osm-gps-map");
506    #else
507      char *path = g_strdup("/media/mmc2/osm-gps-map");
508  #endif  #endif
509  #endif  #endif
510    
   GtkWidget *hbox = gtk_hbox_new(FALSE, 0);  
   
   char *path = g_strdup_printf("%s/map/", appdata->image_path);  
511    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
512    
513    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
514                  "repo-uri", MAP_SOURCE_OPENSTREETMAP,                   "map-source",               MAP_SOURCE,
515                  "tile-cache", path,                   "tile-cache",               path,
516                  proxy?"proxy-uri":NULL, proxy,                   "auto-center",              FALSE,
517                     "record-trip-history",      FALSE,
518                     "show-trip-history",        FALSE,
519                     proxy?"proxy-uri":NULL,     proxy,
520                   NULL);                   NULL);
521    
522    g_free(path);    g_free(path);
523    
524    /* draw all geocaches */    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
525    gpx_t *gpx = appdata->gpx;  
526    while(gpx) {    char *name = NULL;
527      map_draw_cachelist(context->widget, gpx->cache);  #ifdef USE_MAEMO
528      gpx = gpx->next;    if(!appdata->cur_gpx) {
529    #endif
530        /* draw all geocaches */
531        gpx_t *gpx = appdata->gpx;
532        while(gpx) {
533          map_draw_cachelist(context->widget, gpx->cache);
534          gpx = gpx->next;
535        }
536        name = g_strdup(_("all geocaches"));
537    #ifdef USE_MAEMO
538      } else {
539        map_draw_cachelist(context->widget, appdata->cur_gpx->cache);
540        name = g_strdup(appdata->cur_gpx->name);
541    }    }
542    #endif
543    
544      char *title = g_strdup_printf(_("Map - %s"), name);
545      g_free(name);
546    
547    #ifdef USE_MAEMO
548    #ifdef USE_STACKABLE_WINDOW
549      context->window = hildon_stackable_window_new();
550      /* try to enable the zoom buttons. don't do this on x86 as it breaks */
551      /* at runtime with cygwin x */
552    #ifndef __i386__
553      g_signal_connect(G_OBJECT(context->window), "realize",
554                       G_CALLBACK(on_window_realize), NULL);
555    #endif // MAEMO_VERSION
556    #else
557      context->window = hildon_window_new();
558    #endif
559    #else
560      context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
561    #endif
562    
563      gtk_window_set_title(GTK_WINDOW(context->window), title);
564    
565    #ifndef USE_MAEMO
566      gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
567    #endif
568    
569      g_free(title);
570    
571    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
572                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
573  #if 0  
574      g_signal_connect(G_OBJECT(context->widget), "button-press-event",
575                       G_CALLBACK(on_map_button_press_event), context);
576    
577    g_signal_connect(G_OBJECT(context->widget), "button-release-event",    g_signal_connect(G_OBJECT(context->widget), "button-release-event",
578                     G_CALLBACK(on_map_button_release_event), context);                     G_CALLBACK(on_map_button_release_event), context);
 #endif  
579    
   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(GTK_STOCK_ZOOM_IN, 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(GTK_STOCK_ZOOM_OUT, 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(GTK_STOCK_HOME, G_CALLBACK(cb_map_gps),  
                    context, _("Jump to GPS position"));  
   gtk_widget_set_sensitive(context->gps, FALSE);  
580    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
581    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
   gtk_box_pack_start(GTK_BOX(vbox), context->gps, FALSE, FALSE, 0);  
   
   gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);  
582    
583  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
584    /* prevent some of the main screen things */    /* prevent some of the main screen things */
585    context->old_view = appdata->cur_view;    context->old_view = appdata->cur_view;
586    appdata->cur_view = NULL;    appdata->cur_view = NULL;
587    #endif
588    
589    g_signal_connect(G_OBJECT(window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
590                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
591    
592    gtk_container_add(GTK_CONTAINER(window), hbox);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
593    gtk_widget_show_all(GTK_WIDGET(window));    gtk_widget_show_all(GTK_WIDGET(context->window));
   
 #else  
   gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox);  
   gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);  
   gtk_widget_show_all(dialog);  
   gtk_dialog_run(GTK_DIALOG(dialog));  
   gtk_timeout_remove(context->handler_id);  
   gtk_widget_destroy(dialog);  
   g_free(context);  
 #endif  
594  }  }
Legend:
Removed from v.40  
changed lines
  Added in v.81