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 189 by harbaum, Tue Nov 17 09:07:17 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    /*
26     * TODO:
27     * - draw caches only once
28     * - prefer duplicates from selected files
29     * - make semi-transparent caches selectable
30     */
31    
32  #include "gpxview.h"  #include "gpxview.h"
33    #include "converter.h"
34  #include <math.h>    // for isnan  #include <math.h>    // for isnan
35    
36  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
37  #include "osm-gps-map.h"  #include "osm-gps-map.h"
38    #include "osm-gps-map-osd-classic.h"
39  #endif  #endif
40    
41  /* equatorial radius in meters */  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
42  #define EQ_RADIUS     (6378137.0)  #include <gdk/gdkx.h>
43    #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;  
44  #endif  #endif
45  } map_context_t;  
46    /* default values */
47    #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENCYCLEMAP
48    #define GPS_DEFAULT_ZOOM 13
49    
50  #define PROXY_KEY  "/system/http_proxy/"  #define PROXY_KEY  "/system/http_proxy/"
51    
# Line 49  static const char *get_proxy_uri(appdata Line 55  static const char *get_proxy_uri(appdata
55    /* use environment settings if preset */    /* use environment settings if preset */
56    const char *proxy = g_getenv("http_proxy");    const char *proxy = g_getenv("http_proxy");
57    if(proxy) {    if(proxy) {
58      printf("http_proxy: %s\n", proxy);      printf("map http proxy from env: %s\n", proxy);
59      return proxy;      return proxy;
60    }    }
61    
# Line 70  static const char *get_proxy_uri(appdata Line 76  static const char *get_proxy_uri(appdata
76    
77        snprintf(proxy_buffer, sizeof(proxy_buffer),        snprintf(proxy_buffer, sizeof(proxy_buffer),
78                 "http://%s:%u", host, port);                 "http://%s:%u", host, port);
79          printf("map http proxy from gconf: %s\n ", proxy_buffer);
80    
81        g_free(host);        g_free(host);
82      }      }
# Line 79  static const char *get_proxy_uri(appdata Line 86  static const char *get_proxy_uri(appdata
86    return NULL;    return NULL;
87  }  }
88    
89  static void map_zoom(map_context_t *context, int step) {  static void
90    int zoom;  cb_map_gps(osd_button_t but, map_context_t *context) {
   OsmGpsMap *map = OSM_GPS_MAP(context->widget);  
   g_object_get(map, "zoom", &zoom, NULL);  
   zoom = osm_gps_map_set_zoom(map, zoom+step);  
   
   /* enable/disable zoom buttons as required */  
   gtk_widget_set_sensitive(context->zoomin, zoom<17);  
   gtk_widget_set_sensitive(context->zoomout, zoom>1);  
 }  
   
 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;  
 }  
91    
92  static gboolean    if(but == OSD_GPS) {
93  cb_map_gps(GtkButton *button, map_context_t *context) {      pos_t *refpos = get_pos(context->appdata);
94    pos_t *refpos = get_pos(context->appdata);      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
95    if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {        gint zoom;
96      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),        g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
97                                refpos->lat, refpos->lon, 14);        if(zoom < 10)
98    } else {          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
99      /* no coordinates given: display the entire world */                                    refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
100      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),        else
101                                0.0, 0.0, 1);          osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
102                                   refpos->lat, refpos->lon);
103    
104          /* re-enable centering */
105          g_object_set(context->widget, "auto-center", TRUE, NULL);
106        } else {
107          /* no coordinates given: display the entire world */
108          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
109                                    0.0, 0.0, 1);
110        }
111    }    }
   
   return FALSE;  
