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

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

revision 51 by harbaum, Wed Aug 12 12:16:05 2009 UTC revision 129 by harbaum, Tue Sep 29 14:30:16 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  #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  #endif
33    
34  #define GPS_DEFAULT_ZOOM 13  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
35    #include <gdk/gdkx.h>
36  /* equatorial radius in meters */  #include <X11/Xatom.h>
 #define EQ_RADIUS     (6378137.0)  
   
 #define RAD2DEG(a)  (((a)*180.0)/M_PI)  
 #define DEG2RAD(a)  (((a)*M_PI)/180.0)  
   
 typedef struct {  
   appdata_t *appdata;  
   GtkWidget *widget;  
   GtkWidget *zoomin, *zoomout, *gps;  
   gint handler_id;  
   cache_t *press_on;  
 #if MAEMO_VERSION_MAJOR == 5  
   GtkWidget *old_view;  
37  #endif  #endif
38  } map_context_t;  
39    /* default values */
40    #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENCYCLEMAP
41    #define GPS_DEFAULT_ZOOM 13
42    
43  #define PROXY_KEY  "/system/http_proxy/"  #define PROXY_KEY  "/system/http_proxy/"
44    
# Line 81  static const char *get_proxy_uri(appdata Line 78  static const char *get_proxy_uri(appdata
78    return NULL;    return NULL;
79  }  }
80    
81  static void map_zoom(map_context_t *context, int step) {  static void
82    gint zoom;  cb_map_gps(osd_button_t but, map_context_t *context) {
83    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    if(but == OSD_GPS) {
84    g_object_get(map, "zoom", &zoom, NULL);      pos_t *refpos = get_pos(context->appdata);
85    zoom = osm_gps_map_set_zoom(map, zoom+step);      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
86          gint zoom;
87    /* enable/disable zoom buttons as required */        g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
88    gtk_widget_set_sensitive(context->zoomin, zoom<17);        if(zoom < 10)
89    gtk_widget_set_sensitive(context->zoomout, zoom>1);          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
90                                      refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
91    /* save new zoom */        else
92    context->appdata->map.zoom = zoom;          osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
93  }                                 refpos->lat, refpos->lon);
   
 static gboolean  
 cb_map_zoomin(GtkButton *button, map_context_t *context) {  
   map_zoom(context, +1);  
   return FALSE;  
 }  
   
 static gboolean  
 cb_map_zoomout(GtkButton *button, map_context_t *context) {  
   map_zoom(context, -1);  
   return FALSE;  
 }  
94    
95  static gboolean        /* re-enable centering */
96  cb_map_gps(GtkButton *button, map_context_t *context) {        g_object_set(context->widget, "auto-center", TRUE, NULL);
97    pos_t *refpos = get_pos(context->appdata);      } else {
98    if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {        /* no coordinates given: display the entire world */
99      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
100                        refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);                                  0.0, 0.0, 1);
101    } else {      }
     /* no coordinates given: display the entire world */  
     osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                               0.0, 0.0, 1);  
102    }    }
   
   return FALSE;  
