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

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

revision 61 by harbaum, Tue Aug 18 14:32:45 2009 UTC revision 240 by harbaum, Sat Dec 12 20:56:23 2009 UTC
# Line 17  Line 17 
17   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.   * along with GPXView.  If not, see <http://www.gnu.org/licenses/>.
18   */   */
19    
20    /*
21     * http://topo.geofabrik.de/relief/${z}/${x}/${y}.png  8-15
22     * http://topo.geofabrik.de/trail/${z}/${x}/${y}.png   8-15
23     */
24    
25    /*
26     * TODO:
27     * - make semi-transparent caches selectable
28     */
29    
30  #include "gpxview.h"  #include "gpxview.h"
31  #include "converter.h"  #include "converter.h"
32  #include <math.h>    // for isnan  #include <math.h>    // for isnan
33    
34  #ifdef ENABLE_OSM_GPS_MAP  #ifdef ENABLE_OSM_GPS_MAP
35  #include "osm-gps-map.h"  #include "osm-gps-map.h"
36    #include "osm-gps-map-osd-classic.h"
37  #endif  #endif
38    
39  #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENSTREETMAP  #if defined(USE_MAEMO) && (MAEMO_VERSION_MAJOR == 5)
40    #include <gdk/gdkx.h>
41    #include <X11/Xatom.h>
42    #endif
43    
44    /* default values */
45    #define MAP_SOURCE  OSM_GPS_MAP_SOURCE_OPENCYCLEMAP
46  #define GPS_DEFAULT_ZOOM 13  #define GPS_DEFAULT_ZOOM 13
47    
48  #define PROXY_KEY  "/system/http_proxy/"  #define PROXY_KEY  "/system/http_proxy/"
# Line 36  static const char *get_proxy_uri(appdata Line 53  static const char *get_proxy_uri(appdata
53    /* use environment settings if preset */    /* use environment settings if preset */
54    const char *proxy = g_getenv("http_proxy");    const char *proxy = g_getenv("http_proxy");
55    if(proxy) {    if(proxy) {
56      printf("http_proxy: %s\n", proxy);      printf("map http proxy from env: %s\n", proxy);
57      return proxy;      return proxy;
58    }    }
59    
# Line 57  static const char *get_proxy_uri(appdata Line 74  static const char *get_proxy_uri(appdata
74    
75        snprintf(proxy_buffer, sizeof(proxy_buffer),        snprintf(proxy_buffer, sizeof(proxy_buffer),
76                 "http://%s:%u", host, port);                 "http://%s:%u", host, port);
77          printf("map http proxy from gconf: %s\n ", proxy_buffer);
78    
79        g_free(host);        g_free(host);
80      }      }
# Line 66  static const char *get_proxy_uri(appdata Line 84  static const char *get_proxy_uri(appdata
84    return NULL;    return NULL;
85  }  }
86    
87  static void map_zoom(map_context_t *context, int step) {  static void
88    gint 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 < osm_gps_map_source_get_max_zoom(MAP_SOURCE));  
   gtk_widget_set_sensitive(context->zoomout,  
            zoom > osm_gps_map_source_get_min_zoom(MAP_SOURCE));  
89    
90    /* save new zoom */    if(but == OSD_GPS) {
91    context->appdata->map.zoom = zoom;      printf("clicked OSD_GPS %p\n", context);
92  }      printf("clicked OSD_GPS a %p\n", context->appdata);
93    
94  static gboolean      pos_t *refpos = get_pos(context->appdata);
95  cb_map_zoomin(GtkButton *button, map_context_t *context) {      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
96    map_zoom(context, +1);        gint zoom;
97    return FALSE;        g_object_get(OSM_GPS_MAP(context->widget), "zoom", &zoom, NULL);
98  }        if(zoom < 10)
99            osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
100  static gboolean                                    refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
101  cb_map_zoomout(GtkButton *button, map_context_t *context) {        else
102    map_zoom(context, -1);          osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
103    return FALSE;                                 refpos->lat, refpos->lon);
 }  
104    
105  static gboolean        /* re-enable centering */
106  cb_map_gps(GtkButton *button, map_context_t *context) {        g_object_set(context->widget, "auto-center", TRUE, NULL);
107    pos_t *refpos = get_pos(context->appdata);      } else {
108    if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {        /* no coordinates given: display the entire world */
109      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),        osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
110                        refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);                                  0.0, 0.0, 1);
111    } else {      }
     /* no coordinates given: display the entire world */  
     osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),  
                               0.0, 0.0, 1);  
112    }    }
   
   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;  
