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

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

revision 69 by harbaum, Thu Aug 20 18:54:06 2009 UTC revision 280 by harbaum, Fri May 21 19:28:16 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 67  static const char *get_proxy_uri(appdata Line 85  static const char *get_proxy_uri(appdata
85  }  }
86    
87  static void  static void
88  cb_map_gps(map_context_t *context) {  cb_map_gps(osd_button_t but, map_context_t *context) {
89    pos_t *refpos = get_pos(context->appdata);  
90    if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {    if(but == OSD_GPS) {
91      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      printf("clicked OSD_GPS %p\n", context);
92                        refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);      printf("clicked OSD_GPS a %p\n", context->appdata);
93    } else {  
94      /* no coordinates given: display the entire world */      pos_t *refpos = get_pos(context->appdata);
95      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
96                                0.0, 0.0, 1);        gint zoom;
97          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                                      refpos->lat, refpos->lon, GPS_DEFAULT_ZOOM);
101          else
102            osm_gps_map_set_center(OSM_GPS_MAP(context->widget),
103                                   refpos->lat, refpos->lon);
104    
105          /* re-enable centering */
106          g_object_set(context->widget, "auto-center", TRUE, NULL);
107        } else {
108          /* no coordinates given: display the entire world */
109          osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
110                                    0.0, 0.0, 1);
111        }
112    }    }
113  }  }
114    
# Line 86  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    osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),    if(ok != context->goto_is_enabled) {
134                   OSM_GPS_MAP_OSD_GPS_CALLBACK(ok?cb_map_gps:NULL), context);      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 107  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 116  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    
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 179  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 212  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      puts("press event");
517    
518      /* check if we actually clicked parts of the OSD */
519      if(osm_gps_map_osd_check(map, event->x, event->y) != OSD_NONE)
520        return FALSE;
521    
522    /* got a press event without release event? eat it! */    /* got a press event without release event? eat it! */
523    if(context->press_on != NULL) {    if(context->press_on != NULL) {
524      printf("PRESS: already\n");      printf("PRESS: already\n");
525      return TRUE;      return FALSE;
526    }    }
527    
528    pos_t pos =    pos_t pos =
# Line 225  on_map_button_press_event(GtkWidget *wid Line 530  on_map_button_press_event(GtkWidget *wid
530    
531    cache_t *nearest = map_closest(context, &pos);    cache_t *nearest = map_closest(context, &pos);
532    if(nearest) {    if(nearest) {
533      float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);      pos_t cpos = gpx_cache_pos(nearest);
534      if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ)  
535        float dist = gpx_pos_get_distance(pos, cpos, FALSE);
536        if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ)
537        context->press_on = nearest;        context->press_on = nearest;
538    }    }
539    
# Line 244  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 551  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
551                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
552    
553    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
554      g_assert(image_surface);
555    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
556    
557    // Draw the image on the new Context    // Draw the image on the new Context
# Line 257  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 565  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
565  }  }
566    
567  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
568  #define LINE_SKIP  7  #define ICON_SIZE  ICON_CACHE_TYPE
569  #else  #else
570  #define LINE_SKIP  12  #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
571  #endif  #endif
572    
573  static void  #ifndef BIG_BALLOONS
574  balloon_draw_cb(cairo_t *cr, OsmGpsMapRect_t *rect, gpointer data) {  #define FONT_SIZE 14.0
575    cache_t *cache = (cache_t*)data;  #else
576    #define FONT_SIZE 22.0
577    #endif
578    #define LINE_SKIP  (FONT_SIZE/4)
579    
   //  printf("draw cb for \"%s\"\n", cache->name);  
580    
581  #if 0  static void
582    /* draw pink background to check clipping */  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
583    cairo_rectangle (cr, rect->x-20, rect->y-20, rect->w+40, rect->h+40);    printf("balloon event: ");
   cairo_set_source_rgba (cr, 1, 0, 0, 0.3);  
   cairo_fill_preserve (cr);  
   cairo_set_line_width (cr, 0);  
   cairo_stroke (cr);  
 #endif  
   
   /* leave a little border top and left */  
   gint x = rect->x, y = rect->y;  
   
   /* draw the cache type icon ... */  
   GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);  
   cairo_draw_pixbuf(cr, icon, x, y);  
