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

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

revision 47 by harbaum, Thu Aug 6 20:23:12 2009 UTC revision 142 by harbaum, Mon Oct 26 10:40:06 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  /* equatorial radius in meters */  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
35  #define EQ_RADIUS     (6378137.0)  #include <gdk/gdkx.h>
36    #include <X11/Xatom.h>
 #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 79  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    int 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          else
92  static gboolean          osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
93  cb_map_zoomin(GtkButton *button, map_context_t *context) {                                 refpos->lat, refpos->lon);
94    map_zoom(context, +1);  
95    return FALSE;        /* re-enable centering */
96  }        g_object_set(context->widget, "auto-center", TRUE, NULL);
97        } else {
98  static gboolean        /* no coordinates given: display the entire world */
99  cb_map_zoomout(GtkButton *button, map_context_t *context) {        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
100    map_zoom(context, -1);                                  0.0, 0.0, 1);
101    return FALSE;      }
 }  
   
 static gboolean  
 cb_map_gps(GtkButton *button, map_context_t *context) {  
   pos_t *refpos = get_pos(context->appdata);  
   if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {  
     osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                               refpos->lat, refpos->lon, 14);  
   } else {  
     /* no coordinates given: display the entire world */  
     osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                               0.0, 0.0, 1);  
102    }    }
   
   return FALSE;  
103  }  }
104    
105  static GtkWidget  static int dist2pixel(map_context_t *context, float km, float lat) {
106  *map_add_button(const gchar *icon, GCallback cb, gpointer data,    return 1000.0*km/osm_gps_map_get_scale(OSM_GPS_MAP(context->widget));
                 char *tooltip) {  
   GtkWidget *button = gtk_button_new();  
   gtk_button_set_image(GTK_BUTTON(button),  
                        gtk_image_new_from_stock(icon, GTK_ICON_SIZE_BUTTON));  
   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) {
110    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
111    
112      /* get reference position ... */
113    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
114    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
115    
116    /* get reference position and go there */    /* ... 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) {
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;    return TRUE;
140  }  }
141    
# Line 146  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    cb_map_gps(NULL, context);    if(!context->map_complete) {
147    
148    return FALSE;      /* set default values if they are invalid */
149  }      if(!context->appdata->map.zoom ||
150           isnan(context->appdata->map.pos.lat) ||
151  static void map_draw_cachelist(GtkWidget *map, cache_t *cache) {         isnan(context->appdata->map.pos.lon)) {
152    while(cache) {        printf("no valid map position found\n");
153      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  
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;  
 } 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  
174    
 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);  
   
184    
185    gdk_window_shape_combine_mask(window->window, mask, 0, 0);      osm_gps_map_add_image(OSM_GPS_MAP(map),
186  }            cache->notes->pos.lat, cache->notes->pos.lon, icon);
187    
188  /* create a left aligned label (normal ones are centered) */      osm_gps_map_add_image(OSM_GPS_MAP(map),
189  static GtkWidget *gtk_label_left_new(char *str) {            cache->notes->pos.lat, cache->notes->pos.lon, over);
190    GtkWidget *label = gtk_label_new(str);    } else
191    gtk_misc_set_alignment(GTK_MISC(label), 0.f, .5f);      osm_gps_map_add_image(OSM_GPS_MAP(map),
192    return label;                            cache->pos.lat, cache->pos.lon, icon);
 }  
