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

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

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