584    
585    /* ... and right of it the waypoint id */    map_context_t *context = (map_context_t*)data;
586    cairo_text_extents_t extents;    cache_t *cache = context->balloon;
587    
588    if(cache->id) {    if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_DRAW) {
589      cairo_select_font_face (cr, "Sans",      printf("draw\n");
590                              CAIRO_FONT_SLANT_NORMAL,  
591                              CAIRO_FONT_WEIGHT_BOLD);  #if 0
592        /* draw pink background to check clipping */
593        cairo_rectangle (event->data.draw.cr,
594                         event->data.draw.rect->x-20, event->data.draw.rect->y-20,
595                         event->data.draw.rect->w+40, event->data.draw.rect->h+40);
596        cairo_set_source_rgba (event->data.draw.cr, 1, 0, 0, 0.3);
597        cairo_fill_preserve (event->data.draw.cr);
598        cairo_set_line_width (event->data.draw.cr, 0);
599        cairo_stroke (event->data.draw.cr);
600    #endif
601    
602        /* leave a little border top and left */
603        gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
604    
605        /* draw the cache type icon ... */
606        GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
607        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
608    
609        if(cache->notes && cache->notes->override) {
610          GdkPixbuf *over = icon_get(ICON_SIZE, 11);
611          cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
612        }
613    
614        /* ... and right of it the waypoint id */
615        cairo_text_extents_t extents;
616    
617        if(cache->id) {
618          cairo_select_font_face (event->data.draw.cr, "Sans",
619                                  CAIRO_FONT_SLANT_NORMAL,
620                                  CAIRO_FONT_WEIGHT_BOLD);
621    
622  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
623      cairo_set_font_size (cr, 20.0);        cairo_set_font_size (event->data.draw.cr, 20.0);
624  #else  #else
625      cairo_set_font_size (cr, 36.0);        cairo_set_font_size (event->data.draw.cr, 36.0);
626  #endif  #endif
627    
628          cairo_text_extents (event->data.draw.cr, cache->id, &extents);
629    
630          /* display id right of icon vertically centered */
631          x += gdk_pixbuf_get_width(icon) + 5;
632          y += (gdk_pixbuf_get_height(icon) + extents.height)/2;
633          cairo_move_to (event->data.draw.cr, x, y);
634          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
635          cairo_show_text (event->data.draw.cr, cache->id);
636          cairo_stroke (event->data.draw.cr);
637    
638          y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;
639        } else
640          y += gdk_pixbuf_get_height(icon);
641    
642        /* return to the left border and below icon/text */
643        x = event->data.draw.rect->x;
644    
645        /* everything from here uses the same font */
646        cairo_select_font_face (event->data.draw.cr, "Sans",
647                                CAIRO_FONT_SLANT_NORMAL,
648                                CAIRO_FONT_WEIGHT_NORMAL);
649    
650      cairo_text_extents (cr, cache->id, &extents);      cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
651    
652        if(cache->name) {
653          /* draw cache name */
654          cairo_text_extents (event->data.draw.cr, cache->name, &extents);
655          cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
656          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
657          cairo_show_text (event->data.draw.cr, cache->name);
658          cairo_stroke (event->data.draw.cr);
659    
660          /* return to the left border and below text */
661          y += LINE_SKIP + FONT_SIZE;
662          x = event->data.draw.rect->x;
663        }
664    
665        if(cache->terrain) {
666          int text_y = 0, icon_y = 0;
667    
668      /* display id right of icon vertically centered */        /* draw cache rating */
669      x += gdk_pixbuf_get_width(icon) + 5;        const char *terrain = "Terrain:";
670      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
671      cairo_move_to (cr, x, y);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
672      cairo_set_source_rgba (cr, 0, 0, 0, 1);  
673      cairo_show_text (cr, cache->id);        if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
674      cairo_stroke (cr);          text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
675          else
676            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
677    
678          /* draw "Terrain:" string */
679          cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
680          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
681          cairo_show_text (event->data.draw.cr, _(terrain));
682          cairo_stroke (event->data.draw.cr);
683          x += extents.width + 2;
684    
685          /* draw terrain stars */
686          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
687    
688          x += gdk_pixbuf_get_width(icon) + FONT_SIZE/2;
689        }
690    
691        if(cache->difficulty) {
692          int text_y = 0, icon_y = 0;
693    
694      y += (gdk_pixbuf_get_height(icon) - extents.height)/2 + LINE_SKIP;        const char *difficulty = "Difficulty:";
695    } else        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
696      y += gdk_pixbuf_get_height(icon);        cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
697    
698          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
699            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
700          else
701            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
702    
703          /* draw "Difficulty:" string */
704          cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
705          cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
706          cairo_show_text (event->data.draw.cr, _(difficulty));
707          cairo_stroke (event->data.draw.cr);
708          x += extents.width + 2;
709    
710          cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
711        }
712    
713    /* return to the left border and below icon/text */      /* draw container info */
714    x = rect->x;      /* TODO ... */
715    
   /* everything from here uses the same font */  
   cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,  
                           CAIRO_FONT_WEIGHT_NORMAL);  
 #ifndef BIG_BALLOONS  
   cairo_set_font_size (cr, 14.0);  
 #else  
   cairo_set_font_size (cr, 22.0);  
 #endif  