113  }  }
114    
115  static int dist2pixel(map_context_t *context, float km, float lat) {  static int dist2pixel(map_context_t *context, float km, float lat) {
# Line 128  static int dist2pixel(map_context_t *con Line 119  static int dist2pixel(map_context_t *con
119  static gboolean map_gps_update(gpointer data) {  static gboolean map_gps_update(gpointer data) {
120    map_context_t *context = (map_context_t*)data;    map_context_t *context = (map_context_t*)data;
121    
122    #ifdef USE_MAEMO
123      if(context->appdata->goto_disable_screensaver)
124        if(osso_display_blanking_pause(context->appdata->osso_context) != OSSO_OK)
125          fprintf(stderr, "error with display blank\n");
126    #endif
127    
128    /* get reference position ... */    /* get reference position ... */
129    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
130    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
131    
132    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
133    gtk_widget_set_sensitive(context->gps, ok);    if(ok != context->goto_is_enabled) {
134        osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
135                    OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
136        context->goto_is_enabled = ok;
137      }
138    
139    if(ok) {    if(ok) {
140      float heading = NAN;      float heading = NAN;
# Line 148  static gboolean map_gps_update(gpointer Line 149  static gboolean map_gps_update(gpointer
149          radius = dist2pixel(context, eph/1000, refpos->lat);          radius = dist2pixel(context, eph/1000, refpos->lat);
150      }      }
151    
152        /* TODO: in order to save energy: only draw if state actually changed */
153    
154      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);      g_object_set(context->widget, "gps-track-highlight-radius", radius, NULL);
155      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),      osm_gps_map_draw_gps(OSM_GPS_MAP(context->widget),
156                           refpos->lat, refpos->lon, heading);                           refpos->lat, refpos->lon, heading);
# Line 157  static gboolean map_gps_update(gpointer Line 160  static gboolean map_gps_update(gpointer
160    return TRUE;    return TRUE;
161  }  }
162    
163  static gboolean on_map_configure(GtkWidget *widget,  static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
164                                   GdkEventConfigure *event,    int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;
                                  map_context_t *context) {  
165    
166    /* set default values if they are invalid */    GdkPixbuf *icon = icon_get(type, cache->type);
167    if(!context->appdata->map.zoom ||    GdkPixbuf *over = NULL;
168       isnan(context->appdata->map.pos.lat) ||  
169       isnan(context->appdata->map.pos.lon)) {    if(cache->mine)                   over = icon_get(type, 14);
170      printf("no valid map position found\n");    else if(cache->found)             over = icon_get(type, 12);
171      else if(cache->notes) {
172      pos_t *refpos = get_pos(context->appdata);      if(cache->notes->found)         over = icon_get(type, 12);
173      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {      else if(cache->notes->override) over = icon_get(type, 11);
174        /* use gps position if present */      else                            over = icon_get(type, 13);
       context->appdata->map.pos = *refpos;  
       context->appdata->map.zoom = GPS_DEFAULT_ZOOM;  
     } else {  
       /* use world map otherwise */  
       context->appdata->map.pos.lat = 0.0;  
       context->appdata->map.pos.lon = 0.0;  
       context->appdata->map.zoom = 1;  
     }  
175    }    }
176    
177    /* jump to initial position */    pos_t *pos = &cache->pos;
178    osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),    /* check if there's also an overwritten coordinate */
179                              context->appdata->map.pos.lat,    if(cache->notes && cache->notes->override)
180                              context->appdata->map.pos.lon,      pos = &cache->notes->pos;
181                              context->appdata->map.zoom);  
182      if(!isnan(pos->lat) && !isnan(pos->lon)) {
183    return FALSE;      osm_gps_map_add_image(OSM_GPS_MAP(map),
184                              pos->lat, pos->lon, icon);
185        if(over)
186          osm_gps_map_add_image(OSM_GPS_MAP(map),
187                                pos->lat, pos->lon, over);
188      }
189    }
190    
191    static void map_draw_wpt(GtkWidget *map, cache_t *cache, wpt_t *wpt) {
192      /* only draw wpts that don't equal the main point */
193      if(pos_differ(&cache->pos, &wpt->pos)) {
194        if(!isnan(wpt->pos.lat) && !isnan(wpt->pos.lon))  {
195          GdkPixbuf *icon =
196            icon_get(ICON_WPT, (wpt->sym!=WPT_SYM_UNKNOWN)?
197                     wpt->sym:WPT_SYM_REFPOINT);
198    
199          osm_gps_map_add_image(OSM_GPS_MAP(map),
200                                wpt->pos.lat, wpt->pos.lon, icon);
201        }
202      }
203  }  }
204    
205  static void map_draw_cachelist(GtkWidget *map, cache_t *cache) {  static void map_draw_gpx(appdata_t *appdata, cache_display_t *caches,
206                             GtkWidget *map, gpx_t *gpx,
207                             cache_t *nav, gboolean semi) {
208      if(!gpx->notes_loaded) {
209        notes_load_all(appdata, gpx);
210        gpx->notes_loaded = TRUE;
211      }
212    
213      cache_t *cache = gpx->cache;
214    while(cache) {    while(cache) {
215      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);      /* search if we have that cache already in our list/displayed */
216        int i=0;
217      osm_gps_map_add_image(OSM_GPS_MAP(map),      while(caches[i].id && (strcmp(caches[i].id, cache->id) != 0))
218                            cache->pos.lat, cache->pos.lon, icon);        i++;
219    
220        if(!caches[i].id) {
221          /* if nav is given draw all other caches semitransparent. */
222          /* if nav is not given do what semi sais */
223          map_draw_cache(map, cache, nav?(cache != nav):semi);
224          caches[i].id = cache->id;
225    
226          /* also draw waypoints of nav cache */
227          if(nav && cache == nav) {
228            wpt_t *wpt = cache->wpt;
229            while(wpt) {
230              map_draw_wpt(map, cache, wpt);
231              wpt = wpt->next;
232            }
233          }
234        }
235    
236      cache = cache->next;      cache = cache->next;
237    }    }
238  }  }
239    
240    static cache_t *cache_search_first(gpx_t *gpx, cache_t *cache) {
241      while(gpx) {
242        cache_t *cur = gpx->cache;
243        while(cur) {
244          /* we do a string comparision to make sure that if copies */
245          /* exist, we get the original one */
246          if(!strcmp(cache->id, cur->id))
247             return cur;
248    
249          cur = cur->next;
250        }
251        gpx = gpx->next;
252      }
253      g_assert(FALSE);
254      return NULL;
255    }
256    
257    /* draw geocaches and set window title */
258    static void map_setup(map_context_t *context) {
259      char *name = NULL;
260    
261      int cache_num = gpx_total_caches_global(context->appdata->gpx);
262    
263      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
264        //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
265        //     cache_num, context->cache_list_len);
266        g_free(context->caches_displayed);
267        context->caches_displayed = NULL;
268        context->cache_list_len = 0;
269      }
270    
271      /* allocate buffer */
272      if(cache_num && !context->caches_displayed) {
273        context->cache_list_len = cache_num;
274        context->caches_displayed = g_new0(cache_display_t, cache_num+1);
275        printf("allocated space to handle %d map icons\n", cache_num);
276      }
277    
278      if(context->appdata->search_results && !context->appdata->cur_cache) {
279        if(context->state != MAP_SEARCH) {
280          printf("map_setup(SEARCH)\n");
281    
282          /* clear any pending balloon */
283          context->balloon = NULL;
284          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
285    
286    #ifdef OSD_NAV
287          /* no navigation in this mode */
288          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
289    #endif
290    
291          /* clear all existing cache images */
292          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
293          memset(context->caches_displayed, 0,
294                 (cache_num+1) * sizeof(cache_display_t));
295    
296          /* draw search results and all other gpx files are semi-transparent */
297          map_draw_gpx(context->appdata, context->caches_displayed,
298                       context->widget, context->appdata->search_results,
299                       NULL, FALSE);
300    
301          gpx_t *gpx = context->appdata->gpx;
302          while(gpx) {
303            map_draw_gpx(context->appdata, context->caches_displayed,
304                         context->widget, gpx, NULL, TRUE);
305    
306            gpx = gpx->next;
307          }
308    
309          name = g_strdup(_("Search results"));
310          context->state = MAP_SEARCH;
311        }
312      } else if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
313        if(context->state != MAP_ALL) {
314          printf("map_setup(ALL)\n");
315    
316          /* clear any pending balloon */
317          context->balloon = NULL;
318          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
319    
320    #ifdef OSD_NAV
321          /* no navigation in this mode */
322          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
323    #endif
324    
325          /* clear all existing cache images */
326          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
327          memset(context->caches_displayed, 0,
328                 (cache_num+1) * sizeof(cache_display_t));
329    
330          /* draw all geocaches and none is semi-transparent */
331          gpx_t *gpx = context->appdata->gpx;
332          while(gpx) {
333            map_draw_gpx(context->appdata, context->caches_displayed,
334                         context->widget, gpx, NULL, FALSE);
335            gpx = gpx->next;
336          }
337    
338          {
339            int i=0;
340            while(context->caches_displayed[i].id) i++;
341            printf("number of caches actually displayed: %d\n", i);
342          }
343    
344          name = g_strdup(_("all"));
345          context->state = MAP_ALL;
346        }
347      } else if(!context->appdata->cur_cache) {
348        if(context->state != MAP_GPX) {
349          printf("map_setup(GPX)\n");
350    
351          /* clear any pending balloon */
352          context->balloon = NULL;
353          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
354    
355    #ifdef OSD_NAV
356          /* no navigation in this mode */
357          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
358    #endif
359    
360          /* clear all existing cache images */
361          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
362          memset(context->caches_displayed, 0,
363                 (cache_num+1) * sizeof(cache_display_t));
364    
365          /* draw all geocaches and all other gpx files are semi-transparent */
366          map_draw_gpx(context->appdata, context->caches_displayed,
367                       context->widget, context->appdata->cur_gpx, NULL, FALSE);
368    
369          gpx_t *gpx = context->appdata->gpx;
370          while(gpx) {
371            if(gpx != context->appdata->cur_gpx)
372              map_draw_gpx(context->appdata, context->caches_displayed,
373                           context->widget, gpx, NULL, TRUE);
374    
375            gpx = gpx->next;
376          }
377    
378          name = g_strdup(context->appdata->cur_gpx->name);
379          context->state = MAP_GPX;
380        }
381      } else {
382        cache_t *cache = context->appdata->cur_cache;
383    
384        printf("map_setup(CACHE)\n");
385    
386        /* clear any pending balloon */
387        context->balloon = NULL;
388        osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
389    
390        /* clear all existing ccahe images */
391        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
392        memset(context->caches_displayed, 0,
393               (cache_num+1) * sizeof(cache_display_t));
394    
395        /* Make sure we really work on the first copy in the list as */
396        /* only this is being used if duplicates exist */
397        cache = cache_search_first(context->appdata->gpx, cache);
398    
399        /* draw all geocaches and all but selected one are semi-transparent */
400        gpx_t *gpx = context->appdata->gpx;
401        while(gpx) {
402          map_draw_gpx(context->appdata, context->caches_displayed,
403                       context->widget, gpx, cache, FALSE);
404          gpx = gpx->next;
405        }
406    
407        name = g_strdup(cache->name);
408        context->state = MAP_CACHE;
409    
410        /* navigation in this mode! */
411        pos_t cpos = gpx_cache_pos(cache);
412    
413    #ifdef OSD_NAV
414        osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
415                                  context->appdata->imperial,
416                                  cpos.lat, cpos.lon, cache->name);
417    #else
418    #warning OSD_NAV not defined!
419    #endif
420      }
421    
422      /* also mark geomath position */
423    
424      /* remove all existing appearances of this icon first */
425      osm_gps_map_remove_image(OSM_GPS_MAP(context->widget),
426                               icon_get(ICON_MISC, 4));
427    
428      if(!isnan(context->appdata->geomath.lat) &&
429         !isnan(context->appdata->geomath.lon))  {
430    
431        osm_gps_map_add_image(OSM_GPS_MAP(context->widget),
432                              context->appdata->geomath.lat,
433                              context->appdata->geomath.lon,
434                              icon_get(ICON_MISC, 4));
435      }
436    
437      if(name) {
438        char *title = g_strdup_printf(_("Map - %s"), name);
439        g_free(name);
440    
441        gtk_window_set_title(GTK_WINDOW(context->window), title);
442    
443        g_free(title);
444      } else
445        printf("map_setup(keep)\n");
446    }
447    
448  static void  static void
449  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
450                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
451    
452    while(cache) {    while(cache) {
453        pos_t cpos = gpx_cache_pos(cache);
454    
455      float dist =      float dist =
456        pow(cache->pos.lat - pos->lat, 2) +        pow(cpos.lat - pos->lat, 2) +
457        pow(cache->pos.lon - pos->lon, 2);        pow(cpos.lon - pos->lon, 2);
458    
459      if(!(dist > *distance)) {      if(!(dist > *distance)) {
460        *result = cache;        *result = cache;
# Line 220  map_cachelist_nearest(cache_t *cache, po Line 468  map_cachelist_nearest(cache_t *cache, po
468  static cache_t *map_closest(map_context_t *context, pos_t *pos) {  static cache_t *map_closest(map_context_t *context, pos_t *pos) {
469    cache_t *result = NULL;    cache_t *result = NULL;
470    float distance = NAN;    float distance = NAN;
471    
472  #ifdef USE_MAEMO    if(context->appdata->search_results && !context->appdata->cur_cache) {
473    if(!context->appdata->cur_gpx) {      /* search search results */
474  #endif      map_cachelist_nearest(context->appdata->search_results->cache,
475                              pos, &result, &distance);
476      } else if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
477      /* search all geocaches */      /* search all geocaches */
478      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
479      while(gpx) {      while(gpx) {
480        map_cachelist_nearest(gpx->cache, pos, &result, &distance);        map_cachelist_nearest(gpx->cache, pos, &result, &distance);
481        gpx = gpx->next;        gpx = gpx->next;
482      }      }
483  #ifdef USE_MAEMO    } else if(context->appdata->cur_gpx) {
484    } else {      /* search in current gpx file */
485      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
486                            pos, &result, &distance);                            pos, &result, &distance);
487    }    } else
488  #endif      result = context->appdata->cur_cache;
489    
490      /* make sure this is the first hit */
491      result = cache_search_first(context->appdata->gpx, result);
492    
493    return result;    return result;
494  }  }
# Line 253  pos_t coord2pos(coord_t coo) { Line 506  pos_t coord2pos(coord_t coo) {
506  static gboolean  static gboolean
507  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
508                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
509    
510    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
511    
512      /* check if we actually clicked parts of the OSD */
513      if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)
514        return FALSE;
515    
516    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
517    if(context->press_on != NULL) {    if(context->press_on != NULL) {
518      printf("PRESS: already\n");      printf("PRESS: already\n");
519      return TRUE;      return FALSE;
520    }    }
521    
522    pos_t pos =    pos_t pos =
# Line 266  on_map_button_press_event(GtkWidget *wid Line 524  on_map_button_press_event(GtkWidget *wid
524    
525    cache_t *nearest = map_closest(context, &pos);    cache_t *nearest = map_closest(context, &pos);
526    if(nearest) {    if(nearest) {
527      float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);      pos_t cpos = gpx_cache_pos(nearest);
528      if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)  
529        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
530        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ)
531        context->press_on = nearest;        context->press_on = nearest;
532    }    }
533    
# Line 285  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 545  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
545                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
546    
547    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
548      g_assert(image_surface);
549    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
550    
551    // Draw the image on the new Context    // Draw the image on the new Context
# Line 297  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 558  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
558    cairo_paint(cr);    cairo_paint(cr);
559  }  }
560    
561  #define LINE_SKIP  7  #ifndef BIG_BALLOONS
562    #define ICON_SIZE  ICON_CACHE_TYPE
563    #else
564    #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
565    #endif
566    
567    #ifndef BIG_BALLOONS
568    #define FONT_SIZE 14.0
569    #else
570    #define FONT_SIZE 22.0
571    #endif
572    #define LINE_SKIP  (FONT_SIZE/4)
573    
574    
575  static void  static void
576  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
577    cache_t *cache = (cache_t*)data;    printf("balloon event: ");
578    
579      map_context_t *context = (map_context_t*)data;
580      cache_t *cache = context->balloon;
581    
582    //  printf("draw cb for \"%s\"\n", cache->name);    if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
583        printf("draw\n");
584    
585  #if 0  #if 0
586    /* draw pink background to check clipping */      /* draw pink background to check clipping */
587    cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);      cairo_rectangle (event->data.draw.cr,
588    cairo_set_source_rgba (cr, 1, 0, 0, 0.3);                       event->data.draw.rect->x-20, event->data.draw.rect->y-20,
589    cairo_fill_preserve (cr);                       event->data.draw.rect->w+40, event->data.draw.rect->h+40);
590    cairo_set_line_width (cr, 0);      cairo_set_source_rgba (event->data.draw.cr, 1, 0, 0, 0.3);
591    cairo_stroke (cr);      cairo_fill_preserve (event->data.draw.cr);
592  #endif      cairo_set_line_width (event->data.draw.cr, 0);
593        cairo_stroke (event->data.draw.cr);
594    /* leave a little border top and left */  #endif
595    gint x = rect->x, y = rect->y;  
596        /* leave a little border top and left */
597    /* draw the cache type icon ... */      gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
598    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  
599    cairo_draw_pixbuf(cr, icon, x, y);      /* draw the cache type icon ... */
600        GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
601        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
602    
603        if(cache->notes && cache->notes->override) {
604          GdkPixbuf *over = icon_get(ICON_SIZE, 11);
605          cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
606        }
607    
608        /* ... and right of it the waypoint id */
609        cairo_text_extents_t extents;
610    
611        if(cache->id) {
612          cairo_select_font_face (event->data.draw.cr, "Sans",
613                                  CAIRO_FONT_SLANT_NORMAL,
614                                  CAIRO_FONT_WEIGHT_BOLD);
615    
616    #ifndef BIG_BALLOONS
617          cairo_set_font_size (event->data.draw.cr, 20.0);
618    #else
619          cairo_set_font_size (event->data.draw.cr, 36.0);
620    #endif
621    
622          cairo_text_extents (event->data.draw.cr, cache->id, &extents);
623    
624          /* display id right of icon vertically centered */
625          x += gdk_pixbuf_get_width(icon) + 5;
626          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
627          cairo_move_to (event->data.draw.cr, x, y);
628          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
629          cairo_show_text (event->data.draw.cr, cache->id);
630          cairo_stroke (event->data.draw.cr);
631    
632          y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
633        } else
634          y += gdk_pixbuf_get_height(icon);
635    
636        /* return to the left border and below icon/text */
637        x = event->data.draw.rect->x;
638    
639        /* everything from here uses the same font */
640        cairo_select_font_face (event->data.draw.cr, "Sans",
641                                CAIRO_FONT_SLANT_NORMAL,
642                                CAIRO_FONT_WEIGHT_NORMAL);
643    
644    /* ... and right of it the waypoint id */      cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
645    cairo_text_extents_t extents;  
646        if(cache->name) {
647          /* draw cache name */
648          cairo_text_extents (event->data.draw.cr, cache->name, &extents);
649          cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
650          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
651          cairo_show_text (event->data.draw.cr, cache->name);
652          cairo_stroke (event->data.draw.cr);
653    
654          /* return to the left border and below text */
655          y += LINE_SKIP + FONT_SIZE;
656          x = event->data.draw.rect->x;
657        }
658    
659        if(cache->terrain) {
660          int text_y = 0, icon_y = 0;
661    
662    if(cache->id) {        /* draw cache rating */
663      cairo_select_font_face (cr, "Sans",        const char *terrain = "Terrain:";
664                              CAIRO_FONT_SLANT_NORMAL,        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
665                              CAIRO_FONT_WEIGHT_BOLD);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
666    
667      cairo_set_font_size (cr, 20.0);        if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
668      cairo_text_extents (cr, cache->id, &extents);          text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
669          else
670            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
671    
672          /* draw "Terrain:" string */
673          cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
674          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
675          cairo_show_text (event->data.draw.cr, _(terrain));
676          cairo_stroke (event->data.draw.cr);
677          x += extents.width + 2;
678    
679          /* draw terrain stars */
680          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
681    
682          x += gdk_pixbuf_get_width(icon) + FONT_SIZE/2;
683        }
684    
685        if(cache->difficulty) {
686          int text_y = 0, icon_y = 0;
687    
688      /* display id right of icon vertically centered */        const char *difficulty = "Difficulty:";
689      x += gdk_pixbuf_get_width(icon) + 5;        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
690      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
691      cairo_move_to (cr, x, y);  
692      cairo_set_source_rgba (cr, 0, 0, 0, 1);        if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
693      cairo_show_text (cr, cache->id);          text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
694      cairo_stroke (cr);        else
695            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
696    
697          /* draw "Difficulty:" string */
698          cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
699          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
700          cairo_show_text (event->data.draw.cr, _(difficulty));
701          cairo_stroke (event->data.draw.cr);
702          x += extents.width + 2;
703    
704          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
705        }
706    
707      y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;      /* draw container info */
708    } else      /* TODO ... */
     y += gdk_pixbuf_get_height(icon);  
