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

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

revision 46 by harbaum, Wed Aug 5 14:11:00 2009 UTC revision 86 by harbaum, Sun Aug 30 19:05:44 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 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  #endif
28    
29  /* equatorial radius in meters */  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
30  #define EQ_RADIUS     (6378137.0)  #include <gdk/gdkx.h>
31    #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;  
32  #endif  #endif
33  } map_context_t;  
34    // #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP
35    #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENCYCLEMAP
36    #define GPS_DEFAULT_ZOOM 13
37    
38  #define PROXY_KEY  "/system/http_proxy/"  #define PROXY_KEY  "/system/http_proxy/"
39    
# Line 79  static const char *get_proxy_uri(appdata Line 73  static const char *get_proxy_uri(appdata
73    return NULL;    return NULL;
74  }  }
75    
76  static void map_zoom(map_context_t *context, int step) {  static void
77    int zoom;  cb_map_gps(osd_button_t but, map_context_t *context) {
78    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    if(but == OSD_GPS) {
79    g_object_get(map, "zoom", &zoom, NULL);      pos_t *refpos = get_pos(context->appdata);
80    zoom = osm_gps_map_set_zoom(map, zoom+step);      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
81          gint zoom;
82    /* enable/disable zoom buttons as required */        g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
83    gtk_widget_set_sensitive(context->zoomin, zoom<17);        if(zoom < 10)
84    gtk_widget_set_sensitive(context->zoomout, zoom>1);          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
85  }                                    refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
86          else
87  static gboolean          osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
88  cb_map_zoomin(GtkButton *button, map_context_t *context) {                                 refpos->lat, refpos->lon);
89    map_zoom(context, +1);  
90    return FALSE;        /* re-enable centering */
91  }        g_object_set(context->widget, "auto-center", TRUE, NULL);
92        } else {
93  static gboolean        /* no coordinates given: display the entire world */
94  cb_map_zoomout(GtkButton *button, map_context_t *context) {        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
95    map_zoom(context, -1);                                  0.0, 0.0, 1);
96    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);  
97    }    }
   
   return FALSE;  
