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 255 by harbaum, Tue Feb 9 19:25:36 2010 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_cachelist(GtkWidget *map, cache_t *cache) {  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_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    
294          if(context->caches_displayed) {
295            memset(context->caches_displayed, 0,
296                   (cache_num+1) * sizeof(cache_display_t));
297    
298            /* draw search results and all other gpx files are semi-transparent */
299            map_draw_gpx(context->appdata, context->caches_displayed,
300                         context->widget, context->appdata->search_results,
301                         NULL, FALSE);
302    
303            gpx_t *gpx = context->appdata->gpx;
304            while(gpx) {
305              map_draw_gpx(context->appdata, context->caches_displayed,
306                           context->widget, gpx, NULL, TRUE);
307    
308              gpx = gpx->next;
309            }
310          }
311          name = g_strdup(_("Search results"));
312          context->state = MAP_SEARCH;
313        }
314      } else if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
315        if(context->state != MAP_ALL) {
316          printf("map_setup(ALL)\n");
317    
318          /* clear any pending balloon */
319          context->balloon = NULL;
320          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
321    
322    #ifdef OSD_NAV
323          /* no navigation in this mode */
324          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
325    #endif
326    
327          /* clear all existing cache images */
328          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
329          if(context->caches_displayed) {
330            memset(context->caches_displayed, 0,
331                   (cache_num+1) * sizeof(cache_display_t));
332    
333            /* draw all geocaches and none is semi-transparent */
334            gpx_t *gpx = context->appdata->gpx;
335            while(gpx) {
336              map_draw_gpx(context->appdata, context->caches_displayed,
337                           context->widget, gpx, NULL, FALSE);
338              gpx = gpx->next;
339            }
340    
341            {
342              int i=0;
343              while(context->caches_displayed[i].id) i++;
344              printf("number of caches actually displayed: %d\n", i);
345            }
346          }
347          name = g_strdup(_("all"));
348          context->state = MAP_ALL;
349        }
350      } else if(!context->appdata->cur_cache) {
351        if(context->state != MAP_GPX) {
352          printf("map_setup(GPX)\n");
353    
354          /* clear any pending balloon */
355          context->balloon = NULL;
356          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
357    
358    #ifdef OSD_NAV
359          /* no navigation in this mode */
360          osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
361    #endif
362    
363          /* clear all existing cache images */
364          osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
365          if(context->caches_displayed) {
366            memset(context->caches_displayed, 0,
367                   (cache_num+1) * sizeof(cache_display_t));
368    
369            /* draw all geocaches and all other gpx files are semi-transparent */
370            map_draw_gpx(context->appdata, context->caches_displayed,
371                         context->widget, context->appdata->cur_gpx, NULL, FALSE);
372    
373            gpx_t *gpx = context->appdata->gpx;
374            while(gpx) {
375              if(gpx != context->appdata->cur_gpx)
376                map_draw_gpx(context->appdata, context->caches_displayed,
377                             context->widget, gpx, NULL, TRUE);
378    
379              gpx = gpx->next;
380            }
381          }
382    
383          name = g_strdup(context->appdata->cur_gpx->name);
384          context->state = MAP_GPX;
385        }
386      } else {
387        cache_t *cache = context->appdata->cur_cache;
388    
389        printf("map_setup(CACHE)\n");
390    
391        /* clear any pending balloon */
392        context->balloon = NULL;
393        osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
394    
395        /* clear all existing ccahe images */
396        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
397        if(context->caches_displayed) {
398          memset(context->caches_displayed, 0,
399                 (cache_num+1) * sizeof(cache_display_t));
400    
401          /* Make sure we really work on the first copy in the list as */
402          /* only this is being used if duplicates exist */
403          cache = cache_search_first(context->appdata->gpx, cache);
404    
405          /* draw all geocaches and all but selected one are semi-transparent */
406          gpx_t *gpx = context->appdata->gpx;
407          while(gpx) {
408            map_draw_gpx(context->appdata, context->caches_displayed,
409                         context->widget, gpx, cache, FALSE);
410            gpx = gpx->next;
411          }
412        }
413    
414        name = g_strdup(cache->name);
415        context->state = MAP_CACHE;
416    
417        /* navigation in this mode! */
418        pos_t cpos = gpx_cache_pos(cache);
419    
420    #ifdef OSD_NAV
421        osm_gps_map_osd_draw_nav (OSM_GPS_MAP(context->widget),
422                                  context->appdata->imperial,
423                                  cpos.lat, cpos.lon, cache->name);
424    #else
425    #warning OSD_NAV not defined!
426    #endif
427      }
428    
429      /* also mark geomath position */
430    
431      /* remove all existing appearances of this icon first */
432      osm_gps_map_remove_image(OSM_GPS_MAP(context->widget),
433                               icon_get(ICON_MISC, 4));
434    
435      if(!isnan(context->appdata->geomath.lat) &&
436         !isnan(context->appdata->geomath.lon))  {
437    
438        osm_gps_map_add_image(OSM_GPS_MAP(context->widget),
439                              context->appdata->geomath.lat,
440                              context->appdata->geomath.lon,
441                              icon_get(ICON_MISC, 4));
442      }
443    
444      if(name) {
445        gtk_window_set_title(GTK_WINDOW(context->window), name);
446        g_free(name);
447      } else
448        printf("map_setup(keep)\n");
449    }
450    
451  static void  static void
452  map_cachelist_nearest(cache_t *cache, pos_t *pos,  map_cachelist_nearest(cache_t *cache, pos_t *pos,
453                        cache_t **result, float *distance) {                        cache_t **result, float *distance) {
454    
455    while(cache) {    while(cache) {
456        pos_t cpos = gpx_cache_pos(cache);
457    
458      float dist =      float dist =
459        pow(cache->pos.lat - pos->lat, 2) +        pow(cpos.lat - pos->lat, 2) +
460        pow(cache->pos.lon - pos->lon, 2);        pow(cpos.lon - pos->lon, 2);
461    
462      if(!(dist > *distance)) {      if(!(dist > *distance)) {
463        *result = cache;        *result = cache;
# Line 220  map_cachelist_nearest(cache_t *cache, po Line 471  map_cachelist_nearest(cache_t *cache, po
471  static cache_t *map_closest(map_context_t *context, pos_t *pos) {  static cache_t *map_closest(map_context_t *context, pos_t *pos) {
472    cache_t *result = NULL;    cache_t *result = NULL;
473    float distance = NAN;    float distance = NAN;
474    
475  #ifdef USE_MAEMO    if(context->appdata->search_results && !context->appdata->cur_cache) {
476    if(!context->appdata->cur_gpx) {      /* search search results */
477  #endif      map_cachelist_nearest(context->appdata->search_results->cache,
478                              pos, &result, &distance);
479      } else if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
480      /* search all geocaches */      /* search all geocaches */
481      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
482      while(gpx) {      while(gpx) {
483        map_cachelist_nearest(gpx->cache, pos, &result, &distance);        map_cachelist_nearest(gpx->cache, pos, &result, &distance);
484        gpx = gpx->next;        gpx = gpx->next;
485      }      }
486  #ifdef USE_MAEMO    } else if(context->appdata->cur_gpx) {
487    } else {      /* search in current gpx file */
488      map_cachelist_nearest(context->appdata->cur_gpx->cache,      map_cachelist_nearest(context->appdata->cur_gpx->cache,
489                            pos, &result, &distance);                            pos, &result, &distance);
490    }    } else
491  #endif      result = context->appdata->cur_cache;
492    
493      /* make sure this is the first hit */
494      if(context->caches_displayed)
495        result = cache_search_first(context->appdata->gpx, result);
496    
497    return result;    return result;
498  }  }
# Line 253  pos_t coord2pos(coord_t coo) { Line 510  pos_t coord2pos(coord_t coo) {
510  static gboolean  static gboolean
511  on_map_button_press_event(GtkWidget *widget,  on_map_button_press_event(GtkWidget *widget,
512                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
513    
514    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
515    
516      /* check if we actually clicked parts of the OSD */
517      if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)
518        return FALSE;
519    
520    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
521    if(context->press_on != NULL) {    if(context->press_on != NULL) {
522      printf("PRESS: already\n");      printf("PRESS: already\n");
523      return TRUE;      return FALSE;
524    }    }
525    
526    pos_t pos =    pos_t pos =
# Line 266  on_map_button_press_event(GtkWidget *wid Line 528  on_map_button_press_event(GtkWidget *wid
528    
529    cache_t *nearest = map_closest(context, &pos);    cache_t *nearest = map_closest(context, &pos);
530    if(nearest) {    if(nearest) {
531      float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);      pos_t cpos = gpx_cache_pos(nearest);
532      if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)  
533        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
534        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ)
535        context->press_on = nearest;        context->press_on = nearest;
536    }    }
537    
# Line 285  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 549  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
549                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
550    
551    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
552      g_assert(image_surface);
553    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
554    
555    // Draw the image on the new Context    // Draw the image on the new Context
# Line 297  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 562  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
562    cairo_paint(cr);    cairo_paint(cr);
563  }  }
564    
565  #define LINE_SKIP  7  #ifndef BIG_BALLOONS
566    #define ICON_SIZE  ICON_CACHE_TYPE
567    #else
568    #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
569    #endif
570    
571    #ifndef BIG_BALLOONS
572    #define FONT_SIZE 14.0
573    #else
574    #define FONT_SIZE 22.0
575    #endif
576    #define LINE_SKIP  (FONT_SIZE/4)
577    
578    
579  static void  static void
580  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
581    cache_t *cache = (cache_t*)data;    printf("balloon event: ");
582    
583      map_context_t *context = (map_context_t*)data;
584      cache_t *cache = context->balloon;
585    
586    //  printf("draw cb for \"%s\"\n", cache->name);    if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
587        printf("draw\n");
588    
589  #if 0  #if 0
590    /* draw pink background to check clipping */      /* draw pink background to check clipping */
591    cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);      cairo_rectangle (event->data.draw.cr,
592    cairo_set_source_rgba (cr, 1, 0, 0, 0.3);                       event->data.draw.rect->x-20, event->data.draw.rect->y-20,
593    cairo_fill_preserve (cr);                       event->data.draw.rect->w+40, event->data.draw.rect->h+40);
594    cairo_set_line_width (cr, 0);      cairo_set_source_rgba (event->data.draw.cr, 1, 0, 0, 0.3);
595    cairo_stroke (cr);      cairo_fill_preserve (event->data.draw.cr);
596  #endif      cairo_set_line_width (event->data.draw.cr, 0);
597        cairo_stroke (event->data.draw.cr);
598    /* leave a little border top and left */  #endif
599    gint x = rect->x, y = rect->y;  
600        /* leave a little border top and left */
601    /* draw the cache type icon ... */      gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
602    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  
603    cairo_draw_pixbuf(cr, icon, x, y);      /* draw the cache type icon ... */
604        GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
605        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
606    
607        if(cache->notes && cache->notes->override) {
608          GdkPixbuf *over = icon_get(ICON_SIZE, 11);
609          cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
610        }
611    
612        /* ... and right of it the waypoint id */
613        cairo_text_extents_t extents;
614    
615        if(cache->id) {
616          cairo_select_font_face (event->data.draw.cr, "Sans",
617                                  CAIRO_FONT_SLANT_NORMAL,
618                                  CAIRO_FONT_WEIGHT_BOLD);
619    
620    #ifndef BIG_BALLOONS
621          cairo_set_font_size (event->data.draw.cr, 20.0);
622    #else
623          cairo_set_font_size (event->data.draw.cr, 36.0);
624    #endif
625    
626          cairo_text_extents (event->data.draw.cr, cache->id, &extents);
627    
628          /* display id right of icon vertically centered */
629          x += gdk_pixbuf_get_width(icon) + 5;
630          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
631          cairo_move_to (event->data.draw.cr, x, y);
632          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
633          cairo_show_text (event->data.draw.cr, cache->id);
634          cairo_stroke (event->data.draw.cr);
635    
636          y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
637        } else
638          y += gdk_pixbuf_get_height(icon);
639    
640        /* return to the left border and below icon/text */
641        x = event->data.draw.rect->x;
642    
643        /* everything from here uses the same font */
644        cairo_select_font_face (event->data.draw.cr, "Sans",
645                                CAIRO_FONT_SLANT_NORMAL,
646                                CAIRO_FONT_WEIGHT_NORMAL);
647    
648    /* ... and right of it the waypoint id */      cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
649    cairo_text_extents_t extents;  
650        if(cache->name) {
651          /* draw cache name */
652          cairo_text_extents (event->data.draw.cr, cache->name, &extents);
653          cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
654          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
655          cairo_show_text (event->data.draw.cr, cache->name);
656          cairo_stroke (event->data.draw.cr);
657    
658          /* return to the left border and below text */
659          y += LINE_SKIP + FONT_SIZE;
660          x = event->data.draw.rect->x;
661        }
662    
663        if(cache->terrain) {
664          int text_y = 0, icon_y = 0;
665    
666    if(cache->id) {        /* draw cache rating */
667      cairo_select_font_face (cr, "Sans",        const char *terrain = "Terrain:";
668                              CAIRO_FONT_SLANT_NORMAL,        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
669                              CAIRO_FONT_WEIGHT_BOLD);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
670    
671      cairo_set_font_size (cr, 20.0);        if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
672      cairo_text_extents (cr, cache->id, &extents);          text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
673          else
674            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
675    
676          /* draw "Terrain:" string */
677          cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
678          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
679          cairo_show_text (event->data.draw.cr, _(terrain));
680          cairo_stroke (event->data.draw.cr);
681          x += extents.width + 2;
682    
683          /* draw terrain stars */
684          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
685    
686          x += gdk_pixbuf_get_width(icon) + FONT_SIZE/2;
687        }
688    
689        if(cache->difficulty) {
690          int text_y = 0, icon_y = 0;
691    
692      /* display id right of icon vertically centered */        const char *difficulty = "Difficulty:";
693      x += gdk_pixbuf_get_width(icon) + 5;        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
694      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
695      cairo_move_to (cr, x, y);  
696      cairo_set_source_rgba (cr, 0, 0, 0, 1);        if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
697      cairo_show_text (cr, cache->id);          text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
698      cairo_stroke (cr);        else
699            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
700    
701          /* draw "Difficulty:" string */
702          cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
703          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
704          cairo_show_text (event->data.draw.cr, _(difficulty));
705          cairo_stroke (event->data.draw.cr);
706          x += extents.width + 2;
707    
708          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
709        }
710    
711      y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;      /* draw container info */
712    } else      /* TODO ... */
     y += gdk_pixbuf_get_height(icon);  