112  }  }
113    
114  static GtkWidget  static int dist2pixel(map_context_t *context, float km, float lat) {
115  *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;  
116  }  }
117    
118  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
119    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
120      static gboolean goto_is_enabled = FALSE;
121    
122      /* get reference position ... */
123    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
124    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
125    
126    /* get reference position and go there */    /* ... and enable "goto" button if it's valid */
127    gtk_widget_set_sensitive(context->gps, ok);    if(ok != goto_is_enabled) {
128        osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
129                    OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
130        goto_is_enabled = ok;
131      }
132    
133      if(ok) {
134        float heading = NAN;
135        int radius = 0;
136    
137        if(context->appdata->use_gps) {
138          heading = gps_get_heading(context->appdata);
139    
140          /* get error */
141          float eph = gps_get_eph(context->appdata);
142          if(!isnan(eph))
143            radius = dist2pixel(context, eph/1000, refpos->lat);
144        }
145    
146        /* TODO: in order to save energy: only draw if state actually changed */
147    
148        g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
149        osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
150                             refpos->lat, refpos->lon, heading);
151      } else
152        osm_gps_map_clear_gps(OSM_GPS_MAP(context->widget));
153    
154    return TRUE;    return TRUE;
155  }  }
156    
157  static gboolean on_map_configure(GtkWidget *widget,  static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
158                                   GdkEventConfigure *event,    int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;
                                  map_context_t *context) {  
159    
160    cb_map_gps(NULL, context);    GdkPixbuf *icon = icon_get(type, cache->type);
161    
162    return FALSE;    /* check if there's also an overwritten coordinate */
163  }    if(cache->notes && cache->notes->override) {
164        GdkPixbuf *over = icon_get(type, 11);
165    
 static void map_draw_cachelist(GtkWidget *map, cache_t *cache) {  
   while(cache) {  
     GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  
   
166      osm_gps_map_add_image(OSM_GPS_MAP(map),      osm_gps_map_add_image(OSM_GPS_MAP(map),
167                            cache->pos.lat, cache->pos.lon, icon);            cache->notes->pos.lat, cache->notes->pos.lon, icon);
168    
169      cache = cache->next;      osm_gps_map_add_image(OSM_GPS_MAP(map),
170              cache->notes->pos.lat, cache->notes->pos.lon, over);
171      } else {
172        if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon))
173          osm_gps_map_add_image(OSM_GPS_MAP(map),
174                                cache->pos.lat, cache->pos.lon, icon);
175    }    }
176  }  }
177    
178  /* draw a nice popup */  static void map_draw_gpx(appdata_t *appdata, cache_display_t *caches,
179  typedef struct {                           GtkWidget *map, gpx_t *gpx,
180    appdata_t *appdata;                           cache_t *nav, gboolean semi) {
181    GtkWidget *window;    if(!gpx->notes_loaded) {
182    GMainLoop *loop;      notes_load_all(appdata, gpx);
183  } popup_context_t;      gpx->notes_loaded = TRUE;
184      }
185    
186  #ifndef USE_HILDON    cache_t *cache = gpx->cache;
187  #define POPUP_WIDTH  300    while(cache) {
188  #define POPUP_HEIGHT 100      /* search if we have that cache already in our list/displayed */
189  #else      int i=0;
190  #define POPUP_WIDTH  600      while(caches[i].id && (strcmp(caches[i].id, cache->id) != 0))
191  #define POPUP_HEIGHT 200        i++;
192  #endif  
193        if(!caches[i].id) {
194          /* if nav is given draw all other caches semitransparent. */
195          /* if nav is not given do what semi sais */
196          map_draw_cache(map, cache, nav?(cache != nav):semi);
197          caches[i].id = cache->id;
198        }
199    
200  static gboolean      cache = cache->next;
 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;  
201    }    }
   
   return FALSE;  