709    
   /* return to the left border and below icon/text */  
   x = rect->x;  
710    
711    /* everything from here uses the same font */    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
712    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      printf("click %s event at %d %d\n",
713                            CAIRO_FONT_WEIGHT_NORMAL);             event->data.click.down?"down":"up",
714    cairo_set_font_size (cr, 14.0);             event->data.click.x, event->data.click.y);
715    
716    if(cache->name) {      /* make the main screen jump to that cache */
717      /* draw cache name */      if(!event->data.click.down) {
718      cairo_text_extents (cr, cache->name, &extents);        if(context->appdata->cur_cache) {
719      y += extents.height;          printf("ERROR: no current cache should be visible!\n");
720      cairo_move_to (cr, x, y);        } else {
721      cairo_set_source_rgba (cr, 0, 0, 0, 1);          gpx_t *is_in = NULL;
722      cairo_show_text (cr, cache->name);  
723      cairo_stroke (cr);          if(!context->appdata->cur_gpx) {
724              printf("click while in \"all\" view\n");
725      /* return to the left border and below text */  
726      y += LINE_SKIP;            /* we first need to figure out which gpx file this cache */
727      x = rect->x;            /* is in so we can open it first */
728    }            gpx_t *gpx = context->appdata->gpx;
729              while(gpx && !is_in) {
730    if(cache->terrain) {              cache_t *cur = gpx->cache;
731      /* draw cache rating */              while(cur && !is_in) {
732      const char *terrain = "Terrain:";                if(cur == cache)
733      icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));                  is_in = gpx;
734      cairo_text_extents (cr, _(terrain), &extents);                cur = cur->next;
735      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;              }
736                gpx = gpx->next;
737      /* draw "Terrain:" string */            }
738      cairo_move_to (cr, x, y);  
739      cairo_set_source_rgba (cr, 0, 0, 0, 1);            if(is_in)
740      cairo_show_text (cr, _(terrain));              gpxlist_goto_cachelist(context->appdata, is_in);
741      cairo_stroke (cr);  
742      x += extents.width + 2;          } else
743              /* the simple case: there already is an open gpx file and */
744      /* draw terrain stars */            /* we just jump into the "cache" view */
745      cairo_draw_pixbuf(cr, icon, x, y -            is_in = context->appdata->cur_gpx;
746                        (gdk_pixbuf_get_height(icon) + extents.height)/2);  
747            if(is_in) {
748      x += gdk_pixbuf_get_width(icon) + LINE_SKIP;            printf("selecting %s in %s\n",
749      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;                   cache->id,
750    }                   context->appdata->cur_gpx->name);
751    
752    if(cache->difficulty) {            cachelist_goto_cache(context->appdata, cache);
753      const char *difficulty = "Difficulty:";  
754      cairo_text_extents (cr, _(difficulty), &extents);            /* give focus to main screen (important for maemo) */
755      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;            printf("raising main window\n");
756              gtk_window_present(GTK_WINDOW(context->appdata->window));
757      /* draw "Difficulty:" string */          }
758      cairo_move_to (cr, x, y);        }
759      cairo_set_source_rgba (cr, 0, 0, 0, 1);      }
760      cairo_show_text (cr, _(difficulty));    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
761      cairo_stroke (cr);      printf("removed\n");
762      x += extents.width + 2;      context->balloon = NULL;
   
     icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));  
     cairo_draw_pixbuf(cr, icon, x, y -  
                       (gdk_pixbuf_get_height(icon) + extents.height)/2);  