193    
 /* 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;  
194  }  }
 #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);  
   }  
195    
196    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);  static void map_draw_gpx(appdata_t *appdata, GtkWidget *map, gpx_t *gpx) {
197    if(cache->terrain) {    if(!gpx->notes_loaded) {
198      GtkWidget *ihbox = gtk_hbox_new(FALSE, 0);      notes_load_all(appdata, gpx);
199      gtk_box_pack_start(GTK_BOX(ihbox),      gpx->notes_loaded = TRUE;
        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);  
200    }    }
201    
202    if(cache->difficulty) {    cache_t *cache = gpx->cache;
203      GtkWidget *ihbox = gtk_hbox_new(FALSE, 0);    while(cache) {
204      gtk_box_pack_start(GTK_BOX(ihbox),      map_draw_cache(map, cache);
205         gtk_label_small_left_new(_("Difficulty:")), FALSE, FALSE, 0);      cache = cache->next;
     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 494  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 516  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) {  
   int 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 539  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 550  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_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
319      map_context_t *context = (map_context_t*)data;
320      cache_t *cache = context->balloon;
321    
322      printf("balloon event: ");
323    
324      if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
325        printf("draw\n");
326    
327    #if 0
328        /* draw pink background to check clipping */
329        cairo_rectangle (event->data.draw.cr,
330                         event->data.draw.rect->x-20, event->data.draw.rect->y-20,
331                         event->data.draw.rect->w+40, event->data.draw.rect->h+40);
332        cairo_set_source_rgba (event->data.draw.cr, 1, 0, 0, 0.3);
333        cairo_fill_preserve (event->data.draw.cr);
334        cairo_set_line_width (event->data.draw.cr, 0);
335        cairo_stroke (event->data.draw.cr);
336    #endif
337    
338        /* leave a little border top and left */
339        gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
340    
341        /* draw the cache type icon ... */
342        GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
343        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
344    
345        if(cache->notes && cache->notes->override) {
346          GdkPixbuf *over = icon_get(ICON_MISC, 1);
347          cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
348        }
349    
350        /* ... and right of it the waypoint id */
351        cairo_text_extents_t extents;
352    
353        if(cache->id) {
354          cairo_select_font_face (event->data.draw.cr, "Sans",
355                                  CAIRO_FONT_SLANT_NORMAL,
356                                  CAIRO_FONT_WEIGHT_BOLD);
357    
358    #ifndef BIG_BALLOONS
359          cairo_set_font_size (event->data.draw.cr, 20.0);
360    #else
361          cairo_set_font_size (event->data.draw.cr, 36.0);
362    #endif
363    
364          cairo_text_extents (event->data.draw.cr, cache->id, &extents);
365    
366          /* display id right of icon vertically centered */
367          x += gdk_pixbuf_get_width(icon) + 5;
368          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
369          cairo_move_to (event->data.draw.cr, x, y);
370          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
371          cairo_show_text (event->data.draw.cr, cache->id);
372          cairo_stroke (event->data.draw.cr);
373    
374          y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
375        } else
376          y += gdk_pixbuf_get_height(icon);
377    
378        /* return to the left border and below icon/text */
379        x = event->data.draw.rect->x;
380    
381        /* everything from here uses the same font */
382        cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
383                                CAIRO_FONT_WEIGHT_NORMAL);
384    #ifndef BIG_BALLOONS
385        cairo_set_font_size (event->data.draw.cr, 14.0);
386    #else
387        cairo_set_font_size (event->data.draw.cr, 22.0);
388    #endif
389    
390        if(cache->name) {
391          /* draw cache name */
392          cairo_text_extents (event->data.draw.cr, cache->name, &extents);
393          y += extents.height;
394          cairo_move_to (event->data.draw.cr, x, y);
395          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
396          cairo_show_text (event->data.draw.cr, cache->name);
397          cairo_stroke (event->data.draw.cr);
398    
399          /* return to the left border and below text */
400          y += LINE_SKIP;
401          x = event->data.draw.rect->x;
402        }
403    
404        if(cache->terrain) {
405          /* draw cache rating */
406          const char *terrain = "Terrain:";
407          icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
408          cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
409          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
410    
411          /* draw "Terrain:" string */
412          cairo_move_to (event->data.draw.cr, x, y);
413          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
414          cairo_show_text (event->data.draw.cr, _(terrain));
415          cairo_stroke (event->data.draw.cr);
416          x += extents.width + 2;
417    
418          /* draw terrain stars */
419          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -
420                            (gdk_pixbuf_get_height(icon) + extents.height)/2);
421    
422          x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
423        y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;
424        }
425    
426        if(cache->difficulty) {
427          const char *difficulty = "Difficulty:";
428          cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
429          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
430    
431          /* draw "Difficulty:" string */
432          cairo_move_to (event->data.draw.cr, x, y);
433          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
434          cairo_show_text (event->data.draw.cr, _(difficulty));
435          cairo_stroke (event->data.draw.cr);
436          x += extents.width + 2;
437    
438          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
439          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -
440                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
441        }
442      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
443        printf("click %s event at %d %d\n",
444               event->data.click.down?"down":"up",
445               event->data.click.x, event->data.click.y);
446    
447        /* make the main screen jump to that cache */
448        if(!event->data.click.down) {
449          if(context->appdata->cur_cache) {
450            printf("ERROR: no current cache should be visible!\n");
451          } else {
452            gpx_t *is_in = NULL;
453    
454            if(!context->appdata->cur_gpx) {
455              printf("click while in \"all\" view\n");
456    
457              /* we first need to figure out which gpx file this cache */
458              /* is in so we can open it first */
459              gpx_t *gpx = context->appdata->gpx;
460              while(gpx && !is_in) {
461                cache_t *cur = gpx->cache;
462                while(cur && !is_in) {
463                  if(cur == cache)
464                    is_in = gpx;
465                  cur = cur->next;
466                }
467                gpx = gpx->next;
468              }
469    
470              if(is_in)
471                gpxlist_goto_cachelist(context->appdata, is_in);
472    
473            } else
474              /* the simple case: there already is an open gpx file and */
475              /* we just jump into the "cache" view */
476              is_in = context->appdata->cur_gpx;
477    
478            if(is_in) {
479              printf("selecting %s in %s\n",
480                     cache->id,
481                     context->appdata->cur_gpx->name);
482    
483              cachelist_goto_cache(context->appdata, cache);
484    
485              /* give focus to main screen (important for maemo) */
486              printf("raising main window\n");
487              gtk_window_present(GTK_WINDOW(context->appdata->window));
488            }
489          }
490        }
491      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
492        printf("removed\n");
493        context->balloon = NULL;
494      }
495    }
496    
497  static gboolean  static gboolean
498  on_map_button_release_event(GtkWidget *widget,  on_map_button_release_event(GtkWidget *widget,
499                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
500    if(context->press_on) {    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
501      OsmGpsMap *map = OSM_GPS_MAP(context->widget);  
502      /* in "MAP_CACHE" state only one cache is visible */
503      /* and the map is in navigation mode. the balloon is */
504      /* pretty useless there */
505      if(context->press_on && (context->state != MAP_CACHE)) {
506    
507        coord_t coo;
508        coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
509    
510      pos_t pos =      pos_t pos =
511        coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));        coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));
512    
513      cache_t *nearest = map_closest(context, &pos);      cache_t *nearest = map_closest(context, &pos);
514      if(nearest && nearest == context->press_on) {      if(nearest && nearest == context->press_on) {
515        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);        pos_t cpos = gpx_cache_pos(nearest);
516        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)  
517          cache_popup(context, nearest);        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
518          if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
519    
520            context->balloon = nearest;
521            osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
522                                         balloon_cb, context);
523          }
524      }      }
525      context->press_on = NULL;      context->press_on = NULL;
526      } else {
527        /* save new map position */
528        gfloat lat, lon;
529        g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
530        context->appdata->map.pos.lat = lat;
531        context->appdata->map.pos.lon = lon;
532    }    }
533    
534    return FALSE;    return FALSE;
535  }  }
536    
   
 #if MAEMO_VERSION_MAJOR == 5  