202  }  }
203    
204  static gboolean  /* draw geocaches and set window title */
205  on_button_press_event(GtkWidget *widget,  static void map_setup(map_context_t *context) {
206                            GdkEventButton *event, popup_context_t *context) {    char *name = NULL;
   gboolean in = pointer_in_window(widget, event->x_root, event->y_root);  
207    
208    printf("overlay button press (in = %d)\n", in);    int cache_num = gpx_total_caches_global(context->appdata->gpx);
   return !in;  
 }  
209    
210  static gboolean    if(context->caches_displayed && (cache_num != context->cache_list_len)) {
211  on_button_release_event(GtkWidget *widget,      //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
212                            GdkEventButton *event, popup_context_t *context) {      //     cache_num, context->cache_list_len);
213    gboolean in = pointer_in_window(widget, event->x_root, event->y_root);      g_free(context->caches_displayed);
214        context->caches_displayed = NULL;
215        context->cache_list_len = 0;
216      }
217    
218      /* allocate buffer */
219      if(cache_num && !context->caches_displayed) {
220        context->cache_list_len = cache_num;
221        context->caches_displayed = g_new0(cache_display_t, cache_num+1);
222        printf("allocated space to handle %d map icons\n", cache_num);
223      }
224    
225      if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
226        if(context->state != MAP_ALL) {
227          printf("map_setup(ALL)\n");
228    
229    #ifdef OSD_NAV
230          /* no navigation in this mode */
231          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
232    #endif
233    
234          /* clear all existing cache images */
235          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
236          memset(context->caches_displayed, 0,
237                 (cache_num+1) * sizeof(cache_display_t));
238    
239          /* draw all geocaches and none is semi-transparent */
240          gpx_t *gpx = context->appdata->gpx;
241          while(gpx) {
242            map_draw_gpx(context->appdata, context->caches_displayed,
243                         context->widget, gpx, NULL, FALSE);
244            gpx = gpx->next;
245          }
246    
247          {
248            int i=0;
249            while(context->caches_displayed[i].id) i++;
250            printf("number of caches actually displayed: %d\n", i);
251          }
252    
253    printf("overlay button release (in = %d)\n", in);        name = g_strdup(_("all"));
254          context->state = MAP_ALL;
255        }
256      } else if(!context->appdata->cur_cache) {
257        if(context->state != MAP_GPX) {
258          printf("map_setup(GPX)\n");
259    
260    #ifdef OSD_NAV
261          /* no navigation in this mode */
262          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
263    #endif
264    
265          /* clear all existing ccahe images */
266          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
267          memset(context->caches_displayed, 0,
268                 (cache_num+1) * sizeof(cache_display_t));
269    
270          /* draw all geocaches and all other gpx files are semi-transparent */
271          map_draw_gpx(context->appdata, context->caches_displayed,
272                       context->widget, context->appdata->cur_gpx, NULL, FALSE);
273    
274          gpx_t *gpx = context->appdata->gpx;
275          while(gpx) {
276            if(gpx != context->appdata->cur_gpx)
277              map_draw_gpx(context->appdata, context->caches_displayed,
278                           context->widget, gpx, NULL, TRUE);
279    
280    if(!in) {          gpx = gpx->next;
281      printf("destroying popup\n");        }
     gtk_widget_destroy(gtk_widget_get_toplevel(widget));  
   }  
282    
283    return !in;        name = g_strdup(context->appdata->cur_gpx->name);
284  }        context->state = MAP_GPX;
285        }
286      } else {
287        cache_t *cache = context->appdata->cur_cache;
288    
289        printf("map_setup(CACHE)\n");
290    
291        /* no balloons in this mode */
292        context->balloon = NULL;
293        osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
294    
295        /* clear all existing ccahe images */
296        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
297        memset(context->caches_displayed, 0,
298               (cache_num+1) * sizeof(cache_display_t));
299    
300        /* draw all geocaches and all but selected one are semi-transparent */
301        gpx_t *gpx = context->appdata->gpx;
302        while(gpx) {
303          map_draw_gpx(context->appdata, context->caches_displayed,
304                       context->widget, gpx, cache, FALSE);
305          gpx = gpx->next;
306        }
307    
308  static void      name = g_strdup(cache->name);
309  shutdown_loop(popup_context_t *context) {      context->state = MAP_CACHE;
310    if(g_main_loop_is_running(context->loop))  
311      g_main_loop_quit(context->loop);      /* navigation in this mode! */
312  }      pos_t cpos = gpx_cache_pos(cache);
313    
314  static gint  #ifdef OSD_NAV
315  run_delete_handler(GtkWindow *window, GdkEventAny *event,      osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
316                     popup_context_t *context) {                                context->appdata->imperial,
317    shutdown_loop(context);                                cpos.lat, cpos.lon, cache->name);
318    return TRUE; /* Do not destroy */  #else
319  }  #warning OSD_NAV not defined!
320    #endif
321      }
322    
323  static void    if(name) {
324  run_destroy_handler(GtkWindow *window, popup_context_t *context) {      char *title = g_strdup_printf(_("Map - %s"), name);
325    /* shutdown_loop will be called by run_unmap_handler */      g_free(name);
   printf("popup destroyed\n");  
 }  
326    
327  static void      gtk_window_set_title(GTK_WINDOW(context->window), title);
328  run_unmap_handler(GtkWindow *window, popup_context_t *context) {  
329    shutdown_loop(context);      g_free(title);
330      } else
331        printf("map_setup(keep)\n");
332  }  }
333    
334  /* draw shape */  static gboolean on_map_configure(GtkWidget *widget,
335  #define ARROW_BORDER   20                                   GdkEventConfigure *event,
336  #define CORNER_RADIUS  10                                   map_context_t *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);  
   
   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);  