713    
   /* return to the left border and below icon/text */  
   x = rect->x;  
714    
715    /* everything from here uses the same font */    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
716    cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      printf("click %s event at %d %d\n",
717                            CAIRO_FONT_WEIGHT_NORMAL);             event->data.click.down?"down":"up",
718    cairo_set_font_size (cr, 14.0);             event->data.click.x, event->data.click.y);
719    
720    if(cache->name) {      /* make the main screen jump to that cache */
721      /* draw cache name */      if(!event->data.click.down) {
722      cairo_text_extents (cr, cache->name, &extents);        if(context->appdata->cur_cache) {
723      y += extents.height;          printf("ERROR: no current cache should be visible!\n");
724      cairo_move_to (cr, x, y);        } else {
725      cairo_set_source_rgba (cr, 0, 0, 0, 1);          gpx_t *is_in = NULL;
726      cairo_show_text (cr, cache->name);  
727      cairo_stroke (cr);          if(context->appdata->search_results) {
728              printf("click while in \"search results\" view\n");
729      /* return to the left border and below text */  
730      y += LINE_SKIP;            is_in = context->appdata->search_results;
731      x = rect->x;          } else if(!context->appdata->cur_gpx) {
732    }            printf("click while in \"all\" view\n");
733    
734    if(cache->terrain) {            /* we first need to figure out which gpx file this cache */
735      /* draw cache rating */            /* is in so we can open it first */
736      const char *terrain = "Terrain:";            gpx_t *gpx = context->appdata->gpx;
737      icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));            while(gpx && !is_in) {
738      cairo_text_extents (cr, _(terrain), &extents);              cache_t *cur = gpx->cache;
739      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;              while(cur && !is_in) {
740                  if(cur == cache)
741      /* draw "Terrain:" string */                  is_in = gpx;
742      cairo_move_to (cr, x, y);                cur = cur->next;
743      cairo_set_source_rgba (cr, 0, 0, 0, 1);              }
744      cairo_show_text (cr, _(terrain));              gpx = gpx->next;
745      cairo_stroke (cr);            }
746      x += extents.width + 2;  
747              if(is_in)
748      /* draw terrain stars */              gpxlist_goto_cachelist(context->appdata, is_in);
749      cairo_draw_pixbuf(cr, icon, x, y -  
750                        (gdk_pixbuf_get_height(icon) + extents.height)/2);          } else {
751              printf("click while in \"cachelist\" view\n");
752      x += gdk_pixbuf_get_width(icon) + LINE_SKIP;  
753      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;            /* the simple case: there already is an open gpx file and */
754    }            /* we just jump into the "cache" view */
755              is_in = context->appdata->cur_gpx;
756    if(cache->difficulty) {          }
757      const char *difficulty = "Difficulty:";  
758      cairo_text_extents (cr, _(difficulty), &extents);          if(is_in) {
759      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;            printf("selecting %s in %s\n",
760                     cache->id,
761      /* draw "Difficulty:" string */                   context->appdata->search_results?
762      cairo_move_to (cr, x, y);                   context->appdata->search_results->name:
763      cairo_set_source_rgba (cr, 0, 0, 0, 1);                   context->appdata->cur_gpx->name);
764      cairo_show_text (cr, _(difficulty));  
765      cairo_stroke (cr);            cachelist_goto_cache(context->appdata, cache);
766      x += extents.width + 2;  
767              /* give focus to main screen (important for maemo) */
768      icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));            printf("raising main window\n");
769      cairo_draw_pixbuf(cr, icon, x, y -            gtk_window_present(GTK_WINDOW(context->appdata->window));
770                        (gdk_pixbuf_get_height(icon) + extents.height)/2);          }
771          }
772        }
773      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
774        printf("removed\n");
775        context->balloon = NULL;
776    }    }
777  }  }
778    
# Line 411  on_map_button_release_event(GtkWidget *w Line 781  on_map_button_release_event(GtkWidget *w
781                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
782    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
783    
784      /* in "MAP_CACHE" state only one cache is visible */
785      /* and the map is in navigation mode. the balloon is */
786      /* pretty useless there */
787    if(context->press_on) {    if(context->press_on) {
788    
789      coord_t coo;      coord_t coo;
790      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
791    
# Line 420  on_map_button_release_event(GtkWidget *w Line 794  on_map_button_release_event(GtkWidget *w
794    
795      cache_t *nearest = map_closest(context, &pos);      cache_t *nearest = map_closest(context, &pos);
796      if(nearest && nearest == context->press_on) {      if(nearest && nearest == context->press_on) {
797        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);        pos_t cpos = gpx_cache_pos(nearest);
798        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {  
799          float dist = gpx_pos_get_distance(pos, cpos, FALSE);
800          if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
801    
802          osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,          context->balloon = nearest;
803                                   balloon_draw_cb, nearest);          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
804                                         balloon_cb, context);
805        }        }
806      }      }
807      context->press_on = NULL;      context->press_on = NULL;
# Line 442  on_map_button_release_event(GtkWidget *w Line 819  on_map_button_release_event(GtkWidget *w
819  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
820    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
821    
   printf("destroy map window\n");  
   