98  }  }
99    
100  static GtkWidget  static int dist2pixel(map_context_t *context, float km, float lat) {
101  *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;  
102  }  }
103    
104  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
105    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
106    
107      /* get reference position ... */
108    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
109    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
110    
111    /* get reference position and go there */    /* ... and enable "goto" button if it's valid */
112    gtk_widget_set_sensitive(context->gps, ok);    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
113                     OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
114    
115      if(ok) {
116        float heading = NAN;
117        int radius = 0;
118    
119        if(context->appdata->use_gps) {
120          heading = gps_get_heading(context->appdata);
121    
122          /* get error */
123          float eph = gps_get_eph(context->appdata);
124          if(!isnan(eph))
125            radius = dist2pixel(context, eph/1000, refpos->lat);
126        }
127    
128        g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
129        osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
130                             refpos->lat, refpos->lon, heading);
131      } else
132        osm_gps_map_clear_gps(OSM_GPS_MAP(context->widget));
133    
134    return TRUE;    return TRUE;
135  }  }
136    
# Line 146  static gboolean on_map_configure(GtkWidg Line 138  static gboolean on_map_configure(GtkWidg
138                                   GdkEventConfigure *event,                                   GdkEventConfigure *event,
139                                   map_context_t *context) {                                   map_context_t *context) {
140    
141    cb_map_gps(NULL, context);    if(!context->map_complete) {
142    
143        /* set default values if they are invalid */
144        if(!context->appdata->map.zoom ||
145           isnan(context->appdata->map.pos.lat) ||
146           isnan(context->appdata->map.pos.lon)) {
147          printf("no valid map position found\n");
148    
149          pos_t *refpos = get_pos(context->appdata);
150          if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
151            /* use gps position if present */
152            context->appdata->map.pos = *refpos;
153            context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
154          } else {
155            /* use world map otherwise */
156            context->appdata->map.pos.lat = 0.0;
157            context->appdata->map.pos.lon = 0.0;
158            context->appdata->map.zoom = 1;
159          }
160        }
161    
162        /* jump to initial position */
163        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
164                                  context->appdata->map.pos.lat,
165                                  context->appdata->map.pos.lon,
166                                  context->appdata->map.zoom);
167        context->map_complete = TRUE;
168      }
169    
170    return FALSE;    return FALSE;
171  }  }
# Line 162  static void map_draw_cachelist(GtkWidget Line 181  static void map_draw_cachelist(GtkWidget
181    }    }
182  }  }
183    
 /* draw a nice popup */  
 typedef struct {  
   appdata_t *appdata;  
   GtkWidget *window;  
   GMainLoop *loop;  
 } popup_context_t;  
   
   
 #ifndef USE_HILDON  
 #define POPUP_WIDTH  300  
 #define POPUP_HEIGHT 100  
 #else  
 #define POPUP_WIDTH  600  
 #define POPUP_HEIGHT 200  
 #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);  
 }  
   
 /* draw shape */  
 #define ARROW_BORDER   20  
 #define CORNER_RADIUS  10  
   
 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);  
   
   gdk_draw_rectangle(mask, gc, TRUE,  
                      0, ARROW_BORDER + CORNER_RADIUS,  
                      POPUP_WIDTH,  
                      POPUP_HEIGHT - 2*CORNER_RADIUS - 2*ARROW_BORDER);  
   
   gdk_draw_rectangle(mask, gc, TRUE,  
                      CORNER_RADIUS, ARROW_BORDER,  
                      POPUP_WIDTH  - 2*CORNER_RADIUS,  
                      POPUP_HEIGHT - 2*ARROW_BORDER);  
   
   int off[][2] = {  
           { CORNER_RADIUS, ARROW_BORDER + CORNER_RADIUS },  
           { POPUP_WIDTH - CORNER_RADIUS,  
             ARROW_BORDER + CORNER_RADIUS },  
           { POPUP_WIDTH - CORNER_RADIUS,  
             POPUP_HEIGHT - CORNER_RADIUS - ARROW_BORDER },  
           { CORNER_RADIUS,  
             POPUP_HEIGHT - CORNER_RADIUS  - ARROW_BORDER}};  
   
   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);  
 }  
   
 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);  
   
   printf("screen pos %d/%d\n", sx, sy);  
   
   gdk_window_get_origin(mcontext->widget->window, &x, &y);  
   printf("window = %d/%d +%d+%d %d*%d\n", x, y,  
          mcontext->widget->allocation.x,  
          mcontext->widget->allocation.y,  
          mcontext->widget->allocation.width,  
          mcontext->widget->allocation.height  
          );  
   
   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_HILDON) || (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 *frame = gtk_frame_new(NULL);  
   gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_NONE);  
   gtk_container_set_border_width(GTK_CONTAINER(frame),  
                                  ARROW_BORDER+CORNER_RADIUS);  
   gtk_container_add(GTK_CONTAINER(frame),  
                     gtk_button_new_with_label(cache->name));  
   
   gtk_container_add(GTK_CONTAINER(pcontext.window), frame);  
   
   /* --------- give the 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");  
 }  
   
184  static void  static void
185  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
186                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
# Line 443  static cache_t *map_closest(map_context_ Line 224  static cache_t *map_closest(map_context_
224  /* translate between osm-gps-map positions and gpxview ones */  /* translate between osm-gps-map positions and gpxview ones */
225  pos_t coord2pos(coord_t coo) {  pos_t coord2pos(coord_t coo) {
226    pos_t pos;    pos_t pos;
227    pos.lat = RAD2DEG(coo.rlat);    pos.lat = rad2deg(coo.rlat);
228    pos.lon = RAD2DEG(coo.rlon);    pos.lon = rad2deg(coo.rlon);
229    return pos;    return pos;
230  }  }
231    
232  static int dist2pixel(map_context_t *context, float km, float lat) {  #define CLICK_FUZZ (24)
   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;  
 }  
   
 #define CLICK_FUZZ (16)  