716    
717    if(cache->name) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
718      /* draw cache name */      printf("click %s event at %d %d\n",
719      cairo_text_extents (cr, cache->name, &extents);             event->data.click.down?"down":"up",
720      y += extents.height;             event->data.click.x, event->data.click.y);
721      cairo_move_to (cr, x, y);  
722      cairo_set_source_rgba (cr, 0, 0, 0, 1);      /* make the main screen jump to that cache */
723      cairo_show_text (cr, cache->name);      if(!event->data.click.down) {
724      cairo_stroke (cr);        if(context->appdata->cur_cache) {
725            printf("ERROR: no current cache should be visible!\n");
726      /* return to the left border and below text */        } else {
727      y += LINE_SKIP;          gpx_t *is_in = NULL;
728      x = rect->x;  
729    }          if(context->appdata->search_results) {
730              printf("click while in \"search results\" view\n");
731    if(cache->terrain) {  
732      /* draw cache rating */            is_in = context->appdata->search_results;
733      const char *terrain = "Terrain:";          } else if(!context->appdata->cur_gpx) {
734      icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));            printf("click while in \"all\" view\n");
735      cairo_text_extents (cr, _(terrain), &extents);  
736      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;            /* we first need to figure out which gpx file this cache */
737              /* is in so we can open it first */
738      /* draw "Terrain:" string */            gpx_t *gpx = context->appdata->gpx;
739      cairo_move_to (cr, x, y);            while(gpx && !is_in) {
740      cairo_set_source_rgba (cr, 0, 0, 0, 1);              cache_t *cur = gpx->cache;
741      cairo_show_text (cr, _(terrain));              while(cur && !is_in) {
742      cairo_stroke (cr);                if(cur == cache)
743      x += extents.width + 2;                  is_in = gpx;
744                  cur = cur->next;
745      /* draw terrain stars */              }
746      cairo_draw_pixbuf(cr, icon, x, y -              gpx = gpx->next;
747                        (gdk_pixbuf_get_height(icon) + extents.height)/2);            }
748    
749      x += gdk_pixbuf_get_width(icon) + LINE_SKIP;            if(is_in)
750      y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;              gpxlist_goto_cachelist(context->appdata, is_in);
751    }  
752            } else {
753    if(cache->difficulty) {            printf("click while in \"cachelist\" view\n");
754      const char *difficulty = "Difficulty:";  
755      cairo_text_extents (cr, _(difficulty), &extents);            /* the simple case: there already is an open gpx file and */
756      y += (gdk_pixbuf_get_height(icon) + extents.height)/2;            /* we just jump into the "cache" view */
757              is_in = context->appdata->cur_gpx;
758      /* draw "Difficulty:" string */          }
759      cairo_move_to (cr, x, y);  
760      cairo_set_source_rgba (cr, 0, 0, 0, 1);          if(is_in) {
761      cairo_show_text (cr, _(difficulty));            printf("selecting %s in %s\n",
762      cairo_stroke (cr);                   cache->id,
763      x += extents.width + 2;                   context->appdata->search_results?
764                     context->appdata->search_results->name:
765      icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));                   context->appdata->cur_gpx->name);
766      cairo_draw_pixbuf(cr, icon, x, y -  
767                        (gdk_pixbuf_get_height(icon) + extents.height)/2);            cachelist_goto_cache(context->appdata, cache);
768    
769              /* give focus to main screen (important for maemo) */
770              printf("raising main window\n");
771              gtk_window_present(GTK_WINDOW(context->appdata->window));
772            }
773          }
774        }
775      } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_REMOVED) {
776        printf("removed\n");
777        context->balloon = NULL;
778    }    }
779  }  }
780    
# Line 383  on_map_button_release_event(GtkWidget *w Line 783  on_map_button_release_event(GtkWidget *w
783                              GdkEventButton *event, map_context_t *context) {                              GdkEventButton *event, map_context_t *context) {
784    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
785    
786      puts("release event");
787    
788      /* in "MAP_CACHE" state only one cache is visible */
789      /* and the map is in navigation mode. the balloon is */
790      /* pretty useless there */
791    if(context->press_on) {    if(context->press_on) {
792    
793      coord_t coo;      coord_t coo;
794      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
795    
# Line 392  on_map_button_release_event(GtkWidget *w Line 798  on_map_button_release_event(GtkWidget *w
798    
799      cache_t *nearest = map_closest(context, &pos);      cache_t *nearest = map_closest(context, &pos);
800      if(nearest && nearest == context->press_on) {      if(nearest && nearest == context->press_on) {
801        float dist = gpx_pos_get_distance(pos, nearest->pos, FALSE);        pos_t cpos = gpx_cache_pos(nearest);
802        if(dist2pixel(context, dist, nearest->pos.lat) < CLICK_FUZZ) {  
803          float dist = gpx_pos_get_distance(pos, cpos, FALSE);
804          if(dist2pixel(context, dist, cpos.lat) < CLICK_FUZZ) {
805    
806          osm_gps_map_draw_balloon(map, nearest->pos.lat, nearest->pos.lon,          context->balloon = nearest;
807                                   balloon_draw_cb, nearest);          osm_gps_map_osd_draw_balloon(map, cpos.lat, cpos.lon,
808                                         balloon_cb, context);
809        }        }
810      }      }
811      context->press_on = NULL;      context->press_on = NULL;
# Line 414  on_map_button_release_event(GtkWidget *w Line 823  on_map_button_release_event(GtkWidget *w
823  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {  static void on_window_destroy(GtkWidget *widget, map_context_t *context) {
824    appdata_t *appdata = context->appdata;    appdata_t *appdata = context->appdata;
825    
   printf("destroy map window\n");  
   
826    /* save map parameters */    /* save map parameters */
827    OsmGpsMap *map = OSM_GPS_MAP(context->widget);    OsmGpsMap *map = OSM_GPS_MAP(context->widget);
828    gint zoom;    gint zoom;
829    g_object_get(map, "zoom", &zoom, NULL);    g_object_get(map, "zoom", &zoom, NULL);
830    context->appdata->map.zoom = zoom;    context->appdata->map.zoom = zoom;
831    
832      gboolean dpix;
833      g_object_get(map, "double-pixel", &dpix, NULL);
834      context->appdata->map.dpix = dpix;
835    
836    gfloat lat, lon;    gfloat lat, lon;
837    g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);    g_object_get(map, "latitude", &lat, "longitude", &lon, NULL);
838    context->appdata->map.pos.lat = lat;    context->appdata->map.pos.lat = lat;
839    context->appdata->map.pos.lon = lon;    context->appdata->map.pos.lon = lon;
840    
841      gint source;
842      g_object_get(map, "map-source", &source, NULL);
843      context->appdata->map.source = source;
844    
845  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
846    /* restore cur_view */    /* restore cur_view */
847    context->appdata->cur_view = context->old_view;    context->appdata->cur_view = context->old_view;
848  #endif  #endif
849    
850    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
851      gps_unregister_callback(appdata, context->cb_id);
852    
853      if(context->caches_displayed) {
854        g_free(context->caches_displayed);
855        context->caches_displayed = NULL;
856      }
857    
858      printf("destroy map context\n");
859    g_free(context);    g_free(context);
860    appdata->map.context = NULL;    appdata->map.context = NULL;
861  }  }
862    
863    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
864    /* get access to zoom buttons */
865    static void
866    on_window_realize(GtkWidget *widget, gpointer data) {
867      if (widget->window) {
868        unsigned char value = 1;
869        Atom hildon_zoom_key_atom =
870          gdk_x11_get_xatom_by_name("_HILDON_ZOOM_KEY_ATOM"),
871          integer_atom = gdk_x11_get_xatom_by_name("INTEGER");
872        Display *dpy =
873          GDK_DISPLAY_XDISPLAY(gdk_drawable_get_display(widget->window));
874        Window w = GDK_WINDOW_XID(widget->window);
875    
876        XChangeProperty(dpy, w, hildon_zoom_key_atom,
877                        integer_atom, 8, PropModeReplace, &value, 1);
878      }
879    }
880    #endif
881    
882    /* on maemo a window is either on top or completely invisible. this */
883    /* means that we only need to update the map window if its raised.  */
884    /* on ordinary desktops this is different and we always update */
885    
886    static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
887                             gpointer data) {
888      map_context_t *context = (map_context_t*)data;
889    
890      printf("map got focus\n");
891    
892    #ifdef USE_MAEMO
893      /* re-enable refresh of map */
894      if(!context->handler_id)
895        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
896    #endif
897    
898      map_setup(context);
899      return FALSE;
900    }
901    
902    static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
903                             gpointer data) {
904      map_context_t *context = (map_context_t*)data;
905    
906      printf("map lost focus\n");
907    
908      /* save new map position */
909      gfloat lat, lon;
910      g_object_get(widget, "latitude", &lat, "longitude", &lon, NULL);
911    
912      context->appdata->map.pos.lat = lat;
913      context->appdata->map.pos.lon = lon;
914    
915    #ifdef USE_MAEMO
916      gtk_timeout_remove(context->handler_id);
917      context->handler_id = 0;
918    #endif
919    
920      return FALSE;
921    }
922    
923    void map_update(appdata_t *appdata) {
924      printf("map_update\n");
925    #ifndef USE_MAEMO
926      if(appdata->map.context)
927        map_setup(appdata->map.context);
928    #endif
929    }
930    
931    /* callback called by the gps layer whenever gps state changes */
932    static void
933    gps_callback(struct gps_state *state, gpointer data) {
934      printf("map: gps callback\n");
935    }
936    
937  void map(appdata_t *appdata) {  void map(appdata_t *appdata) {
938    map_context_t *context = NULL;    map_context_t *context = NULL;
939    
940    /* if the map window already exists, just raise it */    /* if the map window already exists, just raise it */
941    if(appdata->map.context) {    if(appdata->map.context) {
942        printf("using existing map!\n");
943      gtk_window_present(GTK_WINDOW(appdata->map.context->window));      gtk_window_present(GTK_WINDOW(appdata->map.context->window));
944        map_setup(appdata->map.context);
945      return;      return;
946    }    }
947    
948    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
949      printf("allocated new context at %p\n", context);
950    
951    context->appdata = appdata;    context->appdata = appdata;
952      context->state = MAP_NONE;
953    
954      /* cleanup old (pre 0.8.7) path if it exists */
955      char *old_path = g_strdup_printf("%s/map/", appdata->image_path);
956      if(g_file_test(old_path, G_FILE_TEST_IS_DIR)) {
957        printf("old file path %s exists\n", old_path);
958        rmdir_recursive(old_path);
959      }
960    
961      /* It is recommanded that all applications share these same */
962      /* map path, so data is only cached once. The path should be: */
963      /* ~/.osm-gps-map on standard PC     (users home) */
964      /* /home/user/.osm-gps-map on Maemo5 (ext3 on internal card) */
965      /* /media/mmc2/osm-gps-map on Maemo4 (vfat on internal card) */
966    #if !defined(USE_MAEMO)
967      char *p = getenv("HOME");
968      if(!p) p = "/tmp";
969      char *path = g_strdup_printf("%s/.osm-gps-map", p);
970    #else
971    #if MAEMO_VERSION_MAJOR == 5
972      char *path = g_strdup("/home/user/.osm-gps-map");
973    #else
974      char *path = g_strdup("/media/mmc2/osm-gps-map");
975    #endif
976    #endif
977    
   char *path = g_strdup_printf("%s/map/", appdata->image_path);  
978    const char *proxy = get_proxy_uri(appdata);    const char *proxy = get_proxy_uri(appdata);
979    
980      gint source = context->appdata->map.source;
981      if(!source) source = MAP_SOURCE;
982    
983    context->widget = g_object_new(OSM_TYPE_GPS_MAP,    context->widget = g_object_new(OSM_TYPE_GPS_MAP,
984                   "map-source",               MAP_SOURCE,                   "map-source",               source,
985                   "tile-cache",               path,                   "tile-cache",               path,
986                   "auto-center",              FALSE,                   "auto-center",              FALSE,
987                   "record-trip-history",      FALSE,                   "record-trip-history",      FALSE,
988                   "show-trip-history",        FALSE,                   "show-trip-history",        FALSE,
989                     "double-pixel",             context->appdata->map.dpix,
990                   proxy?"proxy-uri":NULL,     proxy,                   proxy?"proxy-uri":NULL,     proxy,
991                   NULL);                   NULL);
992    
993    g_free(path);    g_free(path);
994    
995    char *name = NULL;    osm_gps_map_osd_classic_init(OSM_GPS_MAP(context->widget));
996  #ifdef USE_MAEMO  
997    if(!appdata->cur_gpx) {    /* set default values if they are invalid */
998  #endif    if(!context->appdata->map.zoom ||
999      /* draw all geocaches */       isnan(context->appdata->map.pos.lat) ||
1000      gpx_t *gpx = appdata->gpx;       isnan(context->appdata->map.pos.lon)) {
1001      while(gpx) {      printf("no valid map position found\n");
1002        map_draw_cachelist(context->widget, gpx->cache);  
1003        gpx = gpx->next;      pos_t *refpos = get_pos(context->appdata);
1004        if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
1005          printf("use refpos\n");
1006    
1007            /* use gps position if present */
1008          context->appdata->map.pos = *refpos;
1009          context->appdata->map.zoom = GPS_DEFAULT_ZOOM;
1010        } else {
1011          printf("use zero pos\n");
1012    
1013          /* use world map otherwise */
1014          context->appdata->map.pos.lat = 0.0;
1015          context->appdata->map.pos.lon = 0.0;
1016          context->appdata->map.zoom = 1;
1017      }      }
     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);  
1018    }    }
1019  #endif  
1020      osm_gps_map_set_mapcenter(OSM_GPS_MAP(context->widget),
1021    char *title = g_strdup_printf(_("Map - %s"), name);                              context->appdata->map.pos.lat,
1022    g_free(name);                              context->appdata->map.pos.lon,
1023                                context->appdata->map.zoom);
1024    
1025  #ifdef USE_MAEMO  #ifdef USE_MAEMO
1026  #ifdef USE_STACKABLE_WINDOW    /* we don't use a stackable window here on fremantle, since */
1027    context->window = hildon_stackable_window_new();    /* this leaves the main window independent from the map and */
1028  #else    /* the user can e.g. still navigate the main menu */
1029    context->window = hildon_window_new();    context->window = hildon_window_new();
1030  #endif  
1031    #if (MAEMO_VERSION_MAJOR == 5) && !defined(__i386__)
1032      g_signal_connect(G_OBJECT(context->window), "realize",
1033                       G_CALLBACK(on_window_realize), NULL);
1034    #endif // MAEMO_VERSION
1035  #else  #else
1036    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);    context->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
1037  #endif  #endif
1038    
   gtk_window_set_title(GTK_WINDOW(context->window), title);  
   