822    /* save map parameters */    /* save map parameters */
823    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
824    gint zoom;    gint zoom;
# Line 455  static void on_window_destroy(GtkWidget Line 830  static void on_window_destroy(GtkWidget
830    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
831    context->appdata->map.pos.lon = lon;    context->appdata->map.pos.lon = lon;
832    
833      gint source;
834      g_object_get(map, "map-source", &source, NULL);
835      context->appdata->map.source = source;
836    
837  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
838    /* restore cur_view */    /* restore cur_view */
839    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
840  #endif  #endif
841    
842    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
843      gps_unregister_callback(appdata, context->cb_id);
844    
845      if(context->caches_displayed) {
846        g_free(context->caches_displayed);
847        context->caches_displayed = NULL;
848      }
849    
850      printf("destroy map context\n");
851    g_free(context);    g_free(context);
852    appdata->map.context = NULL;    appdata->map.context = NULL;
853  }  }
854    
855    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
856    /* get access to zoom buttons */
857    static void
858    on_window_realize(GtkWidget *widget, gpointer data) {
859      if (widget->window) {
860        unsigned char value = 1;
861        Atom hildon_zoom_key_atom =
862          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
863          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
864        Display *dpy =
865          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
866        Window w = GDK_WINDOW_XID(widget->window);
867    
868        XChangeProperty(dpy, w, hildon_zoom_key_atom,
869                        integer_atom, 8, PropModeReplace, &value, 1);
870      }
871    }
872    #endif
873    
874    /* on maemo a window is either on top or completely invisible. this */
875    /* means that we only need to update the map window if its raised.  */
876    /* on ordinary desktops this is different and we always update */
877    
878    static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
879                             gpointer data) {
880      map_context_t *context = (map_context_t*)data;
881    
882      printf("map got focus\n");
883    
884    #ifdef USE_MAEMO
885      /* re-enable refresh of map */
886      if(!context->handler_id)
887        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
888    #endif
889    
890      map_setup(context);
891      return FALSE;
892    }
893    
894    static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
895                             gpointer data) {
896      map_context_t *context = (map_context_t*)data;
897    
898      printf("map lost focus\n");
899    
900      /* save new map position */
901      gfloat lat, lon;
902      g_object_get(widget, "latitude", &lat, "longitude", &lon, NULL);
903    
904      context->appdata->map.pos.lat = lat;
905      context->appdata->map.pos.lon = lon;
906    
907    #ifdef USE_MAEMO
908      gtk_timeout_remove(context->handler_id);
909      context->handler_id = 0;
910    #endif
911    
912      return FALSE;
913    }
914    
915    void map_update(appdata_t *appdata) {
916      printf("map_update\n");
917    #ifndef USE_MAEMO
918      if(appdata->map.context)
919        map_setup(appdata->map.context);
920    #endif
921    }
922    
923    /* callback called by the gps layer whenever gps state changes */
924    static void
925    gps_callback(struct gps_state *state, gpointer data) {
926      printf("map: gps callback\n");
927    }
928    
929  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
930    map_context_t *context = NULL;    map_context_t *context = NULL;
931    
932    /* if the map window already exists, just raise it */    /* if the map window already exists, just raise it */
933    if(appdata->map.context) {    if(appdata->map.context) {
934        printf("using existing map!\n");
935      gtk_window_present(GTK_WINDOW(appdata->map.context->window));      gtk_window_present(GTK_WINDOW(appdata->map.context->window));
936        map_setup(appdata->map.context);
937      return;      return;
938    }    }
939    
940    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
941      printf("allocated new context at %p\n", context);
942    
943    context->appdata = appdata;    context->appdata = appdata;
944      context->state = MAP_NONE;
945    
946    GtkWidget *hbox = gtk_hbox_new(FALSE, 0);    /* cleanup old (pre 0.8.7) path if it exists */
947      char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
948      if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
949        printf("old file path %s exists\n", old_path);
950        rmdir_recursive(old_path);
951      }
952    
953      /* It is recommanded that all applications share these same */
954      /* map path, so data is only cached once. The path should be: */
955      /* ~/.osm-gps-map on standard PC     (users home) */
956      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
957      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
958    #if !defined(USE_MAEMO)
959      char *p = getenv("HOME");
960      if(!p) p = "/tmp";
961      char *path = g_strdup_printf("%s/.osm-gps-map", p);
962    #else
963    #if MAEMO_VERSION_MAJOR == 5
964      char *path = g_strdup("/home/user/.osm-gps-map");
965    #else
966      char *path = g_strdup("/media/mmc2/osm-gps-map");
967    #endif
968    #endif
969    
   char *path = g_strdup_printf("%s/map/", appdata->image_path);  