103  }  }
104    
105  static GtkWidget  static int dist2pixel(map_context_t *context, float km, float lat) {
106  *map_add_button(int 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), 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;  
107  }  }
108    
109  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
# Line 142  static gboolean map_gps_update(gpointer Line 114  static gboolean map_gps_update(gpointer
114    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
115    
116    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
117    gtk_widget_set_sensitive(context->gps, ok);    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) {    if(ok) {
121      float heading = context->appdata->use_gps?      float heading = NAN;
122        gps_get_heading(context->appdata):NAN;      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     osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),      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);                           refpos->lat, refpos->lon, heading);
136    } else    } else
137      osm_gps_map_clear_gps(OSM_GPS_MAP(context->widget));      osm_gps_map_clear_gps(OSM_GPS_MAP(context->widget));
# Line 160  static gboolean on_map_configure(GtkWidg Line 143  static gboolean on_map_configure(GtkWidg
143                                   GdkEventConfigure *event,                                   GdkEventConfigure *event,
144                                   map_context_t *context) {                                   map_context_t *context) {
145    
146    /* set default values if they are invalid */    if(!context->map_complete) {
147    if(!context->appdata->map.zoom ||  
148       isnan(context->appdata->map.pos.lat) ||      /* set default values if they are invalid */
149       isnan(context->appdata->map.pos.lon)) {      if(!context->appdata->map.zoom ||
150      printf("no valid map position found\n");         isnan(context->appdata->map.pos.lat) ||
151           isnan(context->appdata->map.pos.lon)) {
152      pos_t *refpos = get_pos(context->appdata);        printf("no valid map position found\n");
153      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {  
154        /* use gps position if present */        pos_t *refpos = get_pos(context->appdata);
155        context->appdata->map.pos = *refpos;        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
156        context->appdata->map.zoom = GPS_DEFAULT_ZOOM;          /* use gps position if present */
157      } else {          context->appdata->map.pos = *refpos;
158        /* use world map otherwise */          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
159        context->appdata->map.pos.lat = 0.0;        } else {
160        context->appdata->map.pos.lon = 0.0;          /* use world map otherwise */
161        context->appdata->map.zoom = 1;          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    
   /* jump to initial position */  
   osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                             context->appdata->map.pos.lat,  
                             context->appdata->map.pos.lon,  
                             context->appdata->map.zoom);  
   
175    return FALSE;    return FALSE;
176  }  }
177    
178  static void map_draw_cachelist(GtkWidget *map, cache_t *cache) {  static void map_draw_cache(GtkWidget *map, cache_t *cache) {
179    while(cache) {    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
     GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  
180    
181      /* check if there's also an overwritten coordinate */
182      if(cache->notes && cache->notes->override) {
183        GdkPixbuf *over = icon_get(ICON_MISC, 1);
184    
185        osm_gps_map_add_image(OSM_GPS_MAP(map),
186              cache->notes->pos.lat, cache->notes->pos.lon, icon);
187    
188        osm_gps_map_add_image(OSM_GPS_MAP(map),
189              cache->notes->pos.lat, cache->notes->pos.lon, over);
190      } else
191      osm_gps_map_add_image(OSM_GPS_MAP(map),      osm_gps_map_add_image(OSM_GPS_MAP(map),
192                            cache->pos.lat, cache->pos.lon, icon);                            cache->pos.lat, cache->pos.lon, icon);
193    
     cache = cache->next;  
   }  
194  }  }
195    
196  /* draw a nice popup */  static void map_draw_gpx(appdata_t *appdata, GtkWidget *map, gpx_t *gpx) {
197  typedef struct {    if(!gpx->notes_loaded) {
198    appdata_t *appdata;      notes_load_all(appdata, gpx);
199    GtkWidget *window;      gpx->notes_loaded = TRUE;
   GMainLoop *loop;  
 } popup_context_t;  
   
 /* draw shape */  
 #define ARROW_BORDER   20  
 #define CORNER_RADIUS  10  
   
 #ifndef USE_MAEMO  
 #define POPUP_WIDTH  300  
 #define POPUP_HEIGHT 100  
 #else  
 #define POPUP_WIDTH  350  
 #define POPUP_HEIGHT 120  
 #endif  
   
 static gboolean  
 pointer_in_window(GtkWidget *widget, gint x_root, gint y_root) {  
   if(GTK_WIDGET_MAPPED(gtk_widget_get_toplevel(widget))) {  
     gint window_x, window_y;  
   
     gdk_window_get_position(gtk_widget_get_toplevel(widget)->window,  
                             &window_x, &window_y);  
   
     if(x_root >= window_x && x_root < window_x + widget->allocation.width &&  
         y_root >= window_y && y_root < window_y + widget->allocation.height)  
       return TRUE;  
200    }    }
   
   return FALSE;  
 }  
   
 static gboolean  
 on_button_press_event(GtkWidget *widget,  
                           GdkEventButton *event, popup_context_t *context) {  
   gboolean in = pointer_in_window(widget, event->x_root, event->y_root);  
   
   printf("overlay button press (in = %d)\n", in);  
   return !in;  
 }  
201    
202  static gboolean    cache_t *cache = gpx->cache;
203  on_button_release_event(GtkWidget *widget,    while(cache) {
204                            GdkEventButton *event, popup_context_t *context) {      map_draw_cache(map, cache);
205    gboolean in = pointer_in_window(widget, event->x_root, event->y_root);      cache = cache->next;
   
   printf("overlay button release (in = %d)\n", in);  
   
   if(!in) {  
     printf("destroying popup\n");  
     gtk_widget_destroy(gtk_widget_get_toplevel(widget));  
206    }    }
   
   return !in;  
 }  
   
 static void  
 shutdown_loop(popup_context_t *context) {  
   if(g_main_loop_is_running(context->loop))  
     g_main_loop_quit(context->loop);  
 }  
   
 static gint  
 run_delete_handler(GtkWindow *window, GdkEventAny *event,  
                    popup_context_t *context) {  
   shutdown_loop(context);  
   return TRUE; /* Do not destroy */  
 }  
   
 static void  
 run_destroy_handler(GtkWindow *window, popup_context_t *context) {  
   /* shutdown_loop will be called by run_unmap_handler */  
   printf("popup destroyed\n");  
 }  
   
 static void  
 run_unmap_handler(GtkWindow *window, popup_context_t *context) {  
   shutdown_loop(context);  
 }  
   
 static void popup_window_shape(GtkWidget *window, int tip_x, int tip_y) {  
   GdkBitmap *mask = gdk_pixmap_new(NULL, POPUP_WIDTH, POPUP_HEIGHT, 1);  
   
   GdkGC *gc = gdk_gc_new(mask);  
   GdkColormap *colormap;  
   GdkColor black;  
   GdkColor white;  
   
   /* get black/white color values */  
   colormap = gdk_colormap_get_system();  
   gdk_color_black(colormap, &black);  
   gdk_color_white(colormap, &white);  
   
   /* erase */  
   gdk_gc_set_foreground(gc, &black);  
   gdk_gc_set_background(gc, &white);  
   
   /* erase background */  
   gdk_draw_rectangle(mask, gc, TRUE, 0, 0, POPUP_WIDTH, POPUP_HEIGHT);  
   
   gdk_gc_set_foreground(gc, &white);  
   gdk_gc_set_background(gc, &black);  
   
   /* the tip is always above or below the "bubble" but never at its side */  
   guint tip_offset = (tip_y == 0)?ARROW_BORDER:0;  
   
   gdk_draw_rectangle(mask, gc, TRUE,  
                      0, tip_offset + CORNER_RADIUS,  
                      POPUP_WIDTH,  
                      POPUP_HEIGHT - 2*CORNER_RADIUS - ARROW_BORDER);  
   
   gdk_draw_rectangle(mask, gc, TRUE,  
                      CORNER_RADIUS, tip_offset,  
                      POPUP_WIDTH  - 2*CORNER_RADIUS,  
                      POPUP_HEIGHT - ARROW_BORDER);  
   
   int off[][2] = {  
           { CORNER_RADIUS,               tip_offset + CORNER_RADIUS },  
           { POPUP_WIDTH - CORNER_RADIUS, tip_offset + CORNER_RADIUS },  
           { POPUP_WIDTH - CORNER_RADIUS,  
             POPUP_HEIGHT - CORNER_RADIUS - ARROW_BORDER + tip_offset},  
           { CORNER_RADIUS,  
             POPUP_HEIGHT - CORNER_RADIUS  - ARROW_BORDER + tip_offset}};  
   
   int i;  
   for(i=0;i<4;i++) {  
     gdk_draw_arc(mask, gc, TRUE,  
                  off[i][0]-CORNER_RADIUS, off[i][1]-CORNER_RADIUS,  
                  2*CORNER_RADIUS,         2*CORNER_RADIUS,  
                  0, 360*64);  
   }  
   
   GdkPoint points[3] = { {POPUP_WIDTH*1/3, POPUP_HEIGHT/2},  
                          {POPUP_WIDTH*2/3, POPUP_HEIGHT/2},  
                          {tip_x,tip_y} };  
   gdk_draw_polygon(mask, gc, TRUE, points, 3);  
   
   
   gdk_window_shape_combine_mask(window->window, mask, 0, 0);  
 }  
   
 /* create a left aligned label (normal ones are centered) */  
 static GtkWidget *gtk_label_left_new(char *str) {  
   GtkWidget *label = gtk_label_new(str);  
   gtk_misc_set_alignment(GTK_MISC(label), 0.f, .5f);  
   return label;  
 }  
   
 /* the small labels are actually only on maemo small */  
 #ifdef USE_MAEMO  
 #define MARKUP_SMALL "<span size='small'>%s</span>"  
 GtkWidget *gtk_label_small_left_new(char *str) {  
   GtkWidget *label = gtk_label_new("");  
   char *markup = g_markup_printf_escaped(MARKUP_SMALL, str);  
   gtk_label_set_markup(GTK_LABEL(label), markup);  
   g_free(markup);  
   gtk_misc_set_alignment(GTK_MISC(label), 0.f, .5f);  
   return label;  
 }  
 #define gtk_label_big_left_new(a) gtk_label_left_new(a)  
 #else  
 #define gtk_label_small_left_new(a) gtk_label_left_new(a)  
 #define MARKUP_BIG "<span size='x-large'>%s</span>"  
 GtkWidget *gtk_label_big_left_new(char *str) {  
   GtkWidget *label = gtk_label_new("");  
   char *markup = g_markup_printf_escaped(MARKUP_BIG, str);  
   gtk_label_set_markup(GTK_LABEL(label), markup);  
   g_free(markup);  
   gtk_misc_set_alignment(GTK_MISC(label), 0.f, .5f);  
   return label;  
 }  
 #endif  
   
 void cache_popup(map_context_t *mcontext, cache_t *cache) {  
   popup_context_t pcontext;  
   pcontext.appdata = mcontext->appdata;  
   
   pcontext.window = gtk_window_new(GTK_WINDOW_POPUP);  
   gtk_widget_realize(pcontext.window);  
   gtk_window_set_default_size(GTK_WINDOW(pcontext.window),  
                               POPUP_WIDTH, POPUP_HEIGHT);  
   gtk_window_resize(GTK_WINDOW(pcontext.window), POPUP_WIDTH, POPUP_HEIGHT);  
   //  gtk_window_set_resizable(GTK_WINDOW(pcontext.window), FALSE);  
   gtk_window_set_transient_for(GTK_WINDOW(pcontext.window),  
                                GTK_WINDOW(mcontext->appdata->window));  
   gtk_window_set_keep_above(GTK_WINDOW(pcontext.window), TRUE);  
   gtk_window_set_destroy_with_parent(GTK_WINDOW(pcontext.window), TRUE);  
   gtk_window_set_gravity(GTK_WINDOW(pcontext.window), GDK_GRAVITY_STATIC);  
   gtk_window_set_modal(GTK_WINDOW(pcontext.window), TRUE);  
   
   /* connect events */  
   g_signal_connect(G_OBJECT(pcontext.window), "button-press-event",  
                    G_CALLBACK(on_button_press_event), &pcontext);  
   g_signal_connect(G_OBJECT(pcontext.window), "button-release-event",  
                    G_CALLBACK(on_button_release_event), &pcontext);  
   g_signal_connect(G_OBJECT(pcontext.window), "delete-event",  
                    G_CALLBACK(run_delete_handler), &pcontext);  
   g_signal_connect(G_OBJECT(pcontext.window), "destroy",  
                    G_CALLBACK(run_destroy_handler), &pcontext);  
   g_signal_connect(G_OBJECT(pcontext.window), "unmap",  
                    G_CALLBACK(run_unmap_handler), &pcontext);  
   
   gdk_pointer_grab(pcontext.window->window, TRUE,  
      GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_MOTION_MASK,  
                    NULL, NULL, GDK_CURRENT_TIME);  
   gtk_grab_add(pcontext.window);  
   
   /* check whether cache is in upper or lower half of window */  
   gint x, y, sx, sy;  
   osm_gps_map_geographic_to_screen(OSM_GPS_MAP(mcontext->widget),  
                                    cache->pos.lat, cache->pos.lon,  
                                    &sx, &sy);  
   
   gdk_window_get_origin(mcontext->widget->window, &x, &y);  
   
   gint ax = 0, ay = 0;  
   if(sx > mcontext->widget->allocation.width/2)  
     ax = POPUP_WIDTH;  
   
   if(sy > mcontext->widget->allocation.height/2)  
     ay = POPUP_HEIGHT;  
   
 #if !defined(USE_MAEMO) || (MAEMO_VERSION_MAJOR < 5)  
   GdkColor color;  
   gdk_color_parse("darkgray", &color);  
   gtk_widget_modify_bg(GTK_WIDGET(pcontext.window), GTK_STATE_NORMAL, &color);  
 #endif  
   
   gtk_window_move(GTK_WINDOW(pcontext.window),  
                   x + mcontext->widget->allocation.x + sx - ax,  
                   y + mcontext->widget->allocation.y + sy - ay);  
   
   
   GtkWidget *alignment = gtk_alignment_new(0.5, 0.5, 1.0, 1.0);  
   gtk_alignment_set_padding(GTK_ALIGNMENT(alignment),  
                             CORNER_RADIUS/2 + (ay?0:ARROW_BORDER),  
                             CORNER_RADIUS/2 + (ay?ARROW_BORDER:0),  
                             CORNER_RADIUS, CORNER_RADIUS);  
   
   /* --- actual content ---- */  
   GtkWidget *vbox = gtk_vbox_new(FALSE, 0);  
   
   if(cache->id) {  
     GtkWidget *ihbox = gtk_hbox_new(FALSE, 0);  
   
     gtk_box_pack_start(GTK_BOX(ihbox),  
        icon_get_widget(ICON_CACHE_TYPE, cache->type),  
        FALSE, FALSE, 5);  
   
     gtk_box_pack_start_defaults(GTK_BOX(ihbox),  
                 gtk_label_big_left_new(cache->id));  
   
     gtk_box_pack_start_defaults(GTK_BOX(vbox), ihbox);  
   }  
   
   if(cache->name) {  
     GtkWidget *label = gtk_label_small_left_new(cache->name);  
     gtk_label_set_ellipsize(GTK_LABEL(label), PANGO_ELLIPSIZE_END);  
     gtk_box_pack_start_defaults(GTK_BOX(vbox), label);  
   }  
   
   GtkWidget *hbox = gtk_hbox_new(FALSE, 0);  
   if(cache->terrain) {  
     GtkWidget *ihbox = gtk_hbox_new(FALSE, 0);  
     gtk_box_pack_start(GTK_BOX(ihbox),  
        gtk_label_small_left_new(_("Terrain:")), FALSE, FALSE, 0);  
     gtk_box_pack_start(GTK_BOX(ihbox),  
        icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)),  
        FALSE, FALSE, 5);  
     gtk_box_pack_start_defaults(GTK_BOX(hbox), ihbox);  
   }  
   
   if(cache->difficulty) {  
     GtkWidget *ihbox = gtk_hbox_new(FALSE, 0);  
     gtk_box_pack_start(GTK_BOX(ihbox),  
        gtk_label_small_left_new(_("Difficulty:")), FALSE, FALSE, 0);  
     gtk_box_pack_start(GTK_BOX(ihbox),  
        icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)),  
        FALSE, FALSE, 5);  
     gtk_box_pack_start_defaults(GTK_BOX(hbox), ihbox);  
   }  
   
   gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);  
   
   gtk_container_add(GTK_CONTAINER(alignment), vbox);  
   /* ----------------------- */  
   
   
   gtk_container_add(GTK_CONTAINER(pcontext.window), alignment);  
   
   /* give window its shape */  
   popup_window_shape(pcontext.window, ax, ay);  
   
   gtk_widget_show_all(pcontext.window);  
   
   /* handle this popup until it's gone */  
   
   pcontext.loop = g_main_loop_new(NULL, FALSE);  
   
   GDK_THREADS_LEAVE();  
   g_main_loop_run(pcontext.loop);  
   GDK_THREADS_ENTER();  
   
   g_main_loop_unref(pcontext.loop);  
   
   printf("cache popup removed\n");  