1039  #ifndef USE_MAEMO  #ifndef USE_MAEMO
1040    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);    gtk_window_set_default_size(GTK_WINDOW(context->window), 640, 480);
1041  #endif  #endif
1042    
1043    g_free(title);    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
1044                       G_CALLBACK(on_focus_in), context);
1045    
1046    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
1047                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_focus_out), context);
1048    
1049    g_signal_connect(G_OBJECT(context->widget), "button-press-event",    g_signal_connect(G_OBJECT(context->widget), "button-press-event",
1050                     G_CALLBACK(on_map_button_press_event), context);                     G_CALLBACK(on_map_button_press_event), context);
# Line 514  void map(appdata_t *appdata) { Line 1054  void map(appdata_t *appdata) {
1054    
1055    /* install handler for timed updates of the gps button */    /* install handler for timed updates of the gps button */
1056    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);    context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
1057      context->cb_id = gps_register_callback(appdata, gps_callback, context);
1058    
1059  #if MAEMO_VERSION_MAJOR == 5  #if MAEMO_VERSION_MAJOR == 5
1060    /* prevent some of the main screen things */    /* prevent some of the main screen things */
# Line 526  void map(appdata_t *appdata) { Line 1067  void map(appdata_t *appdata) {
1067    
1068    gtk_container_add(GTK_CONTAINER(context->window), context->widget);    gtk_container_add(GTK_CONTAINER(context->window), context->widget);
1069    gtk_widget_show_all(GTK_WIDGET(context->window));    gtk_widget_show_all(GTK_WIDGET(context->window));
1070    
1071      /* setup cache state */
1072      map_setup(context);
1073  }  }
Legend:
Removed from v.69  
changed lines
  Added in v.280