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

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

revision 56 by harbaum, Fri Aug 14 12:19:45 2009 UTC revision 81 by harbaum, Tue Aug 25 13:21:45 2009 UTC
# Line 18  Line 18 
18   */   */
19    
20  #include "gpxview.h"  #include "gpxview.h"
21    #include "converter.h"
22  #include <math.h>    // for isnan  #include <math.h>    // for isnan
23    
24  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
25  #include "osm-gps-map.h"  #include "osm-gps-map.h"
26    #include "osm-gps-map-osd-classic.h"
27    #endif
28    
29    #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
30    #include <gdk/gdkx.h>
31    #include <X11/Xatom.h>
32  #endif  #endif
33    
34  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP
35  #define GPS_DEFAULT_ZOOM 13  #define GPS_DEFAULT_ZOOM 13
36    
 /* 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)  
   
37  #define PROXY_KEY  "/system/http_proxy/"  #define PROXY_KEY  "/system/http_proxy/"
38    
39  static const char *get_proxy_uri(appdata_t *appdata) {  static const char *get_proxy_uri(appdata_t *appdata) {
# Line 71  static const char *get_proxy_uri(appdata Line 72  static const char *get_proxy_uri(appdata
72    return NULL;    return NULL;
73  }  }
74    
75  static void map_zoom(map_context_t *context, int step) {  static void
76    gint zoom;  cb_map_gps(osd_button_t but, map_context_t *context) {
77    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    if(but == OSD_GPS) {
78    g_object_get(map, "zoom", &zoom, NULL);      pos_t *refpos = get_pos(context->appdata);
79    zoom = osm_gps_map_set_zoom(map, zoom+step);      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
80          gint zoom;
81    /* enable/disable zoom buttons as required */        g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
82    gtk_widget_set_sensitive(context->zoomin,        if(zoom < 10)
83             zoom < osm_gps_map_source_get_max_zoom(MAP_SOURCE));          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
84    gtk_widget_set_sensitive(context->zoomout,                                    refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
85             zoom > osm_gps_map_source_get_min_zoom(MAP_SOURCE));        else
86            osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
87    /* hmm ... this doesn't really work */                                 refpos->lat, refpos->lon);
   osm_gps_map_osd_speed(map, zoom);  
   
   /* save new zoom */  
   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;  
 }  
88    
89  static gboolean        /* re-enable centering */
90  cb_map_gps(GtkButton *button, map_context_t *context) {        g_object_set(context->widget, "auto-center", TRUE, NULL);
91    pos_t *refpos = get_pos(context->appdata);      } else {
92    if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {        /* no coordinates given: display the entire world */
93      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
94                        refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);                                  0.0, 0.0, 1);
95    } else {      }
     /* no coordinates given: display the entire world */  
     osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                               0.0, 0.0, 1);  
96    }    }
   
   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;  