337    
338    GDK_THREADS_LEAVE();    /* for some reason there's a configure event with 1/1 */
339    g_main_loop_run(pcontext.loop);    /* on diablo. We just ignore this! */
   GDK_THREADS_ENTER();  
340    
341    g_main_loop_unref(pcontext.loop);    printf("on_map_configure %d %d\n",
342             widget->allocation.width,
343             widget->allocation.height);
344    
345      if(!context->map_complete &&
346         (widget->allocation.width > 100) &&
347         (widget->allocation.height > 100)) {
348    
349        /* setup cache state */
350        map_setup(context);
351    
352        /* set default values if they are invalid */
353        if(!context->appdata->map.zoom ||
354           isnan(context->appdata->map.pos.lat) ||
355           isnan(context->appdata->map.pos.lon)) {
356          printf("no valid map position found\n");
357    
358          pos_t *refpos = get_pos(context->appdata);
359          if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
360            printf("use refpos\n");
361    
362            /* use gps position if present */
363            context->appdata->map.pos = *refpos;
364            context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
365          } else {
366            printf("use zero pos\n");
367    
368            /* use world map otherwise */
369            context->appdata->map.pos.lat = 0.0;
370            context->appdata->map.pos.lon = 0.0;
371            context->appdata->map.zoom = 1;
372          }
373        }
374    
375        /* jump to initial position */
376        printf("osm_gps_map_set_mapcenter(%f,%f,%d)\n",
377               context->appdata->map.pos.lat,
378               context->appdata->map.pos.lon,
379               context->appdata->map.zoom);
380    
381        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
382                                  context->appdata->map.pos.lat,
383                                  context->appdata->map.pos.lon,
384                                  context->appdata->map.zoom);
385        context->map_complete = TRUE;
386      }
387    
388    printf("cache popup removed\n");    return FALSE;
389  }  }
390    
391  static void  static void
392  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
393                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
394    
395    while(cache) {    while(cache) {
396        pos_t cpos = gpx_cache_pos(cache);
397    
398      float dist =      float dist =
399        pow(cache->pos.lat - pos->lat, 2) +        pow(cpos.lat - pos->lat, 2) +
400        pow(cache->pos.lon - pos->lon, 2);        pow(cpos.lon - pos->lon, 2);
401    
402      if(!(dist > *distance)) {      if(!(dist > *distance)) {
403        *result = cache;        *result = cache;
# Line 421  static cache_t *map_closest(map_context_ Line 412  static cache_t *map_closest(map_context_
412    cache_t *result = NULL;    cache_t *result = NULL;
413    float distance = NAN;    float distance = NAN;
414    
415  #ifdef USE_MAEMO    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
   if(!context->appdata->cur_gpx) {  
 #endif  
416      /* search all geocaches */      /* search all geocaches */
417      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
418      while(gpx) {      while(gpx) {
419        map_cachelist_nearest(gpx->cache, pos, &result, &distance);        map_cachelist_nearest(gpx->cache, pos, &result, &distance);
420        gpx = gpx->next;        gpx = gpx->next;
421      }      }
422  #ifdef USE_MAEMO    } else if(context->appdata->cur_gpx) {
   } else {  
423      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
424                            pos, &result, &distance);                            pos, &result, &distance);
425    }    } else
426  #endif      result = context->appdata->cur_gpx->cache;
427    
428    return result;    return result;
429  }  }
# Line 443  static cache_t *map_closest(map_context_ Line 431  static cache_t *map_closest(map_context_
431  /* translate between osm-gps-map positions and gpxview ones */  /* translate between osm-gps-map positions and gpxview ones */
432  pos_t coord2pos(coord_t coo) {  pos_t coord2pos(coord_t coo) {
433    pos_t pos;    pos_t pos;
434    pos.lat = RAD2DEG(coo.rlat);    pos.lat = rad2deg(coo.rlat);
435    pos.lon = RAD2DEG(coo.rlon);    pos.lon = rad2deg(coo.rlon);
436    return pos;    return pos;
437  }  }
438    
439  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)  
440    
441  static gboolean  static gboolean
442  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
443                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
444    
445    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
446    
447      /* check if we actually clicked parts of the OSD */
448      if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)
449        return FALSE;
450    
451    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
452    if(context->press_on != NULL) {    if(context->press_on != NULL) {
453      printf("PRESS: already\n");      printf("PRESS: already\n");
454      return TRUE;      return FALSE;
455    }    }
456    
457    pos_t pos =    pos_t pos =
# Line 477  on_map_button_press_event(GtkWidget *wid Line 459  on_map_button_press_event(GtkWidget *wid
459    
460    cache_t *nearest = map_closest(context, &pos);    cache_t *nearest = map_closest(context, &pos);
461    if(nearest) {    if(nearest) {
462      float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);      pos_t cpos = gpx_cache_pos(nearest);
463      if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)  
464        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
465        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ)
466        context->press_on = nearest;        context->press_on = nearest;
467    }    }
468    
469    return FALSE;    return FALSE;
470  }  }
471    
472    static void
473    cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf *buf, gint x, gint y) {
474      /* convert the pixbuf into something cairo can handle */
475    
476      // Create a new ImageSurface
477      cairo_surface_t *image_surface =
478        cairo_image_surface_create(CAIRO_FORMAT_ARGB32,
479                                   gdk_pixbuf_get_width(buf),
480                                   gdk_pixbuf_get_height(buf));
481    
482      // Create the new Context for the ImageSurface
483      g_assert(image_surface);
484      cairo_t *context = cairo_create(image_surface);
485    
486      // Draw the image on the new Context
487      gdk_cairo_set_source_pixbuf(context, buf, 0.0, 0.0);
488      cairo_paint(context);
489    
490      // now draw this onto the original context
491      cairo_set_source_surface(cr, image_surface, x, y);
492    
493      cairo_paint(cr);
494    }
495    
496    #ifndef BIG_BALLOONS
497    #define ICON_SIZE  ICON_CACHE_TYPE
498    #define LINE_SKIP  7
499    #else
500    #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
501    #define LINE_SKIP  12
502    #endif
503    
504    static void
505    balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
506      printf("balloon event: ");
507    
508      map_context_t *context = (map_context_t*)data;
509      cache_t *cache = context->balloon;
510    
511      if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
512        printf("draw\n");
513    
514    #if 0
515        /* draw pink background to check clipping */
516        cairo_rectangle (event->data.draw.cr,
517                         event->data.draw.rect->x-20, event->data.draw.rect->y-20,
518                         event->data.draw.rect->w+40, event->data.draw.rect->h+40);
519        cairo_set_source_rgba (event->data.draw.cr, 1, 0, 0, 0.3);
520        cairo_fill_preserve (event->data.draw.cr);
521        cairo_set_line_width (event->data.draw.cr, 0);
522        cairo_stroke (event->data.draw.cr);
523    #endif
524    
525        /* leave a little border top and left */
526        gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
527    
528        /* draw the cache type icon ... */
529        GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
530        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
531    
532        if(cache->notes && cache->notes->override) {
533          GdkPixbuf *over = icon_get(ICON_SIZE, 11);
534          cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
535        }
536    
537        /* ... and right of it the waypoint id */
538        cairo_text_extents_t extents;
539    
540        if(cache->id) {
541          cairo_select_font_face (event->data.draw.cr, "Sans",
542                                  CAIRO_FONT_SLANT_NORMAL,
543                                  CAIRO_FONT_WEIGHT_BOLD);
544    
545    #ifndef BIG_BALLOONS
546          cairo_set_font_size (event->data.draw.cr, 20.0);
547    #else
548          cairo_set_font_size (event->data.draw.cr, 36.0);
549    #endif
550    
551          cairo_text_extents (event->data.draw.cr, cache->id, &extents);
552    
553          /* display id right of icon vertically centered */
554          x += gdk_pixbuf_get_width(icon) + 5;
555          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
556          cairo_move_to (event->data.draw.cr, x, y);
557          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
558          cairo_show_text (event->data.draw.cr, cache->id);
559          cairo_stroke (event->data.draw.cr);
560    
561          y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
562        } else
563          y += gdk_pixbuf_get_height(icon);
564    
565        /* return to the left border and below icon/text */
566        x = event->data.draw.rect->x;
567    
568        /* everything from here uses the same font */
569        cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
570                                CAIRO_FONT_WEIGHT_NORMAL);
571    #ifndef BIG_BALLOONS
572    #define FONT_SIZE 14.0
573    #else
574    #define FONT_SIZE 22.0
575    #endif
576    
577        cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
578    
579        if(cache->name) {
580          /* draw cache name */
581          cairo_text_extents (event->data.draw.cr, cache->name, &extents);
582          y += extents.height;
583          cairo_move_to (event->data.draw.cr, x, y);
584          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
585          cairo_show_text (event->data.draw.cr, cache->name);
586          cairo_stroke (event->data.draw.cr);
587    
588          /* return to the left border and below text */
589          y += LINE_SKIP;
590          x = event->data.draw.rect->x;
591        }
592    
593        if(cache->terrain) {
594          int text_y = 0, icon_y = 0;
595    
596          /* draw cache rating */
597          const char *terrain = "Terrain:";
598          icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
599          cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
600    
601          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
602            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
603          else
604            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
605    
606          /* draw "Terrain:" string */
607          cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
608          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
609          cairo_show_text (event->data.draw.cr, _(terrain));
610          cairo_stroke (event->data.draw.cr);
611          x += extents.width + 2;
612    
613          /* draw terrain stars */
614          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
615    
616          x += gdk_pixbuf_get_width(icon) + LINE_SKIP - 2;
617        }
618    
619        if(cache->difficulty) {
620          int text_y = 0, icon_y = 0;
621    
622          const char *difficulty = "Difficulty:";
623          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
624          cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
625    
626          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
627            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
628          else
629            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
630    
631          /* draw "Difficulty:" string */
632          cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
633          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
634          cairo_show_text (event->data.draw.cr, _(difficulty));
635          cairo_stroke (event->data.draw.cr);
636          x += extents.width + 2;
637    
638          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
639        }
640      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
641        printf("click %s event at %d %d\n",
642               event->data.click.down?"down":"up",
643               event->data.click.x, event->data.click.y);
644    
645        /* make the main screen jump to that cache */
646        if(!event->data.click.down) {
647          if(context->appdata->cur_cache) {
648            printf("ERROR: no current cache should be visible!\n");
649          } else {
650            gpx_t *is_in = NULL;
651    
652            if(!context->appdata->cur_gpx) {
653              printf("click while in \"all\" view\n");
654    
655              /* we first need to figure out which gpx file this cache */
656              /* is in so we can open it first */
657              gpx_t *gpx = context->appdata->gpx;
658              while(gpx && !is_in) {
659                cache_t *cur = gpx->cache;
660                while(cur && !is_in) {
661                  if(cur == cache)
662                    is_in = gpx;
663                  cur = cur->next;
664                }
665                gpx = gpx->next;
666              }
667    
668              if(is_in)
669                gpxlist_goto_cachelist(context->appdata, is_in);
670    
671            } else
672              /* the simple case: there already is an open gpx file and */
673              /* we just jump into the "cache" view */
674              is_in = context->appdata->cur_gpx;
675    
676            if(is_in) {
677              printf("selecting %s in %s\n",
678                     cache->id,
679                     context->appdata->cur_gpx->name);
680    
681              cachelist_goto_cache(context->appdata, cache);
682    
683              /* give focus to main screen (important for maemo) */
684              printf("raising main window\n");
685              gtk_window_present(GTK_WINDOW(context->appdata->window));
686            }
687          }
688        }
689      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
690        printf("removed\n");
691        context->balloon = NULL;
692      }
693    }
694    
695  static gboolean  static gboolean
696  on_map_button_release_event(GtkWidget *widget,  on_map_button_release_event(GtkWidget *widget,
697                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
698    if(context->press_on) {    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
699      OsmGpsMap *map = OSM_GPS_MAP(context->widget);  
700      /* in "MAP_CACHE" state only one cache is visible */
701      /* and the map is in navigation mode. the balloon is */
702      /* pretty useless there */
703      if(context->press_on && (context->state != MAP_CACHE)) {
704    
705        coord_t coo;
706        coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
707    
708      pos_t pos =      pos_t pos =
709        coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));        coord2pos(osm_gps_map_get_co_ordinates(map, event->x, event->y));
710    
711      cache_t *nearest = map_closest(context, &pos);      cache_t *nearest = map_closest(context, &pos);
712      if(nearest && nearest == context->press_on) {      if(nearest && nearest == context->press_on) {
713        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);        pos_t cpos = gpx_cache_pos(nearest);
714        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)  
715          cache_popup(context, nearest);        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
716          if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
717    
718            context->balloon = nearest;
719            osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
720                                         balloon_cb, context);
721          }
722      }      }
723      context->press_on = NULL;      context->press_on = NULL;
724      } else {
725        /* save new map position */
726        gfloat lat, lon;
727        g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
728        context->appdata->map.pos.lat = lat;
729        context->appdata->map.pos.lon = lon;
730    }    }
731    
732    return FALSE;    return FALSE;
733  }  }
734    
   
 #if MAEMO_VERSION_MAJOR == 5  