207  }  }
208    
209  static void  static void
210  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
211                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
212    while(cache) {    while(cache) {
213        pos_t cpos = gpx_cache_pos(cache);
214    
215      float dist =      float dist =
216        pow(cache->pos.lat - pos->lat, 2) +        pow(cpos.lat - pos->lat, 2) +
217        pow(cache->pos.lon - pos->lon, 2);        pow(cpos.lon - pos->lon, 2);
218    
219      if(!(dist > *distance)) {      if(!(dist > *distance)) {
220        *result = cache;        *result = cache;
# Line 531  static cache_t *map_closest(map_context_ Line 229  static cache_t *map_closest(map_context_
229    cache_t *result = NULL;    cache_t *result = NULL;
230    float distance = NAN;    float distance = NAN;
231    
232  #ifdef USE_MAEMO    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
   if(!context->appdata->cur_gpx) {  
 #endif  
233      /* search all geocaches */      /* search all geocaches */
234      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
235      while(gpx) {      while(gpx) {
236        map_cachelist_nearest(gpx->cache, pos, &result, &distance);        map_cachelist_nearest(gpx->cache, pos, &result, &distance);
237        gpx = gpx->next;        gpx = gpx->next;
238      }      }
239  #ifdef USE_MAEMO    } else if(context->appdata->cur_gpx) {
   } else {  
240      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
241                            pos, &result, &distance);                            pos, &result, &distance);
242    }    } else
243  #endif      result = context->appdata->cur_gpx->cache;
244    
245    return result;    return result;
246  }  }
# Line 553  static cache_t *map_closest(map_context_ Line 248  static cache_t *map_closest(map_context_
248  /* translate between osm-gps-map positions and gpxview ones */  /* translate between osm-gps-map positions and gpxview ones */
249  pos_t coord2pos(coord_t coo) {  pos_t coord2pos(coord_t coo) {
250    pos_t pos;    pos_t pos;
251    pos.lat = RAD2DEG(coo.rlat);    pos.lat = rad2deg(coo.rlat);
252    pos.lon = RAD2DEG(coo.rlon);    pos.lon = rad2deg(coo.rlon);
253    return pos;    return pos;
254  }  }
255    
 static int dist2pixel(map_context_t *context, float km, float lat) {  
   gint zoom;  
   g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);  
   
   /* world at zoom 1 == 512 pixels */  
   float m_per_pix =  
     cos(DEG2RAD(lat))*2*M_PI*EQ_RADIUS/(1<<(8+zoom));  
   
   return 1000.0*km/m_per_pix;  
 }  
   