233    
234  static gboolean  static gboolean
235  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
236                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
237    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
238    
239      /* check if we actually clicked parts of the OSD */
240      if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)
241        return FALSE;
242    
243    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
244    if(context->press_on != NULL) {    if(context->press_on != NULL) {
245      printf("PRESS: already\n");      printf("PRESS: already\n");
246      return TRUE;      return FALSE;
247    }    }
248    
249    pos_t pos =    pos_t pos =
# Line 485  on_map_button_press_event(GtkWidget *wid Line 259  on_map_button_press_event(GtkWidget *wid
259    return FALSE;    return FALSE;
260  }  }
261    
262    static void
263    cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf *buf, gint x, gint y) {
264      /* convert the pixbuf into something cairo can handle */
265    
266      // Create a new ImageSurface
267      cairo_surface_t *image_surface =
268        cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
269                                   gdk_pixbuf_get_width(buf),
270                                   gdk_pixbuf_get_height(buf));
271    
272      // Create the new Context for the ImageSurface
273      cairo_t *context = cairo_create(image_surface);
274    
275      // Draw the image on the new Context
276      gdk_cairo_set_source_pixbuf(context, buf, 0.0, 0.0);
277      cairo_paint(context);
278    
279      // now draw this onto the original context
280      cairo_set_source_surface(cr, image_surface, x, y);
281    
282      cairo_paint(cr);
283    }
284    
285    #ifndef BIG_BALLOONS
286    #define LINE_SKIP  7
287    #else
288    #define LINE_SKIP  12
289    #endif
290    
291    static void
292    balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {
293      cache_t *cache = (cache_t*)data;
294    
295    #if 0
296      /* draw pink background to check clipping */
297      cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);
298      cairo_set_source_rgba (cr, 1, 0, 0, 0.3);
299      cairo_fill_preserve (cr);
300      cairo_set_line_width (cr, 0);
301      cairo_stroke (cr);
302    #endif
303    
304      /* leave a little border top and left */
305      gint x = rect->x, y = rect->y;
306    
307      /* draw the cache type icon ... */
308      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);
309      cairo_draw_pixbuf(cr, icon, x, y);
310    
311      /* ... and right of it the waypoint id */
312      cairo_text_extents_t extents;
313    
314      if(cache->id) {
315        cairo_select_font_face (cr, "Sans",
316                                CAIRO_FONT_SLANT_NORMAL,
317                                CAIRO_FONT_WEIGHT_BOLD);
318    
319    #ifndef BIG_BALLOONS
320        cairo_set_font_size (cr, 20.0);
321    #else
322        cairo_set_font_size (cr, 36.0);
323    #endif
324    
325        cairo_text_extents (cr, cache->id, &extents);
326    
327        /* display id right of icon vertically centered */
328        x += gdk_pixbuf_get_width(icon) + 5;
329        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
330        cairo_move_to (cr, x, y);
331        cairo_set_source_rgba (cr, 0, 0, 0, 1);
332        cairo_show_text (cr, cache->id);
333        cairo_stroke (cr);
334    
335        y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
336      } else
337        y += gdk_pixbuf_get_height(icon);
338    
339      /* return to the left border and below icon/text */
340      x = rect->x;
341    
342      /* everything from here uses the same font */
343      cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
344                              CAIRO_FONT_WEIGHT_NORMAL);
345    #ifndef BIG_BALLOONS
346      cairo_set_font_size (cr, 14.0);
347    #else
348      cairo_set_font_size (cr, 22.0);
349    #endif
350    
351      if(cache->name) {
352        /* draw cache name */
353        cairo_text_extents (cr, cache->name, &extents);
354        y += extents.height;
355        cairo_move_to (cr, x, y);
356        cairo_set_source_rgba (cr, 0, 0, 0, 1);
357        cairo_show_text (cr, cache->name);
358        cairo_stroke (cr);
359    
360        /* return to the left border and below text */
361        y += LINE_SKIP;
362        x = rect->x;
363      }
364    
365      if(cache->terrain) {
366        /* draw cache rating */
367        const char *terrain = "Terrain:";
368        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
369        cairo_text_extents (cr, _(terrain), &extents);
370        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
371    
372        /* draw "Terrain:" string */
373        cairo_move_to (cr, x, y);
374        cairo_set_source_rgba (cr, 0, 0, 0, 1);
375        cairo_show_text (cr, _(terrain));
376        cairo_stroke (cr);
377        x += extents.width + 2;
378    
379        /* draw terrain stars */
380        cairo_draw_pixbuf(cr, icon, x, y -
381                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
382    
383        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;
384        y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;
385      }
386    
387      if(cache->difficulty) {
388        const char *difficulty = "Difficulty:";
389        cairo_text_extents (cr, _(difficulty), &extents);
390        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
391    
392        /* draw "Difficulty:" string */
393        cairo_move_to (cr, x, y);
394        cairo_set_source_rgba (cr, 0, 0, 0, 1);
395        cairo_show_text (cr, _(difficulty));
396        cairo_stroke (cr);
397        x += extents.width + 2;
398    
399        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
400        cairo_draw_pixbuf(cr, icon, x, y -
401                          (gdk_pixbuf_get_height(icon) + extents.height)/2);
402      }
403    }
404    
405  static gboolean  static gboolean
406  on_map_button_release_event(GtkWidget *widget,  on_map_button_release_event(GtkWidget *widget,
407                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
408      OsmGpsMap *map = OSM_GPS_MAP(context->widget);
409    
410    if(context->press_on) {    if(context->press_on) {
411      OsmGpsMap *map = OSM_GPS_MAP(context->widget);      coord_t coo;
412        coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
413    
414      pos_t pos =      pos_t pos =
415        coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));        coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));
# Line 497  on_map_button_release_event(GtkWidget *w Line 417  on_map_button_release_event(GtkWidget *w
417      cache_t *nearest = map_closest(context, &pos);      cache_t *nearest = map_closest(context, &pos);
418      if(nearest && nearest == context->press_on) {      if(nearest && nearest == context->press_on) {
419        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);
420        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {
421          cache_popup(context, nearest);  
422            osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,
423                                     balloon_draw_cb, nearest);
424          }
425      }      }
426      context->press_on = NULL;      context->press_on = NULL;
427      } else {
428        /* save new map position */
429        gfloat lat, lon;
430        g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
431        context->appdata->map.pos.lat = lat;
432        context->appdata->map.pos.lon = lon;
433    }    }
434    
435    return FALSE;    return FALSE;
436  }  }
437    
   
 #if MAEMO_VERSION_MAJOR == 5  