735  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
736    printf("destroy map view\n");    appdata_t *appdata = context->appdata;
737    
738      /* save map parameters */
739      OsmGpsMap *map = OSM_GPS_MAP(context->widget);
740      gint zoom;
741      g_object_get(map, "zoom", &zoom, NULL);
742      context->appdata->map.zoom = zoom;
743    
744      gfloat lat, lon;
745      g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
746      context->appdata->map.pos.lat = lat;
747      context->appdata->map.pos.lon = lon;
748    
749      gint source;
750      g_object_get(map, "map-source", &source, NULL);
751      context->appdata->map.source = source;
752    
753    #if MAEMO_VERSION_MAJOR == 5
754    /* restore cur_view */    /* restore cur_view */
755    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
756    #endif
757    
758    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
759      gps_unregister_callback(appdata, context->cb_id);
760    
761      if(context->caches_displayed) {
762        g_free(context->caches_displayed);
763        context->caches_displayed = NULL;
764      }
765    
766    g_free(context);    g_free(context);
767      appdata->map.context = NULL;
768  }  }
 #endif  
769    
770  void map(appdata_t *appdata) {  #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
771    map_context_t *context = g_new0(map_context_t, 1);  /* get access to zoom buttons */
772    context->appdata = appdata;  static void
773    on_window_realize(GtkWidget *widget, gpointer data) {
774      if (widget->window) {
775        unsigned char value = 1;
776        Atom hildon_zoom_key_atom =
777          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
778          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
779        Display *dpy =
780          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
781        Window w = GDK_WINDOW_XID(widget->window);
782    
783    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);      XChangeProperty(dpy, w, hildon_zoom_key_atom,
784                        integer_atom, 8, PropModeReplace, &value, 1);
785      }
786    }
787    #endif
788    
789    char *path = g_strdup_printf("%s/map/", appdata->image_path);  /* on maemo a window is either on top or completely invisible. this */
790    const char *proxy = get_proxy_uri(appdata);  /* means that we only need to update the map window if its raised.  */
791    /* on ordinary desktops this is different and we always update */
792    
793    context->widget = g_object_new(OSM_TYPE_GPS_MAP,  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
794                  "repo-uri", MAP_SOURCE_OPENSTREETMAP,                           gpointer data) {
795                  "tile-cache", path,    map_context_t *context = (map_context_t*)data;
                 proxy?"proxy-uri":NULL, proxy,  
                  NULL);  
