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

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

revision 55 by harbaum, Thu Aug 13 12:01:52 2009 UTC revision 133 by harbaum, Mon Oct 12 20:27:55 2009 UTC
# Line 17  Line 17 
17   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.
18   */   */
19    
20    /*
21     * http://topo.geofabrik.de/relief/${z}/${x}/${y}.png  8-15
22     * http://topo.geofabrik.de/trail/${z}/${x}/${y}.png   8-15
23     */
24    
25  #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 MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
35  #define GPS_DEFAULT_ZOOM 13  #include <gdk/gdkx.h>
36    #include <X11/Xatom.h>
 /* equatorial radius in meters */  
 #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 82  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,        if(zoom < 10)
89             zoom < osm_gps_map_source_get_max_zoom(MAP_SOURCE));          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
90    gtk_widget_set_sensitive(context->zoomout,                                    refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
91             zoom > osm_gps_map_source_get_min_zoom(MAP_SOURCE));        else
92            osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
93    /* save new zoom */                                 refpos->lat, refpos->lon);
   context->appdata->map.zoom = zoom;  
 }  
   
 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;  
 }  
   
 static GtkWidget  
 *map_add_button(int icon, GCallback cb, gpointer data,  
                 char *tooltip) {  
   GtkWidget *button = gtk_button_new();  
   gtk_button_set_image(GTK_BUTTON(button), icon_get_widget(ICON_MISC, icon));  
   g_signal_connect(button, "clicked", cb, data);  
 #ifndef USE_MAEMO  
   gtk_widget_set_tooltip_text(button, tooltip);  
 #endif  
   return button;  
103  }  }
104    
105  static int dist2pixel(map_context_t *context, float km, float lat) {  static int dist2pixel(map_context_t *context, float km, float lat) {
# Line 149  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 = NAN;      float heading = NAN;
# Line 177  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) {
   if(!context->appdata->map.zoom ||  
      isnan(context->appdata->map.pos.lat) ||  
      isnan(context->appdata->map.pos.lon)) {  
     printf("no valid map position found\n");  
   
     pos_t *refpos = get_pos(context->appdata);  
     if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {  
       /* use gps position if present */  
       context->appdata->map.pos = *refpos;  
       context->appdata->map.zoom = GPS_DEFAULT_ZOOM;  
     } else {  
       /* use world map otherwise */  
       context->appdata->map.pos.lat = 0.0;  
       context->appdata->map.pos.lon = 0.0;  
       context->appdata->map.zoom = 1;  
     }  
   }  
   
   /* 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);  
   
   return FALSE;  
 }  
147    
148  static void map_draw_cachelist(GtkWidget *map, cache_t *cache) {      /* set default values if they are invalid */
149    while(cache) {      if(!context->appdata->map.zoom ||
150      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);         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      osm_gps_map_add_image(OSM_GPS_MAP(map),      /* jump to initial position */
168                            cache->pos.lat, cache->pos.lon, icon);      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
169                                  context->appdata->map.pos.lat,
170      cache = cache->next;                                context->appdata->map.pos.lon,
171                                  context->appdata->map.zoom);
172        context->map_complete = TRUE;
173    }    }
 }  
   
 /* draw a nice popup */  
 typedef struct {  
   appdata_t *appdata;  
   GtkWidget *window;  
   GMainLoop *loop;  
   cache_t *cache;  
 } popup_context_t;  
   
 /* draw shape */  
 #define ARROW_BORDER   20  
 #define CORNER_RADIUS  10  
174    
 #ifndef USE_MAEMO  
 #define POPUP_WIDTH  300  
 #define POPUP_HEIGHT 100  
 #else  
 #define POPUP_WIDTH  360  
 #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;  
   }  
   