256  #define CLICK_FUZZ (24)  #define CLICK_FUZZ (24)
257    
258  static gboolean  static gboolean
# Line 576  on_map_button_press_event(GtkWidget *wid Line 260  on_map_button_press_event(GtkWidget *wid
260                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
261    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
262    
263      /* check if we actually clicked parts of the OSD */
264      if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)
265        return FALSE;
266    
267    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
268    if(context->press_on != NULL) {    if(context->press_on != NULL) {
269      printf("PRESS: already\n");      printf("PRESS: already\n");
270      return TRUE;      return FALSE;
271    }    }
272    
273    pos_t pos =    pos_t pos =
# Line 587  on_map_button_press_event(GtkWidget *wid Line 275  on_map_button_press_event(GtkWidget *wid
275    
276    cache_t *nearest = map_closest(context, &pos);    cache_t *nearest = map_closest(context, &pos);
277    if(nearest) {    if(nearest) {
278      float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);      pos_t cpos = gpx_cache_pos(nearest);
279      if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)  
280        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
281        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ)
282        context->press_on = nearest;        context->press_on = nearest;
283    }    }
284    
285    return FALSE;    return FALSE;
286  }  }
287    
288    static void
289    cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf *buf, gint x, gint y) {
290      /* convert the pixbuf into something cairo can handle */
291    
292      // Create a new ImageSurface
293      cairo_surface_t *image_surface =
294        cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
295                                   gdk_pixbuf_get_width(buf),
296                                   gdk_pixbuf_get_height(buf));
297    
298      // Create the new Context for the ImageSurface
299      cairo_t *context = cairo_create(image_surface);
300    
301      // Draw the image on the new Context
302      gdk_cairo_set_source_pixbuf(context, buf, 0.0, 0.0);
303      cairo_paint(context);
304    
305      // now draw this onto the original context
306      cairo_set_source_surface(cr, image_surface, x, y);
307    
308      cairo_paint(cr);
309    }
310    
311    #ifndef BIG_BALLOONS
312    #define LINE_SKIP  7
313    #else
314    #define LINE_SKIP  12
315    #endif
316    
317    static void
318    balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {
319      cache_t *cache = (cache_t*)data;
320    
321    #if 0
322      /* draw pink background to check clipping */
323      cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);
324      cairo_set_source_rgba (cr, 1, 0, 0, 0.3);
325      cairo_fill_preserve (cr);
326      cairo_set_line_width (cr, 0);
327      cairo_stroke (cr);
328    #endif
329    
330      /* leave a little border top and left */
331      gint x = rect->x, y = rect->y;
332    
333      /* draw the cache type icon ... */
334      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
335      cairo_draw_pixbuf(cr, icon, x, y);
336    
337      if(cache->notes && cache->notes->override) {
338        GdkPixbuf *over = icon_get(ICON_MISC, 1);
339        cairo_draw_pixbuf(cr, over, x, y);
340      }
341    
342      /* ... and right of it the waypoint id */
343      cairo_text_extents_t extents;
344    
345      if(cache->id) {
346        cairo_select_font_face (cr, "Sans",
347                                CAIRO_FONT_SLANT_NORMAL,
348                                CAIRO_FONT_WEIGHT_BOLD);
349    
350    #ifndef BIG_BALLOONS
351        cairo_set_font_size (cr, 20.0);
352    #else
353        cairo_set_font_size (cr, 36.0);
354    #endif
355    
356        cairo_text_extents (cr, cache->id, &extents);
357    
358        /* display id right of icon vertically centered */
359        x += gdk_pixbuf_get_width(icon) + 5;
360        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
361        cairo_move_to (cr, x, y);
362        cairo_set_source_rgba (cr, 0, 0, 0, 1);
363        cairo_show_text (cr, cache->id);
364        cairo_stroke (cr);
365    
366        y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
367      } else
368        y += gdk_pixbuf_get_height(icon);
369    
370      /* return to the left border and below icon/text */
371      x = rect->x;
372    
373      /* everything from here uses the same font */
374      cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
375                              CAIRO_FONT_WEIGHT_NORMAL);
376    #ifndef BIG_BALLOONS
377      cairo_set_font_size (cr, 14.0);
378    #else
379      cairo_set_font_size (cr, 22.0);
380    #endif
381    
382      if(cache->name) {
383        /* draw cache name */
384        cairo_text_extents (cr, cache->name, &extents);
385        y += extents.height;
386        cairo_move_to (cr, x, y);
387        cairo_set_source_rgba (cr, 0, 0, 0, 1);
388        cairo_show_text (cr, cache->name);
389        cairo_stroke (cr);
390    
391        /* return to the left border and below text */
392        y += LINE_SKIP;
393        x = rect->x;
394      }
395    
396      if(cache->terrain) {
397        /* draw cache rating */
398        const char *terrain = "Terrain:";
399        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
400        cairo_text_extents (cr, _(terrain), &extents);
401        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
402    
403        /* draw "Terrain:" string */
404        cairo_move_to (cr, x, y);
405        cairo_set_source_rgba (cr, 0, 0, 0, 1);
406        cairo_show_text (cr, _(terrain));
407        cairo_stroke (cr);
408        x += extents.width + 2;
409    
410        /* draw terrain stars */
411        cairo_draw_pixbuf(cr, icon, x, y -
412                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
413    
414        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
415        y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;
416      }
417    
418      if(cache->difficulty) {
419        const char *difficulty = "Difficulty:";
420        cairo_text_extents (cr, _(difficulty), &extents);
421        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
422    
423        /* draw "Difficulty:" string */
424        cairo_move_to (cr, x, y);
425        cairo_set_source_rgba (cr, 0, 0, 0, 1);
426        cairo_show_text (cr, _(difficulty));
427        cairo_stroke (cr);
428        x += extents.width + 2;
429    
430        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
431        cairo_draw_pixbuf(cr, icon, x, y -
432                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
433      }
434    }
435    
436  static gboolean  static gboolean
437  on_map_button_release_event(GtkWidget *widget,  on_map_button_release_event(GtkWidget *widget,
438                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
439    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
440    
441    if(context->press_on) {    if(context->press_on) {
442        coord_t coo;
443        coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
444    
445      pos_t pos =      pos_t pos =
446        coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));        coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));
447    
448      cache_t *nearest = map_closest(context, &pos);      cache_t *nearest = map_closest(context, &pos);
449      if(nearest && nearest == context->press_on) {      if(nearest && nearest == context->press_on) {
450        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);        pos_t cpos = gpx_cache_pos(nearest);
451        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)  
452          cache_popup(context, nearest);        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
453          if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
454    
455            osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
456                                         balloon_draw_cb, nearest);
457    
458            osm_gps_map_osd_draw_nav (map, cpos.lat, cpos.lon, nearest->name);
459    
460          }
461      }      }
462      context->press_on = NULL;      context->press_on = NULL;
463    } else {    } else {
# Line 622  on_map_button_release_event(GtkWidget *w Line 471  on_map_button_release_event(GtkWidget *w
471    return FALSE;    return FALSE;
472  }  }
473    
474  static void save_map_state(map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
475      appdata_t *appdata = context->appdata;
476    
477      printf("destroy map window\n");
478    
479    /* save map parameters */    /* save map parameters */
480    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
481    gint zoom;    gint zoom;
# Line 633  static void save_map_state(map_context_t Line 486  static void save_map_state(map_context_t
486    g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);    g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
487    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
488    context->appdata->map.pos.lon = lon;    context->appdata->map.pos.lon = lon;
 }  