763    }    }
764  }  }
765    
# Line 411  on_map_button_release_event(GtkWidget *w Line 768  on_map_button_release_event(GtkWidget *w
768                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
769    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
770    
771      /* in "MAP_CACHE" state only one cache is visible */
772      /* and the map is in navigation mode. the balloon is */
773      /* pretty useless there */
774    if(context->press_on) {    if(context->press_on) {
775    
776      coord_t coo;      coord_t coo;
777      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
778    
# Line 420  on_map_button_release_event(GtkWidget *w Line 781  on_map_button_release_event(GtkWidget *w
781    
782      cache_t *nearest = map_closest(context, &pos);      cache_t *nearest = map_closest(context, &pos);
783      if(nearest && nearest == context->press_on) {      if(nearest && nearest == context->press_on) {
784        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);        pos_t cpos = gpx_cache_pos(nearest);
785        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {  
786          float dist = gpx_pos_get_distance(pos, cpos, FALSE);
787          if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
788    
789          osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,          context->balloon = nearest;
790                                   balloon_draw_cb, nearest);          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
791                                         balloon_cb, context);
792        }        }
793      }      }
794      context->press_on = NULL;      context->press_on = NULL;
# Line 442  on_map_button_release_event(GtkWidget *w Line 806  on_map_button_release_event(GtkWidget *w
806  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
807    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
808    
   printf("destroy map window\n");  
   
