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

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

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