489    
490  #if MAEMO_VERSION_MAJOR == 5    gint source;
491  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {    g_object_get(map, "map-source", &source, NULL);
492    printf("destroy map view\n");    context->appdata->map.source = source;
   
   save_map_state(context);  
493    
494    #if MAEMO_VERSION_MAJOR == 5
495    /* restore cur_view */    /* restore cur_view */
496    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
497    #endif
498    
499    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
500    
501    g_free(context);    g_free(context);
502      appdata->map.context = NULL;
503  }  }
 #endif  
   
 void map(appdata_t *appdata) {  
   map_context_t *context = g_new0(map_context_t, 1);  
   context->appdata = appdata;  
504    
505    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);  #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
506    /* get access to zoom buttons */
507    char *path = g_strdup_printf("%s/map/", appdata->image_path);  static void
508    const char *proxy = get_proxy_uri(appdata);  on_window_realize(GtkWidget *widget, gpointer data) {
509      if (widget->window) {
510        unsigned char value = 1;
511        Atom hildon_zoom_key_atom =
512          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
513          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
514        Display *dpy =
515          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
516        Window w = GDK_WINDOW_XID(widget->window);
517    
518    context->widget = g_object_new(OSM_TYPE_GPS_MAP,      XChangeProperty(dpy, w, hildon_zoom_key_atom,
519                   "repo-uri",             MAP_SOURCE_OPENSTREETMAP,                      integer_atom, 8, PropModeReplace, &value, 1);
520                   "tile-cache",           path,    }
521                   "auto-center",          FALSE,  }
522                   "record-trip-history",  FALSE,  #endif
                  "show-trip-history",    FALSE,  
                  NULL);  