809    /* save map parameters */    /* save map parameters */
810    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
811    gint zoom;    gint zoom;
# Line 455  static void on_window_destroy(GtkWidget Line 817  static void on_window_destroy(GtkWidget
817    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
818    context->appdata->map.pos.lon = lon;    context->appdata->map.pos.lon = lon;
819    
820      gint source;
821      g_object_get(map, "map-source", &source, NULL);
822      context->appdata->map.source = source;
823    
824  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
825    /* restore cur_view */    /* restore cur_view */
826    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
827  #endif  #endif
828    
829    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
830      gps_unregister_callback(appdata, context->cb_id);
831    
832      if(context->caches_displayed) {
833        g_free(context->caches_displayed);
834        context->caches_displayed = NULL;
835      }
836    
837      printf("destroy map context\n");
838    g_free(context);    g_free(context);
839    appdata->map.context = NULL;    appdata->map.context = NULL;
840  }  }
841    
842    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
843    /* get access to zoom buttons */
844    static void
845    on_window_realize(GtkWidget *widget, gpointer data) {
846      if (widget->window) {
847        unsigned char value = 1;
848        Atom hildon_zoom_key_atom =
849          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
850          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
851        Display *dpy =
852          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
853        Window w = GDK_WINDOW_XID(widget->window);
854    
855        XChangeProperty(dpy, w, hildon_zoom_key_atom,
856                        integer_atom, 8, PropModeReplace, &value, 1);
857      }
858    }
859    #endif
860    
861    /* on maemo a window is either on top or completely invisible. this */
862    /* means that we only need to update the map window if its raised.  */
863    /* on ordinary desktops this is different and we always update */
864    
865    static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
866                             gpointer data) {
867      map_context_t *context = (map_context_t*)data;
868    
869      printf("map got focus\n");
870    
871    #ifdef USE_MAEMO
872      /* re-enable refresh of map */
873      if(!context->handler_id)
874        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
875    #endif
876    
877      map_setup(context);
878      return FALSE;
879    }
880    
881    static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
882                             gpointer data) {
883      map_context_t *context = (map_context_t*)data;
884    
885      printf("map lost focus\n");
886    
887      /* save new map position */
888      gfloat lat, lon;
889      g_object_get(widget, "latitude", &lat, "longitude", &lon, NULL);
890    
891      context->appdata->map.pos.lat = lat;
892      context->appdata->map.pos.lon = lon;
893    
894    #ifdef USE_MAEMO
895      gtk_timeout_remove(context->handler_id);
896      context->handler_id = 0;
897    #endif
898    
899      return FALSE;
900    }
901    
902    void map_update(appdata_t *appdata) {
903      printf("map_update\n");
904    #ifndef USE_MAEMO
905      if(appdata->map.context)
906        map_setup(appdata->map.context);
907    #endif
908    }
909    
910    /* callback called by the gps layer whenever gps state changes */
911    static void
912    gps_callback(struct gps_state *state, gpointer data) {
913      printf("map: gps callback\n");
914    }
915    
916  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
917    map_context_t *context = NULL;    map_context_t *context = NULL;
918    
919    /* if the map window already exists, just raise it */    /* if the map window already exists, just raise it */
920    if(appdata->map.context) {    if(appdata->map.context) {
921        printf("using existing map!\n");
922      gtk_window_present(GTK_WINDOW(appdata->map.context->window));      gtk_window_present(GTK_WINDOW(appdata->map.context->window));
923        map_setup(appdata->map.context);
924      return;      return;
925    }    }
926    
927    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
928      printf("allocated new context at %p\n", context);
929    
930    context->appdata = appdata;    context->appdata = appdata;
931      context->state = MAP_NONE;
932    
933    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);    /* cleanup old (pre 0.8.7) path if it exists */
934      char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
935      if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
936        printf("old file path %s exists\n", old_path);
937        rmdir_recursive(old_path);
938      }
939    
940      /* It is recommanded that all applications share these same */
941      /* map path, so data is only cached once. The path should be: */
942      /* ~/.osm-gps-map on standard PC     (users home) */
943      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
944      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
945    #if !defined(USE_MAEMO)
946      char *p = getenv("HOME");
947      if(!p) p = "/tmp";
948      char *path = g_strdup_printf("%s/.osm-gps-map", p);
949    #else
950    #if MAEMO_VERSION_MAJOR == 5
951      char *path = g_strdup("/home/user/.osm-gps-map");
952    #else
953      char *path = g_strdup("/media/mmc2/osm-gps-map");
954    #endif
955    #endif
956    
   char *path = g_strdup_printf("%s/map/", appdata->image_path);  
