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

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

revision 149 by harbaum, Thu Oct 29 13:59:16 2009 UTC revision 226 by harbaum, Wed Dec 2 20:05:52 2009 UTC
# Line 22  Line 22 
22   * http://topo.geofabrik.de/trail/${z}/${x}/${y}.png   8-15   * 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
# Line 48  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 69  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 82  static void Line 88  static void
88  cb_map_gps(osd_button_t but, map_context_t *context) {  cb_map_gps(osd_button_t but, map_context_t *context) {
89    
90    if(but == OSD_GPS) {    if(but == OSD_GPS) {
91        printf("clicked OSD_GPS %p\n", context);
92        printf("clicked OSD_GPS a %p\n", context->appdata);
93    
94      pos_t *refpos = get_pos(context->appdata);      pos_t *refpos = get_pos(context->appdata);
95      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {      if(refpos && !isnan(refpos->lat) && !isnan(refpos->lon)) {
96        gint zoom;        gint zoom;
# Line 109  static int dist2pixel(map_context_t *con Line 118  static int dist2pixel(map_context_t *con
118    
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;
   static gboolean goto_is_enabled = FALSE;  
121    
122    /* get reference position ... */    /* get reference position ... */
123    pos_t *refpos = get_pos(context->appdata);    pos_t *refpos = get_pos(context->appdata);
124    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);    gboolean ok = (refpos!= NULL) && !isnan(refpos->lat) && !isnan(refpos->lon);
125    
126    /* ... and enable "goto" button if it's valid */    /* ... and enable "goto" button if it's valid */
127    if(ok != goto_is_enabled) {    if(ok != context->goto_is_enabled) {
128      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),      osm_gps_map_osd_enable_gps (OSM_GPS_MAP(context->widget),
129                  OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);                  OSM_GPS_MAP_OSD_CALLBACK(ok?cb_map_gps:NULL), context);
130      goto_is_enabled = ok;      context->goto_is_enabled = ok;
131    }    }
132    
133    if(ok) {    if(ok) {
# Line 146  static gboolean map_gps_update(gpointer Line 154  static gboolean map_gps_update(gpointer
154    return TRUE;    return TRUE;
155  }  }
156    
157  static void map_draw_cache(GtkWidget *map, cache_t *cache) {  static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
158    GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);    int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;
159    
160      GdkPixbuf *icon = icon_get(type, cache->type);
161      GdkPixbuf *over = NULL;
162    
163      if(cache->mine)                   over = icon_get(type, 14);
164      else if(cache->found)             over = icon_get(type, 12);
165      else if(cache->notes) {
166        if(cache->notes->found)         over = icon_get(type, 12);
167        else if(cache->notes->override) over = icon_get(type, 11);
168        else                            over = icon_get(type, 13);
169      }
170    
171      pos_t *pos = &cache->pos;
172    /* check if there's also an overwritten coordinate */    /* check if there's also an overwritten coordinate */
173    if(cache->notes && cache->notes->override) {    if(cache->notes && cache->notes->override)
174      GdkPixbuf *over = icon_get(ICON_MISC, 1);      pos = &cache->notes->pos;
175    
176      if(!isnan(pos->lat) && !isnan(pos->lon)) {
177      osm_gps_map_add_image(OSM_GPS_MAP(map),      osm_gps_map_add_image(OSM_GPS_MAP(map),
178            cache->notes->pos.lat, cache->notes->pos.lon, icon);                            pos->lat, pos->lon, icon);
179        if(over)
180          osm_gps_map_add_image(OSM_GPS_MAP(map),
181                                pos->lat, pos->lon, over);
182      }
183    }
184    
185      osm_gps_map_add_image(OSM_GPS_MAP(map),  static void map_draw_wpt(GtkWidget *map, cache_t *cache, wpt_t *wpt) {
186            cache->notes->pos.lat, cache->notes->pos.lon, over);    /* only draw wpts that don't equal the main point */
187    } else {    if(pos_differ(&cache->pos, &wpt->pos)) {
188      if(!isnan(cache->pos.lat) && !isnan(cache->pos.lon))      if(!isnan(wpt->pos.lat) && !isnan(wpt->pos.lon))  {
189          GdkPixbuf *icon =
190            icon_get(ICON_WPT, (wpt->sym!=WPT_SYM_UNKNOWN)?
191                     wpt->sym:WPT_SYM_REFPOINT);
192    
193        osm_gps_map_add_image(OSM_GPS_MAP(map),        osm_gps_map_add_image(OSM_GPS_MAP(map),
194                              cache->pos.lat, cache->pos.lon, icon);                              wpt->pos.lat, wpt->pos.lon, icon);
195        }
196    }    }
197  }  }
198    
199  static void map_draw_gpx(appdata_t *appdata, GtkWidget *map, gpx_t *gpx) {  static void map_draw_gpx(appdata_t *appdata, cache_display_t *caches,
200                             GtkWidget *map, gpx_t *gpx,
201                             cache_t *nav, gboolean semi) {
202    if(!gpx->notes_loaded) {    if(!gpx->notes_loaded) {
203      notes_load_all(appdata, gpx);      notes_load_all(appdata, gpx);
204      gpx->notes_loaded = TRUE;      gpx->notes_loaded = TRUE;
# Line 173  static void map_draw_gpx(appdata_t *appd Line 206  static void map_draw_gpx(appdata_t *appd
206    
207    cache_t *cache = gpx->cache;    cache_t *cache = gpx->cache;
208    while(cache) {    while(cache) {
209      map_draw_cache(map, cache);      /* search if we have that cache already in our list/displayed */
210        int i=0;
211        while(caches[i].id && (strcmp(caches[i].id, cache->id) != 0))
212          i++;
213    
214        if(!caches[i].id) {
215          /* if nav is given draw all other caches semitransparent. */
216          /* if nav is not given do what semi sais */
217          map_draw_cache(map, cache, nav?(cache != nav):semi);
218          caches[i].id = cache->id;
219    
220          /* also draw waypoints of nav cache */
221          if(nav && cache == nav) {
222            wpt_t *wpt = cache->wpt;
223            while(wpt) {
224              map_draw_wpt(map, cache, wpt);
225              wpt = wpt->next;
226            }
227          }
228        }
229    
230      cache = cache->next;      cache = cache->next;
231    }    }
232  }  }
# Line 182  static void map_draw_gpx(appdata_t *appd Line 235  static void map_draw_gpx(appdata_t *appd
235  static void map_setup(map_context_t *context) {  static void map_setup(map_context_t *context) {
236    char *name = NULL;    char *name = NULL;
237    
238      int cache_num = gpx_total_caches_global(context->appdata->gpx);
239    
240      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
241        //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
242        //     cache_num, context->cache_list_len);
243        g_free(context->caches_displayed);
244        context->caches_displayed = NULL;
245        context->cache_list_len = 0;
246      }
247    
248      /* allocate buffer */
249      if(cache_num && !context->caches_displayed) {
250        context->cache_list_len = cache_num;
251        context->caches_displayed = g_new0(cache_display_t, cache_num+1);
252        printf("allocated space to handle %d map icons\n", cache_num);
253      }
254    
255    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
256      if(context->state != MAP_ALL) {      if(context->state != MAP_ALL) {
257        printf("map_setup(ALL)\n");        printf("map_setup(ALL)\n");
258    
259          /* clear any pending balloon */
260          context->balloon = NULL;
261          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
262    
263  #ifdef OSD_NAV  #ifdef OSD_NAV
264        /* no navigation in this mode */        /* no navigation in this mode */
265        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
266  #endif  #endif
267    
268        /* clear all existing ccahe images */        /* clear all existing cache images */
269        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
270          memset(context->caches_displayed, 0,
271                 (cache_num+1) * sizeof(cache_display_t));
272    
273        /* draw all geocaches */        /* draw all geocaches and none is semi-transparent */
274        gpx_t *gpx = context->appdata->gpx;        gpx_t *gpx = context->appdata->gpx;
275        while(gpx) {        while(gpx) {
276          map_draw_gpx(context->appdata, context->widget, gpx);          map_draw_gpx(context->appdata, context->caches_displayed,
277                         context->widget, gpx, NULL, FALSE);
278          gpx = gpx->next;          gpx = gpx->next;
279        }        }
280    
281          {
282            int i=0;
283            while(context->caches_displayed[i].id) i++;
284            printf("number of caches actually displayed: %d\n", i);
285          }
286    
287        name = g_strdup(_("all"));        name = g_strdup(_("all"));
288        context->state = MAP_ALL;        context->state = MAP_ALL;
289      }      }
# Line 207  static void map_setup(map_context_t *con Line 291  static void map_setup(map_context_t *con
291      if(context->state != MAP_GPX) {      if(context->state != MAP_GPX) {
292        printf("map_setup(GPX)\n");        printf("map_setup(GPX)\n");
293    
294          /* clear any pending balloon */
295          context->balloon = NULL;
296          osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
297    
298  #ifdef OSD_NAV  #ifdef OSD_NAV
299        /* no navigation in this mode */        /* no navigation in this mode */
300        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));        osm_gps_map_osd_clear_nav (OSM_GPS_MAP(context->widget));
301  #endif  #endif
302    
303        /* clear all existing ccahe images */        /* clear all existing cache images */
304        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
305          memset(context->caches_displayed, 0,
306                 (cache_num+1) * sizeof(cache_display_t));
307    
308          /* draw all geocaches and all other gpx files are semi-transparent */
309          map_draw_gpx(context->appdata, context->caches_displayed,
310                       context->widget, context->appdata->cur_gpx, NULL, FALSE);
311    
312          gpx_t *gpx = context->appdata->gpx;
313          while(gpx) {
314            if(gpx != context->appdata->cur_gpx)
315              map_draw_gpx(context->appdata, context->caches_displayed,
316                           context->widget, gpx, NULL, TRUE);
317    
318            gpx = gpx->next;
319          }
320    
       map_draw_gpx(context->appdata, context->widget,  
                    context->appdata->cur_gpx);  
321        name = g_strdup(context->appdata->cur_gpx->name);        name = g_strdup(context->appdata->cur_gpx->name);
322        context->state = MAP_GPX;        context->state = MAP_GPX;
323      }      }
324    } else {    } else {
325      cache_t *cache = context->appdata->cur_cache;      cache_t *cache = context->appdata->cur_cache;
326    
327      printf("map_setp(CACHE)\n");      printf("map_setup(CACHE)\n");
328    
329      /* no balloons in this mode */      /* clear any pending balloon */
330      context->balloon = NULL;      context->balloon = NULL;
331      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));      osm_gps_map_osd_clear_balloon (OSM_GPS_MAP(context->widget));
332    
333      /* clear all existing ccahe images */      /* clear all existing ccahe images */
334      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
335        memset(context->caches_displayed, 0,
336               (cache_num+1) * sizeof(cache_display_t));
337    
338      map_draw_cache(context->widget, cache);      /* draw all geocaches and all but selected one are semi-transparent */
339        gpx_t *gpx = context->appdata->gpx;
340        while(gpx) {
341          map_draw_gpx(context->appdata, context->caches_displayed,
342                       context->widget, gpx, cache, FALSE);
343          gpx = gpx->next;
344        }
345    
346      name = g_strdup(cache->name);      name = g_strdup(cache->name);
347      context->state = MAP_CACHE;      context->state = MAP_CACHE;
348    
# Line 248  static void map_setup(map_context_t *con Line 358  static void map_setup(map_context_t *con
358  #endif  #endif
359    }    }
360    
361      /* also mark geomath position */
362    
363      /* remove all existing appearances of this icon first */
364      osm_gps_map_remove_image(OSM_GPS_MAP(context->widget),
365                               icon_get(ICON_MISC, 6));
366    
367      if(!isnan(context->appdata->geomath.lat) &&
368         !isnan(context->appdata->geomath.lon))  {
369    
370        osm_gps_map_add_image(OSM_GPS_MAP(context->widget),
371                              context->appdata->geomath.lat,
372                              context->appdata->geomath.lon,
373                              icon_get(ICON_MISC, 6));
374      }
375    
376    if(name) {    if(name) {
377      char *title = g_strdup_printf(_("Map - %s"), name);      char *title = g_strdup_printf(_("Map - %s"), name);
378      g_free(name);      g_free(name);
# Line 408  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 533  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
533                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
534    
535    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
536      g_assert(image_surface);
537    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
538    
539    // Draw the image on the new Context    // Draw the image on the new Context
# Line 421  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 547  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
547  }  }
548    
549  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
550  #define LINE_SKIP  7  #define ICON_SIZE  ICON_CACHE_TYPE
551  #else  #else
552  #define LINE_SKIP  12  #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
553  #endif  #endif
554    
555    #ifndef BIG_BALLOONS
556    #define FONT_SIZE 14.0
557    #else
558    #define FONT_SIZE 22.0
559    #endif
560    #define LINE_SKIP  (FONT_SIZE/4)
561    
562    
563  static void  static void
564  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {  balloon_cb(osm_gps_map_balloon_event_t *event, gpointer data) {
565    printf("balloon event: ");    printf("balloon event: ");
# Line 451  balloon_cb(osm_gps_map_balloon_event_t * Line 585  balloon_cb(osm_gps_map_balloon_event_t *
585      gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;      gint x = event->data.draw.rect->x, y = event->data.draw.rect->y;
586    
587      /* draw the cache type icon ... */      /* draw the cache type icon ... */
588      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);      GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
589      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
590    
591      if(cache->notes && cache->notes->override) {      if(cache->notes && cache->notes->override) {
592        GdkPixbuf *over = icon_get(ICON_MISC, 1);        GdkPixbuf *over = icon_get(ICON_SIZE, 11);
593        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
594      }      }
595    
# Line 491  balloon_cb(osm_gps_map_balloon_event_t * Line 625  balloon_cb(osm_gps_map_balloon_event_t *
625      x = event->data.draw.rect->x;      x = event->data.draw.rect->x;
626    
627      /* everything from here uses the same font */      /* everything from here uses the same font */
628      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans",
629                                CAIRO_FONT_SLANT_NORMAL,
630                              CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
631  #ifndef BIG_BALLOONS  
632      cairo_set_font_size (event->data.draw.cr, 14.0);      cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
 #else  
     cairo_set_font_size (event->data.draw.cr, 22.0);  
 #endif  
633    
634      if(cache->name) {      if(cache->name) {
635        /* draw cache name */        /* draw cache name */
636        cairo_text_extents (event->data.draw.cr, cache->name, &extents);        cairo_text_extents (event->data.draw.cr, cache->name, &extents);
637        y += extents.height;        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing);
       cairo_move_to (event->data.draw.cr, x, y);  
638        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
639        cairo_show_text (event->data.draw.cr, cache->name);        cairo_show_text (event->data.draw.cr, cache->name);
640        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
641    
642        /* return to the left border and below text */        /* return to the left border and below text */
643        y += LINE_SKIP;        y += LINE_SKIP + FONT_SIZE;
644        x = event->data.draw.rect->x;        x = event->data.draw.rect->x;
645      }      }
646    
647      if(cache->terrain) {      if(cache->terrain) {
648          int text_y = 0, icon_y = 0;
649    
650        /* draw cache rating */        /* draw cache rating */
651        const char *terrain = "Terrain:";        const char *terrain = "Terrain:";
652        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
653        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
654        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
655          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
656            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
657          else
658            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
659    
660        /* draw "Terrain:" string */        /* draw "Terrain:" string */
661        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
662        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
663        cairo_show_text (event->data.draw.cr, _(terrain));        cairo_show_text (event->data.draw.cr, _(terrain));
664        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
665        x += extents.width + 2;        x += extents.width + 2;
666    
667        /* draw terrain stars */        /* draw terrain stars */
668        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
                         (gdk_pixbuf_get_height(icon) + extents.height)/2);  
669    
670        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;        x += gdk_pixbuf_get_width(icon) + FONT_SIZE/2;
     y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;  
671      }      }
672    
673      if(cache->difficulty) {      if(cache->difficulty) {
674          int text_y = 0, icon_y = 0;
675    
676        const char *difficulty = "Difficulty:";        const char *difficulty = "Difficulty:";
677          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
678        cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);        cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
       y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
679    
680          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
681            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
682          else
683            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
684    
685        /* draw "Difficulty:" string */        /* draw "Difficulty:" string */
686        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
687        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
688        cairo_show_text (event->data.draw.cr, _(difficulty));        cairo_show_text (event->data.draw.cr, _(difficulty));
689        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
690        x += extents.width + 2;        x += extents.width + 2;
691    
692        icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));        cairo_draw_pixbuf(event->data.draw.cr, icon, x, y + icon_y);
       cairo_draw_pixbuf(event->data.draw.cr, icon, x, y -  
                       (gdk_pixbuf_get_height(icon) + extents.height)/2);  