523    
524    if(proxy)  /* draw geocaches and set window title */
525      g_object_set(OSM_GPS_MAP(context->widget),  static void map_setup(map_context_t *context) {
526                   "proxy-uri", proxy, NULL);    char *name = NULL;
527    
528    g_free(path);    /* clear all existing ccahe images */
529      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
530    
531    char *name = NULL;    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
 #ifdef USE_MAEMO  
   if(!appdata->cur_gpx) {  
 #endif  
532      /* draw all geocaches */      /* draw all geocaches */
533      gpx_t *gpx = appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
534      while(gpx) {      while(gpx) {
535        map_draw_cachelist(context->widget, gpx->cache);        map_draw_gpx(context->appdata, context->widget, gpx);
536        gpx = gpx->next;        gpx = gpx->next;
537      }      }
538      name = g_strdup(_("all geocaches"));      name = g_strdup(_("all"));
539  #ifdef USE_MAEMO      context->state = MAP_ALL;
540        context->gpx = context->appdata->gpx;
541      } else if(!context->appdata->cur_cache) {
542        map_draw_gpx(context->appdata, context->widget, context->appdata->cur_gpx);
543        name = g_strdup(context->appdata->cur_gpx->name);
544        context->state = MAP_GPX;
545        context->gpx = context->appdata->cur_gpx;
546    } else {    } else {
547      map_draw_cachelist(context->widget, appdata->cur_gpx->cache);      map_draw_cache(context->widget, context->appdata->cur_cache);
548      name = g_strdup(appdata->cur_gpx->name);      name = g_strdup(context->appdata->cur_cache->name);
549        context->state = MAP_CACHE;
550        context->cache = context->appdata->cur_cache;
551    }    }
 #endif  