175    return FALSE;    return FALSE;
176  }  }
177    
178  static gboolean  static void map_draw_cache(GtkWidget *map, cache_t *cache) {
179  on_button_press_event(GtkWidget *widget,    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
180                            GdkEventButton *event, popup_context_t *context) {  
181    gboolean in = pointer_in_window(widget, event->x_root, event->y_root);    /* check if there's also an overwritten coordinate */
182      if(cache->notes && cache->notes->override) {
183    printf("overlay button press (in = %d)\n", in);      GdkPixbuf *over = icon_get(ICON_MISC, 1);
   return !in;  
 }  
   
 static gboolean  
 on_button_release_event(GtkWidget *widget,  
                           GdkEventButton *event, popup_context_t *context) {  
   gboolean in = pointer_in_window(widget, event->x_root, event->y_root);  
   
   printf("overlay button release (in = %d)\n", in);  
   
   if(!in) {  
     printf("destroying popup\n");  
     gtk_widget_destroy(gtk_widget_get_toplevel(widget));  
   }  
   
   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);  
 }  
184    
185  /* create a left aligned label (normal ones are centered) */      osm_gps_map_add_image(OSM_GPS_MAP(map),
186  static GtkWidget *gtk_label_left_new(char *str) {            cache->notes->pos.lat, cache->notes->pos.lon, icon);
   GtkWidget *label = gtk_label_new(str);  
   gtk_misc_set_alignment(GTK_MISC(label), 0.f, .5f);  
   return label;  
 }  
187    
188  /* the small labels are actually only on maemo small */      osm_gps_map_add_image(OSM_GPS_MAP(map),
189  #ifdef USE_MAEMO            cache->notes->pos.lat, cache->notes->pos.lon, over);
190  #define MARKUP_SMALL "<span size='small'>%s</span>"    } else
191  GtkWidget *gtk_label_small_left_new(char *str) {      osm_gps_map_add_image(OSM_GPS_MAP(map),
192    GtkWidget *label = gtk_label_new("");                            cache->pos.lat, cache->pos.lon, icon);
   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  
193    
 static gboolean  
 on_cache_button_clicked(GtkButton *button, popup_context_t *context) {  
   printf("clicked %s\n", context->cache->name);  
   return FALSE;  
194  }  }
195    
196  void cache_popup(map_context_t *mcontext, cache_t *cache) {  static void map_draw_gpx(appdata_t *appdata, GtkWidget *map, gpx_t *gpx) {
197    popup_context_t pcontext;    if(!gpx->notes_loaded) {
198    pcontext.appdata = mcontext->appdata;      notes_load_all(appdata, gpx);
199    pcontext.cache = cache;      gpx->notes_loaded = TRUE;
   
   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);  
   GtkWidget *hbox = gtk_hbox_new(FALSE, 0);  
   
   gtk_box_pack_start(GTK_BOX(hbox),  
                      icon_get_widget(ICON_CACHE_TYPE, cache->type),  
                      FALSE, FALSE, 5);  
   
   if(cache->id)  
     gtk_box_pack_start_defaults(GTK_BOX(hbox),  
                                 gtk_label_big_left_new(cache->id));  
   
   GtkWidget *button = gtk_button_new();  
   gtk_button_set_image(GTK_BUTTON(button), icon_get_widget(ICON_MISC, 12));  
   g_signal_connect(button, "clicked",  
                    G_CALLBACK(on_cache_button_clicked), &pcontext);  
   gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0);  
   
   gtk_box_pack_start_defaults(GTK_BOX(vbox), hbox);  
   
   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);  
200    }    }
201    
202    hbox = gtk_hbox_new(FALSE, 0);    cache_t *cache = gpx->cache;
203    if(cache->terrain) {    while(cache) {
204      GtkWidget *ihbox = gtk_hbox_new(FALSE, 0);      map_draw_cache(map, cache);
205      gtk_box_pack_start(GTK_BOX(ihbox),      cache = cache->next;
        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);  
206    }    }
   
   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 560  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 582  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    
# Line 594  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 605  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) {    /* in "MAP_CACHE" state only one cache is visible */
442      /* and the map is in navigation mode. the balloon is */
443      /* pretty useless there */
444      if(context->press_on && (context->state != MAP_CACHE)) {
445    
446        coord_t coo;
447        coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
448    
449      pos_t pos =      pos_t pos =
450        coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));        coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));
451    
452      cache_t *nearest = map_closest(context, &pos);      cache_t *nearest = map_closest(context, &pos);
453      if(nearest && nearest == context->press_on) {      if(nearest && nearest == context->press_on) {
454        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);        pos_t cpos = gpx_cache_pos(nearest);
455        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)  
456          cache_popup(context, nearest);        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
457          if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
458    
459            osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
460                                         balloon_draw_cb, nearest);
461          }
462      }      }
463      context->press_on = NULL;      context->press_on = NULL;
464    } else {    } else {
# Line 640  on_map_button_release_event(GtkWidget *w Line 472  on_map_button_release_event(GtkWidget *w
472    return FALSE;    return FALSE;
473  }  }
474    
475  static void save_map_state(map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
476      appdata_t *appdata = context->appdata;
477    
478      printf("destroy map window\n");
479    
480    /* save map parameters */    /* save map parameters */
481    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
482    gint zoom;    gint zoom;
# Line 651  static void save_map_state(map_context_t Line 487  static void save_map_state(map_context_t
487    g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);    g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
488    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
489    context->appdata->map.pos.lon = lon;    context->appdata->map.pos.lon = lon;
 }  