970    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
971    
972      gint source = context->appdata->map.source;
973      if(!source) source = MAP_SOURCE;
974    
975    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
976                   "map-source",               MAP_SOURCE,                   "map-source",               source,
977                   "tile-cache",               path,                   "tile-cache",               path,
978                   "auto-center",              FALSE,                   "auto-center",              FALSE,
979                   "record-trip-history",      FALSE,                   "record-trip-history",      FALSE,
# Line 494  void map(appdata_t *appdata) { Line 983  void map(appdata_t *appdata) {
983    
984    g_free(path);    g_free(path);
985    
986    char *name = NULL;    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
987  #ifdef USE_MAEMO  
988    if(!appdata->cur_gpx) {    /* set default values if they are invalid */
989  #endif    if(!context->appdata->map.zoom ||
990      /* draw all geocaches */       isnan(context->appdata->map.pos.lat) ||
991      gpx_t *gpx = appdata->gpx;       isnan(context->appdata->map.pos.lon)) {
992      while(gpx) {      printf("no valid map position found\n");
993        map_draw_cachelist(context->widget, gpx->cache);  
994        gpx = gpx->next;      pos_t *refpos = get_pos(context->appdata);
995        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
996          printf("use refpos\n");
997    
998            /* use gps position if present */
999          context->appdata->map.pos = *refpos;
1000          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
1001        } else {
1002          printf("use zero pos\n");
1003    
1004          /* use world map otherwise */
1005          context->appdata->map.pos.lat = 0.0;
1006          context->appdata->map.pos.lon = 0.0;
1007          context->appdata->map.zoom = 1;
1008      }      }
     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);  