693      }      }
694    
695        /* draw container info */
696        /* TODO ... */
697    
698    
699    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
700      printf("click %s event at %d %d\n",      printf("click %s event at %d %d\n",
701             event->data.click.down?"down":"up",             event->data.click.down?"down":"up",
# Line 614  on_map_button_release_event(GtkWidget *w Line 759  on_map_button_release_event(GtkWidget *w
759    /* in "MAP_CACHE" state only one cache is visible */    /* in "MAP_CACHE" state only one cache is visible */
760    /* and the map is in navigation mode. the balloon is */    /* and the map is in navigation mode. the balloon is */
761    /* pretty useless there */    /* pretty useless there */
762    if(context->press_on && (context->state != MAP_CACHE)) {    if(context->press_on) {
763    
764      coord_t coo;      coord_t coo;
765      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);      coo = osm_gps_map_get_co_ordinates(map, event->x, event->y);
# Line 672  static void on_window_destroy(GtkWidget Line 817  static void on_window_destroy(GtkWidget
817    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
818    gps_unregister_callback(appdata, context->cb_id);    gps_unregister_callback(appdata, context->cb_id);
819    
820      if(context->caches_displayed) {
821        g_free(context->caches_displayed);
822        context->caches_displayed = NULL;
823      }
824    
825      printf("destroy map context\n");
826    g_free(context);    g_free(context);
827    appdata->map.context = NULL;    appdata->map.context = NULL;
828  }  }
# Line 701  on_window_realize(GtkWidget *widget, gpo Line 852  on_window_realize(GtkWidget *widget, gpo
852    
853  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
854                           gpointer data) {                           gpointer data) {
855      map_context_t *context = (map_context_t*)data;
856    
857    printf("map got focus\n");    printf("map got focus\n");
858    map_setup((map_context_t*)data);  
859    #ifdef USE_MAEMO
860      /* re-enable refresh of map */
861      if(!context->handler_id)
862        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
863    #endif
864    
865      map_setup(context);
866    return FALSE;    return FALSE;
867  }  }
868    
869    static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
870                             gpointer data) {
871      map_context_t *context = (map_context_t*)data;
872    
873      printf("map lost focus\n");
874    
875      /* save new map position */
876      gfloat lat, lon;
877      g_object_get(widget, "latitude", &lat, "longitude", &lon, NULL);
878    
879      context->appdata->map.pos.lat = lat;
880      context->appdata->map.pos.lon = lon;
881    
882    #ifdef USE_MAEMO
883      gtk_timeout_remove(context->handler_id);
884      context->handler_id = 0;
885    #endif
886    
887      return FALSE;
888    }
889    
890  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
891    printf("map_update\n");    printf("map_update\n");
892  #ifndef USE_MAEMO  #ifndef USE_MAEMO
# Line 732  void map(appdata_t *appdata) { Line 913  void map(appdata_t *appdata) {
913    }    }
914    
915    context = appdata->map.context = g_new0(map_context_t, 1);    context = appdata->map.context = g_new0(map_context_t, 1);
916      printf("allocated new context at %p\n", context);
917    
918    context->appdata = appdata;    context->appdata = appdata;
919    context->map_complete = FALSE;    context->map_complete = FALSE;
920    context->state = MAP_NONE;    context->state = MAP_NONE;
# Line 799  void map(appdata_t *appdata) { Line 982  void map(appdata_t *appdata) {
982    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
983                     G_CALLBACK(on_focus_in), context);                     G_CALLBACK(on_focus_in), context);
984    
985      g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
986                       G_CALLBACK(on_focus_out), context);
987    
988    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
989                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
990    
Legend:
Removed from v.149  
changed lines
  Added in v.226