438  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
439    printf("destroy map view\n");    appdata_t *appdata = context->appdata;
440    
441      printf("destroy map window\n");
442    
443      /* save map parameters */
444      OsmGpsMap *map = OSM_GPS_MAP(context->widget);
445      gint zoom;
446      g_object_get(map, "zoom", &zoom, NULL);
447      context->appdata->map.zoom = zoom;
448    
449      gfloat lat, lon;
450      g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
451      context->appdata->map.pos.lat = lat;
452      context->appdata->map.pos.lon = lon;
453    
454    #if MAEMO_VERSION_MAJOR == 5
455    /* restore cur_view */    /* restore cur_view */
456    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
457    #endif
458    
459    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
460    
461    g_free(context);    g_free(context);
462      appdata->map.context = NULL;
463    }
464    
465    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
466    /* get access to zoom buttons */
467    static void
468    on_window_realize(GtkWidget *widget, gpointer data) {
469      if (widget->window) {
470        unsigned char value = 1;
471        Atom hildon_zoom_key_atom =
472          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
473          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
474        Display *dpy =
475          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
476        Window w = GDK_WINDOW_XID(widget->window);
477    
478        XChangeProperty(dpy, w, hildon_zoom_key_atom,
479                        integer_atom, 8, PropModeReplace, &value, 1);
480      }
481  }  }
482  #endif  #endif
483    
484  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
485    map_context_t *context = g_new0(map_context_t, 1);    map_context_t *context = NULL;
486    
487      /* if the map window already exists, just raise it */
488      if(appdata->map.context) {
489        gtk_window_present(GTK_WINDOW(appdata->map.context->window));
490        return;
491      }
492    
493      context = appdata->map.context = g_new0(map_context_t, 1);
494    context->appdata = appdata;    context->appdata = appdata;
495      context->map_complete = FALSE;
496    
497    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);    /* cleanup old (pre 0.8.7) path if it exists */
498      char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
499      if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
500        printf("old file path %s exists\n", old_path);
501        rmdir_recursive(old_path);
502      }
503    
504      /* It is recommanded that all applications share these same */
505      /* map path, so data is only cached once. The path should be: */
506      /* ~/.osm-gps-map on standard PC     (users home) */
507      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
508      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
509    #if !defined(USE_MAEMO)
510      char *p = getenv("HOME");
511      if(!p) p = "/tmp";
512      char *path = g_strdup_printf("%s/.osm-gps-map", p);
513    #else
514    #if MAEMO_VERSION_MAJOR == 5
515      char *path = g_strdup("/home/user/.osm-gps-map");
516    #else
517      char *path = g_strdup("/media/mmc2/osm-gps-map");
518    #endif
519    #endif
520    
   char *path = g_strdup_printf("%s/map/", appdata->image_path);  