552    
553    char *title = g_strdup_printf(_("Map - %s"), name);    char *title = g_strdup_printf(_("Map - %s"), name);
554    g_free(name);    g_free(name);
555    
556      gtk_window_set_title(GTK_WINDOW(context->window), title);
557    
558      g_free(title);
559    }
560    
561    /* on maemo a window is either on top or completely invisible. this means that */
562    /* we only need to update the map window if its raised. on ordinary desktops this */
563    /* is different and we always update */
564    static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
565                             gpointer data) {
566      map_context_t *context = (map_context_t*)data;
567    
568      printf("map focus in!\n");
569    
570      return FALSE;
571    }
572    
573    void map_update(appdata_t *appdata) {
574      if(appdata->map.context) {
575        printf("map update\n");
576      }
577    }
578    
579    void map(appdata_t *appdata) {
580      map_context_t *context = NULL;
581    
582      /* if the map window already exists, just raise it */
583      if(appdata->map.context) {
584        printf("using existing map!\n");
585        gtk_window_present(GTK_WINDOW(appdata->map.context->window));
586        map_setup(appdata->map.context);
587        return;
588      }
589    
590      context = appdata->map.context = g_new0(map_context_t, 1);
591      context->appdata = appdata;
592      context->map_complete = FALSE;
593    
594      /* cleanup old (pre 0.8.7) path if it exists */
595      char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
596      if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
597        printf("old file path %s exists\n", old_path);
598        rmdir_recursive(old_path);
599      }
600    
601      /* It is recommanded that all applications share these same */
602      /* map path, so data is only cached once. The path should be: */
603      /* ~/.osm-gps-map on standard PC     (users home) */
604      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
605      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
606    #if !defined(USE_MAEMO)
607      char *p = getenv("HOME");
608      if(!p) p = "/tmp";
609      char *path = g_strdup_printf("%s/.osm-gps-map", p);
610    #else
611  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
612    GtkWidget *window = hildon_stackable_window_new();    char *path = g_strdup("/home/user/.osm-gps-map");
   gtk_window_set_title(GTK_WINDOW(window), title);  