957    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
958    
959      gint source = context->appdata->map.source;
960      if(!source) source = MAP_SOURCE;
961    
962    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
963                   "map-source",               MAP_SOURCE,                   "map-source",               source,
964                   "tile-cache",               path,                   "tile-cache",               path,
965                   "auto-center",              FALSE,                   "auto-center",              FALSE,
966                   "record-trip-history",      FALSE,                   "record-trip-history",      FALSE,
# Line 494  void map(appdata_t *appdata) { Line 970  void map(appdata_t *appdata) {
970    
971    g_free(path);    g_free(path);
972    
973    char *name = NULL;    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
974  #ifdef USE_MAEMO  
975    if(!appdata->cur_gpx) {    /* set default values if they are invalid */
976  #endif    if(!context->appdata->map.zoom ||
977      /* draw all geocaches */       isnan(context->appdata->map.pos.lat) ||
978      gpx_t *gpx = appdata->gpx;       isnan(context->appdata->map.pos.lon)) {
979      while(gpx) {      printf("no valid map position found\n");
980        map_draw_cachelist(context->widget, gpx->cache);  
981        gpx = gpx->next;      pos_t *refpos = get_pos(context->appdata);
982        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
983          printf("use refpos\n");
984    
985            /* use gps position if present */
986          context->appdata->map.pos = *refpos;
987          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
988        } else {
989          printf("use zero pos\n");
990    
991          /* use world map otherwise */
992          context->appdata->map.pos.lat = 0.0;
993          context->appdata->map.pos.lon = 0.0;
994          context->appdata->map.zoom = 1;
995      }      }
     name = g_strdup(_("all geocaches"));  
 #ifdef USE_MAEMO  
   } else {  
     map_draw_cachelist(context->widget, appdata->cur_gpx->cache);  
     name = g_strdup(appdata->cur_gpx->name);  
996    }    }
997  #endif  
998      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
999    char *title = g_strdup_printf(_("Map - %s"), name);                              context->appdata->map.pos.lat,
1000    g_free(name);                              context->appdata->map.pos.lon,
1001                                context->appdata->map.zoom);
1002    
1003  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1004  #ifdef USE_STACKABLE_WINDOW    /* we don't use a stackable window here on fremantle, since */
1005    context->window = hildon_stackable_window_new();    /* this leaves the main window independent from the map and */
1006  #else    /* the user can e.g. still navigate the main menu */
1007    context->window = hildon_window_new();    context->window = hildon_window_new();
1008  #endif  
1009    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
1010      g_signal_connect(G_OBJECT(context->window), "realize",
1011                       G_CALLBACK(on_window_realize), NULL);
1012    #endif // MAEMO_VERSION
1013  #else  #else
1014    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
1015  #endif  #endif
1016    
   gtk_window_set_title(GTK_WINDOW(context->window), title);  
   