97  }  }
98    
99  static int dist2pixel(map_context_t *context, float km, float lat) {  static int dist2pixel(map_context_t *context, float km, float lat) {
# Line 141  static gboolean map_gps_update(gpointer Line 108  static gboolean map_gps_update(gpointer
108    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
109    
110    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
111    gtk_widget_set_sensitive(context->gps, ok);    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
112                     OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
113    
114    if(ok) {    if(ok) {
115      float heading = NAN;      float heading = NAN;
# Line 193  static gboolean on_map_configure(GtkWidg Line 161  static gboolean on_map_configure(GtkWidg
161                              context->appdata->map.pos.lat,                              context->appdata->map.pos.lat,
162                              context->appdata->map.pos.lon,                              context->appdata->map.pos.lon,
163                              context->appdata->map.zoom);                              context->appdata->map.zoom);
164    
165    return FALSE;    return FALSE;
166  }  }
167    
# Line 208  static void map_draw_cachelist(GtkWidget Line 176  static void map_draw_cachelist(GtkWidget
176    }    }
177  }  }
178    
 /* 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  
   
 #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;  
   }  
   
   return FALSE;  
 }  
   
 static gboolean  
 on_button_press_event(GtkWidget *widget,  
                           GdkEventButton *event, popup_context_t *context) {  
   gboolean in = pointer_in_window(widget, event->x_root, event->y_root);  
   
   printf("overlay button press (in = %d)\n", in);  
   return !in;  
 }  
   
 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);  
 }  
   
 /* create a left aligned label (normal ones are centered) */  
 static GtkWidget *gtk_label_left_new(char *str) {  
   GtkWidget *label = gtk_label_new(str);  
   gtk_misc_set_alignment(GTK_MISC(label), 0.f, .5f);  
   return label;  
 }  
   
 /* the small labels are actually only on maemo small */  
 #ifdef USE_MAEMO  
 #define MARKUP_SMALL "<span size='small'>%s</span>"  
 GtkWidget *gtk_label_small_left_new(char *str) {  
   GtkWidget *label = gtk_label_new("");  
   char *markup = g_markup_printf_escaped(MARKUP_SMALL, str);  
   gtk_label_set_markup(GTK_LABEL(label), markup);  
   g_free(markup);  
   gtk_misc_set_alignment(GTK_MISC(label), 0.f, .5f);  
   return label;  
 }  
 #define gtk_label_big_left_new(a) gtk_label_left_new(a)  
 #else  
 #define gtk_label_small_left_new(a) gtk_label_left_new(a)  
 #define MARKUP_BIG "<span size='x-large'>%s</span>"  
 GtkWidget *gtk_label_big_left_new(char *str) {  
   GtkWidget *label = gtk_label_new("");  
   char *markup = g_markup_printf_escaped(MARKUP_BIG, str);  
   gtk_label_set_markup(GTK_LABEL(label), markup);  
   g_free(markup);  
   gtk_misc_set_alignment(GTK_MISC(label), 0.f, .5f);  
   return label;  
 }  
 #endif  
   
 static gboolean  
 on_cache_button_clicked(GtkButton *button, popup_context_t *context) {  
   printf("clicked %s\n", context->cache->name);  
   return FALSE;  
 }  
   
 void cache_popup(map_context_t *mcontext, cache_t *cache) {  
   popup_context_t pcontext;  
   pcontext.appdata = mcontext->appdata;  
   pcontext.cache = cache;  
   
   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));  
   
 #if 0  
   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);  
 #endif  
   
   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);  
   }  
   
   hbox = gtk_hbox_new(FALSE, 0);  
   if(cache->terrain) {  
     GtkWidget *ihbox = gtk_hbox_new(FALSE, 0);  
     gtk_box_pack_start(GTK_BOX(ihbox),  
        gtk_label_small_left_new(_("Terrain:")), FALSE, FALSE, 0);  
     gtk_box_pack_start(GTK_BOX(ihbox),  
        icon_get_widget(ICON_STARS, (int)(cache->terrain*2-2)),  
        FALSE, FALSE, 5);  
     gtk_box_pack_start_defaults(GTK_BOX(hbox), ihbox);  
   }  
   
   if(cache->difficulty) {  
     GtkWidget *ihbox = gtk_hbox_new(FALSE, 0);  
     gtk_box_pack_start(GTK_BOX(ihbox),  
        gtk_label_small_left_new(_("Difficulty:")), FALSE, FALSE, 0);  
     gtk_box_pack_start(GTK_BOX(ihbox),  
        icon_get_widget(ICON_STARS, (int)(cache->difficulty*2-2)),  
        FALSE, FALSE, 5);  
     gtk_box_pack_start_defaults(GTK_BOX(hbox), ihbox);  
   }  
   
   gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);  
   
   gtk_container_add(GTK_CONTAINER(alignment), vbox);  
   /* ----------------------- */  
   
   
   gtk_container_add(GTK_CONTAINER(pcontext.window), alignment);  
   
   /* give window its shape */  
   popup_window_shape(pcontext.window, ax, ay);  
   
   gtk_widget_show_all(pcontext.window);  
   
   /* handle this popup until it's gone */  
   
   pcontext.loop = g_main_loop_new(NULL, FALSE);  
   
   GDK_THREADS_LEAVE();  
   g_main_loop_run(pcontext.loop);  
   GDK_THREADS_ENTER();  
   
   g_main_loop_unref(pcontext.loop);  
   
   printf("cache popup removed\n");  
 }  
   