796    
797    g_free(path);    printf("map got focus\n");
798    
   char *name = NULL;  
799  #ifdef USE_MAEMO  #ifdef USE_MAEMO
800    if(!appdata->cur_gpx) {    /* re-enable refresh of map */
801      if(!context->handler_id)
802        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
803  #endif  #endif
804      /* draw all geocaches */  
805      gpx_t *gpx = appdata->gpx;    map_setup(context);
806      while(gpx) {    return FALSE;
807        map_draw_cachelist(context->widget, gpx->cache);  }
808        gpx = gpx->next;  
     }  
     name = g_strdup(_("all geocaches"));  
809  #ifdef USE_MAEMO  #ifdef USE_MAEMO
810    } else {  static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
811      map_draw_cachelist(context->widget, appdata->cur_gpx->cache);                           gpointer data) {
812      name = g_strdup(appdata->cur_gpx->name);    map_context_t *context = (map_context_t*)data;
813    }  
814      printf("map lost focus\n");
815      gtk_timeout_remove(context->handler_id);
816      context->handler_id = 0;
817    
818      return FALSE;
819    }
820  #endif  #endif
821    
822    char *title = g_strdup_printf(_("Map - %s"), name);  void map_update(appdata_t *appdata) {
823    g_free(name);    printf("map_update\n");
824    #ifndef USE_MAEMO
825      if(appdata->map.context)
826        map_setup(appdata->map.context);
827    #endif
828    }
829    
830    /* callback called by the gps layer whenever gps state changes */
831    static void
832    gps_callback(struct gps_state *state, gpointer data) {
833      printf("map: gps callback\n");
834    }
835    
836    void map(appdata_t *appdata) {
837      map_context_t *context = NULL;
838    
839      /* if the map window already exists, just raise it */
840      if(appdata->map.context) {
841        printf("using existing map!\n");
842        gtk_window_present(GTK_WINDOW(appdata->map.context->window));
843        map_setup(appdata->map.context);
844        return;
845      }
846    
847      context = appdata->map.context = g_new0(map_context_t, 1);
848      context->appdata = appdata;
849      context->map_complete = FALSE;
850      context->state = MAP_NONE;
851    
852      /* cleanup old (pre 0.8.7) path if it exists */
853      char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
854      if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
855        printf("old file path %s exists\n", old_path);
856        rmdir_recursive(old_path);
857      }
858    
859      /* It is recommanded that all applications share these same */
860      /* map path, so data is only cached once. The path should be: */
861      /* ~/.osm-gps-map on standard PC     (users home) */
862      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
863      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
864    #if !defined(USE_MAEMO)
865      char *p = getenv("HOME");
866      if(!p) p = "/tmp";
867      char *path = g_strdup_printf("%s/.osm-gps-map", p);
868    #else
869  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
870    GtkWidget *window = hildon_stackable_window_new();    char *path = g_strdup("/home/user/.osm-gps-map");
   gtk_window_set_title(GTK_WINDOW(window), title);  