490    
491  #if MAEMO_VERSION_MAJOR == 5    gint source;
492  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {    g_object_get(map, "map-source", &source, NULL);
493    printf("destroy map view\n");    context->appdata->map.source = source;
   
   save_map_state(context);  
494    
495    #if MAEMO_VERSION_MAJOR == 5
496    /* restore cur_view */    /* restore cur_view */
497    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
498    #endif
499    
500    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
501    
502    g_free(context);    g_free(context);
503      appdata->map.context = NULL;
504    }
505    
506    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
507    /* get access to zoom buttons */
508    static void
509    on_window_realize(GtkWidget *widget, gpointer data) {
510      if (widget->window) {
511        unsigned char value = 1;
512        Atom hildon_zoom_key_atom =
513          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
514          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
515        Display *dpy =
516          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
517        Window w = GDK_WINDOW_XID(widget->window);
518    
519        XChangeProperty(dpy, w, hildon_zoom_key_atom,
520                        integer_atom, 8, PropModeReplace, &value, 1);
521      }
522  }  }
523  #endif  #endif
524    
525    /* draw geocaches and set window title */
526    static void map_setup(map_context_t *context) {
527      char *name = NULL;
528    
529      if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
530        if(context->state != MAP_ALL) {
531          printf("map_setp(ALL)\n");
532    
533          /* no navigation in this mode */
534          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
535    
536          /* clear all existing ccahe images */
537          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
538    
539          /* draw all geocaches */
540          gpx_t *gpx = context->appdata->gpx;
541          while(gpx) {
542            map_draw_gpx(context->appdata, context->widget, gpx);
543            gpx = gpx->next;
544          }
545          name = g_strdup(_("all"));
546          context->state = MAP_ALL;
547        }
548      } else if(!context->appdata->cur_cache) {
549        if(context->state != MAP_GPX) {
550          printf("map_setp(GPX)\n");
551    
552          /* no navigation in this mode */
553          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
554    
555          /* clear all existing ccahe images */
556          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
557    
558          map_draw_gpx(context->appdata, context->widget,
559                       context->appdata->cur_gpx);
560          name = g_strdup(context->appdata->cur_gpx->name);
561          context->state = MAP_GPX;
562        }
563      } else {
564        cache_t *cache = context->appdata->cur_cache;
565    
566        printf("map_setp(CACHE)\n");
567    
568        /* no balloons in this mode */
569        osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
570    
571        /* clear all existing ccahe images */
572        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
573    
574        map_draw_cache(context->widget, cache);
575        name = g_strdup(cache->name);
576        context->state = MAP_CACHE;
577    
578        /* navigation in this mode! */
579        pos_t cpos = gpx_cache_pos(cache);
580        osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
581                                  context->appdata->imperial,
582                                  cpos.lat, cpos.lon, cache->name);
583      }
584    
585      if(name) {
586        char *title = g_strdup_printf(_("Map - %s"), name);
587        g_free(name);
588    
589        gtk_window_set_title(GTK_WINDOW(context->window), title);
590    
591        g_free(title);
592      } else
593        printf("map_setup(keep)\n");
594    }
595    
596    /* on maemo a window is either on top or completely invisible. this means that */
597    /* we only need to update the map window if its raised. on ordinary desktops this */
598    /* is different and we always update */
599    static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
600                             gpointer data) {
601      printf("map got focus\n");
602      map_setup((map_context_t*)data);
603      return FALSE;
604    }
605    
606    void map_update(appdata_t *appdata) {
607    #ifndef USE_MAEMO
608      if(appdata->map.context)
609        map_setup(appdata->map.context);
610    #endif
611    }
612    
613  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
614    map_context_t *context = g_new0(map_context_t, 1);    map_context_t *context = NULL;
615    
616      /* if the map window already exists, just raise it */
617      if(appdata->map.context) {
618        printf("using existing map!\n");
619        gtk_window_present(GTK_WINDOW(appdata->map.context->window));
620        map_setup(appdata->map.context);
621        return;
622      }
623    
624      context = appdata->map.context = g_new0(map_context_t, 1);
625    context->appdata = appdata;    context->appdata = appdata;
626      context->map_complete = FALSE;
627      context->state = MAP_NONE;
628    
629    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);    /* cleanup old (pre 0.8.7) path if it exists */
630      char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
631      if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
632        printf("old file path %s exists\n", old_path);
633        rmdir_recursive(old_path);
634      }
635    
636      /* It is recommanded that all applications share these same */
637      /* map path, so data is only cached once. The path should be: */
638      /* ~/.osm-gps-map on standard PC     (users home) */
639      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
640      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
641    #if !defined(USE_MAEMO)
642      char *p = getenv("HOME");
643      if(!p) p = "/tmp";
644      char *path = g_strdup_printf("%s/.osm-gps-map", p);
645    #else
646    #if MAEMO_VERSION_MAJOR == 5
647      char *path = g_strdup("/home/user/.osm-gps-map");
648    #else
649      char *path = g_strdup("/media/mmc2/osm-gps-map");
650    #endif
651    #endif
652    
   char *path = g_strdup_printf("%s/map/", appdata->image_path);  