537  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
538    printf("destroy map view\n");    appdata_t *appdata = context->appdata;
539    
540      printf("destroy map window\n");
541    
542      /* save map parameters */
543      OsmGpsMap *map = OSM_GPS_MAP(context->widget);
544      gint zoom;
545      g_object_get(map, "zoom", &zoom, NULL);
546      context->appdata->map.zoom = zoom;
547    
548      gfloat lat, lon;
549      g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
550      context->appdata->map.pos.lat = lat;
551      context->appdata->map.pos.lon = lon;
552    
553      gint source;
554      g_object_get(map, "map-source", &source, NULL);
555      context->appdata->map.source = source;
556    
557    #if MAEMO_VERSION_MAJOR == 5
558    /* restore cur_view */    /* restore cur_view */
559    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
560    #endif
561    
562    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
563    
564    g_free(context);    g_free(context);
565      appdata->map.context = NULL;
566  }  }
567    
568    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
569    /* get access to zoom buttons */
570    static void
571    on_window_realize(GtkWidget *widget, gpointer data) {
572      if (widget->window) {
573        unsigned char value = 1;
574        Atom hildon_zoom_key_atom =
575          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
576          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
577        Display *dpy =
578          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
579        Window w = GDK_WINDOW_XID(widget->window);
580    
581        XChangeProperty(dpy, w, hildon_zoom_key_atom,
582                        integer_atom, 8, PropModeReplace, &value, 1);
583      }
584    }
585    #endif
586    
587    /* draw geocaches and set window title */
588    static void map_setup(map_context_t *context) {
589      char *name = NULL;
590    
591      if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
592        if(context->state != MAP_ALL) {
593          printf("map_setp(ALL)\n");
594    
595          /* no navigation in this mode */
596          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
597    
598          /* clear all existing ccahe images */
599          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
600    
601          /* draw all geocaches */
602          gpx_t *gpx = context->appdata->gpx;
603          while(gpx) {
604            map_draw_gpx(context->appdata, context->widget, gpx);
605            gpx = gpx->next;
606          }
607          name = g_strdup(_("all"));
608          context->state = MAP_ALL;
609        }
610      } else if(!context->appdata->cur_cache) {
611        if(context->state != MAP_GPX) {
612          printf("map_setp(GPX)\n");
613    
614          /* no navigation in this mode */
615          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
616    
617          /* clear all existing ccahe images */
618          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
619    
620          map_draw_gpx(context->appdata, context->widget,
621                       context->appdata->cur_gpx);
622          name = g_strdup(context->appdata->cur_gpx->name);
623          context->state = MAP_GPX;
624        }
625      } else {
626        cache_t *cache = context->appdata->cur_cache;
627    
628        printf("map_setp(CACHE)\n");
629    
630        /* no balloons in this mode */
631        context->balloon = NULL;
632        osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
633    
634        /* clear all existing ccahe images */
635        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
636    
637        map_draw_cache(context->widget, cache);
638        name = g_strdup(cache->name);
639        context->state = MAP_CACHE;
640    
641        /* navigation in this mode! */
642        pos_t cpos = gpx_cache_pos(cache);
643        osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
644                                  context->appdata->imperial,
645                                  cpos.lat, cpos.lon, cache->name);
646      }
647    
648      if(name) {
649        char *title = g_strdup_printf("%s - %s", _("Map"), name);
650        g_free(name);
651    
652        gtk_window_set_title(GTK_WINDOW(context->window), title);
653    
654        g_free(title);
655      } else
656        printf("map_setup(keep)\n");
657    }
658    
659    /* on maemo a window is either on top or completely invisible. this means that */
660    /* we only need to update the map window if its raised. on ordinary desktops this */
661    /* is different and we always update */
662    static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
663                             gpointer data) {
664      printf("map got focus\n");
665      map_setup((map_context_t*)data);
666      return FALSE;
667    }
668    
669    void map_update(appdata_t *appdata) {
670    #ifndef USE_MAEMO
671      if(appdata->map.context)
672        map_setup(appdata->map.context);
673  #endif  #endif
674    }
675    
676  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
677    map_context_t *context = g_new0(map_context_t, 1);    map_context_t *context = NULL;
678    
679      /* if the map window already exists, just raise it */
680      if(appdata->map.context) {
681        printf("using existing map!\n");
682        gtk_window_present(GTK_WINDOW(appdata->map.context->window));
683        map_setup(appdata->map.context);
684        return;
685      }
686    
687      context = appdata->map.context = g_new0(map_context_t, 1);
688    context->appdata = appdata;    context->appdata = appdata;
689      context->map_complete = FALSE;
690      context->state = MAP_NONE;
691    
692    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);    /* cleanup old (pre 0.8.7) path if it exists */
693      char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
694      if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
695        printf("old file path %s exists\n", old_path);
696        rmdir_recursive(old_path);
697      }
698    
699      /* It is recommanded that all applications share these same */
700      /* map path, so data is only cached once. The path should be: */
701      /* ~/.osm-gps-map on standard PC     (users home) */
702      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
703      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
704    #if !defined(USE_MAEMO)
705      char *p = getenv("HOME");
706      if(!p) p = "/tmp";
707      char *path = g_strdup_printf("%s/.osm-gps-map", p);
708    #else
709    #if MAEMO_VERSION_MAJOR == 5
710      char *path = g_strdup("/home/user/.osm-gps-map");
711    #else
712      char *path = g_strdup("/media/mmc2/osm-gps-map");
713    #endif
714    #endif
715    
   char *path = g_strdup_printf("%s/map/", appdata->image_path);  
