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

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

revision 151 by harbaum, Fri Oct 30 20:09:13 2009 UTC revision 189 by harbaum, Tue Nov 17 09:07:17 2009 UTC
# Line 55  static const char *get_proxy_uri(appdata Line 55  static const char *get_proxy_uri(appdata
55    /* use environment settings if preset */    /* use environment settings if preset */
56    const char *proxy = g_getenv("http_proxy");    const char *proxy = g_getenv("http_proxy");
57    if(proxy) {    if(proxy) {
58      printf("http_proxy: %s\n", proxy);      printf("map http proxy from env: %s\n", proxy);
59      return proxy;      return proxy;
60    }    }
61    
# Line 76  static const char *get_proxy_uri(appdata Line 76  static const char *get_proxy_uri(appdata
76    
77        snprintf(proxy_buffer, sizeof(proxy_buffer),        snprintf(proxy_buffer, sizeof(proxy_buffer),
78                 "http://%s:%u", host, port);                 "http://%s:%u", host, port);
79          printf("map http proxy from gconf: %s\n ", proxy_buffer);
80    
81        g_free(host);        g_free(host);
82      }      }
# Line 154  static gboolean map_gps_update(gpointer Line 155  static gboolean map_gps_update(gpointer
155  }  }
156    
157  static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {  static void map_draw_cache(GtkWidget *map, cache_t *cache, gboolean semi) {
158    GdkPixbuf *icon = icon_get(semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE,    int type = semi?ICON_CACHE_TYPE_SEMI:ICON_CACHE_TYPE;
159                               cache->type);  
160      GdkPixbuf *icon = icon_get(type, cache->type);
161    
162    /* check if there's also an overwritten coordinate */    /* check if there's also an overwritten coordinate */
163    if(cache->notes && cache->notes->override) {    if(cache->notes && cache->notes->override) {
164      GdkPixbuf *over = icon_get(ICON_MISC, 1);      GdkPixbuf *over = icon_get(type, 11);
165    
166      osm_gps_map_add_image(OSM_GPS_MAP(map),      osm_gps_map_add_image(OSM_GPS_MAP(map),
167            cache->notes->pos.lat, cache->notes->pos.lon, icon);            cache->notes->pos.lat, cache->notes->pos.lon, icon);
# Line 173  static void map_draw_cache(GtkWidget *ma Line 175  static void map_draw_cache(GtkWidget *ma
175    }    }
176  }  }
177    
178  static void map_draw_gpx(appdata_t *appdata,  static void map_draw_gpx(appdata_t *appdata, cache_display_t *caches,
179                           GtkWidget *map, gpx_t *gpx,                           GtkWidget *map, gpx_t *gpx,
180                           cache_t *nav, gboolean semi) {                           cache_t *nav, gboolean semi) {
181    if(!gpx->notes_loaded) {    if(!gpx->notes_loaded) {
# Line 183  static void map_draw_gpx(appdata_t *appd Line 185  static void map_draw_gpx(appdata_t *appd
185    
186    cache_t *cache = gpx->cache;    cache_t *cache = gpx->cache;
187    while(cache) {    while(cache) {
188      /* if nav is given draw all other caches semitransparent. */      /* search if we have that cache already in our list/displayed */
189      /* if nav is not given do what semi sais */      int i=0;
190      map_draw_cache(map, cache, nav?(cache != nav):semi);      while(caches[i].id && (strcmp(caches[i].id, cache->id) != 0))
191          i++;
192    
193        if(!caches[i].id) {
194          /* if nav is given draw all other caches semitransparent. */
195          /* if nav is not given do what semi sais */
196          map_draw_cache(map, cache, nav?(cache != nav):semi);
197          caches[i].id = cache->id;
198        }
199    
200      cache = cache->next;      cache = cache->next;
201    }    }
202  }  }
# Line 194  static void map_draw_gpx(appdata_t *appd Line 205  static void map_draw_gpx(appdata_t *appd
205  static void map_setup(map_context_t *context) {  static void map_setup(map_context_t *context) {
206    char *name = NULL;    char *name = NULL;
207    
208      int cache_num = gpx_total_caches_global(context->appdata->gpx);
209    
210      if(context->caches_displayed && (cache_num != context->cache_list_len)) {
211        //    printf("re-alloc because %p %d/%d\n", context->caches_displayed,
212        //     cache_num, context->cache_list_len);
213        g_free(context->caches_displayed);
214        context->caches_displayed = NULL;
215        context->cache_list_len = 0;
216      }
217    
218      /* allocate buffer */
219      if(cache_num && !context->caches_displayed) {
220        context->cache_list_len = cache_num;
221        context->caches_displayed = g_new0(cache_display_t, cache_num+1);
222        printf("allocated space to handle %d map icons\n", cache_num);
223      }
224    
225    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {    if(!context->appdata->cur_gpx && !context->appdata->cur_cache) {
226      if(context->state != MAP_ALL) {      if(context->state != MAP_ALL) {
227        printf("map_setup(ALL)\n");        printf("map_setup(ALL)\n");
# Line 205  static void map_setup(map_context_t *con Line 233  static void map_setup(map_context_t *con
233    
234        /* clear all existing cache images */        /* clear all existing cache images */
235        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
236          memset(context->caches_displayed, 0,
237                 (cache_num+1) * sizeof(cache_display_t));
238    
239        /* draw all geocaches and none is semi-transparent */        /* draw all geocaches and none is semi-transparent */
240        gpx_t *gpx = context->appdata->gpx;        gpx_t *gpx = context->appdata->gpx;
241        while(gpx) {        while(gpx) {
242          map_draw_gpx(context->appdata, context->widget, gpx, NULL, FALSE);          map_draw_gpx(context->appdata, context->caches_displayed,
243                         context->widget, gpx, NULL, FALSE);
244          gpx = gpx->next;          gpx = gpx->next;
245        }        }
246    
247          {
248            int i=0;
249            while(context->caches_displayed[i].id) i++;
250            printf("number of caches actually displayed: %d\n", i);
251          }
252    
253        name = g_strdup(_("all"));        name = g_strdup(_("all"));
254        context->state = MAP_ALL;        context->state = MAP_ALL;
255      }      }
# Line 226  static void map_setup(map_context_t *con Line 264  static void map_setup(map_context_t *con
264    
265        /* clear all existing ccahe images */        /* clear all existing ccahe images */
266        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));        osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
267          memset(context->caches_displayed, 0,
268                 (cache_num+1) * sizeof(cache_display_t));
269    
270        /* draw all geocaches and all other gpx files are semi-transparent */        /* draw all geocaches and all other gpx files are semi-transparent */
271          map_draw_gpx(context->appdata, context->caches_displayed,
272                       context->widget, context->appdata->cur_gpx, NULL, FALSE);
273    
274        gpx_t *gpx = context->appdata->gpx;        gpx_t *gpx = context->appdata->gpx;
275        while(gpx) {        while(gpx) {
276          map_draw_gpx(context->appdata, context->widget, gpx, NULL,          if(gpx != context->appdata->cur_gpx)
277                       gpx != context->appdata->cur_gpx);            map_draw_gpx(context->appdata, context->caches_displayed,
278                           context->widget, gpx, NULL, TRUE);
279    
280          gpx = gpx->next;          gpx = gpx->next;
281        }        }
282    
# Line 241  static void map_setup(map_context_t *con Line 286  static void map_setup(map_context_t *con
286    } else {    } else {
287      cache_t *cache = context->appdata->cur_cache;      cache_t *cache = context->appdata->cur_cache;
288    
289      printf("map_setp(CACHE)\n");      printf("map_setup(CACHE)\n");
290    
291      /* no balloons in this mode */      /* no balloons in this mode */
292      context->balloon = NULL;      context->balloon = NULL;
# Line 249  static void map_setup(map_context_t *con Line 294  static void map_setup(map_context_t *con
294    
295      /* clear all existing ccahe images */      /* clear all existing ccahe images */
296      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));      osm_gps_map_clear_images (OSM_GPS_MAP(context->widget));
297        memset(context->caches_displayed, 0,
298               (cache_num+1) * sizeof(cache_display_t));
299    
300      /* draw all geocaches and all but selected one are semi-transparent */      /* draw all geocaches and all but selected one are semi-transparent */
301      gpx_t *gpx = context->appdata->gpx;      gpx_t *gpx = context->appdata->gpx;
302      while(gpx) {      while(gpx) {
303        map_draw_gpx(context->appdata, context->widget, gpx, cache, FALSE);        map_draw_gpx(context->appdata, context->caches_displayed,
304                       context->widget, gpx, cache, FALSE);
305        gpx = gpx->next;        gpx = gpx->next;
306      }      }
307    
# Line 432  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 480  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
480                                 gdk_pixbuf_get_height(buf));                                 gdk_pixbuf_get_height(buf));
481    
482    // Create the new Context for the ImageSurface    // Create the new Context for the ImageSurface
483      g_assert(image_surface);
484    cairo_t *context = cairo_create(image_surface);    cairo_t *context = cairo_create(image_surface);
485    
486    // Draw the image on the new Context    // Draw the image on the new Context
# Line 445  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf Line 494  cairo_draw_pixbuf(cairo_t *cr, GdkPixbuf
494  }  }
495    
496  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
497    #define ICON_SIZE  ICON_CACHE_TYPE
498  #define LINE_SKIP  7  #define LINE_SKIP  7
499  #else  #else
500    #define ICON_SIZE  ICON_CACHE_TYPE_1_5X
501  #define LINE_SKIP  12  #define LINE_SKIP  12
502  #endif  #endif
503    
# Line 475  balloon_cb(osm_gps_map_balloon_event_t * Line 526  balloon_cb(osm_gps_map_balloon_event_t *
526      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;
527    
528      /* draw the cache type icon ... */      /* draw the cache type icon ... */
529      GdkPixbuf *icon = icon_get(ICON_CACHE_TYPE, cache->type);      GdkPixbuf *icon = icon_get(ICON_SIZE, cache->type);
530      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);      cairo_draw_pixbuf(event->data.draw.cr, icon, x, y);
531    
532      if(cache->notes && cache->notes->override) {      if(cache->notes && cache->notes->override) {
533        GdkPixbuf *over = icon_get(ICON_MISC, 1);        GdkPixbuf *over = icon_get(ICON_SIZE, 11);
534        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);        cairo_draw_pixbuf(event->data.draw.cr, over, x, y);
535      }      }
536    
# Line 518  balloon_cb(osm_gps_map_balloon_event_t * Line 569  balloon_cb(osm_gps_map_balloon_event_t *
569      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,      cairo_select_font_face (event->data.draw.cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
570                              CAIRO_FONT_WEIGHT_NORMAL);                              CAIRO_FONT_WEIGHT_NORMAL);
571  #ifndef BIG_BALLOONS  #ifndef BIG_BALLOONS
572      cairo_set_font_size (event->data.draw.cr, 14.0);  #define FONT_SIZE 14.0
573  #else  #else
574      cairo_set_font_size (event->data.draw.cr, 22.0);  #define FONT_SIZE 22.0
575  #endif  #endif
576    
577        cairo_set_font_size (event->data.draw.cr, FONT_SIZE);
578    
579      if(cache->name) {      if(cache->name) {
580        /* draw cache name */        /* draw cache name */
# Line 538  balloon_cb(osm_gps_map_balloon_event_t * Line 591  balloon_cb(osm_gps_map_balloon_event_t *
591      }      }
592    
593      if(cache->terrain) {      if(cache->terrain) {
594          int text_y = 0, icon_y = 0;
595    
596        /* draw cache rating */        /* draw cache rating */
597        const char *terrain = "Terrain:";        const char *terrain = "Terrain:";
598        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));        icon = icon_get(ICON_STARS, (int)(cache->terrain*2-2));
599        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);        cairo_text_extents (event->data.draw.cr, _(terrain), &extents);
600        y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
601          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
602            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
603          else
604            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
605    
606        /* draw "Terrain:" string */        /* draw "Terrain:" string */
607        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
608        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
609        cairo_show_text (event->data.draw.cr, _(terrain));        cairo_show_text (event->data.draw.cr, _(terrain));
610        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
611        x += extents.width + 2;        x += extents.width + 2;
612    
613        /* draw terrain stars */        /* draw terrain stars */
614        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);  
615    
616        x += gdk_pixbuf_get_width(icon) + LINE_SKIP;        x += gdk_pixbuf_get_width(icon) + LINE_SKIP - 2;
     y -= (gdk_pixbuf_get_height(icon) + extents.height)/2;  