653    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
654    
655      gint source = context->appdata->map.source;
656      if(!source) source = MAP_SOURCE;
657    
658    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
659                   "map-source",               MAP_SOURCE,                   "map-source",               source,
660                   "tile-cache",               path,                   "tile-cache",               path,
661                   "auto-center",              FALSE,                   "auto-center",              FALSE,
662                   "record-trip-history",      FALSE,                   "record-trip-history",      FALSE,
# Line 687  void map(appdata_t *appdata) { Line 666  void map(appdata_t *appdata) {
666    
667    g_free(path);    g_free(path);
668    
669    char *name = NULL;    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
670  #ifdef USE_MAEMO  
   if(!appdata->cur_gpx) {  
 #endif  
     /* draw all geocaches */  
     gpx_t *gpx = appdata->gpx;  
     while(gpx) {  
       map_draw_cachelist(context->widget, gpx->cache);  
       gpx = gpx->next;  
     }  
     name = g_strdup(_("all geocaches"));  
671  #ifdef USE_MAEMO  #ifdef USE_MAEMO
672    } else {    /* we don't use a stackable window here on fremantle, since */
673      map_draw_cachelist(context->widget, appdata->cur_gpx->cache);    /* this leaves the main window independent from the map and */
674      name = g_strdup(appdata->cur_gpx->name);    /* the user can e.g. still navigate the main menu */
675    }    context->window = hildon_window_new();
676    
677    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
678      g_signal_connect(G_OBJECT(context->window), "realize",
679                       G_CALLBACK(on_window_realize), NULL);
680    #endif // MAEMO_VERSION
681    #else
682      context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
683  #endif  #endif
684    
685    char *title = g_strdup_printf(_("Map - %s"), name);    /* setup cache state */
686    g_free(name);    map_setup(context);
   
 #if MAEMO_VERSION_MAJOR == 5  
   GtkWidget *window = hildon_stackable_window_new();  
   gtk_window_set_title(GTK_WINDOW(window), title);  
 #else  
   GtkWidget *dialog = gtk_dialog_new_with_buttons(title,  
                           GTK_WINDOW(appdata->window),  
                           GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,  
                           GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,  
                           NULL);  
687    
688  #ifndef USE_MAEMO  #ifndef USE_MAEMO
689    gtk_window_set_default_size(GTK_WINDOW(dialog), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
 #else  
   gtk_window_set_default_size(GTK_WINDOW(dialog), 800, 480);  
 #endif  
690  #endif  #endif
691    
692    g_free(title);    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
693                       G_CALLBACK(on_focus_in), context);
694    
695    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
696                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
# Line 736  void map(appdata_t *appdata) { Line 701  void map(appdata_t *appdata) {
701    g_signal_connect(G_OBJECT(context->widget), "button-release-event",    g_signal_connect(G_OBJECT(context->widget), "button-release-event",
702                     G_CALLBACK(on_map_button_release_event), context);                     G_CALLBACK(on_map_button_release_event), context);
703    
   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);  
704    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
705    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);  
706    
707  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
708    /* prevent some of the main screen things */    /* prevent some of the main screen things */
709    context->old_view = appdata->cur_view;    context->old_view = appdata->cur_view;
710    appdata->cur_view = NULL;    appdata->cur_view = NULL;
711    #endif
712    
713    g_signal_connect(G_OBJECT(window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
714                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
715    
716    gtk_container_add(GTK_CONTAINER(window), hbox);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
717    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  
718  }  }
Legend:
Removed from v.55  
changed lines
  Added in v.133