871  #else  #else
872    GtkWidget *dialog = gtk_dialog_new_with_buttons(title,    char *path = g_strdup("/media/mmc2/osm-gps-map");
873                            GTK_WINDOW(appdata->window),  #endif
874                            GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,  #endif
                           GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,  
                           NULL);  
875    
876  #ifndef USE_MAEMO    const char *proxy = get_proxy_uri(appdata);
877    gtk_window_set_default_size(GTK_WINDOW(dialog), 640, 480);  
878      gint source = context->appdata->map.source;
879      if(!source) source = MAP_SOURCE;
880    
881      context->widget = g_object_new(OSM_TYPE_GPS_MAP,
882                     "map-source",               source,
883                     "tile-cache",               path,
884                     "auto-center",              FALSE,
885                     "record-trip-history",      FALSE,
886                     "show-trip-history",        FALSE,
887                     proxy?"proxy-uri":NULL,     proxy,
888                     NULL);
889    
890      g_free(path);
891    
892      osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
893    
894    #ifdef USE_MAEMO
895      /* we don't use a stackable window here on fremantle, since */
896      /* this leaves the main window independent from the map and */
897      /* the user can e.g. still navigate the main menu */
898      context->window = hildon_window_new();
899    
900    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
901      g_signal_connect(G_OBJECT(context->window), "realize",
902                       G_CALLBACK(on_window_realize), NULL);
903    #endif // MAEMO_VERSION
904  #else  #else
905    gtk_window_set_default_size(GTK_WINDOW(dialog), 800, 480);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
906  #endif  #endif
907    
908    #ifndef USE_MAEMO
909      gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
910  #endif  #endif
911    
912    g_free(title);    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
913                       G_CALLBACK(on_focus_in), context);
914    
915    #ifdef USE_MAEMO
916      g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
917                       G_CALLBACK(on_focus_out), context);
918    #endif
919    
920    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
921                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
# Line 585  void map(appdata_t *appdata) { Line 926  void map(appdata_t *appdata) {
926    g_signal_connect(G_OBJECT(context->widget), "button-release-event",    g_signal_connect(G_OBJECT(context->widget), "button-release-event",
927                     G_CALLBACK(on_map_button_release_event), context);                     G_CALLBACK(on_map_button_release_event), context);
928    
   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);  
929    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
930    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
931    gtk_box_pack_start(GTK_BOX(vbox), context->gps, FALSE, FALSE, 0);    context->cb_id = gps_register_callback(appdata, gps_callback, context);
   
   gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0);  
932    
933  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
934    /* prevent some of the main screen things */    /* prevent some of the main screen things */
935    context->old_view = appdata->cur_view;    context->old_view = appdata->cur_view;
936    appdata->cur_view = NULL;    appdata->cur_view = NULL;
937    #endif
938    
939    g_signal_connect(G_OBJECT(window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
940                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
941    
942    gtk_container_add(GTK_CONTAINER(window), hbox);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
943    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  
944  }  }
Legend:
Removed from v.46  
changed lines
  Added in v.189