613  #else  #else
614    GtkWidget *dialog = gtk_dialog_new_with_buttons(title,    char *path = g_strdup("/media/mmc2/osm-gps-map");
615                            GTK_WINDOW(appdata->window),  #endif
616                            GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,  #endif
                           GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,  
                           NULL);  
617    
618  #ifndef USE_MAEMO    const char *proxy = get_proxy_uri(appdata);
619    gtk_window_set_default_size(GTK_WINDOW(dialog), 640, 480);  
620      gint source = context->appdata->map.source;
621      if(!source) source = MAP_SOURCE;
622    
623      context->widget = g_object_new(OSM_TYPE_GPS_MAP,
624                     "map-source",               source,
625                     "tile-cache",               path,
626                     "auto-center",              FALSE,
627                     "record-trip-history",      FALSE,
628                     "show-trip-history",        FALSE,
629                     proxy?"proxy-uri":NULL,     proxy,
630                     NULL);
631    
632      g_free(path);
633    
634      osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
635    
636    #ifdef USE_MAEMO
637      /* we don't use a stackable window here on fremantle, since */
638      /* this leaves the main window independent from the map and */
639      /* the user can e.g. still navigate the main menu */
640      context->window = hildon_window_new();
641    
642    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
643      g_signal_connect(G_OBJECT(context->window), "realize",
644                       G_CALLBACK(on_window_realize), NULL);
645    #endif // MAEMO_VERSION
646  #else  #else
647    gtk_window_set_default_size(GTK_WINDOW(dialog), 800, 480);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
648  #endif  #endif
649    
650      /* setup cache state */
651      map_setup(context);
652    
653    #ifndef USE_MAEMO
654      gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
655  #endif  #endif
656    
657    g_free(title);    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
658                       G_CALLBACK(on_focus_in), context);
659    
660    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
661                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
# Line 721  void map(appdata_t *appdata) { Line 666  void map(appdata_t *appdata) {
666    g_signal_connect(G_OBJECT(context->widget), "button-release-event",    g_signal_connect(G_OBJECT(context->widget), "button-release-event",
667                     G_CALLBACK(on_map_button_release_event), context);                     G_CALLBACK(on_map_button_release_event), context);
668    
   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);  
669    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
670    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);  
671    
672  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
673    /* prevent some of the main screen things */    /* prevent some of the main screen things */
674    context->old_view = appdata->cur_view;    context->old_view = appdata->cur_view;
675    appdata->cur_view = NULL;    appdata->cur_view = NULL;
676    #endif
677    
678    g_signal_connect(G_OBJECT(window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
679                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
680    
681    gtk_container_add(GTK_CONTAINER(window), hbox);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
682    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));  
   save_map_state(context);  
   gtk_timeout_remove(context->handler_id);  
   gtk_widget_destroy(dialog);  
   g_free(context);  
 #endif  
683  }  }
Legend:
Removed from v.51  
changed lines
  Added in v.129