521    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
522    
523    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
524                  "repo-uri", MAP_SOURCE_OPENSTREETMAP,                   "map-source",               MAP_SOURCE,
525                  "tile-cache", path,                   "tile-cache",               path,
526                  proxy?"proxy-uri":NULL, proxy,                   "auto-center",              FALSE,
527                     "record-trip-history",      FALSE,
528                     "show-trip-history",        FALSE,
529                     proxy?"proxy-uri":NULL,     proxy,
530                   NULL);                   NULL);
531    
532    g_free(path);    g_free(path);
533    
534      osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
535    
536    char *name = NULL;    char *name = NULL;
537  #ifdef USE_MAEMO  #ifdef USE_MAEMO
538    if(!appdata->cur_gpx) {    if(!appdata->cur_gpx) {
# Line 557  void map(appdata_t *appdata) { Line 554  void map(appdata_t *appdata) {
554    char *title = g_strdup_printf(_("Map - %s"), name);    char *title = g_strdup_printf(_("Map - %s"), name);
555    g_free(name);    g_free(name);
556    
557  #if MAEMO_VERSION_MAJOR == 5  #ifdef USE_MAEMO
558    GtkWidget *window = hildon_stackable_window_new();  #ifdef USE_STACKABLE_WINDOW
559    gtk_window_set_title(GTK_WINDOW(window), title);    context->window = hildon_stackable_window_new();
560      /* try to enable the zoom buttons. don't do this on x86 as it breaks */
561      /* at runtime with cygwin x */
562    #ifndef __i386__
563      g_signal_connect(G_OBJECT(context->window), "realize",
564                       G_CALLBACK(on_window_realize), NULL);
565    #endif // MAEMO_VERSION
566  #else  #else
567    GtkWidget *dialog = gtk_dialog_new_with_buttons(title,    context->window = hildon_window_new();
568                            GTK_WINDOW(appdata->window),  #endif
                           GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,  
                           GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,  
                           NULL);  
   
 #ifndef USE_MAEMO  
   gtk_window_set_default_size(GTK_WINDOW(dialog), 640, 480);  
569  #else  #else
570    gtk_window_set_default_size(GTK_WINDOW(dialog), 800, 480);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
571  #endif  #endif
572    
573      gtk_window_set_title(GTK_WINDOW(context->window), title);
574    
575    #ifndef USE_MAEMO
576      gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
577  #endif  #endif
578    
579    g_free(title);    g_free(title);
# Line 585  void map(appdata_t *appdata) { Line 587  void map(appdata_t *appdata) {
587    g_signal_connect(G_OBJECT(context->widget), "button-release-event",    g_signal_connect(G_OBJECT(context->widget), "button-release-event",
588                     G_CALLBACK(on_map_button_release_event), context);                     G_CALLBACK(on_map_button_release_event), context);
589    
   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);  
590    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
591    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);  
592    
593  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
594    /* prevent some of the main screen things */    /* prevent some of the main screen things */
595    context->old_view = appdata->cur_view;    context->old_view = appdata->cur_view;
596    appdata->cur_view = NULL;    appdata->cur_view = NULL;
597    #endif
598    
599    g_signal_connect(G_OBJECT(window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
600                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
601    
602    gtk_container_add(GTK_CONTAINER(window), hbox);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
603    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  
604  }  }
Legend:
Removed from v.46  
changed lines
  Added in v.86