179  static void  static void
180  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
181                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
# Line 576  static cache_t *map_closest(map_context_ Line 219  static cache_t *map_closest(map_context_
219  /* translate between osm-gps-map positions and gpxview ones */  /* translate between osm-gps-map positions and gpxview ones */
220  pos_t coord2pos(coord_t coo) {  pos_t coord2pos(coord_t coo) {
221    pos_t pos;    pos_t pos;
222    pos.lat = RAD2DEG(coo.rlat);    pos.lat = rad2deg(coo.rlat);
223    pos.lon = RAD2DEG(coo.rlon);    pos.lon = rad2deg(coo.rlon);
224    return pos;    return pos;
225  }  }
226    
# Line 607  on_map_button_press_event(GtkWidget *wid Line 250  on_map_button_press_event(GtkWidget *wid
250    return FALSE;    return FALSE;
251  }  }
252    
253    static void
254    cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf *buf, gint x, gint y) {
255      /* convert the pixbuf into something cairo can handle */
256    
257      // Create a new ImageSurface
258      cairo_surface_t *image_surface =
259        cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
260                                   gdk_pixbuf_get_width(buf),
261                                   gdk_pixbuf_get_height(buf));
262    
263      // Create the new Context for the ImageSurface
264      cairo_t *context = cairo_create(image_surface);
265    
266      // Draw the image on the new Context
267      gdk_cairo_set_source_pixbuf(context, buf, 0.0, 0.0);
268      cairo_paint(context);
269    
270      // now draw this onto the original context
271      cairo_set_source_surface(cr, image_surface, x, y);
272    
273      cairo_paint(cr);
274    }
275    
276    #ifndef BIG_BALLOONS
277    #define LINE_SKIP  7
278    #else
279    #define LINE_SKIP  12
280    #endif
281    
282    static void
283    balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {
284      cache_t *cache = (cache_t*)data;
285    
286    #if 0
287      /* draw pink background to check clipping */
288      cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);
289      cairo_set_source_rgba (cr, 1, 0, 0, 0.3);
290      cairo_fill_preserve (cr);
291      cairo_set_line_width (cr, 0);
292      cairo_stroke (cr);
293    #endif
294    
295      /* leave a little border top and left */
296      gint x = rect->x, y = rect->y;
297    
298      /* draw the cache type icon ... */
299      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
300      cairo_draw_pixbuf(cr, icon, x, y);
301    
302      /* ... and right of it the waypoint id */
303      cairo_text_extents_t extents;
304    
305      if(cache->id) {
306        cairo_select_font_face (cr, "Sans",
307                                CAIRO_FONT_SLANT_NORMAL,
308                                CAIRO_FONT_WEIGHT_BOLD);
309    
310    #ifndef BIG_BALLOONS
311        cairo_set_font_size (cr, 20.0);
312    #else
313        cairo_set_font_size (cr, 36.0);
314    #endif
315    
316        cairo_text_extents (cr, cache->id, &extents);
317    
318        /* display id right of icon vertically centered */
319        x += gdk_pixbuf_get_width(icon) + 5;
320        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
321        cairo_move_to (cr, x, y);
322        cairo_set_source_rgba (cr, 0, 0, 0, 1);
323        cairo_show_text (cr, cache->id);
324        cairo_stroke (cr);
325    
326        y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
327      } else
328        y += gdk_pixbuf_get_height(icon);
329    
330      /* return to the left border and below icon/text */
331      x = rect->x;
332    
333      /* everything from here uses the same font */
334      cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
335                              CAIRO_FONT_WEIGHT_NORMAL);
336    #ifndef BIG_BALLOONS
337      cairo_set_font_size (cr, 14.0);
338    #else
339      cairo_set_font_size (cr, 22.0);
340    #endif
341    
342      if(cache->name) {
343        /* draw cache name */
344        cairo_text_extents (cr, cache->name, &extents);
345        y += extents.height;
346        cairo_move_to (cr, x, y);
347        cairo_set_source_rgba (cr, 0, 0, 0, 1);
348        cairo_show_text (cr, cache->name);
349        cairo_stroke (cr);
350    
351        /* return to the left border and below text */
352        y += LINE_SKIP;
353        x = rect->x;
354      }
355    
356      if(cache->terrain) {
357        /* draw cache rating */
358        const char *terrain = "Terrain:";
359        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
360        cairo_text_extents (cr, _(terrain), &extents);
361        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
362    
363        /* draw "Terrain:" string */
364        cairo_move_to (cr, x, y);
365        cairo_set_source_rgba (cr, 0, 0, 0, 1);
366        cairo_show_text (cr, _(terrain));
367        cairo_stroke (cr);
368        x += extents.width + 2;
369    
370        /* draw terrain stars */
371        cairo_draw_pixbuf(cr, icon, x, y -
372                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
373    
374        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
375        y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;
376      }
377    
378      if(cache->difficulty) {
379        const char *difficulty = "Difficulty:";
380        cairo_text_extents (cr, _(difficulty), &extents);
381        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
382    
383        /* draw "Difficulty:" string */
384        cairo_move_to (cr, x, y);
385        cairo_set_source_rgba (cr, 0, 0, 0, 1);
386        cairo_show_text (cr, _(difficulty));
387        cairo_stroke (cr);
388        x += extents.width + 2;
389    
390        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
391        cairo_draw_pixbuf(cr, icon, x, y -
392                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
393      }
394    }
395    
396  static gboolean  static gboolean
397  on_map_button_release_event(GtkWidget *widget,  on_map_button_release_event(GtkWidget *widget,
398                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
399    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
400    
401    if(context->press_on) {    if(context->press_on) {
402        coord_t coo;
403        coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
404    
405      pos_t pos =      pos_t pos =
406        coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));        coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));
407    
408      cache_t *nearest = map_closest(context, &pos);      cache_t *nearest = map_closest(context, &pos);
409      if(nearest && nearest == context->press_on) {      if(nearest && nearest == context->press_on) {
410        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);
411        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {
412          cache_popup(context, nearest);  
413            osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,
414                                     balloon_draw_cb, nearest);
415          }
416      }      }
417      context->press_on = NULL;      context->press_on = NULL;
418    } else {    } else {
# Line 661  static void on_window_destroy(GtkWidget Line 453  static void on_window_destroy(GtkWidget
453    appdata->map.context = NULL;    appdata->map.context = NULL;
454  }  }
455    
456    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
457    /* get access to zoom buttons */
458    static void
459    on_window_realize(GtkWidget *widget, gpointer data) {
460      if (widget->window) {
461        unsigned char value = 1;
462        Atom hildon_zoom_key_atom =
463          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
464          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
465        Display *dpy =
466          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
467        Window w = GDK_WINDOW_XID(widget->window);
468    
469        XChangeProperty(dpy, w, hildon_zoom_key_atom,
470                        integer_atom, 8, PropModeReplace, &value, 1);
471      }
472    }
473    #endif
474    
475  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
476    map_context_t *context = NULL;    map_context_t *context = NULL;
477    
# Line 673  void map(appdata_t *appdata) { Line 484  void map(appdata_t *appdata) {
484    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
485    context->appdata = appdata;    context->appdata = appdata;
486    
487    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);    /* cleanup old (pre 0.8.7) path if it exists */
488      char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
489      if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
490        printf("old file path %s exists\n", old_path);
491        rmdir_recursive(old_path);
492      }
493    
494      /* It is recommanded that all applications share these same */
495      /* map path, so data is only cached once. The path should be: */
496      /* ~/.osm-gps-map on standard PC     (users home) */
497      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
498      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
499    #if !defined(USE_MAEMO)
500      char *p = getenv("HOME");
501      if(!p) p = "/tmp";
502      char *path = g_strdup_printf("%s/.osm-gps-map", p);
503    #else
504    #if MAEMO_VERSION_MAJOR == 5
505      char *path = g_strdup("/home/user/.osm-gps-map");
506    #else
507      char *path = g_strdup("/media/mmc2/osm-gps-map");
508    #endif
509    #endif
510    
   char *path = g_strdup_printf("%s/map/", appdata->image_path);  