617      }      }
618    
619      if(cache->difficulty) {      if(cache->difficulty) {
620          int text_y = 0, icon_y = 0;
621    
622        const char *difficulty = "Difficulty:";        const char *difficulty = "Difficulty:";
623          icon = icon_get(ICON_STARS, (int)(cache->difficulty*2-2));
624        cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);        cairo_text_extents (event->data.draw.cr, _(difficulty), &extents);
       y += (gdk_pixbuf_get_height(icon) + extents.height)/2;  
625    
626          if(gdk_pixbuf_get_height(icon) > FONT_SIZE)
627            text_y = (gdk_pixbuf_get_height(icon) - FONT_SIZE)/2;
628          else
629            icon_y = (FONT_SIZE - gdk_pixbuf_get_height(icon))/2;
630    
631        /* draw "Difficulty:" string */        /* draw "Difficulty:" string */
632        cairo_move_to (event->data.draw.cr, x, y);        cairo_move_to (event->data.draw.cr, x, y - extents.y_bearing + text_y);
633        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);        cairo_set_source_rgba (event->data.draw.cr, 0, 0, 0, 1);
634        cairo_show_text (event->data.draw.cr, _(difficulty));        cairo_show_text (event->data.draw.cr, _(difficulty));
635        cairo_stroke (event->data.draw.cr);        cairo_stroke (event->data.draw.cr);
636        x += extents.width + 2;        x += extents.width + 2;
637    
638        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);  
639      }      }
640    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {    } else if(event->type == OSM_GPS_MAP_BALLOON_EVENT_TYPE_CLICK) {
641      printf("click %s event at %d %d\n",      printf("click %s event at %d %d\n",
# Line 696  static void on_window_destroy(GtkWidget Line 758  static void on_window_destroy(GtkWidget
758    gtk_timeout_remove(context->handler_id);    gtk_timeout_remove(context->handler_id);
759    gps_unregister_callback(appdata, context->cb_id);    gps_unregister_callback(appdata, context->cb_id);
760    
761      if(context->caches_displayed) {
762        g_free(context->caches_displayed);
763        context->caches_displayed = NULL;
764      }
765    
766    g_free(context);    g_free(context);
767    appdata->map.context = NULL;    appdata->map.context = NULL;
768  }  }
# Line 725  on_window_realize(GtkWidget *widget, gpo Line 792  on_window_realize(GtkWidget *widget, gpo
792    
793  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,  static gboolean on_focus_in(GtkWidget *widget, GdkEventFocus *event,
794                           gpointer data) {                           gpointer data) {
795      map_context_t *context = (map_context_t*)data;
796    
797    printf("map got focus\n");    printf("map got focus\n");
798    map_setup((map_context_t*)data);  
799    #ifdef USE_MAEMO
800      /* re-enable refresh of map */
801      if(!context->handler_id)
802        context->handler_id = gtk_timeout_add(1000, map_gps_update, context);
803    #endif
804    
805      map_setup(context);
806    return FALSE;    return FALSE;
807  }  }
808    
809    #ifdef USE_MAEMO
810    static gboolean on_focus_out(GtkWidget *widget, GdkEventFocus *event,
811                             gpointer data) {
812      map_context_t *context = (map_context_t*)data;
813    
814      printf("map lost focus\n");
815      gtk_timeout_remove(context->handler_id);
816      context->handler_id = 0;
817    
818      return FALSE;
819    }
820    #endif
821    
822  void map_update(appdata_t *appdata) {  void map_update(appdata_t *appdata) {
823    printf("map_update\n");    printf("map_update\n");
824  #ifndef USE_MAEMO  #ifndef USE_MAEMO
# Line 823  void map(appdata_t *appdata) { Line 912  void map(appdata_t *appdata) {
912    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",    g_signal_connect(G_OBJECT(context->widget), "focus-in-event",
913                     G_CALLBACK(on_focus_in), context);                     G_CALLBACK(on_focus_in), context);
914    
915    #ifdef USE_MAEMO
916      g_signal_connect(G_OBJECT(context->widget), "focus-out-event",
917                       G_CALLBACK(on_focus_out), context);
918    #endif
919    
920    g_signal_connect(G_OBJECT(context->widget), "configure-event",    g_signal_connect(G_OBJECT(context->widget), "configure-event",
921                     G_CALLBACK(on_map_configure), context);                     G_CALLBACK(on_map_configure), context);
922    
Legend:
Removed from v.151  
changed lines
  Added in v.189