716    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
717    
718      gint source = context->appdata->map.source;
719      if(!source) source = MAP_SOURCE;
720    
721    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
722                  "repo-uri", MAP_SOURCE_OPENSTREETMAP,                   "map-source",               source,
723                  "tile-cache", path,                   "tile-cache",               path,
724                  proxy?"proxy-uri":NULL, proxy,                   "auto-center",              FALSE,
725                     "record-trip-history",      FALSE,
726                     "show-trip-history",        FALSE,
727                     proxy?"proxy-uri":NULL,     proxy,
728                   NULL);                   NULL);
729    
730    g_free(path);    g_free(path);
731    
732    char *name = NULL;    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
733  #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"));  
734  #ifdef USE_MAEMO  #ifdef USE_MAEMO
735    } else {    /* we don't use a stackable window here on fremantle, since */
736      map_draw_cachelist(context->widget, appdata->cur_gpx->cache);    /* this leaves the main window independent from the map and */
737      name = g_strdup(appdata->cur_gpx->name);    /* the user can e.g. still navigate the main menu */
738    }    context->window = hildon_window_new();
739    
740    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
741      g_signal_connect(G_OBJECT(context->window), "realize",
742                       G_CALLBACK(on_window_realize), NULL);
743    #endif // MAEMO_VERSION
744    #else
745      context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
746  #endif  #endif
747    
748    char *title = g_strdup_printf(_("Map - %s"), name);    /* setup cache state */
749    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);  
750    
751  #ifndef USE_MAEMO  #ifndef USE_MAEMO
752    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  
753  #endif  #endif
754    
755    g_free(title);    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
756                       G_CALLBACK(on_focus_in), context);
757    
758    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
759                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
# Line 658  void map(appdata_t *appdata) { Line 764  void map(appdata_t *appdata) {
764    g_signal_connect(G_OBJECT(context->widget), "button-release-event",    g_signal_connect(G_OBJECT(context->widget), "button-release-event",
765                     G_CALLBACK(on_map_button_release_event), context);                     G_CALLBACK(on_map_button_release_event), context);
766    
   gtk_box_pack_start_defaults(GTK_BOX(hbox), context->widget);  
   /* zoom button box */  
   GtkWidget *vbox = gtk_vbox_new(FALSE,0);  
   
   context->zoomin =  
     map_add_button(GTK_STOCK_ZOOM_IN, G_CALLBACK(cb_map_zoomin),  
                    context, _("Zoom in"));  
   gtk_box_pack_start(GTK_BOX(vbox), context->zoomin, FALSE, FALSE, 0);  
   
   context->zoomout =  
     map_add_button(GTK_STOCK_ZOOM_OUT, G_CALLBACK(cb_map_zoomout),  
                    context, _("Zoom out"));  
   gtk_box_pack_start(GTK_BOX(vbox), context->zoomout, FALSE, FALSE, 0);  
   
   context->gps =  
     map_add_button(GTK_STOCK_HOME, G_CALLBACK(cb_map_gps),  
                    context, _("Jump to GPS position"));  
   gtk_widget_set_sensitive(context->gps, FALSE);  
767    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
768    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);  
769    
770  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
771    /* prevent some of the main screen things */    /* prevent some of the main screen things */
772    context->old_view = appdata->cur_view;    context->old_view = appdata->cur_view;
773    appdata->cur_view = NULL;    appdata->cur_view = NULL;
774    #endif
775    
776    g_signal_connect(G_OBJECT(window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
777                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
778    
779    gtk_container_add(GTK_CONTAINER(window), hbox);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
780    gtk_widget_show_all(GTK_WIDGET(window));    gtk_widget_show_all(GTK_WIDGET(context->window));
   
 #else  
   gtk_box_pack_start_defaults(GTK_BOX(GTK_DIALOG(dialog)->vbox), hbox);  
   gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_CLOSE);  
   gtk_widget_show_all(dialog);  
   gtk_dialog_run(GTK_DIALOG(dialog));  
   gtk_timeout_remove(context->handler_id);  
   gtk_widget_destroy(dialog);  
   g_free(context);  
 #endif  
781  }  }
Legend:
Removed from v.47  
changed lines
  Added in v.142