511    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
512    
513    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
# Line 689  void map(appdata_t *appdata) { Line 521  void map(appdata_t *appdata) {
521    
522    g_free(path);    g_free(path);
523    
524      osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
525    
526    char *name = NULL;    char *name = NULL;
527  #ifdef USE_MAEMO  #ifdef USE_MAEMO
528    if(!appdata->cur_gpx) {    if(!appdata->cur_gpx) {
# Line 713  void map(appdata_t *appdata) { Line 547  void map(appdata_t *appdata) {
547  #ifdef USE_MAEMO  #ifdef USE_MAEMO
548  #ifdef USE_STACKABLE_WINDOW  #ifdef USE_STACKABLE_WINDOW
549    context->window = hildon_stackable_window_new();    context->window = hildon_stackable_window_new();
550      /* try to enable the zoom buttons. don't do this on x86 as it breaks */
551      /* at runtime with cygwin x */
552    #ifndef __i386__
553      g_signal_connect(G_OBJECT(context->window), "realize",
554                       G_CALLBACK(on_window_realize), NULL);
555    #endif // MAEMO_VERSION
556  #else  #else
557    context->window = hildon_window_new();    context->window = hildon_window_new();
558  #endif  #endif
# Line 737  void map(appdata_t *appdata) { Line 577  void map(appdata_t *appdata) {
577    g_signal_connect(G_OBJECT(context->widget), "button-release-event",    g_signal_connect(G_OBJECT(context->widget), "button-release-event",
578                     G_CALLBACK(on_map_button_release_event), context);                     G_CALLBACK(on_map_button_release_event), context);
579    
   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);  
   
580    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
581    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);  
582    
583  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
584    /* prevent some of the main screen things */    /* prevent some of the main screen things */
# Line 771  void map(appdata_t *appdata) { Line 589  void map(appdata_t *appdata) {
589    g_signal_connect(G_OBJECT(context->window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
590                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
591    
592    gtk_container_add(GTK_CONTAINER(context->window), hbox);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
593    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
594  }  }
Legend:
Removed from v.56  
changed lines
  Added in v.81