1017  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1018    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
1019  #endif  #endif
1020    
1021    g_free(title);    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
1022                       G_CALLBACK(on_focus_in), context);
1023    
1024    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
1025                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_focus_out), context);
1026    
1027    g_signal_connect(G_OBJECT(context->widget), "button-press-event",    g_signal_connect(G_OBJECT(context->widget), "button-press-event",
1028                     G_CALLBACK(on_map_button_press_event), context);                     G_CALLBACK(on_map_button_press_event), context);
# Line 542  void map(appdata_t *appdata) { Line 1030  void map(appdata_t *appdata) {
1030    g_signal_connect(G_OBJECT(context->widget), "button-release-event",    g_signal_connect(G_OBJECT(context->widget), "button-release-event",
1031                     G_CALLBACK(on_map_button_release_event), context);                     G_CALLBACK(on_map_button_release_event), context);
1032    
   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);  
   
1033    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
1034    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
1035    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);  
1036    
1037  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
1038    /* prevent some of the main screen things */    /* prevent some of the main screen things */
# Line 576  void map(appdata_t *appdata) { Line 1043  void map(appdata_t *appdata) {
1043    g_signal_connect(G_OBJECT(context->window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
1044                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
1045    
1046    gtk_container_add(GTK_CONTAINER(context->window), hbox);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
1047    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
1048    
1049      /* setup cache state */
1050      map_setup(context);
1051  }  }
Legend:
Removed from v.61  
changed lines
  Added in v.240