1009    }    }
1010  #endif  
1011      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
1012    char *title = g_strdup_printf(_("Map - %s"), name);                              context->appdata->map.pos.lat,
1013    g_free(name);                              context->appdata->map.pos.lon,
1014                                context->appdata->map.zoom);
1015    
1016  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1017  #ifdef USE_STACKABLE_WINDOW    /* we don't use a stackable window here on fremantle, since */
1018    context->window = hildon_stackable_window_new();    /* this leaves the main window independent from the map and */
1019  #else    /* the user can e.g. still navigate the main menu */
1020    context->window = hildon_window_new();    context->window = hildon_window_new();
1021  #endif  
1022    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
1023      g_signal_connect(G_OBJECT(context->window), "realize",
1024                       G_CALLBACK(on_window_realize), NULL);
1025    #endif // MAEMO_VERSION
1026  #else  #else
1027    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
1028  #endif  #endif
1029    
   gtk_window_set_title(GTK_WINDOW(context->window), title);  
   
1030  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1031    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
1032  #endif  #endif
1033    
1034    g_free(title);    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
1035                       G_CALLBACK(on_focus_in), context);
1036    
1037    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
1038                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_focus_out), context);
1039    
1040    g_signal_connect(G_OBJECT(context->widget), "button-press-event",    g_signal_connect(G_OBJECT(context->widget), "button-press-event",
1041                     G_CALLBACK(on_map_button_press_event), context);                     G_CALLBACK(on_map_button_press_event), context);
# Line 542  void map(appdata_t *appdata) { Line 1043  void map(appdata_t *appdata) {
1043    g_signal_connect(G_OBJECT(context->widget), "button-release-event",    g_signal_connect(G_OBJECT(context->widget), "button-release-event",
1044                     G_CALLBACK(on_map_button_release_event), context);                     G_CALLBACK(on_map_button_release_event), context);
1045    
   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);  
   
1046    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
1047    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
1048    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);  
1049    
1050  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
1051    /* prevent some of the main screen things */    /* prevent some of the main screen things */
# Line 576  void map(appdata_t *appdata) { Line 1056  void map(appdata_t *appdata) {
1056    g_signal_connect(G_OBJECT(context->window), "destroy",    g_signal_connect(G_OBJECT(context->window), "destroy",
1057                     G_CALLBACK(on_window_destroy), context);                     G_CALLBACK(on_window_destroy), context);
1058    
1059    gtk_container_add(GTK_CONTAINER(context->window), hbox);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
1060    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
1061    
1062      /* setup cache state */
1063      map_setup(context);
1064  }  }
Legend:
Removed from v.61  
changed lines
  Added in v.255